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.67 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.88 by root, Tue Apr 24 00:42:03 2007 UTC

… …
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 102
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108
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
113 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
… …
138static void 132static void
139clear_map (player *pl) 133clear_map (player *pl)
140{ 134{
141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
142 136
137 pl->ns->force_newmap = false;
138
143 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
144 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
145 141
146 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
147} 143}
… …
152{ 148{
153 client &socket = *pl->ns; 149 client &socket = *pl->ns;
154 object *ob = pl->ob; 150 object *ob = pl->ob;
155 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
156 152
157 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
158 { 154 {
155 clear_map (pl);
159 socket.current_map = ob->map; 156 socket.current_map = ob->map;
160
161 clear_map (pl);
162 157
163 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
164 { 159 {
165 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
166 { 161 {
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
351 346
352 pl->ns->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
353} 348}
354 349
355/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd */
356void 351void
357SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
358{ 353{
359 int s, slen; 354 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
360 char *cmd, *param, cmdback[HUGE_BUF];
361
362 /* run through the cmds of setup
363 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
364 *
365 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
366 * The client then must sort this out
367 */
368
369 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
370
371 strcpy (cmdback, "setup");
372 for (s = 0; s < len; )
373 {
374 cmd = &buf[s];
375
376 /* find the next space, and put a null there */
377 for (; buf[s] && buf[s] != ' '; s++)
378 ;
379
380 buf[s++] = 0;
381
382 while (buf[s] == ' ')
383 s++;
384
385 if (s >= len)
386 break;
387
388 param = &buf[s];
389
390 for (; buf[s] && buf[s] != ' '; s++)
391 ;
392
393 buf[s++] = 0;
394
395 while (buf[s] == ' ')
396 s++;
397
398 slen = strlen (cmdback);
399 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
400 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402
403 if (!strcmp (cmd, "sound"))
404 {
405 ns->sound = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "exp64"))
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 else if (!strcmp (cmd, "spellmon"))
411 {
412 ns->monitor_spells = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "darkness"))
416 {
417 ns->darkness = atoi (param);
418 safe_strcat (cmdback, param, &slen, HUGE_BUF);
419 }
420 else if (!strcmp (cmd, "map1cmd"))
421 {
422 if (atoi (param))
423 ns->mapmode = Map1Cmd;
424 /* if beyond this size, need to use map1cmd no matter what */
425 if (ns->mapx > 11 || ns->mapy > 11)
426 ns->mapmode = Map1Cmd;
427 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
428 }
429 else if (!strcmp (cmd, "map1acmd"))
430 {
431 if (atoi (param))
432 ns->mapmode = Map1aCmd;
433 /* if beyond this size, need to use map1acmd no matter what */
434 if (ns->mapx > 11 || ns->mapy > 11)
435 ns->mapmode = Map1aCmd;
436 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
437 }
438 else if (!strcmp (cmd, "newmapcmd"))
439 {
440 ns->newmapcmd = atoi (param);
441 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 }
446 else if (!strcmp (cmd, "mapinfocmd"))
447 {
448 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extcmd"))
452 {
453 ns->extcmd = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "extmap"))
457 {
458 ns->extmap = atoi (param);
459 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "facecache"))
462 {
463 ns->facecache = atoi (param);
464 safe_strcat (cmdback, param, &slen, HUGE_BUF);
465 }
466 else if (!strcmp (cmd, "faceset"))
467 {
468 char tmpbuf[20];
469 int q = atoi (param);
470
471 if (is_valid_faceset (q))
472 ns->faceset = q;
473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1;
477 }
478 else if (!strcmp (cmd, "itemcmd"))
479 {
480 /* Version of the item protocol command to use. Currently,
481 * only supported versions are 1 and 2. Using a numeric
482 * value will make it very easy to extend this in the future.
483 */
484 char tmpbuf[20];
485 int q = atoi (param);
486
487 if (q < 1 || q > 2)
488 {
489 strcpy (tmpbuf, "FALSE");
490 }
491 else
492 {
493 ns->itemcmd = q;
494 sprintf (tmpbuf, "%d", ns->itemcmd);
495 }
496 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497 }
498 else if (!strcmp (cmd, "mapsize"))
499 {
500 int x, y = 0;
501 char tmpbuf[MAX_BUF], *cp;
502
503 x = atoi (param);
504 for (cp = param; *cp != 0; cp++)
505 if (*cp == 'x' || *cp == 'X')
506 {
507 y = atoi (cp + 1);
508 break;
509 }
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 }
515 else
516 {
517 ns->mapx = x;
518 ns->mapy = y;
519 /* better to send back what we are really using and not the
520 * param as given to us in case it gets parsed differently.
521 */
522 sprintf (tmpbuf, "%dx%d", x, y);
523 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524 /* If beyond this size and still using orig map command, need to
525 * go to map1cmd.
526 */
527 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528 ns->mapmode = Map1Cmd;
529 }
530 }
531 else if (!strcmp (cmd, "extendedMapInfos"))
532 {
533 /* Added by tchize
534 * prepare to use the mapextended command
535 */
536 char tmpbuf[20];
537
538 ns->ext_mapinfos = (atoi (param));
539 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541 }
542 else if (!strcmp (cmd, "extendedTextInfos"))
543 {
544 /* Added by tchize
545 * prepare to use the extended text commands
546 * Client toggle this to non zero to get exttext
547 */
548 char tmpbuf[20];
549
550 ns->has_readable_type = (atoi (param));
551 sprintf (tmpbuf, "%d", ns->has_readable_type);
552 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553 }
554 else
555 {
556 /* Didn't get a setup command we understood -
557 * report a failure to the client.
558 */
559 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560 }
561 } /* for processing all the setup commands */
562
563 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564 ns->send_packet (cmdback);
565} 355}
566 356
567/** 357/**
568 * The client has requested to be added to the game. 358 * The client has requested to be added to the game.
569 * This is what takes care of it. We tell the client how things worked out. 359 * 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, 360 * 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. 361 * it either has to be here or init_sockets needs to be exported.
572 */ 362 */
573void 363void
574AddMeCmd (char *buf, int len, client * ns) 364AddMeCmd (char *buf, int len, client *ns)
575{ 365{
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 367}
578 368
579/** Reply to ExtendedInfos command */ 369/** Reply to ExtendedInfos command */
… …
691 481
692 ns->send_packet (cmdback); 482 ns->send_packet (cmdback);
693} 483}
694 484
695/** 485/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 486 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 487 * 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 */ 488 */
710 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 489void
711 { 490AskFaceCmd (char *buf, int len, client *ns)
712 491{
713 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 492 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} 493}
730 494
731 /** 495/**
732 * Tells client the picture it has to use 496 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 497 * to smooth a picture number given as argument.
734 */ 498 */
735void 499void
736AskSmooth (char *buf, int len, client *ns) 500AskSmooth (char *buf, int len, client *ns)
737{ 501{
738 SendSmooth (ns, atoi (buf)); 502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
739} 504}
740 505
741/** 506/**
742 * This handles the general commands from the client (ie, north, fire, cast, 507 * This handles the general commands from the client (ie, north, fire, cast,
743 * etc.) 508 * etc.)
… …
846 { 611 {
847 case ST_PLAYING: 612 case ST_PLAYING:
848 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 613 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849 break; 614 break;
850 615
851 case ST_CHANGE_CLASS:
852 key_change_class (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 616 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 617 receive_party_password (pl->ob, 13);
857 break; 618 break;
858 619
859 default: 620 default:
… …
879 640
880 ns->cs_version = atoi (buf); 641 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 642 ns->sc_version = ns->cs_version;
882 643
883 LOG (llevDebug, "connection from client <%s>\n", buf); 644 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885 645
886 //TODO: should log here just for statistics 646 //TODO: should log here just for statistics
887 647
888 //if (VERSION_CS != ns->cs_version) 648 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 649 // unchecked;
… …
969/** 729/**
970 * Asks the client to query the user. This way, the client knows 730 * Asks the client to query the user. This way, the client knows
971 * it needs to send something back (vs just printing out a message) 731 * it needs to send something back (vs just printing out a message)
972 */ 732 */
973void 733void
974send_query (client *ns, uint8 flags, char *text) 734send_query (client *ns, uint8 flags, const char *text)
975{ 735{
976 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 736 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
977} 737}
978 738
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 739#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1108{ 868{
1109 packet sl ("player"); 869 packet sl ("player");
1110 870
1111 sl << uint32 (pl->ob->count) 871 sl << uint32 (pl->ob->count)
1112 << uint32 (weight) 872 << uint32 (weight)
1113 << uint32 (pl->ob->face->number) 873 << uint32 (pl->ob->face)
1114 << data8 (pl->ob->name); 874 << data8 (pl->ob->name);
1115 875
1116 pl->ns->last_weight = weight; 876 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 877 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 878 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 879}
1120
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 880
1163/****************************************************************************** 881/******************************************************************************
1164 * 882 *
1165 * Start of map related commands. 883 * Start of map related commands.
1166 * 884 *
1167 ******************************************************************************/ 885 ******************************************************************************/
1168 886
1169/** Clears a map cell */ 887/** Clears a map cell */
1170static void 888static void
1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 889map_clearcell (struct MapCell *cell, int count)
1172{ 890{
1173 cell->faces[0] = face0; 891 cell->faces[0] = 0;
1174 cell->faces[1] = face1; 892 cell->faces[1] = 0;
1175 cell->faces[2] = face2; 893 cell->faces[2] = 0;
894 cell->smooth[0] = 0;
895 cell->smooth[1] = 0;
896 cell->smooth[2] = 0;
1176 cell->count = count; 897 cell->count = count;
1177 cell->stat_hp = 0; 898 cell->stat_hp = 0;
1178 cell->flags = 0; 899 cell->flags = 0;
1179 cell->player = 0; 900 cell->player = 0;
1180} 901}
1181 902
1182#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1183#define MAX_LAYERS 3 903#define MAX_LAYERS 3
1184
1185/* Using a global really isn't a good approach, but saves the over head of
1186 * allocating and deallocating such a block of data each time run through,
1187 * and saves the space of allocating this in the socket object when we only
1188 * need it for this cycle. If the server is ever threaded, this needs to be
1189 * re-examined.
1190 */
1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1192
1193/**
1194 * Returns true if any of the heads for this
1195 * space is set. Returns false if all are blank - this is used
1196 * for empty space checking.
1197 */
1198static inline int
1199have_head (int ax, int ay)
1200{
1201 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1202 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1203 return 1;
1204
1205 return 0;
1206}
1207
1208/**
1209 * check_head is a bit simplistic version of update_space below.
1210 * basically, it only checks the that the head on space ax,ay at layer
1211 * needs to get sent - if so, it adds the data, sending the head
1212 * if needed, and returning 1. If this no data needs to get
1213 * sent, it returns zero.
1214 */
1215static int
1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1217{
1218 short face_num;
1219
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1222 else
1223 face_num = 0;
1224
1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1226 {
1227 sl << uint16 (face_num);
1228 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1229 esrv_send_face (&ns, face_num, 0);
1230
1231 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1232 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1233 return 1;
1234 }
1235
1236 return 0; /* No change */
1237}
1238 904
1239/** 905/**
1240 * Removes the need to replicate the same code for each layer. 906 * Removes the need to replicate the same code for each layer.
1241 * this returns true if this space is now in fact different than 907 * this returns true if this space is now in fact different than
1242 * it was. 908 * it was.
1243 * sl is the socklist this data is going into. 909 * sl is the socklist this data is going into.
1244 * ns is the socket we are working on - all the info we care 910 * ns is the socket we are working on - all the info we care
1245 * about is in this socket structure, so now need not pass the 911 * about is in this socket structure, so now need not pass the
1246 * entire player object. 912 * entire player object.
1247 * mx and my are map coordinate offsets for map mp
1248 * sx and sy are the offsets into the socket structure that
1249 * holds the old values.
1250 * layer is the layer to update, with 2 being the floor and 0 the 913 * layer is the layer to update, with 2 being the floor and 0 the
1251 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 914 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1252 * take. Interesting to note that before this function, the map1 function 915 * take. Interesting to note that before this function, the map1 function
1253 * numbers the spaces differently - I think this was a leftover from 916 * numbers the spaces differently - I think this was a leftover from
1254 * the map command, where the faces stack up. Sinces that is no longer 917 * the map command, where the faces stack up. Sinces that is no longer
1255 * the case, it seems to make more sense to have these layer values 918 * the case, it seems to make more sense to have these layer values
1256 * actually match. 919 * actually match.
1257 */ 920 */
1258static int 921static int
1259update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 922update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1260{ 923{
1261 object *ob, *head; 924 object *ob = ms.faces_obj [layer];
1262 uint16 face_num;
1263 int bx, by, i;
1264
1265 /* If there is a multipart object stored away, treat that as more important.
1266 * If not, then do the normal processing.
1267 */
1268 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1269
1270 /* Check to see if this head is part of the set of objects
1271 * we would normally send for this space. If so, then
1272 * don't use the head value. We need to do the check
1273 * here and not when setting up the heads[] value for two reasons -
1274 * 1) the heads[] values will get used even if the space is not visible.
1275 * 2) its possible the head is not on the same map as a part, and I'd
1276 * rather not need to do the map translation overhead.
1277 * 3) We need to do some extra checking to make sure that we will
1278 * otherwise send the image as this layer, eg, either it matches
1279 * the head value, or is not multipart.
1280 */
1281 if (head && !head->more)
1282 {
1283 for (i = 0; i < MAP_LAYERS; i++)
1284 {
1285 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1286 if (!ob)
1287 continue;
1288
1289 if (ob->head)
1290 ob = ob->head;
1291
1292 if (ob == head)
1293 {
1294 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1295 head = NULL;
1296 break;
1297 }
1298 }
1299 }
1300
1301 ob = head;
1302 if (!ob)
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1304 925
1305 /* If there is no object for this space, or if the face for the object 926 /* If there is no object for this space, or if the face for the object
1306 * is the blank face, set the face number to zero. 927 * is the blank face, set the face number to zero.
1307 * else if we have the stored head object for this space, that takes 928 * else if we have the stored head object for this space, that takes
1308 * precedence over the other object for this space. 929 * precedence over the other object for this space.
1309 * otherwise, we do special head processing 930 * otherwise, we do special head processing
1310 */ 931 */
1311 if (!ob || ob->face == blank_face) 932 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1312 face_num = 0;
1313 else if (head)
1314 {
1315 /* if this is a head that had previously been stored */
1316 face_num = ob->face->number;
1317 }
1318 else
1319 {
1320 /* if the faces for the different parts of a multipart object
1321 * are the same, we only want to send the bottom right most
1322 * portion of the object. That info is in the tail_.. values
1323 * of the head. Note that for the head itself, ob->head will
1324 * be null, so we only do this block if we are working on
1325 * a tail piece.
1326 */
1327
1328 /* tail_x and tail_y will only be set in the head object. If
1329 * this is the head object and these are set, we proceed
1330 * with logic to only send bottom right. Similarly, if
1331 * this is one of the more parts but the head has those values
1332 * set, we want to do the processing. There can be cases where
1333 * the head is not visible but one of its parts is, so we just
1334 * can always expect that ob->arch->tail_x will be true for all
1335 * object we may want to display.
1336 */
1337 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1338 {
1339
1340 if (ob->head)
1341 head = ob->head;
1342 else
1343 head = ob;
1344
1345 /* Basically figure out where the offset is from where we are right
1346 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1347 * piece is from the head, and the tail is where the tail is from the
1348 * head. Note that bx and by will equal sx and sy if we are already working
1349 * on the bottom right corner. If ob is the head, the clone values
1350 * will be zero, so the right thing will still happen.
1351 */
1352 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1353 by = sy + head->arch->tail_y - ob->arch->clone.y;
1354
1355 /* I don't think this can ever happen, but better to check for it just
1356 * in case.
1357 */
1358 if (bx < sx || by < sy)
1359 {
1360 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1361 face_num = 0;
1362 }
1363 /* single part object, multipart object with non merged faces,
1364 * of multipart object already at lower right.
1365 */
1366 else if (bx == sx && by == sy)
1367 {
1368 face_num = ob->face->number;
1369
1370 /* if this face matches one stored away, clear that one away.
1371 * this code relies on the fact that the map1 commands
1372 * goes from 2 down to 0.
1373 */
1374 for (i = 0; i < MAP_LAYERS; i++)
1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1378 }
1379 else
1380 {
1381 /* If this head is stored away, clear it - otherwise,
1382 * there can be cases where a object is on multiple layers -
1383 * we only want to send it once.
1384 */
1385 face_num = head->face->number;
1386 for (i = 0; i < MAP_LAYERS; i++)
1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1390
1391 /* First, try to put the new head on the same layer. If that is used up,
1392 * then find another layer.
1393 */
1394 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1395 {
1396 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1397 }
1398 else
1399 for (i = 0; i < MAX_LAYERS; i++)
1400 {
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1403 {
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1405 }
1406 }
1407 face_num = 0; /* Don't send this object - we'll send the head later */
1408 }
1409 }
1410 else
1411 {
1412 /* In this case, we are already at the lower right or single part object,
1413 * so nothing special
1414 */
1415 face_num = ob->face->number;
1416
1417 /* clear out any head entries that have the same face as this one */
1418 for (bx = 0; bx < layer; bx++)
1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1422 }
1423 } /* else not already head object or blank face */
1424
1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
1426 * but there is a head on the next layer, send that instead.
1427 * Without this, what happens is you can get the case where the player stands
1428 * on the same space as the head. However, if you have overlapping big objects
1429 * of the same type, what happens then is it doesn't think it needs to send
1430 * This tends to make stacking also work/look better.
1431 */
1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1433 {
1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1436 }
1437
1438 /* Another hack - because of heads and whatnot, this face may match one
1439 * we already sent for a lower layer. In that case, don't send
1440 * this one.
1441 */
1442 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1443 face_num = 0;
1444 933
1445 /* We've gotten what face we want to use for the object. Now see if 934 /* We've gotten what face we want to use for the object. Now see if
1446 * if it has changed since we last sent it to the client. 935 * if it has changed since we last sent it to the client.
1447 */ 936 */
1448 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 937 if (lastcell.faces[layer] != face_num)
1449 { 938 {
1450 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 939 lastcell.faces[layer] = face_num;
940
1451 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 941 if (!ns.faces_sent[face_num])
942 if (ob)
943 ns.send_faces (ob);
944 else
1452 esrv_send_face (&ns, face_num, 0); 945 ns.send_face (face_num);
1453 946
1454 sl << uint16 (face_num); 947 sl << uint16 (face_num);
1455 return 1;
1456 }
1457
1458 /* Nothing changed */
1459 return 0;
1460}
1461
1462/**
1463 * This function is mainly a copy of update_space,
1464 * except it handles update of the smoothing updates,
1465 * not the face updates.
1466 * Removes the need to replicate the same code for each layer.
1467 * this returns true if this smooth is now in fact different
1468 * than it was.
1469 * sl is the socklist this data is going into.
1470 * ns is the socket we are working on - all the info we care
1471 * about is in this socket structure, so know need to pass the
1472 * entire player object.
1473 * mx and my are map coordinate offsets for map mp
1474 * sx and sy are the offsets into the socket structure that
1475 * holds the old values.
1476 * layer is the layer to update, with 2 being the floor and 0 the
1477 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1478 * take.
1479 */
1480
1481static inline int
1482update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{
1484 object *ob;
1485 int smoothlevel; /* old face_num; */
1486
1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1488
1489 /* If there is no object for this space, or if the face for the object
1490 * is the blank face, set the smoothlevel to zero.
1491 */
1492 if (!ob || ob->face == blank_face)
1493 smoothlevel = 0;
1494 else
1495 {
1496 smoothlevel = ob->smoothlevel;
1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1498 SendSmooth (&ns, ob->face->number);
1499 } /* else not already head object or blank face */
1500
1501 /* We've gotten what face we want to use for the object. Now see if
1502 * if it has changed since we last sent it to the client.
1503 */
1504 if (smoothlevel > 255)
1505 smoothlevel = 255;
1506 else if (smoothlevel < 0)
1507 smoothlevel = 0;
1508
1509 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1510 {
1511 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1512 sl << uint8 (smoothlevel);
1513 return 1; 948 return 1;
1514 } 949 }
1515 950
1516 /* Nothing changed */ 951 /* Nothing changed */
1517 return 0; 952 return 0;
… …
1581 * look like. 1016 * look like.
1582 */ 1017 */
1583void 1018void
1584draw_client_map1 (object *pl) 1019draw_client_map1 (object *pl)
1585{ 1020{
1586 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1021 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1587 sint16 nx, ny; 1022 sint16 nx, ny;
1588 int estartlen, eoldlen; 1023 int estartlen, eoldlen;
1589 uint16 mask, emask;
1590 uint8 eentrysize; 1024 uint8 eentrysize;
1591 uint16 ewhatstart, ewhatflag; 1025 uint16 ewhatstart, ewhatflag;
1592 uint8 extendedinfos; 1026 uint8 extendedinfos;
1593 maptile *m; 1027 maptile *m;
1594 1028
… …
1621 << uint8 (extendedinfos) 1055 << uint8 (extendedinfos)
1622 << uint8 (eentrysize); 1056 << uint8 (eentrysize);
1623 1057
1624 estartlen = esl.length (); 1058 estartlen = esl.length ();
1625 } 1059 }
1626 else
1627 {
1628 /* suppress compiler warnings */
1629 ewhatstart = 0;
1630 ewhatflag = 0;
1631 estartlen = 0;
1632 }
1633
1634 /* Init data to zero */
1635 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1636 1060
1637 /* x,y are the real map locations. ax, ay are viewport relative 1061 /* x,y are the real map locations. ax, ay are viewport relative
1638 * locations. 1062 * locations.
1639 */ 1063 */
1640 ay = 0; 1064 ay = 0;
… …
1643 * but that started to get a bit messy to look at. 1067 * but that started to get a bit messy to look at.
1644 */ 1068 */
1645 max_x = pl->x + (socket.mapx + 1) / 2; 1069 max_x = pl->x + (socket.mapx + 1) / 2;
1646 max_y = pl->y + (socket.mapy + 1) / 2; 1070 max_y = pl->y + (socket.mapy + 1) / 2;
1647 1071
1648 if (socket.mapmode == Map1aCmd) 1072 maptile *plmap = pl->map;
1649 {
1650 max_x += MAX_HEAD_OFFSET;
1651 max_y += MAX_HEAD_OFFSET;
1652 }
1653 1073
1654 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1074 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1655 { 1075 {
1656 ax = 0; 1076 ax = 0;
1657 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1077 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1658 { 1078 {
1079 int emask, mask;
1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1080 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1660 1081
1661 /* If this space is out of the normal viewable area, we only check
1662 * the heads value ax or ay will only be greater than what
1663 * the client wants if using the map1a command - this is because
1664 * if the map1a command is not used, max_x and max_y will be
1665 * set to lower values.
1666 */
1667 if (ax >= socket.mapx || ay >= socket.mapy)
1668 {
1669 int i, got_one;
1670
1671 oldlen = sl.length ();
1672
1673 sl << uint16 (mask);
1674
1675 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1676 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1677 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1678
1679 /* If all we are doing is sending 0 (blank) faces, we don't
1680 * actually need to send that - just the coordinates
1681 * with no faces tells the client to blank out the
1682 * space.
1683 */
1684 got_one = 0;
1685 for (i = oldlen + 2; i < sl.length (); i++)
1686 if (sl[i])
1687 got_one = 1;
1688
1689 if (got_one && (mask & 0xf))
1690 sl[oldlen + 1] = mask & 0xff;
1691 else
1692 { /*either all faces blank, either no face at all */
1693 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1694 sl.reset (oldlen + 2);
1695 else
1696 sl.reset (oldlen);
1697 }
1698
1699 /*What concerns extendinfos, nothing to be done for now
1700 * (perhaps effects layer later)
1701 */
1702 continue; /* don't do processing below */
1703 }
1704
1705 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1082 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1706
1707 d = pl->contr->blocked_los[ax][ay];
1708 1083
1709 /* If the coordinates are not valid, or it is too dark to see, 1084 /* If the coordinates are not valid, or it is too dark to see,
1710 * we tell the client as such 1085 * we tell the client as such
1711 */ 1086 */
1712 nx = x; 1087 nx = x;
1713 ny = y; 1088 ny = y;
1714 m = get_map_from_coord (pl->map, &nx, &ny); 1089 m = get_map_from_coord (plmap, &nx, &ny);
1715 1090
1716 if (!m) 1091 if (!m)
1717 { 1092 {
1718 /* space is out of map. Update space and clear values 1093 /* space is out of map. Update space and clear values
1719 * if this hasn't already been done. If the space is out 1094 * if this hasn't already been done. If the space is out
1720 * of the map, it shouldn't have a head 1095 * of the map, it shouldn't have a head
1721 */ 1096 */
1722 if (lastcell.count != -1) 1097 if (lastcell.count != -1)
1723 { 1098 {
1724 sl << uint16 (mask); 1099 sl << uint16 (mask);
1725 map_clearcell (&lastcell, 0, 0, 0, -1); 1100 map_clearcell (&lastcell, -1);
1726 } 1101 }
1102
1103 continue;
1727 } 1104 }
1105
1106 m->touch ();
1107
1108 int d = pl->contr->blocked_los[ax][ay];
1109
1728 else if (d > 3) 1110 if (d > 3)
1729 { 1111 {
1730 m->touch ();
1731 1112
1732 int need_send = 0, count; 1113 int need_send = 0, count;
1733 1114
1734 /* This block deals with spaces that are not visible for whatever 1115 /* This block deals with spaces that are not visible for whatever
1735 * reason. Still may need to send the head for this space. 1116 * reason. Still may need to send the head for this space.
1736 */ 1117 */
1737 1118
1738 oldlen = sl.length (); 1119 oldlen = sl.length ();
1739 1120
1740 sl << uint16 (mask); 1121 sl << uint16 (mask);
… …
1742 if (lastcell.count != -1) 1123 if (lastcell.count != -1)
1743 need_send = 1; 1124 need_send = 1;
1744 1125
1745 count = -1; 1126 count = -1;
1746 1127
1747 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1748 {
1749 /* Now check to see if any heads need to be sent */
1750
1751 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1752 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1753 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1754
1755 lastcell.count = count;
1756 }
1757 else
1758 {
1759 /* properly clear a previously sent big face */ 1128 /* properly clear a previously sent big face */
1760 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1129 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1761 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1130 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1762 need_send = 1; 1131 need_send = 1;
1763 1132
1764 map_clearcell (&lastcell, 0, 0, 0, count); 1133 map_clearcell (&lastcell, count);
1765 }
1766 1134
1767 if ((mask & 0xf) || need_send) 1135 if ((mask & 0xf) || need_send)
1768 sl[oldlen + 1] = mask & 0xff; 1136 sl[oldlen + 1] = mask & 0xff;
1769 else 1137 else
1770 sl.reset (oldlen); 1138 sl.reset (oldlen);
1771 } 1139 }
1772 else 1140 else
1773 { 1141 {
1774 m->touch ();
1775
1776 /* In this block, the space is visible or there are head objects 1142 /* In this block, the space is visible.
1777 * we need to send.
1778 */ 1143 */
1779 1144
1780 /* Rather than try to figure out what everything that we might 1145 /* Rather than try to figure out what everything that we might
1781 * need to send is, then form the packet after that, 1146 * need to send is, then form the packet after that,
1782 * we presume that we will in fact form a packet, and update 1147 * we presume that we will in fact form a packet, and update
… …
1785 * is done. 1150 * is done.
1786 * I think this is simpler than doing a bunch of checks to see 1151 * I think this is simpler than doing a bunch of checks to see
1787 * what if anything we need to send, setting the bits, then 1152 * what if anything we need to send, setting the bits, then
1788 * doing those checks again to add the real data. 1153 * doing those checks again to add the real data.
1789 */ 1154 */
1790 oldlen = sl.length (); 1155 oldlen = sl.length ();
1791 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1792 eoldlen = esl.length (); 1156 eoldlen = esl.length ();
1793 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1157
1794 sl << uint16 (mask); 1158 sl << uint16 (mask);
1795
1796 if (socket.ext_mapinfos)
1797 esl << uint16 (emask);
1798 1159
1799 unsigned char dummy; 1160 unsigned char dummy;
1800 unsigned char *last_ext = &dummy; 1161 unsigned char *last_ext = &dummy;
1801 1162
1802 /* Darkness changed */ 1163 /* Darkness changed */
… …
1814 sl << uint8 (255 - 64 * d); 1175 sl << uint8 (255 - 64 * d);
1815 } 1176 }
1816 1177
1817 lastcell.count = d; 1178 lastcell.count = d;
1818 1179
1180 mapspace &ms = m->at (nx, ny);
1181
1819 if (socket.extmap) 1182 if (socket.extmap)
1820 { 1183 {
1821 uint8 stat_hp = 0; 1184 uint8 stat_hp = 0;
1822 uint8 stat_width = 0; 1185 uint8 stat_width = 0;
1823 uint8 flags = 0; 1186 uint8 flags = 0;
1824 UUID player = 0; 1187 tag_t player = 0;
1825 1188
1826 // send hp information, if applicable 1189 // send hp information, if applicable
1827 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1190 if (object *op = ms.faces_obj [0])
1828 { 1191 {
1829 if (op->head || op->invisible) 1192 if (op->head || op->invisible)
1830 ; // do not show 1193 ; // do not show
1831 else if (op->type == PLAYER 1194 else if (op->type == PLAYER
1832 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1195 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1870 1233
1871 mask |= 0x8; 1234 mask |= 0x8;
1872 *last_ext |= 0x80; 1235 *last_ext |= 0x80;
1873 last_ext = &sl[sl.length ()]; 1236 last_ext = &sl[sl.length ()];
1874 1237
1875 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1238 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1876 } 1239 }
1877 1240
1878 if (lastcell.flags != flags) 1241 if (lastcell.flags != flags)
1879 { 1242 {
1880 lastcell.flags = flags; 1243 lastcell.flags = flags;
… …
1886 sl << uint8 (8) << uint8 (flags); 1249 sl << uint8 (8) << uint8 (flags);
1887 } 1250 }
1888 } 1251 }
1889 1252
1890 /* Floor face */ 1253 /* Floor face */
1891 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1254 if (update_space (sl, socket, ms, lastcell, 2))
1892 mask |= 0x4; 1255 mask |= 0x4;
1893 1256
1894 if (socket.EMI_smooth)
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1896 emask |= 0x4;
1897
1898 /* Middle face */ 1257 /* Middle face */
1899 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1258 if (update_space (sl, socket, ms, lastcell, 1))
1900 mask |= 0x2; 1259 mask |= 0x2;
1901 1260
1902 if (socket.EMI_smooth) 1261 if (ms.player () == pl
1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1262 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1904 emask |= 0x2;
1905
1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1907 { 1263 {
1264 // force player to be visible to himself if invisible
1908 if (lastcell.faces[0] != pl->face->number) 1265 if (lastcell.faces[0] != pl->face)
1909 { 1266 {
1910 lastcell.faces[0] = pl->face->number; 1267 lastcell.faces[0] = pl->face;
1268
1911 mask |= 0x1; 1269 mask |= 0x1;
1912
1913 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1914 esrv_send_face (&socket, pl->face->number, 0);
1915
1916 sl << uint16 (pl->face->number); 1270 sl << uint16 (pl->face);
1271
1272 socket.send_faces (pl);
1917 } 1273 }
1918 } 1274 }
1919 else
1920 {
1921 /* Top face */ 1275 /* Top face */
1922 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1276 else if (update_space (sl, socket, ms, lastcell, 0))
1923 mask |= 0x1; 1277 mask |= 0x1;
1924
1925 if (socket.EMI_smooth)
1926 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1927 emask |= 0x1;
1928 } 1278
1929 1279
1930 /* Check to see if we are in fact sending anything for this 1280 /* Check to see if we are in fact sending anything for this
1931 * space by checking the mask. If so, update the mask. 1281 * space by checking the mask. If so, update the mask.
1932 * if not, reset the len to that from before adding the mask 1282 * if not, reset the len to that from before adding the mask
1933 * value, so we don't send those bits. 1283 * value, so we don't send those bits.
… …
1935 if (mask & 0xf) 1285 if (mask & 0xf)
1936 sl[oldlen + 1] = mask & 0xff; 1286 sl[oldlen + 1] = mask & 0xff;
1937 else 1287 else
1938 sl.reset (oldlen); 1288 sl.reset (oldlen);
1939 1289
1290 if (socket.ext_mapinfos)
1291 esl << uint16 (emask);
1292
1293 if (socket.EMI_smooth)
1294 {
1295 for (int layer = 2+1; layer--; )
1296 {
1297 object *ob = ms.faces_obj [layer];
1298
1299 // If there is no object for this space, or if the face for the object
1300 // is the blank face, set the smoothlevel to zero.
1301 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1302
1303 // We've gotten what face we want to use for the object. Now see if
1304 // if it has changed since we last sent it to the client.
1305 if (lastcell.smooth[layer] != smoothlevel)
1306 {
1307 lastcell.smooth[layer] = smoothlevel;
1308 esl << uint8 (smoothlevel);
1309 emask |= 1 << layer;
1310 }
1311 }
1312
1940 if (emask & 0xf) 1313 if (emask & 0xf)
1941 esl[eoldlen + 1] = emask & 0xff; 1314 esl[eoldlen + 1] = emask & 0xff;
1942 else 1315 else
1943 esl.reset (eoldlen); 1316 esl.reset (eoldlen);
1317 }
1944 } /* else this is a viewable space */ 1318 } /* else this is a viewable space */
1945 } /* for x loop */ 1319 } /* for x loop */
1946 } /* for y loop */ 1320 } /* for y loop */
1321
1322 socket.flush_fx ();
1947 1323
1948 /* Verify that we in fact do need to send this */ 1324 /* Verify that we in fact do need to send this */
1949 if (socket.ext_mapinfos) 1325 if (socket.ext_mapinfos)
1950 { 1326 {
1951 if (!(sl.length () > startlen || socket.sent_scroll)) 1327 if (!(sl.length () > startlen || socket.sent_scroll))
1952 { 1328 {
1953 /* No map data will follow, so don't say the client 1329 /* No map data will follow, so don't say the client
1954 * it doesn't need draw! 1330 * it doesn't need draw!
1955 */ 1331 */
1956 ewhatflag &= (~EMI_NOREDRAW); 1332 ewhatflag &= ~EMI_NOREDRAW;
1957 esl[ewhatstart + 1] = ewhatflag & 0xff; 1333 esl[ewhatstart + 1] = ewhatflag & 0xff;
1958 } 1334 }
1959 1335
1960 if (esl.length () > estartlen) 1336 if (esl.length () > estartlen)
1961 socket.send_packet (esl); 1337 socket.send_packet (esl);
… …
2187 if (!strcmp (spell->skill, skill_names[i])) 1563 if (!strcmp (spell->skill, skill_names[i]))
2188 { 1564 {
2189 skill = i + CS_STAT_SKILLINFO; 1565 skill = i + CS_STAT_SKILLINFO;
2190 break; 1566 break;
2191 } 1567 }
1568 }
1569
1570 // spells better have a face
1571 if (!spell->face)
1572 {
1573 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1574 spell->face = face_find ("burnout.x11", blank_face);
2192 } 1575 }
2193 1576
2194 /* send the current values */ 1577 /* send the current values */
2195 sl << uint32 (spell->count) 1578 sl << uint32 (spell->count)
2196 << uint16 (spell->level) 1579 << uint16 (spell->level)
… …
2198 << uint16 (spell->last_sp) 1581 << uint16 (spell->last_sp)
2199 << uint16 (spell->last_grace) 1582 << uint16 (spell->last_grace)
2200 << uint16 (spell->last_eat) 1583 << uint16 (spell->last_eat)
2201 << uint8 (skill) 1584 << uint8 (skill)
2202 << uint32 (spell->path_attuned) 1585 << uint32 (spell->path_attuned)
2203 << uint32 (spell->face ? spell->face->number : 0) 1586 << uint32 (spell->face)
2204 << data8 (spell->name) 1587 << data8 (spell->name)
2205 << data16 (spell->msg); 1588 << data16 (spell->msg);
2206} 1589}
2207 1590
2208/** 1591/**
… …
2223 1606
2224 packet sl ("addspell"); 1607 packet sl ("addspell");
2225 1608
2226 if (!spell) 1609 if (!spell)
2227 { 1610 {
2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1611 for (spell = pl->ob->inv; spell; spell = spell->below)
2229 { 1612 {
2230 /* were we to simply keep appending data here, we could exceed 1613 /* were we to simply keep appending data here, we could exceed
2231 * MAXSOCKBUF if the player has enough spells to add, we know that 1614 * MAXSOCKBUF if the player has enough spells to add, we know that
2232 * append_spells will always append 19 data bytes, plus 4 length 1615 * append_spells will always append 19 data bytes, plus 4 length
2233 * bytes and 3 strings (because that is the spec) so we need to 1616 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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