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.72 by root, Mon Mar 12 02:07:43 2007 UTC vs.
Revision 1.83 by root, Mon Apr 2 18:04:47 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/**
688 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 493 * client requested an image. send it rate-limited
689 * Basically, it makes no sense to wait for the client to request a 494 * 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 */ 495 */
702 if (!FindSmooth (face, &smoothface)) 496void
703 { 497AskFaceCmd (char *buf, int len, client *ns)
704 498{
705 LOG (llevError, "could not findsmooth for %d.\n", face); 499 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} 500}
722 501
723/** 502/**
724 * Tells client the picture it has to use 503 * Tells client the picture it has to use
725 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
726 */ 505 */
727void 506void
728AskSmooth (char *buf, int len, client *ns) 507AskSmooth (char *buf, int len, client *ns)
729{ 508{
730 SendSmooth (ns, atoi (buf)); 509 ns->send_face (atoi (buf));
731} 510}
732 511
733/** 512/**
734 * This handles the general commands from the client (ie, north, fire, cast, 513 * This handles the general commands from the client (ie, north, fire, cast,
735 * etc.) 514 * etc.)
… …
960/** 739/**
961 * Asks the client to query the user. This way, the client knows 740 * Asks the client to query the user. This way, the client knows
962 * it needs to send something back (vs just printing out a message) 741 * it needs to send something back (vs just printing out a message)
963 */ 742 */
964void 743void
965send_query (client *ns, uint8 flags, char *text) 744send_query (client *ns, uint8 flags, const char *text)
966{ 745{
967 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 746 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
968} 747}
969 748
970#define AddIfInt64(Old,New,Type) if (Old != New) {\ 749#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1107 pl->ns->last_weight = weight; 886 pl->ns->last_weight = weight;
1108 pl->ns->send_packet (sl); 887 pl->ns->send_packet (sl);
1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 888 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110} 889}
1111 890
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/****************************************************************************** 891/******************************************************************************
1155 * 892 *
1156 * Start of map related commands. 893 * Start of map related commands.
1157 * 894 *
1158 ******************************************************************************/ 895 ******************************************************************************/
1159 896
1160/** Clears a map cell */ 897/** Clears a map cell */
1161static void 898static void
1162map_clearcell (struct MapCell *cell, int count) 899map_clearcell (struct MapCell *cell, int count)
1163{ 900{
1164 cell->faces[0] = 0; 901 cell->faces[0] = 0;
1165 cell->faces[1] = 0; 902 cell->faces[1] = 0;
1166 cell->faces[2] = 0; 903 cell->faces[2] = 0;
904 cell->smooth[0] = 0;
905 cell->smooth[1] = 0;
906 cell->smooth[2] = 0;
1167 cell->count = count; 907 cell->count = count;
1168 cell->stat_hp = 0; 908 cell->stat_hp = 0;
1169 cell->flags = 0; 909 cell->flags = 0;
1170 cell->player = 0; 910 cell->player = 0;
1171} 911}
1172 912
1173#define MAX_LAYERS 3 913#define MAX_LAYERS 3
1174 914
1175/** 915/**
… …
1178 * it was. 918 * it was.
1179 * sl is the socklist this data is going into. 919 * sl is the socklist this data is going into.
1180 * ns is the socket we are working on - all the info we care 920 * 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 921 * about is in this socket structure, so now need not pass the
1182 * entire player object. 922 * 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 923 * 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) 924 * 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 925 * take. Interesting to note that before this function, the map1 function
1189 * numbers the spaces differently - I think this was a leftover from 926 * 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 927 * 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 928 * the case, it seems to make more sense to have these layer values
1192 * actually match. 929 * actually match.
1193 */ 930 */
1194static int 931static int
1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 932update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196{ 933{
1197 uint16 face_num; 934 object *ob = ms.faces_obj [layer];
1198 int bx, by, i;
1199
1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201 935
1202 /* If there is no object for this space, or if the face for the object 936 /* 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. 937 * is the blank face, set the face number to zero.
1204 * else if we have the stored head object for this space, that takes 938 * else if we have the stored head object for this space, that takes
1205 * precedence over the other object for this space. 939 * precedence over the other object for this space.
1206 * otherwise, we do special head processing 940 * otherwise, we do special head processing
1207 */ 941 */
1208 if (!ob || ob->face == blank_face) 942 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 943
1216 /* We've gotten what face we want to use for the object. Now see if 944 /* 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. 945 * if it has changed since we last sent it to the client.
1218 */ 946 */
1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 947 if (lastcell.faces[layer] != face_num)
1220 { 948 {
1221 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 949 lastcell.faces[layer] = face_num;
950
1222 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 951 if (!ns.faces_sent[face_num])
952 if (ob)
953 ns.send_faces (ob);
954 else
1223 esrv_send_face (&ns, face_num, 0); 955 ns.send_face (face_num);
1224 956
1225 sl << uint16 (face_num); 957 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; 958 return 1;
1284 } 959 }
1285 960
1286 /* Nothing changed */ 961 /* Nothing changed */
1287 return 0; 962 return 0;
… …
1390 << uint8 (extendedinfos) 1065 << uint8 (extendedinfos)
1391 << uint8 (eentrysize); 1066 << uint8 (eentrysize);
1392 1067
1393 estartlen = esl.length (); 1068 estartlen = esl.length ();
1394 } 1069 }
1395 else
1396 {
1397 /* suppress compiler warnings */
1398 ewhatstart = 0;
1399 ewhatflag = 0;
1400 estartlen = 0;
1401 }
1402 1070
1403 /* x,y are the real map locations. ax, ay are viewport relative 1071 /* x,y are the real map locations. ax, ay are viewport relative
1404 * locations. 1072 * locations.
1405 */ 1073 */
1406 ay = 0; 1074 ay = 0;
… …
1409 * but that started to get a bit messy to look at. 1077 * but that started to get a bit messy to look at.
1410 */ 1078 */
1411 max_x = pl->x + (socket.mapx + 1) / 2; 1079 max_x = pl->x + (socket.mapx + 1) / 2;
1412 max_y = pl->y + (socket.mapy + 1) / 2; 1080 max_y = pl->y + (socket.mapy + 1) / 2;
1413 1081
1082 maptile *plmap = pl->map;
1083
1414 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1084 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1415 { 1085 {
1416 ax = 0; 1086 ax = 0;
1417 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1087 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1418 { 1088 {
… …
1424 /* If the coordinates are not valid, or it is too dark to see, 1094 /* If the coordinates are not valid, or it is too dark to see,
1425 * we tell the client as such 1095 * we tell the client as such
1426 */ 1096 */
1427 nx = x; 1097 nx = x;
1428 ny = y; 1098 ny = y;
1429 m = get_map_from_coord (pl->map, &nx, &ny); 1099 m = get_map_from_coord (plmap, &nx, &ny);
1430 1100
1431 if (!m) 1101 if (!m)
1432 { 1102 {
1433 /* space is out of map. Update space and clear values 1103 /* space is out of map. Update space and clear values
1434 * if this hasn't already been done. If the space is out 1104 * if this hasn't already been done. If the space is out
… …
1495 oldlen = sl.length (); 1165 oldlen = sl.length ();
1496 eoldlen = esl.length (); 1166 eoldlen = esl.length ();
1497 1167
1498 sl << uint16 (mask); 1168 sl << uint16 (mask);
1499 1169
1500 if (socket.ext_mapinfos)
1501 esl << uint16 (emask);
1502
1503 unsigned char dummy; 1170 unsigned char dummy;
1504 unsigned char *last_ext = &dummy; 1171 unsigned char *last_ext = &dummy;
1505 1172
1506 /* Darkness changed */ 1173 /* Darkness changed */
1507 if (lastcell.count != d && socket.darkness) 1174 if (lastcell.count != d && socket.darkness)
… …
1518 sl << uint8 (255 - 64 * d); 1185 sl << uint8 (255 - 64 * d);
1519 } 1186 }
1520 1187
1521 lastcell.count = d; 1188 lastcell.count = d;
1522 1189
1190 mapspace &ms = m->at (nx, ny);
1191
1523 if (socket.extmap) 1192 if (socket.extmap)
1524 { 1193 {
1525 uint8 stat_hp = 0; 1194 uint8 stat_hp = 0;
1526 uint8 stat_width = 0; 1195 uint8 stat_width = 0;
1527 uint8 flags = 0; 1196 uint8 flags = 0;
1528 UUID player = 0; 1197 UUID player = 0;
1529 1198
1530 // send hp information, if applicable 1199 // send hp information, if applicable
1531 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1200 if (object *op = ms.faces_obj [0])
1532 { 1201 {
1533 if (op->head || op->invisible) 1202 if (op->head || op->invisible)
1534 ; // do not show 1203 ; // do not show
1535 else if (op->type == PLAYER 1204 else if (op->type == PLAYER
1536 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1205 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1590 sl << uint8 (8) << uint8 (flags); 1259 sl << uint8 (8) << uint8 (flags);
1591 } 1260 }
1592 } 1261 }
1593 1262
1594 /* Floor face */ 1263 /* Floor face */
1595 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1264 if (update_space (sl, socket, ms, lastcell, 2))
1596 mask |= 0x4; 1265 mask |= 0x4;
1597 1266
1598 if (socket.EMI_smooth)
1599 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1600 emask |= 0x4;
1601
1602 /* Middle face */ 1267 /* Middle face */
1603 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1268 if (update_space (sl, socket, ms, lastcell, 1))
1604 mask |= 0x2; 1269 mask |= 0x2;
1605 1270
1606 if (socket.EMI_smooth) 1271 if (ms.player () == pl
1607 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1608 emask |= 0x2;
1609
1610 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1611 { 1273 {
1274 // force player to be visible to himself if invisible
1612 if (lastcell.faces[0] != pl->face) 1275 if (lastcell.faces[0] != pl->face)
1613 { 1276 {
1614 lastcell.faces[0] = pl->face; 1277 lastcell.faces[0] = pl->face;
1278
1615 mask |= 0x1; 1279 mask |= 0x1;
1616
1617 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1618 esrv_send_face (&socket, pl->face, 0);
1619
1620 sl << uint16 (pl->face); 1280 sl << uint16 (pl->face);
1281
1282 socket.send_faces (pl);
1621 } 1283 }
1622 } 1284 }
1623 else
1624 {
1625 /* Top face */ 1285 /* Top face */
1626 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1286 else if (update_space (sl, socket, ms, lastcell, 0))
1627 mask |= 0x1; 1287 mask |= 0x1;
1628
1629 if (socket.EMI_smooth)
1630 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1631 emask |= 0x1;
1632 } 1288
1633 1289
1634 /* Check to see if we are in fact sending anything for this 1290 /* Check to see if we are in fact sending anything for this
1635 * space by checking the mask. If so, update the mask. 1291 * space by checking the mask. If so, update the mask.
1636 * if not, reset the len to that from before adding the mask 1292 * if not, reset the len to that from before adding the mask
1637 * value, so we don't send those bits. 1293 * value, so we don't send those bits.
… …
1639 if (mask & 0xf) 1295 if (mask & 0xf)
1640 sl[oldlen + 1] = mask & 0xff; 1296 sl[oldlen + 1] = mask & 0xff;
1641 else 1297 else
1642 sl.reset (oldlen); 1298 sl.reset (oldlen);
1643 1299
1300 if (socket.ext_mapinfos)
1301 esl << uint16 (emask);
1302
1303 if (socket.EMI_smooth)
1304 {
1305 for (int layer = 2+1; layer--; )
1306 {
1307 object *ob = ms.faces_obj [layer];
1308
1309 // If there is no object for this space, or if the face for the object
1310 // is the blank face, set the smoothlevel to zero.
1311 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1312
1313 // We've gotten what face we want to use for the object. Now see if
1314 // if it has changed since we last sent it to the client.
1315 if (lastcell.smooth[layer] != smoothlevel)
1316 {
1317 lastcell.smooth[layer] = smoothlevel;
1318 esl << uint8 (smoothlevel);
1319 emask |= 1 << layer;
1320 }
1321 }
1322
1644 if (emask & 0xf) 1323 if (emask & 0xf)
1645 esl[eoldlen + 1] = emask & 0xff; 1324 esl[eoldlen + 1] = emask & 0xff;
1646 else 1325 else
1647 esl.reset (eoldlen); 1326 esl.reset (eoldlen);
1327 }
1648 } /* else this is a viewable space */ 1328 } /* else this is a viewable space */
1649 } /* for x loop */ 1329 } /* for x loop */
1650 } /* for y loop */ 1330 } /* for y loop */
1651 1331
1652 /* Verify that we in fact do need to send this */ 1332 /* Verify that we in fact do need to send this */

Diff Legend

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