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.73 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.84 by root, Tue Apr 3 00:21:38 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)
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
155 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
156 164
157 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
158 { 166 {
159 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
160 { 168 {
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 353
346 pl->ns->send_packet (bigbuf); 354 pl->ns->send_packet (bigbuf);
347} 355}
348 356
349/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd */
350void 358void
351SetUp (char *buf, int len, client * ns) 359SetUp (char *buf, int len, client * ns)
352{ 360{
353 int s, slen; 361 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 362}
558 363
559/** 364/**
560 * The client has requested to be added to the game. 365 * The client has requested to be added to the game.
561 * This is what takes care of it. We tell the client how things worked out. 366 * 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, 367 * 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. 368 * it either has to be here or init_sockets needs to be exported.
564 */ 369 */
565void 370void
566AddMeCmd (char *buf, int len, client * ns) 371AddMeCmd (char *buf, int len, client *ns)
567{ 372{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 374}
570 375
571/** Reply to ExtendedInfos command */ 376/** Reply to ExtendedInfos command */
… …
683 488
684 ns->send_packet (cmdback); 489 ns->send_packet (cmdback);
685} 490}
686 491
687/** 492/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
500}
501
502/**
688 * Tells client the picture it has to use 503 * Tells client the picture it has to use
689 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
690 */ 505 */
691void 506void
692AskSmooth (char *buf, int len, client *ns) 507AskSmooth (char *buf, int len, client *ns)
693{ 508{
694 ns->send_smooth (atoi (buf)); 509 ns->send_face (atoi (buf));
510 ns->flush_fx ();
695} 511}
696 512
697/** 513/**
698 * This handles the general commands from the client (ie, north, fire, cast, 514 * This handles the general commands from the client (ie, north, fire, cast,
699 * etc.) 515 * etc.)
… …
924/** 740/**
925 * Asks the client to query the user. This way, the client knows 741 * Asks the client to query the user. This way, the client knows
926 * it needs to send something back (vs just printing out a message) 742 * it needs to send something back (vs just printing out a message)
927 */ 743 */
928void 744void
929send_query (client *ns, uint8 flags, char *text) 745send_query (client *ns, uint8 flags, const char *text)
930{ 746{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 747 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
932} 748}
933 749
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 750#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1081 897
1082/** Clears a map cell */ 898/** Clears a map cell */
1083static void 899static void
1084map_clearcell (struct MapCell *cell, int count) 900map_clearcell (struct MapCell *cell, int count)
1085{ 901{
1086 cell->faces[0] = 0; 902 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 903 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 904 cell->faces[2] = 0;
905 cell->smooth[0] = 0;
906 cell->smooth[1] = 0;
907 cell->smooth[2] = 0;
1089 cell->count = count; 908 cell->count = count;
1090 cell->stat_hp = 0; 909 cell->stat_hp = 0;
1091 cell->flags = 0; 910 cell->flags = 0;
1092 cell->player = 0; 911 cell->player = 0;
1093} 912}
1094 913
1095#define MAX_LAYERS 3 914#define MAX_LAYERS 3
1096 915
1097/** 916/**
… …
1100 * it was. 919 * it was.
1101 * sl is the socklist this data is going into. 920 * sl is the socklist this data is going into.
1102 * ns is the socket we are working on - all the info we care 921 * ns is the socket we are working on - all the info we care
1103 * about is in this socket structure, so now need not pass the 922 * about is in this socket structure, so now need not pass the
1104 * entire player object. 923 * entire player object.
1105 * mx and my are map coordinate offsets for map mp
1106 * sx and sy are the offsets into the socket structure that
1107 * holds the old values.
1108 * layer is the layer to update, with 2 being the floor and 0 the 924 * layer is the layer to update, with 2 being the floor and 0 the
1109 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 925 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110 * take. Interesting to note that before this function, the map1 function 926 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 927 * numbers the spaces differently - I think this was a leftover from
1112 * the map command, where the faces stack up. Sinces that is no longer 928 * the map command, where the faces stack up. Sinces that is no longer
1113 * the case, it seems to make more sense to have these layer values 929 * the case, it seems to make more sense to have these layer values
1114 * actually match. 930 * actually match.
1115 */ 931 */
1116static int 932static int
1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 933update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118{ 934{
1119 uint16 face_num; 935 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 936
1124 /* If there is no object for this space, or if the face for the object 937 /* If there is no object for this space, or if the face for the object
1125 * is the blank face, set the face number to zero. 938 * is the blank face, set the face number to zero.
1126 * else if we have the stored head object for this space, that takes 939 * else if we have the stored head object for this space, that takes
1127 * precedence over the other object for this space. 940 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 941 * otherwise, we do special head processing
1129 */ 942 */
1130 if (!ob || ob->face == blank_face) 943 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131 face_num = 0;
1132 else
1133 /* In this case, we are already at the lower right or single part object,
1134 * so nothing special
1135 */
1136 face_num = ob->face;
1137 944
1138 /* We've gotten what face we want to use for the object. Now see if 945 /* We've gotten what face we want to use for the object. Now see if
1139 * if it has changed since we last sent it to the client. 946 * if it has changed since we last sent it to the client.
1140 */ 947 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 948 if (lastcell.faces[layer] != face_num)
1142 { 949 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 950 lastcell.faces[layer] = face_num;
1144 951
1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 952 if (!ns.faces_sent[face_num])
1146 if (ob) 953 if (ob)
1147 ns.send_faces (ob); 954 ns.send_faces (ob);
1148 else 955 else
1149 ns.send_face (face_num); 956 ns.send_face (face_num);
1150 957
1151 sl << uint16 (face_num); 958 sl << uint16 (face_num);
1152 return 1;
1153 }
1154
1155 /* Nothing changed */
1156 return 0;
1157}
1158
1159/**
1160 * This function is mainly a copy of update_space,
1161 * except it handles update of the smoothing updates,
1162 * not the face updates.
1163 * Removes the need to replicate the same code for each layer.
1164 * this returns true if this smooth is now in fact different
1165 * than it was.
1166 * sl is the socklist this data is going into.
1167 * ns is the socket we are working on - all the info we care
1168 * about is in this socket structure, so know need to pass the
1169 * entire player object.
1170 * mx and my are map coordinate offsets for map mp
1171 * sx and sy are the offsets into the socket structure that
1172 * holds the old values.
1173 * layer is the layer to update, with 2 being the floor and 0 the
1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175 * take.
1176 */
1177static inline int
1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179{
1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182 /* If there is no object for this space, or if the face for the object
1183 * is the blank face, set the smoothlevel to zero.
1184 */
1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187 /* We've gotten what face we want to use for the object. Now see if
1188 * if it has changed since we last sent it to the client.
1189 */
1190 if (smoothlevel > 255)
1191 smoothlevel = 255;
1192 else if (smoothlevel < 0)
1193 smoothlevel = 0;
1194
1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196 {
1197 if (smoothlevel)
1198 ns.send_smooth (ob->face);
1199
1200 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1201 sl << uint8 (smoothlevel);
1202 return 1; 959 return 1;
1203 } 960 }
1204 961
1205 /* Nothing changed */ 962 /* Nothing changed */
1206 return 0; 963 return 0;
… …
1309 << uint8 (extendedinfos) 1066 << uint8 (extendedinfos)
1310 << uint8 (eentrysize); 1067 << uint8 (eentrysize);
1311 1068
1312 estartlen = esl.length (); 1069 estartlen = esl.length ();
1313 } 1070 }
1314 else
1315 {
1316 /* suppress compiler warnings */
1317 ewhatstart = 0;
1318 ewhatflag = 0;
1319 estartlen = 0;
1320 }
1321 1071
1322 /* x,y are the real map locations. ax, ay are viewport relative 1072 /* x,y are the real map locations. ax, ay are viewport relative
1323 * locations. 1073 * locations.
1324 */ 1074 */
1325 ay = 0; 1075 ay = 0;
… …
1328 * but that started to get a bit messy to look at. 1078 * but that started to get a bit messy to look at.
1329 */ 1079 */
1330 max_x = pl->x + (socket.mapx + 1) / 2; 1080 max_x = pl->x + (socket.mapx + 1) / 2;
1331 max_y = pl->y + (socket.mapy + 1) / 2; 1081 max_y = pl->y + (socket.mapy + 1) / 2;
1332 1082
1083 maptile *plmap = pl->map;
1084
1333 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1085 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1334 { 1086 {
1335 ax = 0; 1087 ax = 0;
1336 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1088 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1337 { 1089 {
… …
1343 /* If the coordinates are not valid, or it is too dark to see, 1095 /* If the coordinates are not valid, or it is too dark to see,
1344 * we tell the client as such 1096 * we tell the client as such
1345 */ 1097 */
1346 nx = x; 1098 nx = x;
1347 ny = y; 1099 ny = y;
1348 m = get_map_from_coord (pl->map, &nx, &ny); 1100 m = get_map_from_coord (plmap, &nx, &ny);
1349 1101
1350 if (!m) 1102 if (!m)
1351 { 1103 {
1352 /* space is out of map. Update space and clear values 1104 /* space is out of map. Update space and clear values
1353 * if this hasn't already been done. If the space is out 1105 * if this hasn't already been done. If the space is out
… …
1414 oldlen = sl.length (); 1166 oldlen = sl.length ();
1415 eoldlen = esl.length (); 1167 eoldlen = esl.length ();
1416 1168
1417 sl << uint16 (mask); 1169 sl << uint16 (mask);
1418 1170
1419 if (socket.ext_mapinfos)
1420 esl << uint16 (emask);
1421
1422 unsigned char dummy; 1171 unsigned char dummy;
1423 unsigned char *last_ext = &dummy; 1172 unsigned char *last_ext = &dummy;
1424 1173
1425 /* Darkness changed */ 1174 /* Darkness changed */
1426 if (lastcell.count != d && socket.darkness) 1175 if (lastcell.count != d && socket.darkness)
… …
1437 sl << uint8 (255 - 64 * d); 1186 sl << uint8 (255 - 64 * d);
1438 } 1187 }
1439 1188
1440 lastcell.count = d; 1189 lastcell.count = d;
1441 1190
1191 mapspace &ms = m->at (nx, ny);
1192
1442 if (socket.extmap) 1193 if (socket.extmap)
1443 { 1194 {
1444 uint8 stat_hp = 0; 1195 uint8 stat_hp = 0;
1445 uint8 stat_width = 0; 1196 uint8 stat_width = 0;
1446 uint8 flags = 0; 1197 uint8 flags = 0;
1447 UUID player = 0; 1198 UUID player = 0;
1448 1199
1449 // send hp information, if applicable 1200 // send hp information, if applicable
1450 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1201 if (object *op = ms.faces_obj [0])
1451 { 1202 {
1452 if (op->head || op->invisible) 1203 if (op->head || op->invisible)
1453 ; // do not show 1204 ; // do not show
1454 else if (op->type == PLAYER 1205 else if (op->type == PLAYER
1455 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1206 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1509 sl << uint8 (8) << uint8 (flags); 1260 sl << uint8 (8) << uint8 (flags);
1510 } 1261 }
1511 } 1262 }
1512 1263
1513 /* Floor face */ 1264 /* Floor face */
1514 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1265 if (update_space (sl, socket, ms, lastcell, 2))
1515 mask |= 0x4; 1266 mask |= 0x4;
1516 1267
1517 if (socket.EMI_smooth)
1518 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1519 emask |= 0x4;
1520
1521 /* Middle face */ 1268 /* Middle face */
1522 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1269 if (update_space (sl, socket, ms, lastcell, 1))
1523 mask |= 0x2; 1270 mask |= 0x2;
1524 1271
1525 if (socket.EMI_smooth) 1272 if (ms.player () == pl
1526 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1273 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1527 emask |= 0x2;
1528
1529 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1530 { 1274 {
1275 // force player to be visible to himself if invisible
1531 if (lastcell.faces[0] != pl->face) 1276 if (lastcell.faces[0] != pl->face)
1532 { 1277 {
1533 lastcell.faces[0] = pl->face; 1278 lastcell.faces[0] = pl->face;
1279
1534 mask |= 0x1; 1280 mask |= 0x1;
1281 sl << uint16 (pl->face);
1535 1282
1536 socket.send_faces (pl); 1283 socket.send_faces (pl);
1537
1538 sl << uint16 (pl->face);
1539 } 1284 }
1540 } 1285 }
1541 else
1542 {
1543 /* Top face */ 1286 /* Top face */
1544 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1287 else if (update_space (sl, socket, ms, lastcell, 0))
1545 mask |= 0x1; 1288 mask |= 0x1;
1546
1547 if (socket.EMI_smooth)
1548 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1549 emask |= 0x1;
1550 } 1289
1551 1290
1552 /* Check to see if we are in fact sending anything for this 1291 /* Check to see if we are in fact sending anything for this
1553 * space by checking the mask. If so, update the mask. 1292 * space by checking the mask. If so, update the mask.
1554 * if not, reset the len to that from before adding the mask 1293 * if not, reset the len to that from before adding the mask
1555 * value, so we don't send those bits. 1294 * value, so we don't send those bits.
… …
1557 if (mask & 0xf) 1296 if (mask & 0xf)
1558 sl[oldlen + 1] = mask & 0xff; 1297 sl[oldlen + 1] = mask & 0xff;
1559 else 1298 else
1560 sl.reset (oldlen); 1299 sl.reset (oldlen);
1561 1300
1301 if (socket.ext_mapinfos)
1302 esl << uint16 (emask);
1303
1304 if (socket.EMI_smooth)
1305 {
1306 for (int layer = 2+1; layer--; )
1307 {
1308 object *ob = ms.faces_obj [layer];
1309
1310 // If there is no object for this space, or if the face for the object
1311 // is the blank face, set the smoothlevel to zero.
1312 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1313
1314 // We've gotten what face we want to use for the object. Now see if
1315 // if it has changed since we last sent it to the client.
1316 if (lastcell.smooth[layer] != smoothlevel)
1317 {
1318 lastcell.smooth[layer] = smoothlevel;
1319 esl << uint8 (smoothlevel);
1320 emask |= 1 << layer;
1321 }
1322 }
1323
1562 if (emask & 0xf) 1324 if (emask & 0xf)
1563 esl[eoldlen + 1] = emask & 0xff; 1325 esl[eoldlen + 1] = emask & 0xff;
1564 else 1326 else
1565 esl.reset (eoldlen); 1327 esl.reset (eoldlen);
1328 }
1566 } /* else this is a viewable space */ 1329 } /* else this is a viewable space */
1567 } /* for x loop */ 1330 } /* for x loop */
1568 } /* for y loop */ 1331 } /* for y loop */
1332
1333 socket.flush_fx ();
1569 1334
1570 /* Verify that we in fact do need to send this */ 1335 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1336 if (socket.ext_mapinfos)
1572 { 1337 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1338 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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