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.71 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 2007 UTC

… …
132static void 132static void
133clear_map (player *pl) 133clear_map (player *pl)
134{ 134{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false;
138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
141} 143}
… …
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.force_newmap && 0)
152 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
153 socket.current_map = ob->map; 157 socket.current_map = ob->map;
154 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
155 clear_map (pl); 162 clear_map (pl);
156 163
157 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
158 { 165 {
159 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
… …
459 char tmpbuf[20]; 466 char tmpbuf[20];
460 int q = atoi (param); 467 int q = atoi (param);
461 468
462 if (is_valid_faceset (q)) 469 if (is_valid_faceset (q))
463 ns->faceset = q; 470 ns->faceset = q;
471
464 sprintf (tmpbuf, "%d", ns->faceset); 472 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */ 474 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1; 475 ns->image2 = 1;
468 } 476 }
… …
561 * This is what takes care of it. We tell the client how things worked out. 569 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 570 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
564 */ 572 */
565void 573void
566AddMeCmd (char *buf, int len, client * ns) 574AddMeCmd (char *buf, int len, client *ns)
567{ 575{
576 // face caching is mandatory
577 if (!ns->facecache)
578 {
579 ns->send_drawinfo (
580 "\n"
581 "\n"
582 "***\n"
583 "*** WARNING:\n"
584 "*** Your client does not support face/image caching,\n"
585 "*** or it has been disabled. Face caching is mandatory\n"
586 "*** so please enable it or use a newer client.\n"
587 "***\n"
588 "*** Look at your client preferences:\n"
589 "***\n"
590 "*** CFPlus: all known versions automatically enable the facecache.\n"
591 "*** cfclient: use the -cache commandline option.\n"
592 "*** cfclient: map will not redraw automatically (bug).\n"
593 "*** gcfclient: use -cache commandline option, or enable\n"
594 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596 "***\n"
597 "***\n",
598 NDI_RED
599 );
600
601 if (strstr (ns->version, "jcrossclient"))
602 /* let them, for now*/;
603 else
604 {
605 ns->flush ();
606 //ns->destroy ();
607 }
608 //ns->facecache = true;
609 }
610
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 611 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 612}
570 613
571/** Reply to ExtendedInfos command */ 614/** Reply to ExtendedInfos command */
572void 615void
… …
683 726
684 ns->send_packet (cmdback); 727 ns->send_packet (cmdback);
685} 728}
686 729
687/** 730/**
688 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 731 * client requested an image. send it rate-limited
689 * Basically, it makes no sense to wait for the client to request a 732 * before flushing.
690 * a piece of data from us that we know the client wants. So
691 * if we know the client wants it, might as well push it to the
692 * client.
693 */
694static void
695SendSmooth (client *ns, uint16 face)
696{
697 uint16 smoothface;
698
699 /* If we can't find a face, return and set it so we won't try to send this
700 * again.
701 */ 733 */
702 if (!FindSmooth (face, &smoothface)) 734void
703 { 735AskFaceCmd (char *buf, int len, client *ns)
704 736{
705 LOG (llevError, "could not findsmooth for %d.\n", face); 737 ns->askface.push_back (atoi (buf));
706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707 return;
708 }
709
710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711 esrv_send_face (ns, smoothface, 0);
712
713 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715 packet sl ("smooth");
716
717 sl << uint16 (face)
718 << uint16 (smoothface);
719
720 ns->send_packet (sl);
721} 738}
722 739
723/** 740/**
724 * Tells client the picture it has to use 741 * Tells client the picture it has to use
725 * to smooth a picture number given as argument. 742 * to smooth a picture number given as argument.
726 */ 743 */
727void 744void
728AskSmooth (char *buf, int len, client *ns) 745AskSmooth (char *buf, int len, client *ns)
729{ 746{
730 SendSmooth (ns, atoi (buf)); 747 ns->send_face (atoi (buf));
731} 748}
732 749
733/** 750/**
734 * This handles the general commands from the client (ie, north, fire, cast, 751 * This handles the general commands from the client (ie, north, fire, cast,
735 * etc.) 752 * etc.)
… …
1107 pl->ns->last_weight = weight; 1124 pl->ns->last_weight = weight;
1108 pl->ns->send_packet (sl); 1125 pl->ns->send_packet (sl);
1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1126 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110} 1127}
1111 1128
1112/**
1113 * Need to send an animation sequence to the client.
1114 * We will send appropriate face commands to the client if we haven't
1115 * sent them the face yet (this can become quite costly in terms of
1116 * how much we are sending - on the other hand, this should only happen
1117 * when the player logs in and picks stuff up.
1118 */
1119void
1120esrv_send_animation (client * ns, short anim_num)
1121{
1122 /* Do some checking on the anim_num we got. Note that the animations
1123 * are added in contigous order, so if the number is in the valid
1124 * range, it must be a valid animation.
1125 */
1126 if (anim_num < 0 || anim_num > num_animations)
1127 {
1128 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129 return;
1130 }
1131
1132 packet sl ("anim");
1133
1134 sl << uint16 (anim_num)
1135 << uint16 (0); /* flags - not used right now */
1136
1137 /* Build up the list of faces. Also, send any information (ie, the
1138 * the face itself) down to the client.
1139 */
1140 for (int i = 0; i < animations[anim_num].num_animations; i++)
1141 {
1142 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146 }
1147
1148 ns->send_packet (sl);
1149
1150 ns->anims_sent[anim_num] = 1;
1151}
1152
1153
1154/****************************************************************************** 1129/******************************************************************************
1155 * 1130 *
1156 * Start of map related commands. 1131 * Start of map related commands.
1157 * 1132 *
1158 ******************************************************************************/ 1133 ******************************************************************************/
1159 1134
1160/** Clears a map cell */ 1135/** Clears a map cell */
1161static void 1136static void
1162map_clearcell (struct MapCell *cell, int count) 1137map_clearcell (struct MapCell *cell, int count)
1163{ 1138{
1164 cell->faces[0] = 0; 1139 cell->faces[0] = 0;
1165 cell->faces[1] = 0; 1140 cell->faces[1] = 0;
1166 cell->faces[2] = 0; 1141 cell->faces[2] = 0;
1142 cell->smooth[0] = 0;
1143 cell->smooth[1] = 0;
1144 cell->smooth[2] = 0;
1167 cell->count = count; 1145 cell->count = count;
1168 cell->stat_hp = 0; 1146 cell->stat_hp = 0;
1169 cell->flags = 0; 1147 cell->flags = 0;
1170 cell->player = 0; 1148 cell->player = 0;
1171} 1149}
1172 1150
1173#define MAX_LAYERS 3 1151#define MAX_LAYERS 3
1174 1152
1175/** 1153/**
… …
1178 * it was. 1156 * it was.
1179 * sl is the socklist this data is going into. 1157 * sl is the socklist this data is going into.
1180 * ns is the socket we are working on - all the info we care 1158 * ns is the socket we are working on - all the info we care
1181 * about is in this socket structure, so now need not pass the 1159 * about is in this socket structure, so now need not pass the
1182 * entire player object. 1160 * entire player object.
1183 * mx and my are map coordinate offsets for map mp
1184 * sx and sy are the offsets into the socket structure that
1185 * holds the old values.
1186 * layer is the layer to update, with 2 being the floor and 0 the 1161 * layer is the layer to update, with 2 being the floor and 0 the
1187 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1162 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1188 * take. Interesting to note that before this function, the map1 function 1163 * take. Interesting to note that before this function, the map1 function
1189 * numbers the spaces differently - I think this was a leftover from 1164 * numbers the spaces differently - I think this was a leftover from
1190 * the map command, where the faces stack up. Sinces that is no longer 1165 * the map command, where the faces stack up. Sinces that is no longer
1191 * the case, it seems to make more sense to have these layer values 1166 * the case, it seems to make more sense to have these layer values
1192 * actually match. 1167 * actually match.
1193 */ 1168 */
1194static int 1169static int
1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1170update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196{ 1171{
1197 uint16 face_num; 1172 object *ob = ms.faces_obj [layer];
1198 int bx, by, i;
1199
1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201 1173
1202 /* If there is no object for this space, or if the face for the object 1174 /* If there is no object for this space, or if the face for the object
1203 * is the blank face, set the face number to zero. 1175 * is the blank face, set the face number to zero.
1204 * else if we have the stored head object for this space, that takes 1176 * else if we have the stored head object for this space, that takes
1205 * precedence over the other object for this space. 1177 * precedence over the other object for this space.
1206 * otherwise, we do special head processing 1178 * otherwise, we do special head processing
1207 */ 1179 */
1208 if (!ob || ob->face == blank_face) 1180 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209 face_num = 0;
1210 else
1211 /* In this case, we are already at the lower right or single part object,
1212 * so nothing special
1213 */
1214 face_num = ob->face;
1215 1181
1216 /* We've gotten what face we want to use for the object. Now see if 1182 /* We've gotten what face we want to use for the object. Now see if
1217 * if it has changed since we last sent it to the client. 1183 * if it has changed since we last sent it to the client.
1218 */ 1184 */
1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1185 if (lastcell.faces[layer] != face_num)
1220 { 1186 {
1221 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1187 lastcell.faces[layer] = face_num;
1188
1222 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!ns.faces_sent[face_num])
1190 if (ob)
1191 ns.send_faces (ob);
1192 else
1223 esrv_send_face (&ns, face_num, 0); 1193 ns.send_face (face_num);
1224 1194
1225 sl << uint16 (face_num); 1195 sl << uint16 (face_num);
1226 return 1;
1227 }
1228
1229 /* Nothing changed */
1230 return 0;
1231}
1232
1233/**
1234 * This function is mainly a copy of update_space,
1235 * except it handles update of the smoothing updates,
1236 * not the face updates.
1237 * Removes the need to replicate the same code for each layer.
1238 * this returns true if this smooth is now in fact different
1239 * than it was.
1240 * sl is the socklist this data is going into.
1241 * ns is the socket we are working on - all the info we care
1242 * about is in this socket structure, so know need to pass the
1243 * entire player object.
1244 * mx and my are map coordinate offsets for map mp
1245 * sx and sy are the offsets into the socket structure that
1246 * holds the old values.
1247 * layer is the layer to update, with 2 being the floor and 0 the
1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249 * take.
1250 */
1251static inline int
1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253{
1254 object *ob;
1255 int smoothlevel; /* old face_num; */
1256
1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259 /* If there is no object for this space, or if the face for the object
1260 * is the blank face, set the smoothlevel to zero.
1261 */
1262 if (!ob || ob->face == blank_face)
1263 smoothlevel = 0;
1264 else
1265 {
1266 smoothlevel = ob->smoothlevel;
1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268 SendSmooth (&ns, ob->face);
1269 } /* else not already head object or blank face */
1270
1271 /* We've gotten what face we want to use for the object. Now see if
1272 * if it has changed since we last sent it to the client.
1273 */
1274 if (smoothlevel > 255)
1275 smoothlevel = 255;
1276 else if (smoothlevel < 0)
1277 smoothlevel = 0;
1278
1279 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280 {
1281 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282 sl << uint8 (smoothlevel);
1283 return 1; 1196 return 1;
1284 } 1197 }
1285 1198
1286 /* Nothing changed */ 1199 /* Nothing changed */
1287 return 0; 1200 return 0;
… …
1351 * look like. 1264 * look like.
1352 */ 1265 */
1353void 1266void
1354draw_client_map1 (object *pl) 1267draw_client_map1 (object *pl)
1355{ 1268{
1356 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1269 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1357 sint16 nx, ny; 1270 sint16 nx, ny;
1358 int estartlen, eoldlen; 1271 int estartlen, eoldlen;
1359 uint16 mask, emask;
1360 uint8 eentrysize; 1272 uint8 eentrysize;
1361 uint16 ewhatstart, ewhatflag; 1273 uint16 ewhatstart, ewhatflag;
1362 uint8 extendedinfos; 1274 uint8 extendedinfos;
1363 maptile *m; 1275 maptile *m;
1364 1276
… …
1391 << uint8 (extendedinfos) 1303 << uint8 (extendedinfos)
1392 << uint8 (eentrysize); 1304 << uint8 (eentrysize);
1393 1305
1394 estartlen = esl.length (); 1306 estartlen = esl.length ();
1395 } 1307 }
1396 else
1397 {
1398 /* suppress compiler warnings */
1399 ewhatstart = 0;
1400 ewhatflag = 0;
1401 estartlen = 0;
1402 }
1403 1308
1404 /* x,y are the real map locations. ax, ay are viewport relative 1309 /* x,y are the real map locations. ax, ay are viewport relative
1405 * locations. 1310 * locations.
1406 */ 1311 */
1407 ay = 0; 1312 ay = 0;
… …
1410 * but that started to get a bit messy to look at. 1315 * but that started to get a bit messy to look at.
1411 */ 1316 */
1412 max_x = pl->x + (socket.mapx + 1) / 2; 1317 max_x = pl->x + (socket.mapx + 1) / 2;
1413 max_y = pl->y + (socket.mapy + 1) / 2; 1318 max_y = pl->y + (socket.mapy + 1) / 2;
1414 1319
1320 maptile *plmap = pl->map;
1321
1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1322 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1416 { 1323 {
1417 ax = 0; 1324 ax = 0;
1418 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1325 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1419 { 1326 {
1327 int emask, mask;
1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1328 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421 1329
1422 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1330 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423
1424 d = pl->contr->blocked_los[ax][ay];
1425 1331
1426 /* If the coordinates are not valid, or it is too dark to see, 1332 /* If the coordinates are not valid, or it is too dark to see,
1427 * we tell the client as such 1333 * we tell the client as such
1428 */ 1334 */
1429 nx = x; 1335 nx = x;
1430 ny = y; 1336 ny = y;
1431 m = get_map_from_coord (pl->map, &nx, &ny); 1337 m = get_map_from_coord (plmap, &nx, &ny);
1432 1338
1433 if (!m) 1339 if (!m)
1434 { 1340 {
1435 /* space is out of map. Update space and clear values 1341 /* space is out of map. Update space and clear values
1436 * if this hasn't already been done. If the space is out 1342 * if this hasn't already been done. If the space is out
… …
1439 if (lastcell.count != -1) 1345 if (lastcell.count != -1)
1440 { 1346 {
1441 sl << uint16 (mask); 1347 sl << uint16 (mask);
1442 map_clearcell (&lastcell, -1); 1348 map_clearcell (&lastcell, -1);
1443 } 1349 }
1350
1351 continue;
1444 } 1352 }
1353
1354 m->touch ();
1355
1356 int d = pl->contr->blocked_los[ax][ay];
1357
1445 else if (d > 3) 1358 if (d > 3)
1446 { 1359 {
1447 m->touch ();
1448 1360
1449 int need_send = 0, count; 1361 int need_send = 0, count;
1450 1362
1451 /* This block deals with spaces that are not visible for whatever 1363 /* This block deals with spaces that are not visible for whatever
1452 * reason. Still may need to send the head for this space. 1364 * reason. Still may need to send the head for this space.
… …
1460 need_send = 1; 1372 need_send = 1;
1461 1373
1462 count = -1; 1374 count = -1;
1463 1375
1464 /* properly clear a previously sent big face */ 1376 /* properly clear a previously sent big face */
1465 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1377 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1466 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1378 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1467 need_send = 1; 1379 need_send = 1;
1468 1380
1469 map_clearcell (&lastcell, count); 1381 map_clearcell (&lastcell, count);
1470 1382
… …
1473 else 1385 else
1474 sl.reset (oldlen); 1386 sl.reset (oldlen);
1475 } 1387 }
1476 else 1388 else
1477 { 1389 {
1478 m->touch ();
1479
1480 /* In this block, the space is visible. 1390 /* In this block, the space is visible.
1481 */ 1391 */
1482 1392
1483 /* Rather than try to figure out what everything that we might 1393 /* Rather than try to figure out what everything that we might
1484 * need to send is, then form the packet after that, 1394 * need to send is, then form the packet after that,
… …
1488 * is done. 1398 * is done.
1489 * I think this is simpler than doing a bunch of checks to see 1399 * I think this is simpler than doing a bunch of checks to see
1490 * what if anything we need to send, setting the bits, then 1400 * what if anything we need to send, setting the bits, then
1491 * doing those checks again to add the real data. 1401 * doing those checks again to add the real data.
1492 */ 1402 */
1493 oldlen = sl.length (); 1403 oldlen = sl.length ();
1494 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1495 eoldlen = esl.length (); 1404 eoldlen = esl.length ();
1496 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1405
1497 sl << uint16 (mask); 1406 sl << uint16 (mask);
1498
1499 if (socket.ext_mapinfos)
1500 esl << uint16 (emask);
1501 1407
1502 unsigned char dummy; 1408 unsigned char dummy;
1503 unsigned char *last_ext = &dummy; 1409 unsigned char *last_ext = &dummy;
1504 1410
1505 /* Darkness changed */ 1411 /* Darkness changed */
… …
1517 sl << uint8 (255 - 64 * d); 1423 sl << uint8 (255 - 64 * d);
1518 } 1424 }
1519 1425
1520 lastcell.count = d; 1426 lastcell.count = d;
1521 1427
1428 mapspace &ms = m->at (nx, ny);
1429
1522 if (socket.extmap) 1430 if (socket.extmap)
1523 { 1431 {
1524 uint8 stat_hp = 0; 1432 uint8 stat_hp = 0;
1525 uint8 stat_width = 0; 1433 uint8 stat_width = 0;
1526 uint8 flags = 0; 1434 uint8 flags = 0;
1527 UUID player = 0; 1435 UUID player = 0;
1528 1436
1529 // send hp information, if applicable 1437 // send hp information, if applicable
1530 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1438 if (object *op = ms.faces_obj [0])
1531 { 1439 {
1532 if (op->head || op->invisible) 1440 if (op->head || op->invisible)
1533 ; // do not show 1441 ; // do not show
1534 else if (op->type == PLAYER 1442 else if (op->type == PLAYER
1535 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1443 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1589 sl << uint8 (8) << uint8 (flags); 1497 sl << uint8 (8) << uint8 (flags);
1590 } 1498 }
1591 } 1499 }
1592 1500
1593 /* Floor face */ 1501 /* Floor face */
1594 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1502 if (update_space (sl, socket, ms, lastcell, 2))
1595 mask |= 0x4; 1503 mask |= 0x4;
1596 1504
1597 if (socket.EMI_smooth)
1598 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1599 emask |= 0x4;
1600
1601 /* Middle face */ 1505 /* Middle face */
1602 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1506 if (update_space (sl, socket, ms, lastcell, 1))
1603 mask |= 0x2; 1507 mask |= 0x2;
1604 1508
1605 if (socket.EMI_smooth) 1509 if (ms.player () == pl
1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1510 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1607 emask |= 0x2;
1608
1609 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1610 { 1511 {
1512 // force player to be visible to himself if invisible
1611 if (lastcell.faces[0] != pl->face) 1513 if (lastcell.faces[0] != pl->face)
1612 { 1514 {
1613 lastcell.faces[0] = pl->face; 1515 lastcell.faces[0] = pl->face;
1516
1614 mask |= 0x1; 1517 mask |= 0x1;
1615
1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1617 esrv_send_face (&socket, pl->face, 0);
1618
1619 sl << uint16 (pl->face); 1518 sl << uint16 (pl->face);
1519
1520 socket.send_faces (pl);
1620 } 1521 }
1621 } 1522 }
1622 else
1623 {
1624 /* Top face */ 1523 /* Top face */
1625 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1524 else if (update_space (sl, socket, ms, lastcell, 0))
1626 mask |= 0x1; 1525 mask |= 0x1;
1627
1628 if (socket.EMI_smooth)
1629 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1630 emask |= 0x1;
1631 } 1526
1632 1527
1633 /* Check to see if we are in fact sending anything for this 1528 /* Check to see if we are in fact sending anything for this
1634 * space by checking the mask. If so, update the mask. 1529 * space by checking the mask. If so, update the mask.
1635 * if not, reset the len to that from before adding the mask 1530 * if not, reset the len to that from before adding the mask
1636 * value, so we don't send those bits. 1531 * value, so we don't send those bits.
… …
1638 if (mask & 0xf) 1533 if (mask & 0xf)
1639 sl[oldlen + 1] = mask & 0xff; 1534 sl[oldlen + 1] = mask & 0xff;
1640 else 1535 else
1641 sl.reset (oldlen); 1536 sl.reset (oldlen);
1642 1537
1538 if (socket.ext_mapinfos)
1539 esl << uint16 (emask);
1540
1541 if (socket.EMI_smooth)
1542 {
1543 for (int layer = 2+1; layer--; )
1544 {
1545 object *ob = ms.faces_obj [layer];
1546
1547 // If there is no object for this space, or if the face for the object
1548 // is the blank face, set the smoothlevel to zero.
1549 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1550
1551 // We've gotten what face we want to use for the object. Now see if
1552 // if it has changed since we last sent it to the client.
1553 if (lastcell.smooth[layer] != smoothlevel)
1554 {
1555 lastcell.smooth[layer] = smoothlevel;
1556 esl << uint8 (smoothlevel);
1557 emask |= 1 << layer;
1558 }
1559 }
1560
1643 if (emask & 0xf) 1561 if (emask & 0xf)
1644 esl[eoldlen + 1] = emask & 0xff; 1562 esl[eoldlen + 1] = emask & 0xff;
1645 else 1563 else
1646 esl.reset (eoldlen); 1564 esl.reset (eoldlen);
1565 }
1647 } /* else this is a viewable space */ 1566 } /* else this is a viewable space */
1648 } /* for x loop */ 1567 } /* for x loop */
1649 } /* for y loop */ 1568 } /* for y loop */
1650 1569
1651 /* Verify that we in fact do need to send this */ 1570 /* Verify that we in fact do need to send this */
… …
1654 if (!(sl.length () > startlen || socket.sent_scroll)) 1573 if (!(sl.length () > startlen || socket.sent_scroll))
1655 { 1574 {
1656 /* No map data will follow, so don't say the client 1575 /* No map data will follow, so don't say the client
1657 * it doesn't need draw! 1576 * it doesn't need draw!
1658 */ 1577 */
1659 ewhatflag &= (~EMI_NOREDRAW); 1578 ewhatflag &= ~EMI_NOREDRAW;
1660 esl[ewhatstart + 1] = ewhatflag & 0xff; 1579 esl[ewhatstart + 1] = ewhatflag & 0xff;
1661 } 1580 }
1662 1581
1663 if (esl.length () > estartlen) 1582 if (esl.length () > estartlen)
1664 socket.send_packet (esl); 1583 socket.send_packet (esl);

Diff Legend

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