ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.77 by root, Wed Mar 14 15:44:47 2007 UTC

… …
97 * complexities for the client, and probably doesn't make 97 * complexities for the client, and probably doesn't make
98 * that much difference in bandwidth. 98 * that much difference in bandwidth.
99 */ 99 */
100 mx = ns->mapx; 100 mx = ns->mapx;
101 my = ns->mapy; 101 my = ns->mapy;
102
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108 102
109 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
110 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
111 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
112 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
… …
437 } 431 }
438 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
439 { 433 {
440 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
442// } else if (!strcmp(cmd,"plugincmd")) {
443// ns->plugincmd = atoi(param);
444// safe_strcat(cmdback, param, &slen, HUGE_BUF);
445 } 436 }
446 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
447 { 438 {
448 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
468 char tmpbuf[20]; 459 char tmpbuf[20];
469 int q = atoi (param); 460 int q = atoi (param);
470 461
471 if (is_valid_faceset (q)) 462 if (is_valid_faceset (q))
472 ns->faceset = q; 463 ns->faceset = q;
464
473 sprintf (tmpbuf, "%d", ns->faceset); 465 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 466 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */ 467 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1; 468 ns->image2 = 1;
477 } 469 }
… …
505 if (*cp == 'x' || *cp == 'X') 497 if (*cp == 'x' || *cp == 'X')
506 { 498 {
507 y = atoi (cp + 1); 499 y = atoi (cp + 1);
508 break; 500 break;
509 } 501 }
502
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 503 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 { 504 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 505 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 506 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 } 507 }
… …
569 * This is what takes care of it. We tell the client how things worked out. 562 * This is what takes care of it. We tell the client how things worked out.
570 * I am not sure if this file is the best place for this function. however, 563 * I am not sure if this file is the best place for this function. however,
571 * it either has to be here or init_sockets needs to be exported. 564 * it either has to be here or init_sockets needs to be exported.
572 */ 565 */
573void 566void
574AddMeCmd (char *buf, int len, client * ns) 567AddMeCmd (char *buf, int len, client *ns)
575{ 568{
569 // face caching is mandatory
570 if (!ns->facecache)
571 {
572 ns->send_drawinfo (
573 "\n"
574 "\n"
575 "***\n"
576 "*** WARNING:\n"
577 "*** Your client does not support face/image caching,\n"
578 "*** or it has been disabled. Face caching is mandatory\n"
579 "*** so please enable it or use a newer client.\n"
580 "***\n"
581 "*** I will proceed as if face caching were enabled.\n"
582 "\n"
583 "***\n",
584 NDI_RED
585 );
586 //ns->facecache = true;
587 }
588
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 589 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 590}
578 591
579/** Reply to ExtendedInfos command */ 592/** Reply to ExtendedInfos command */
580void 593void
… …
691 704
692 ns->send_packet (cmdback); 705 ns->send_packet (cmdback);
693} 706}
694 707
695/** 708/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 709 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 710 * before flushing.
698 * a piece of data from us that we know the client wants. So
699 * if we know the client wants it, might as well push it to the
700 * client.
701 */
702static void
703SendSmooth (client *ns, uint16 face)
704{
705 uint16 smoothface;
706
707 /* If we can't find a face, return and set it so we won't try to send this
708 * again.
709 */ 711 */
710 if (!FindSmooth (face, &smoothface)) 712void
711 { 713AskFaceCmd (char *buf, int len, client *ns)
712 714{
713 LOG (llevError, "could not findsmooth for %d.\n", face); 715 ns->askface.push_back (atoi (buf));
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return;
716 }
717
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
719 esrv_send_face (ns, smoothface, 0);
720
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722
723 packet sl ("smooth");
724
725 sl << uint16 (face)
726 << uint16 (smoothface);
727
728 ns->send_packet (sl);
729} 716}
730 717
731/** 718/**
732 * Tells client the picture it has to use 719 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 720 * to smooth a picture number given as argument.
734 */ 721 */
735void 722void
736AskSmooth (char *buf, int len, client *ns) 723AskSmooth (char *buf, int len, client *ns)
737{ 724{
738 SendSmooth (ns, atoi (buf)); 725 ns->send_face (atoi (buf));
739} 726}
740 727
741/** 728/**
742 * This handles the general commands from the client (ie, north, fire, cast, 729 * This handles the general commands from the client (ie, north, fire, cast,
743 * etc.) 730 * etc.)
… …
879 866
880 ns->cs_version = atoi (buf); 867 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 868 ns->sc_version = ns->cs_version;
882 869
883 LOG (llevDebug, "connection from client <%s>\n", buf); 870 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885 871
886 //TODO: should log here just for statistics 872 //TODO: should log here just for statistics
887 873
888 //if (VERSION_CS != ns->cs_version) 874 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 875 // unchecked;
… …
1116 pl->ns->last_weight = weight; 1102 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 1103 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1104 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 1105}
1120 1106
1121/**
1122 * Need to send an animation sequence to the client.
1123 * We will send appropriate face commands to the client if we haven't
1124 * sent them the face yet (this can become quite costly in terms of
1125 * how much we are sending - on the other hand, this should only happen
1126 * when the player logs in and picks stuff up.
1127 */
1128void
1129esrv_send_animation (client * ns, short anim_num)
1130{
1131 /* Do some checking on the anim_num we got. Note that the animations
1132 * are added in contigous order, so if the number is in the valid
1133 * range, it must be a valid animation.
1134 */
1135 if (anim_num < 0 || anim_num > num_animations)
1136 {
1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1138 return;
1139 }
1140
1141 packet sl ("anim");
1142
1143 sl << uint16 (anim_num)
1144 << uint16 (0); /* flags - not used right now */
1145
1146 /* Build up the list of faces. Also, send any information (ie, the
1147 * the face itself) down to the client.
1148 */
1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1150 {
1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1155 }
1156
1157 ns->send_packet (sl);
1158
1159 ns->anims_sent[anim_num] = 1;
1160}
1161
1162
1163/****************************************************************************** 1107/******************************************************************************
1164 * 1108 *
1165 * Start of map related commands. 1109 * Start of map related commands.
1166 * 1110 *
1167 ******************************************************************************/ 1111 ******************************************************************************/
1168 1112
1169/** Clears a map cell */ 1113/** Clears a map cell */
1170static void 1114static void
1171map_clearcell (struct MapCell *cell, int count) 1115map_clearcell (struct MapCell *cell, int count)
1172{ 1116{
1173 cell->faces[0] = 0; 1117 cell->faces[0] = 0;
1174 cell->faces[1] = 0; 1118 cell->faces[1] = 0;
1175 cell->faces[2] = 0; 1119 cell->faces[2] = 0;
1120 cell->smooth[0] = 0;
1121 cell->smooth[1] = 0;
1122 cell->smooth[2] = 0;
1176 cell->count = count; 1123 cell->count = count;
1177 cell->stat_hp = 0; 1124 cell->stat_hp = 0;
1178 cell->flags = 0; 1125 cell->flags = 0;
1179 cell->player = 0; 1126 cell->player = 0;
1180} 1127}
1181 1128
1182#define MAX_LAYERS 3 1129#define MAX_LAYERS 3
1183 1130
1184/** 1131/**
… …
1187 * it was. 1134 * it was.
1188 * sl is the socklist this data is going into. 1135 * sl is the socklist this data is going into.
1189 * ns is the socket we are working on - all the info we care 1136 * ns is the socket we are working on - all the info we care
1190 * about is in this socket structure, so now need not pass the 1137 * about is in this socket structure, so now need not pass the
1191 * entire player object. 1138 * entire player object.
1192 * mx and my are map coordinate offsets for map mp
1193 * sx and sy are the offsets into the socket structure that
1194 * holds the old values.
1195 * layer is the layer to update, with 2 being the floor and 0 the 1139 * layer is the layer to update, with 2 being the floor and 0 the
1196 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1140 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1197 * take. Interesting to note that before this function, the map1 function 1141 * take. Interesting to note that before this function, the map1 function
1198 * numbers the spaces differently - I think this was a leftover from 1142 * numbers the spaces differently - I think this was a leftover from
1199 * the map command, where the faces stack up. Sinces that is no longer 1143 * the map command, where the faces stack up. Sinces that is no longer
1200 * the case, it seems to make more sense to have these layer values 1144 * the case, it seems to make more sense to have these layer values
1201 * actually match. 1145 * actually match.
1202 */ 1146 */
1203static int 1147static int
1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1148update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1205{ 1149{
1206 uint16 face_num; 1150 object *ob = ms.faces_obj [layer];
1207 int bx, by, i;
1208
1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1210 1151
1211 /* If there is no object for this space, or if the face for the object 1152 /* If there is no object for this space, or if the face for the object
1212 * is the blank face, set the face number to zero. 1153 * is the blank face, set the face number to zero.
1213 * else if we have the stored head object for this space, that takes 1154 * else if we have the stored head object for this space, that takes
1214 * precedence over the other object for this space. 1155 * precedence over the other object for this space.
1215 * otherwise, we do special head processing 1156 * otherwise, we do special head processing
1216 */ 1157 */
1217 if (!ob || ob->face == blank_face) 1158 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1218 face_num = 0;
1219 else
1220 /* In this case, we are already at the lower right or single part object,
1221 * so nothing special
1222 */
1223 face_num = ob->face;
1224 1159
1225 /* We've gotten what face we want to use for the object. Now see if 1160 /* We've gotten what face we want to use for the object. Now see if
1226 * if it has changed since we last sent it to the client. 1161 * if it has changed since we last sent it to the client.
1227 */ 1162 */
1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1163 if (lastcell.faces[layer] != face_num)
1229 { 1164 {
1230 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1165 lastcell.faces[layer] = face_num;
1166
1231 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1167 if (!ns.faces_sent[face_num])
1168 if (ob)
1169 ns.send_faces (ob);
1170 else
1232 esrv_send_face (&ns, face_num, 0); 1171 ns.send_face (face_num);
1233 1172
1234 sl << uint16 (face_num); 1173 sl << uint16 (face_num);
1235 return 1;
1236 }
1237
1238 /* Nothing changed */
1239 return 0;
1240}
1241
1242/**
1243 * This function is mainly a copy of update_space,
1244 * except it handles update of the smoothing updates,
1245 * not the face updates.
1246 * Removes the need to replicate the same code for each layer.
1247 * this returns true if this smooth is now in fact different
1248 * than it was.
1249 * sl is the socklist this data is going into.
1250 * ns is the socket we are working on - all the info we care
1251 * about is in this socket structure, so know need to pass the
1252 * entire player object.
1253 * mx and my are map coordinate offsets for map mp
1254 * sx and sy are the offsets into the socket structure that
1255 * holds the old values.
1256 * layer is the layer to update, with 2 being the floor and 0 the
1257 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1258 * take.
1259 */
1260
1261static inline int
1262update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1263{
1264 object *ob;
1265 int smoothlevel; /* old face_num; */
1266
1267 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1268
1269 /* If there is no object for this space, or if the face for the object
1270 * is the blank face, set the smoothlevel to zero.
1271 */
1272 if (!ob || ob->face == blank_face)
1273 smoothlevel = 0;
1274 else
1275 {
1276 smoothlevel = ob->smoothlevel;
1277 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1278 SendSmooth (&ns, ob->face);
1279 } /* else not already head object or blank face */
1280
1281 /* We've gotten what face we want to use for the object. Now see if
1282 * if it has changed since we last sent it to the client.
1283 */
1284 if (smoothlevel > 255)
1285 smoothlevel = 255;
1286 else if (smoothlevel < 0)
1287 smoothlevel = 0;
1288
1289 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1290 {
1291 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1292 sl << uint8 (smoothlevel);
1293 return 1; 1174 return 1;
1294 } 1175 }
1295 1176
1296 /* Nothing changed */ 1177 /* Nothing changed */
1297 return 0; 1178 return 0;
… …
1361 * look like. 1242 * look like.
1362 */ 1243 */
1363void 1244void
1364draw_client_map1 (object *pl) 1245draw_client_map1 (object *pl)
1365{ 1246{
1366 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1247 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1367 sint16 nx, ny; 1248 sint16 nx, ny;
1368 int estartlen, eoldlen; 1249 int estartlen, eoldlen;
1369 uint16 mask, emask;
1370 uint8 eentrysize; 1250 uint8 eentrysize;
1371 uint16 ewhatstart, ewhatflag; 1251 uint16 ewhatstart, ewhatflag;
1372 uint8 extendedinfos; 1252 uint8 extendedinfos;
1373 maptile *m; 1253 maptile *m;
1374 1254
… …
1401 << uint8 (extendedinfos) 1281 << uint8 (extendedinfos)
1402 << uint8 (eentrysize); 1282 << uint8 (eentrysize);
1403 1283
1404 estartlen = esl.length (); 1284 estartlen = esl.length ();
1405 } 1285 }
1406 else
1407 {
1408 /* suppress compiler warnings */
1409 ewhatstart = 0;
1410 ewhatflag = 0;
1411 estartlen = 0;
1412 }
1413 1286
1414 /* x,y are the real map locations. ax, ay are viewport relative 1287 /* x,y are the real map locations. ax, ay are viewport relative
1415 * locations. 1288 * locations.
1416 */ 1289 */
1417 ay = 0; 1290 ay = 0;
… …
1420 * but that started to get a bit messy to look at. 1293 * but that started to get a bit messy to look at.
1421 */ 1294 */
1422 max_x = pl->x + (socket.mapx + 1) / 2; 1295 max_x = pl->x + (socket.mapx + 1) / 2;
1423 max_y = pl->y + (socket.mapy + 1) / 2; 1296 max_y = pl->y + (socket.mapy + 1) / 2;
1424 1297
1425 if (socket.mapmode == Map1aCmd) 1298 maptile *plmap = pl->map;
1426 {
1427 max_x += MAX_HEAD_OFFSET;
1428 max_y += MAX_HEAD_OFFSET;
1429 }
1430 1299
1431 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1300 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1432 { 1301 {
1433 ax = 0; 1302 ax = 0;
1434 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1303 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1435 { 1304 {
1305 int emask, mask;
1436 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1306 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1437 1307
1438 /* If this space is out of the normal viewable area, we only check
1439 * the heads value ax or ay will only be greater than what
1440 * the client wants if using the map1a command - this is because
1441 * if the map1a command is not used, max_x and max_y will be
1442 * set to lower values.
1443 */
1444 if (ax >= socket.mapx || ay >= socket.mapy)
1445 {
1446 int i, got_one;
1447
1448 oldlen = sl.length ();
1449
1450 sl << uint16 (mask);
1451
1452 /* If all we are doing is sending 0 (blank) faces, we don't
1453 * actually need to send that - just the coordinates
1454 * with no faces tells the client to blank out the
1455 * space.
1456 */
1457 got_one = 0;
1458 for (i = oldlen + 2; i < sl.length (); i++)
1459 if (sl[i])
1460 got_one = 1;
1461
1462 if (got_one && (mask & 0xf))
1463 sl[oldlen + 1] = mask & 0xff;
1464 else
1465 { /*either all faces blank, either no face at all */
1466 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1467 sl.reset (oldlen + 2);
1468 else
1469 sl.reset (oldlen);
1470 }
1471
1472 /*What concerns extendinfos, nothing to be done for now
1473 * (perhaps effects layer later)
1474 */
1475 continue; /* don't do processing below */
1476 }
1477
1478 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1308 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1479
1480 d = pl->contr->blocked_los[ax][ay];
1481 1309
1482 /* If the coordinates are not valid, or it is too dark to see, 1310 /* If the coordinates are not valid, or it is too dark to see,
1483 * we tell the client as such 1311 * we tell the client as such
1484 */ 1312 */
1485 nx = x; 1313 nx = x;
1486 ny = y; 1314 ny = y;
1487 m = get_map_from_coord (pl->map, &nx, &ny); 1315 m = get_map_from_coord (plmap, &nx, &ny);
1488 1316
1489 if (!m) 1317 if (!m)
1490 { 1318 {
1491 /* space is out of map. Update space and clear values 1319 /* space is out of map. Update space and clear values
1492 * if this hasn't already been done. If the space is out 1320 * if this hasn't already been done. If the space is out
… …
1495 if (lastcell.count != -1) 1323 if (lastcell.count != -1)
1496 { 1324 {
1497 sl << uint16 (mask); 1325 sl << uint16 (mask);
1498 map_clearcell (&lastcell, -1); 1326 map_clearcell (&lastcell, -1);
1499 } 1327 }
1328
1329 continue;
1500 } 1330 }
1331
1332 m->touch ();
1333
1334 int d = pl->contr->blocked_los[ax][ay];
1335
1501 else if (d > 3) 1336 if (d > 3)
1502 { 1337 {
1503 m->touch ();
1504 1338
1505 int need_send = 0, count; 1339 int need_send = 0, count;
1506 1340
1507 /* This block deals with spaces that are not visible for whatever 1341 /* This block deals with spaces that are not visible for whatever
1508 * reason. Still may need to send the head for this space. 1342 * reason. Still may need to send the head for this space.
1509 */ 1343 */
1510 1344
1511 oldlen = sl.length (); 1345 oldlen = sl.length ();
1512 1346
1513 sl << uint16 (mask); 1347 sl << uint16 (mask);
… …
1516 need_send = 1; 1350 need_send = 1;
1517 1351
1518 count = -1; 1352 count = -1;
1519 1353
1520 /* properly clear a previously sent big face */ 1354 /* properly clear a previously sent big face */
1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1355 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1522 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1356 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1523 need_send = 1; 1357 need_send = 1;
1524 1358
1525 map_clearcell (&lastcell, count); 1359 map_clearcell (&lastcell, count);
1526 1360
… …
1529 else 1363 else
1530 sl.reset (oldlen); 1364 sl.reset (oldlen);
1531 } 1365 }
1532 else 1366 else
1533 { 1367 {
1534 m->touch ();
1535
1536 /* In this block, the space is visible or there are head objects 1368 /* In this block, the space is visible.
1537 * we need to send.
1538 */ 1369 */
1539 1370
1540 /* Rather than try to figure out what everything that we might 1371 /* Rather than try to figure out what everything that we might
1541 * need to send is, then form the packet after that, 1372 * need to send is, then form the packet after that,
1542 * we presume that we will in fact form a packet, and update 1373 * we presume that we will in fact form a packet, and update
… …
1545 * is done. 1376 * is done.
1546 * I think this is simpler than doing a bunch of checks to see 1377 * I think this is simpler than doing a bunch of checks to see
1547 * what if anything we need to send, setting the bits, then 1378 * what if anything we need to send, setting the bits, then
1548 * doing those checks again to add the real data. 1379 * doing those checks again to add the real data.
1549 */ 1380 */
1550 oldlen = sl.length (); 1381 oldlen = sl.length ();
1551 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1552 eoldlen = esl.length (); 1382 eoldlen = esl.length ();
1553 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1383
1554 sl << uint16 (mask); 1384 sl << uint16 (mask);
1555
1556 if (socket.ext_mapinfos)
1557 esl << uint16 (emask);
1558 1385
1559 unsigned char dummy; 1386 unsigned char dummy;
1560 unsigned char *last_ext = &dummy; 1387 unsigned char *last_ext = &dummy;
1561 1388
1562 /* Darkness changed */ 1389 /* Darkness changed */
… …
1574 sl << uint8 (255 - 64 * d); 1401 sl << uint8 (255 - 64 * d);
1575 } 1402 }
1576 1403
1577 lastcell.count = d; 1404 lastcell.count = d;
1578 1405
1406 mapspace &ms = m->at (nx, ny);
1407
1579 if (socket.extmap) 1408 if (socket.extmap)
1580 { 1409 {
1581 uint8 stat_hp = 0; 1410 uint8 stat_hp = 0;
1582 uint8 stat_width = 0; 1411 uint8 stat_width = 0;
1583 uint8 flags = 0; 1412 uint8 flags = 0;
1584 UUID player = 0; 1413 UUID player = 0;
1585 1414
1586 // send hp information, if applicable 1415 // send hp information, if applicable
1587 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1416 if (object *op = ms.faces_obj [0])
1588 { 1417 {
1589 if (op->head || op->invisible) 1418 if (op->head || op->invisible)
1590 ; // do not show 1419 ; // do not show
1591 else if (op->type == PLAYER 1420 else if (op->type == PLAYER
1592 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1421 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1646 sl << uint8 (8) << uint8 (flags); 1475 sl << uint8 (8) << uint8 (flags);
1647 } 1476 }
1648 } 1477 }
1649 1478
1650 /* Floor face */ 1479 /* Floor face */
1651 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1480 if (update_space (sl, socket, ms, lastcell, 2))
1652 mask |= 0x4; 1481 mask |= 0x4;
1653 1482
1654 if (socket.EMI_smooth)
1655 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1656 emask |= 0x4;
1657
1658 /* Middle face */ 1483 /* Middle face */
1659 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1484 if (update_space (sl, socket, ms, lastcell, 1))
1660 mask |= 0x2; 1485 mask |= 0x2;
1661 1486
1662 if (socket.EMI_smooth) 1487 if (ms.player () == pl
1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1488 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1664 emask |= 0x2;
1665
1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1667 { 1489 {
1490 // force player to be visible to himself if invisible
1668 if (lastcell.faces[0] != pl->face) 1491 if (lastcell.faces[0] != pl->face)
1669 { 1492 {
1670 lastcell.faces[0] = pl->face; 1493 lastcell.faces[0] = pl->face;
1494
1671 mask |= 0x1; 1495 mask |= 0x1;
1672
1673 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1674 esrv_send_face (&socket, pl->face, 0);
1675
1676 sl << uint16 (pl->face); 1496 sl << uint16 (pl->face);
1497
1498 socket.send_faces (pl);
1677 } 1499 }
1678 } 1500 }
1679 else
1680 {
1681 /* Top face */ 1501 /* Top face */
1682 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1502 else if (update_space (sl, socket, ms, lastcell, 0))
1683 mask |= 0x1; 1503 mask |= 0x1;
1684
1685 if (socket.EMI_smooth)
1686 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1687 emask |= 0x1;
1688 } 1504
1689 1505
1690 /* Check to see if we are in fact sending anything for this 1506 /* Check to see if we are in fact sending anything for this
1691 * space by checking the mask. If so, update the mask. 1507 * space by checking the mask. If so, update the mask.
1692 * if not, reset the len to that from before adding the mask 1508 * if not, reset the len to that from before adding the mask
1693 * value, so we don't send those bits. 1509 * value, so we don't send those bits.
… …
1695 if (mask & 0xf) 1511 if (mask & 0xf)
1696 sl[oldlen + 1] = mask & 0xff; 1512 sl[oldlen + 1] = mask & 0xff;
1697 else 1513 else
1698 sl.reset (oldlen); 1514 sl.reset (oldlen);
1699 1515
1516 if (socket.ext_mapinfos)
1517 esl << uint16 (emask);
1518
1519 if (socket.EMI_smooth)
1520 {
1521 for (int layer = 2+1; layer--; )
1522 {
1523 object *ob = ms.faces_obj [layer];
1524
1525 // If there is no object for this space, or if the face for the object
1526 // is the blank face, set the smoothlevel to zero.
1527 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1528
1529 // We've gotten what face we want to use for the object. Now see if
1530 // if it has changed since we last sent it to the client.
1531 if (lastcell.smooth[layer] != smoothlevel)
1532 {
1533 lastcell.smooth[layer] = smoothlevel;
1534 esl << uint8 (smoothlevel);
1535 emask |= 1 << layer;
1536 }
1537 }
1538
1700 if (emask & 0xf) 1539 if (emask & 0xf)
1701 esl[eoldlen + 1] = emask & 0xff; 1540 esl[eoldlen + 1] = emask & 0xff;
1702 else 1541 else
1703 esl.reset (eoldlen); 1542 esl.reset (eoldlen);
1543 }
1704 } /* else this is a viewable space */ 1544 } /* else this is a viewable space */
1705 } /* for x loop */ 1545 } /* for x loop */
1706 } /* for y loop */ 1546 } /* for y loop */
1707 1547
1708 /* Verify that we in fact do need to send this */ 1548 /* Verify that we in fact do need to send this */
… …
1711 if (!(sl.length () > startlen || socket.sent_scroll)) 1551 if (!(sl.length () > startlen || socket.sent_scroll))
1712 { 1552 {
1713 /* No map data will follow, so don't say the client 1553 /* No map data will follow, so don't say the client
1714 * it doesn't need draw! 1554 * it doesn't need draw!
1715 */ 1555 */
1716 ewhatflag &= (~EMI_NOREDRAW); 1556 ewhatflag &= ~EMI_NOREDRAW;
1717 esl[ewhatstart + 1] = ewhatflag & 0xff; 1557 esl[ewhatstart + 1] = ewhatflag & 0xff;
1718 } 1558 }
1719 1559
1720 if (esl.length () > estartlen) 1560 if (esl.length () > estartlen)
1721 socket.send_packet (esl); 1561 socket.send_packet (esl);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines