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.66 by root, Thu Feb 15 04:04:23 2007 UTC vs.
Revision 1.81 by root, Fri Mar 16 02:51:17 2007 UTC

… …
36 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
38 * 38 *
39 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
40 * 40 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
48 45
… …
101 * that much difference in bandwidth. 98 * that much difference in bandwidth.
102 */ 99 */
103 mx = ns->mapx; 100 mx = ns->mapx;
104 my = ns->mapy; 101 my = ns->mapy;
105 102
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111
112 /* 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
113 * (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,
114 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
115 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
116 * 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.
… …
141static void 132static void
142clear_map (player *pl) 133clear_map (player *pl)
143{ 134{
144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
145 136
137 pl->ns->force_newmap = false;
138
146 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
147 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
148 141
149 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
150} 143}
… …
155{ 148{
156 client &socket = *pl->ns; 149 client &socket = *pl->ns;
157 object *ob = pl->ob; 150 object *ob = pl->ob;
158 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
159 152
160 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
161 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
162 socket.current_map = ob->map; 157 socket.current_map = ob->map;
163
164 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;
165 164
166 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
167 { 166 {
168 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
169 { 168 {
… …
440 } 439 }
441 else if (!strcmp (cmd, "newmapcmd")) 440 else if (!strcmp (cmd, "newmapcmd"))
442 { 441 {
443 ns->newmapcmd = atoi (param); 442 ns->newmapcmd = atoi (param);
444 safe_strcat (cmdback, param, &slen, HUGE_BUF); 443 safe_strcat (cmdback, param, &slen, HUGE_BUF);
445// } else if (!strcmp(cmd,"plugincmd")) {
446// ns->plugincmd = atoi(param);
447// safe_strcat(cmdback, param, &slen, HUGE_BUF);
448 } 444 }
449 else if (!strcmp (cmd, "mapinfocmd")) 445 else if (!strcmp (cmd, "mapinfocmd"))
450 { 446 {
451 ns->mapinfocmd = atoi (param); 447 ns->mapinfocmd = atoi (param);
452 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
471 char tmpbuf[20]; 467 char tmpbuf[20];
472 int q = atoi (param); 468 int q = atoi (param);
473 469
474 if (is_valid_faceset (q)) 470 if (is_valid_faceset (q))
475 ns->faceset = q; 471 ns->faceset = q;
472
476 sprintf (tmpbuf, "%d", ns->faceset); 473 sprintf (tmpbuf, "%d", ns->faceset);
477 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
478 /* if the client is using faceset, it knows about image2 command */ 475 /* if the client is using faceset, it knows about image2 command */
479 ns->image2 = 1; 476 ns->image2 = 1;
480 } 477 }
… …
508 if (*cp == 'x' || *cp == 'X') 505 if (*cp == 'x' || *cp == 'X')
509 { 506 {
510 y = atoi (cp + 1); 507 y = atoi (cp + 1);
511 break; 508 break;
512 } 509 }
510
513 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
514 { 512 {
515 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 } 515 }
… …
572 * This is what takes care of it. We tell the client how things worked out. 570 * This is what takes care of it. We tell the client how things worked out.
573 * I am not sure if this file is the best place for this function. however, 571 * I am not sure if this file is the best place for this function. however,
574 * it either has to be here or init_sockets needs to be exported. 572 * it either has to be here or init_sockets needs to be exported.
575 */ 573 */
576void 574void
577AddMeCmd (char *buf, int len, client * ns) 575AddMeCmd (char *buf, int len, client *ns)
578{ 576{
577 // face caching is mandatory
578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
604 else
605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
580} 613}
581 614
582/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
583void 616void
… …
694 727
695 ns->send_packet (cmdback); 728 ns->send_packet (cmdback);
696} 729}
697 730
698/** 731/**
699 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 732 * client requested an image. send it rate-limited
700 * Basically, it makes no sense to wait for the client to request a 733 * before flushing.
701 * a piece of data from us that we know the client wants. So
702 * if we know the client wants it, might as well push it to the
703 * client.
704 */
705static void
706SendSmooth (client *ns, uint16 face)
707{
708 uint16 smoothface;
709
710 /* If we can't find a face, return and set it so we won't try to send this
711 * again.
712 */ 734 */
713 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 735void
714 { 736AskFaceCmd (char *buf, int len, client *ns)
715 737{
716 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 738 ns->askface.push_back (atoi (buf));
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718 return;
719 }
720
721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
722 esrv_send_face (ns, smoothface, 0);
723
724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
725
726 packet sl ("smooth");
727
728 sl << uint16 (face)
729 << uint16 (smoothface);
730
731 ns->send_packet (sl);
732} 739}
733 740
734 /** 741/**
735 * Tells client the picture it has to use 742 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 743 * to smooth a picture number given as argument.
737 */ 744 */
738void 745void
739AskSmooth (char *buf, int len, client *ns) 746AskSmooth (char *buf, int len, client *ns)
740{ 747{
741 SendSmooth (ns, atoi (buf)); 748 ns->send_face (atoi (buf));
742} 749}
743 750
744/** 751/**
745 * This handles the general commands from the client (ie, north, fire, cast, 752 * This handles the general commands from the client (ie, north, fire, cast,
746 * etc.) 753 * etc.)
… …
882 889
883 ns->cs_version = atoi (buf); 890 ns->cs_version = atoi (buf);
884 ns->sc_version = ns->cs_version; 891 ns->sc_version = ns->cs_version;
885 892
886 LOG (llevDebug, "connection from client <%s>\n", buf); 893 LOG (llevDebug, "connection from client <%s>\n", buf);
887
888 894
889 //TODO: should log here just for statistics 895 //TODO: should log here just for statistics
890 896
891 //if (VERSION_CS != ns->cs_version) 897 //if (VERSION_CS != ns->cs_version)
892 // unchecked; 898 // unchecked;
… …
1111{ 1117{
1112 packet sl ("player"); 1118 packet sl ("player");
1113 1119
1114 sl << uint32 (pl->ob->count) 1120 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 1121 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 1122 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 1123 << data8 (pl->ob->name);
1118 1124
1119 pl->ns->last_weight = weight; 1125 pl->ns->last_weight = weight;
1120 pl->ns->send_packet (sl); 1126 pl->ns->send_packet (sl);
1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1122} 1128}
1123
1124/**
1125 * Need to send an animation sequence to the client.
1126 * We will send appropriate face commands to the client if we haven't
1127 * sent them the face yet (this can become quite costly in terms of
1128 * how much we are sending - on the other hand, this should only happen
1129 * when the player logs in and picks stuff up.
1130 */
1131void
1132esrv_send_animation (client * ns, short anim_num)
1133{
1134 /* Do some checking on the anim_num we got. Note that the animations
1135 * are added in contigous order, so if the number is in the valid
1136 * range, it must be a valid animation.
1137 */
1138 if (anim_num < 0 || anim_num > num_animations)
1139 {
1140 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1141 return;
1142 }
1143
1144 packet sl ("anim");
1145
1146 sl << uint16 (anim_num)
1147 << uint16 (0); /* flags - not used right now */
1148
1149 /* Build up the list of faces. Also, send any information (ie, the
1150 * the face itself) down to the client.
1151 */
1152 for (int i = 0; i < animations[anim_num].num_animations; i++)
1153 {
1154 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1155 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1157 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1158 }
1159
1160 ns->send_packet (sl);
1161
1162 ns->anims_sent[anim_num] = 1;
1163}
1164
1165 1129
1166/****************************************************************************** 1130/******************************************************************************
1167 * 1131 *
1168 * Start of map related commands. 1132 * Start of map related commands.
1169 * 1133 *
1170 ******************************************************************************/ 1134 ******************************************************************************/
1171 1135
1172/**
1173 * This adds face_num to a map cell at x,y. If the client doesn't have
1174 * the face yet, we will also send it.
1175 */
1176static void
1177esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1178{
1179 if (newmap->cells[x][y].count >= MAP_LAYERS)
1180 {
1181 //TODO: one or the other, can't both have abort and return, verify and act
1182 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1183 return;
1184 abort ();
1185 }
1186
1187 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1188 newmap->cells[x][y].count++;
1189
1190 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1191 esrv_send_face (ns, face_num, 0);
1192}
1193
1194/** Clears a map cell */ 1136/** Clears a map cell */
1195static void 1137static void
1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1138map_clearcell (struct MapCell *cell, int count)
1197{ 1139{
1198 cell->faces[0] = face0; 1140 cell->faces[0] = 0;
1199 cell->faces[1] = face1; 1141 cell->faces[1] = 0;
1200 cell->faces[2] = face2; 1142 cell->faces[2] = 0;
1143 cell->smooth[0] = 0;
1144 cell->smooth[1] = 0;
1145 cell->smooth[2] = 0;
1201 cell->count = count; 1146 cell->count = count;
1202 cell->stat_hp = 0; 1147 cell->stat_hp = 0;
1203 cell->flags = 0; 1148 cell->flags = 0;
1204 cell->player = 0; 1149 cell->player = 0;
1205} 1150}
1206 1151
1207#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1208#define MAX_LAYERS 3 1152#define MAX_LAYERS 3
1209
1210/* Using a global really isn't a good approach, but saves the over head of
1211 * allocating and deallocating such a block of data each time run through,
1212 * and saves the space of allocating this in the socket object when we only
1213 * need it for this cycle. If the server is ever threaded, this needs to be
1214 * re-examined.
1215 */
1216static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1217
1218/**
1219 * Returns true if any of the heads for this
1220 * space is set. Returns false if all are blank - this is used
1221 * for empty space checking.
1222 */
1223static inline int
1224have_head (int ax, int ay)
1225{
1226 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1227 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1228 return 1;
1229
1230 return 0;
1231}
1232
1233/**
1234 * check_head is a bit simplistic version of update_space below.
1235 * basically, it only checks the that the head on space ax,ay at layer
1236 * needs to get sent - if so, it adds the data, sending the head
1237 * if needed, and returning 1. If this no data needs to get
1238 * sent, it returns zero.
1239 */
1240static int
1241check_head (packet &sl, client &ns, int ax, int ay, int layer)
1242{
1243 short face_num;
1244
1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1246 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1247 else
1248 face_num = 0;
1249
1250 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1251 {
1252 sl << uint16 (face_num);
1253 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1254 esrv_send_face (&ns, face_num, 0);
1255
1256 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1257 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1258 return 1;
1259 }
1260
1261 return 0; /* No change */
1262}
1263 1153
1264/** 1154/**
1265 * Removes the need to replicate the same code for each layer. 1155 * Removes the need to replicate the same code for each layer.
1266 * this returns true if this space is now in fact different than 1156 * this returns true if this space is now in fact different than
1267 * it was. 1157 * it was.
1268 * sl is the socklist this data is going into. 1158 * sl is the socklist this data is going into.
1269 * ns is the socket we are working on - all the info we care 1159 * ns is the socket we are working on - all the info we care
1270 * about is in this socket structure, so now need not pass the 1160 * about is in this socket structure, so now need not pass the
1271 * entire player object. 1161 * entire player object.
1272 * mx and my are map coordinate offsets for map mp
1273 * sx and sy are the offsets into the socket structure that
1274 * holds the old values.
1275 * layer is the layer to update, with 2 being the floor and 0 the 1162 * layer is the layer to update, with 2 being the floor and 0 the
1276 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1163 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1277 * take. Interesting to note that before this function, the map1 function 1164 * take. Interesting to note that before this function, the map1 function
1278 * numbers the spaces differently - I think this was a leftover from 1165 * numbers the spaces differently - I think this was a leftover from
1279 * the map command, where the faces stack up. Sinces that is no longer 1166 * the map command, where the faces stack up. Sinces that is no longer
1280 * the case, it seems to make more sense to have these layer values 1167 * the case, it seems to make more sense to have these layer values
1281 * actually match. 1168 * actually match.
1282 */ 1169 */
1283static int 1170static int
1284update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1171update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1285{ 1172{
1286 object *ob, *head; 1173 object *ob = ms.faces_obj [layer];
1287 uint16 face_num;
1288 int bx, by, i;
1289
1290 /* If there is a multipart object stored away, treat that as more important.
1291 * If not, then do the normal processing.
1292 */
1293 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1294
1295 /* Check to see if this head is part of the set of objects
1296 * we would normally send for this space. If so, then
1297 * don't use the head value. We need to do the check
1298 * here and not when setting up the heads[] value for two reasons -
1299 * 1) the heads[] values will get used even if the space is not visible.
1300 * 2) its possible the head is not on the same map as a part, and I'd
1301 * rather not need to do the map translation overhead.
1302 * 3) We need to do some extra checking to make sure that we will
1303 * otherwise send the image as this layer, eg, either it matches
1304 * the head value, or is not multipart.
1305 */
1306 if (head && !head->more)
1307 {
1308 for (i = 0; i < MAP_LAYERS; i++)
1309 {
1310 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1311 if (!ob)
1312 continue;
1313
1314 if (ob->head)
1315 ob = ob->head;
1316
1317 if (ob == head)
1318 {
1319 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1320 head = NULL;
1321 break;
1322 }
1323 }
1324 }
1325
1326 ob = head;
1327 if (!ob)
1328 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1329 1174
1330 /* If there is no object for this space, or if the face for the object 1175 /* If there is no object for this space, or if the face for the object
1331 * is the blank face, set the face number to zero. 1176 * is the blank face, set the face number to zero.
1332 * else if we have the stored head object for this space, that takes 1177 * else if we have the stored head object for this space, that takes
1333 * precedence over the other object for this space. 1178 * precedence over the other object for this space.
1334 * otherwise, we do special head processing 1179 * otherwise, we do special head processing
1335 */ 1180 */
1336 if (!ob || ob->face == blank_face) 1181 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1337 face_num = 0;
1338 else if (head)
1339 {
1340 /* if this is a head that had previously been stored */
1341 face_num = ob->face->number;
1342 }
1343 else
1344 {
1345 /* if the faces for the different parts of a multipart object
1346 * are the same, we only want to send the bottom right most
1347 * portion of the object. That info is in the tail_.. values
1348 * of the head. Note that for the head itself, ob->head will
1349 * be null, so we only do this block if we are working on
1350 * a tail piece.
1351 */
1352
1353 /* tail_x and tail_y will only be set in the head object. If
1354 * this is the head object and these are set, we proceed
1355 * with logic to only send bottom right. Similarly, if
1356 * this is one of the more parts but the head has those values
1357 * set, we want to do the processing. There can be cases where
1358 * the head is not visible but one of its parts is, so we just
1359 * can always expect that ob->arch->tail_x will be true for all
1360 * object we may want to display.
1361 */
1362 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1363 {
1364
1365 if (ob->head)
1366 head = ob->head;
1367 else
1368 head = ob;
1369
1370 /* Basically figure out where the offset is from where we are right
1371 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1372 * piece is from the head, and the tail is where the tail is from the
1373 * head. Note that bx and by will equal sx and sy if we are already working
1374 * on the bottom right corner. If ob is the head, the clone values
1375 * will be zero, so the right thing will still happen.
1376 */
1377 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1378 by = sy + head->arch->tail_y - ob->arch->clone.y;
1379
1380 /* I don't think this can ever happen, but better to check for it just
1381 * in case.
1382 */
1383 if (bx < sx || by < sy)
1384 {
1385 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1386 face_num = 0;
1387 }
1388 /* single part object, multipart object with non merged faces,
1389 * of multipart object already at lower right.
1390 */
1391 else if (bx == sx && by == sy)
1392 {
1393 face_num = ob->face->number;
1394
1395 /* if this face matches one stored away, clear that one away.
1396 * this code relies on the fact that the map1 commands
1397 * goes from 2 down to 0.
1398 */
1399 for (i = 0; i < MAP_LAYERS; i++)
1400 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1401 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1402 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1403 }
1404 else
1405 {
1406 /* If this head is stored away, clear it - otherwise,
1407 * there can be cases where a object is on multiple layers -
1408 * we only want to send it once.
1409 */
1410 face_num = head->face->number;
1411 for (i = 0; i < MAP_LAYERS; i++)
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1415
1416 /* First, try to put the new head on the same layer. If that is used up,
1417 * then find another layer.
1418 */
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1420 {
1421 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1422 }
1423 else
1424 for (i = 0; i < MAX_LAYERS; i++)
1425 {
1426 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1427 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1428 {
1429 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1430 }
1431 }
1432 face_num = 0; /* Don't send this object - we'll send the head later */
1433 }
1434 }
1435 else
1436 {
1437 /* In this case, we are already at the lower right or single part object,
1438 * so nothing special
1439 */
1440 face_num = ob->face->number;
1441
1442 /* clear out any head entries that have the same face as this one */
1443 for (bx = 0; bx < layer; bx++)
1444 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1445 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1446 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1447 }
1448 } /* else not already head object or blank face */
1449
1450 /* This is a real hack. Basically, if we have nothing to send for this layer,
1451 * but there is a head on the next layer, send that instead.
1452 * Without this, what happens is you can get the case where the player stands
1453 * on the same space as the head. However, if you have overlapping big objects
1454 * of the same type, what happens then is it doesn't think it needs to send
1455 * This tends to make stacking also work/look better.
1456 */
1457 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1458 {
1459 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1460 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1461 }
1462
1463 /* Another hack - because of heads and whatnot, this face may match one
1464 * we already sent for a lower layer. In that case, don't send
1465 * this one.
1466 */
1467 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1468 face_num = 0;
1469 1182
1470 /* We've gotten what face we want to use for the object. Now see if 1183 /* We've gotten what face we want to use for the object. Now see if
1471 * if it has changed since we last sent it to the client. 1184 * if it has changed since we last sent it to the client.
1472 */ 1185 */
1473 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1186 if (lastcell.faces[layer] != face_num)
1474 { 1187 {
1475 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1188 lastcell.faces[layer] = face_num;
1189
1476 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!ns.faces_sent[face_num])
1191 if (ob)
1192 ns.send_faces (ob);
1193 else
1477 esrv_send_face (&ns, face_num, 0); 1194 ns.send_face (face_num);
1478 1195
1479 sl << uint16 (face_num); 1196 sl << uint16 (face_num);
1480 return 1;
1481 }
1482
1483 /* Nothing changed */
1484 return 0;
1485}
1486
1487/**
1488 * This function is mainly a copy of update_space,
1489 * except it handles update of the smoothing updates,
1490 * not the face updates.
1491 * Removes the need to replicate the same code for each layer.
1492 * this returns true if this smooth is now in fact different
1493 * than it was.
1494 * sl is the socklist this data is going into.
1495 * ns is the socket we are working on - all the info we care
1496 * about is in this socket structure, so know need to pass the
1497 * entire player object.
1498 * mx and my are map coordinate offsets for map mp
1499 * sx and sy are the offsets into the socket structure that
1500 * holds the old values.
1501 * layer is the layer to update, with 2 being the floor and 0 the
1502 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1503 * take.
1504 */
1505
1506static inline int
1507update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1508{
1509 object *ob;
1510 int smoothlevel; /* old face_num; */
1511
1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1513
1514 /* If there is no object for this space, or if the face for the object
1515 * is the blank face, set the smoothlevel to zero.
1516 */
1517 if (!ob || ob->face == blank_face)
1518 smoothlevel = 0;
1519 else
1520 {
1521 smoothlevel = ob->smoothlevel;
1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1523 SendSmooth (&ns, ob->face->number);
1524 } /* else not already head object or blank face */
1525
1526 /* We've gotten what face we want to use for the object. Now see if
1527 * if it has changed since we last sent it to the client.
1528 */
1529 if (smoothlevel > 255)
1530 smoothlevel = 255;
1531 else if (smoothlevel < 0)
1532 smoothlevel = 0;
1533
1534 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1535 {
1536 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1537 sl << uint8 (smoothlevel);
1538 return 1; 1197 return 1;
1539 } 1198 }
1540 1199
1541 /* Nothing changed */ 1200 /* Nothing changed */
1542 return 0; 1201 return 0;
… …
1606 * look like. 1265 * look like.
1607 */ 1266 */
1608void 1267void
1609draw_client_map1 (object *pl) 1268draw_client_map1 (object *pl)
1610{ 1269{
1611 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1612 sint16 nx, ny; 1271 sint16 nx, ny;
1613 int estartlen, eoldlen; 1272 int estartlen, eoldlen;
1614 uint16 mask, emask;
1615 uint8 eentrysize; 1273 uint8 eentrysize;
1616 uint16 ewhatstart, ewhatflag; 1274 uint16 ewhatstart, ewhatflag;
1617 uint8 extendedinfos; 1275 uint8 extendedinfos;
1618 maptile *m; 1276 maptile *m;
1619 1277
… …
1646 << uint8 (extendedinfos) 1304 << uint8 (extendedinfos)
1647 << uint8 (eentrysize); 1305 << uint8 (eentrysize);
1648 1306
1649 estartlen = esl.length (); 1307 estartlen = esl.length ();
1650 } 1308 }
1651 else
1652 {
1653 /* suppress compiler warnings */
1654 ewhatstart = 0;
1655 ewhatflag = 0;
1656 estartlen = 0;
1657 }
1658
1659 /* Init data to zero */
1660 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661 1309
1662 /* x,y are the real map locations. ax, ay are viewport relative 1310 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations. 1311 * locations.
1664 */ 1312 */
1665 ay = 0; 1313 ay = 0;
… …
1668 * but that started to get a bit messy to look at. 1316 * but that started to get a bit messy to look at.
1669 */ 1317 */
1670 max_x = pl->x + (socket.mapx + 1) / 2; 1318 max_x = pl->x + (socket.mapx + 1) / 2;
1671 max_y = pl->y + (socket.mapy + 1) / 2; 1319 max_y = pl->y + (socket.mapy + 1) / 2;
1672 1320
1673 if (socket.mapmode == Map1aCmd) 1321 maptile *plmap = pl->map;
1674 {
1675 max_x += MAX_HEAD_OFFSET;
1676 max_y += MAX_HEAD_OFFSET;
1677 }
1678 1322
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 { 1324 {
1681 ax = 0; 1325 ax = 0;
1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1683 { 1327 {
1328 int emask, mask;
1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1685 1330
1686 /* If this space is out of the normal viewable area, we only check
1687 * the heads value ax or ay will only be greater than what
1688 * the client wants if using the map1a command - this is because
1689 * if the map1a command is not used, max_x and max_y will be
1690 * set to lower values.
1691 */
1692 if (ax >= socket.mapx || ay >= socket.mapy)
1693 {
1694 int i, got_one;
1695
1696 oldlen = sl.length ();
1697
1698 sl << uint16 (mask);
1699
1700 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1701 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1702 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1703
1704 /* If all we are doing is sending 0 (blank) faces, we don't
1705 * actually need to send that - just the coordinates
1706 * with no faces tells the client to blank out the
1707 * space.
1708 */
1709 got_one = 0;
1710 for (i = oldlen + 2; i < sl.length (); i++)
1711 if (sl[i])
1712 got_one = 1;
1713
1714 if (got_one && (mask & 0xf))
1715 sl[oldlen + 1] = mask & 0xff;
1716 else
1717 { /*either all faces blank, either no face at all */
1718 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1719 sl.reset (oldlen + 2);
1720 else
1721 sl.reset (oldlen);
1722 }
1723
1724 /*What concerns extendinfos, nothing to be done for now
1725 * (perhaps effects layer later)
1726 */
1727 continue; /* don't do processing below */
1728 }
1729
1730 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1331 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1731
1732 d = pl->contr->blocked_los[ax][ay];
1733 1332
1734 /* If the coordinates are not valid, or it is too dark to see, 1333 /* If the coordinates are not valid, or it is too dark to see,
1735 * we tell the client as such 1334 * we tell the client as such
1736 */ 1335 */
1737 nx = x; 1336 nx = x;
1738 ny = y; 1337 ny = y;
1739 m = get_map_from_coord (pl->map, &nx, &ny); 1338 m = get_map_from_coord (plmap, &nx, &ny);
1740 1339
1741 if (!m) 1340 if (!m)
1742 { 1341 {
1743 /* space is out of map. Update space and clear values 1342 /* space is out of map. Update space and clear values
1744 * if this hasn't already been done. If the space is out 1343 * if this hasn't already been done. If the space is out
1745 * of the map, it shouldn't have a head 1344 * of the map, it shouldn't have a head
1746 */ 1345 */
1747 if (lastcell.count != -1) 1346 if (lastcell.count != -1)
1748 { 1347 {
1749 sl << uint16 (mask); 1348 sl << uint16 (mask);
1750 map_clearcell (&lastcell, 0, 0, 0, -1); 1349 map_clearcell (&lastcell, -1);
1751 } 1350 }
1351
1352 continue;
1752 } 1353 }
1354
1355 m->touch ();
1356
1357 int d = pl->contr->blocked_los[ax][ay];
1358
1753 else if (d > 3) 1359 if (d > 3)
1754 { 1360 {
1755 m->touch ();
1756 1361
1757 int need_send = 0, count; 1362 int need_send = 0, count;
1758 1363
1759 /* This block deals with spaces that are not visible for whatever 1364 /* This block deals with spaces that are not visible for whatever
1760 * reason. Still may need to send the head for this space. 1365 * reason. Still may need to send the head for this space.
1761 */ 1366 */
1762 1367
1763 oldlen = sl.length (); 1368 oldlen = sl.length ();
1764 1369
1765 sl << uint16 (mask); 1370 sl << uint16 (mask);
… …
1767 if (lastcell.count != -1) 1372 if (lastcell.count != -1)
1768 need_send = 1; 1373 need_send = 1;
1769 1374
1770 count = -1; 1375 count = -1;
1771 1376
1772 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1773 {
1774 /* Now check to see if any heads need to be sent */
1775
1776 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1777 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1778 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1779
1780 lastcell.count = count;
1781 }
1782 else
1783 {
1784 /* properly clear a previously sent big face */ 1377 /* properly clear a previously sent big face */
1785 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1378 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1786 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1379 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1787 need_send = 1; 1380 need_send = 1;
1788 1381
1789 map_clearcell (&lastcell, 0, 0, 0, count); 1382 map_clearcell (&lastcell, count);
1790 }
1791 1383
1792 if ((mask & 0xf) || need_send) 1384 if ((mask & 0xf) || need_send)
1793 sl[oldlen + 1] = mask & 0xff; 1385 sl[oldlen + 1] = mask & 0xff;
1794 else 1386 else
1795 sl.reset (oldlen); 1387 sl.reset (oldlen);
1796 } 1388 }
1797 else 1389 else
1798 { 1390 {
1799 m->touch ();
1800
1801 /* In this block, the space is visible or there are head objects 1391 /* In this block, the space is visible.
1802 * we need to send.
1803 */ 1392 */
1804 1393
1805 /* Rather than try to figure out what everything that we might 1394 /* Rather than try to figure out what everything that we might
1806 * need to send is, then form the packet after that, 1395 * need to send is, then form the packet after that,
1807 * we presume that we will in fact form a packet, and update 1396 * we presume that we will in fact form a packet, and update
… …
1810 * is done. 1399 * is done.
1811 * I think this is simpler than doing a bunch of checks to see 1400 * I think this is simpler than doing a bunch of checks to see
1812 * what if anything we need to send, setting the bits, then 1401 * what if anything we need to send, setting the bits, then
1813 * doing those checks again to add the real data. 1402 * doing those checks again to add the real data.
1814 */ 1403 */
1815 oldlen = sl.length (); 1404 oldlen = sl.length ();
1816 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817 eoldlen = esl.length (); 1405 eoldlen = esl.length ();
1818 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1406
1819 sl << uint16 (mask); 1407 sl << uint16 (mask);
1820
1821 if (socket.ext_mapinfos)
1822 esl << uint16 (emask);
1823 1408
1824 unsigned char dummy; 1409 unsigned char dummy;
1825 unsigned char *last_ext = &dummy; 1410 unsigned char *last_ext = &dummy;
1826 1411
1827 /* Darkness changed */ 1412 /* Darkness changed */
… …
1839 sl << uint8 (255 - 64 * d); 1424 sl << uint8 (255 - 64 * d);
1840 } 1425 }
1841 1426
1842 lastcell.count = d; 1427 lastcell.count = d;
1843 1428
1429 mapspace &ms = m->at (nx, ny);
1430
1844 if (socket.extmap) 1431 if (socket.extmap)
1845 { 1432 {
1846 uint8 stat_hp = 0; 1433 uint8 stat_hp = 0;
1847 uint8 stat_width = 0; 1434 uint8 stat_width = 0;
1848 uint8 flags = 0; 1435 uint8 flags = 0;
1849 UUID player = 0; 1436 UUID player = 0;
1850 1437
1851 // send hp information, if applicable 1438 // send hp information, if applicable
1852 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1439 if (object *op = ms.faces_obj [0])
1853 { 1440 {
1854 if (op->head || op->invisible) 1441 if (op->head || op->invisible)
1855 ; // do not show 1442 ; // do not show
1856 else if (op->type == PLAYER 1443 else if (op->type == PLAYER
1857 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1911 sl << uint8 (8) << uint8 (flags); 1498 sl << uint8 (8) << uint8 (flags);
1912 } 1499 }
1913 } 1500 }
1914 1501
1915 /* Floor face */ 1502 /* Floor face */
1916 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1503 if (update_space (sl, socket, ms, lastcell, 2))
1917 mask |= 0x4; 1504 mask |= 0x4;
1918 1505
1919 if (socket.EMI_smooth)
1920 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1921 emask |= 0x4;
1922
1923 /* Middle face */ 1506 /* Middle face */
1924 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1507 if (update_space (sl, socket, ms, lastcell, 1))
1925 mask |= 0x2; 1508 mask |= 0x2;
1926 1509
1927 if (socket.EMI_smooth) 1510 if (ms.player () == pl
1928 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1929 emask |= 0x2;
1930
1931 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932 { 1512 {
1513 // force player to be visible to himself if invisible
1933 if (lastcell.faces[0] != pl->face->number) 1514 if (lastcell.faces[0] != pl->face)
1934 { 1515 {
1935 lastcell.faces[0] = pl->face->number; 1516 lastcell.faces[0] = pl->face;
1517
1936 mask |= 0x1; 1518 mask |= 0x1;
1937
1938 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1939 esrv_send_face (&socket, pl->face->number, 0);
1940
1941 sl << uint16 (pl->face->number); 1519 sl << uint16 (pl->face);
1520
1521 socket.send_faces (pl);
1942 } 1522 }
1943 } 1523 }
1944 else
1945 {
1946 /* Top face */ 1524 /* Top face */
1947 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1525 else if (update_space (sl, socket, ms, lastcell, 0))
1948 mask |= 0x1; 1526 mask |= 0x1;
1949
1950 if (socket.EMI_smooth)
1951 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1952 emask |= 0x1;
1953 } 1527
1954 1528
1955 /* Check to see if we are in fact sending anything for this 1529 /* Check to see if we are in fact sending anything for this
1956 * space by checking the mask. If so, update the mask. 1530 * space by checking the mask. If so, update the mask.
1957 * if not, reset the len to that from before adding the mask 1531 * if not, reset the len to that from before adding the mask
1958 * value, so we don't send those bits. 1532 * value, so we don't send those bits.
… …
1960 if (mask & 0xf) 1534 if (mask & 0xf)
1961 sl[oldlen + 1] = mask & 0xff; 1535 sl[oldlen + 1] = mask & 0xff;
1962 else 1536 else
1963 sl.reset (oldlen); 1537 sl.reset (oldlen);
1964 1538
1539 if (socket.ext_mapinfos)
1540 esl << uint16 (emask);
1541
1542 if (socket.EMI_smooth)
1543 {
1544 for (int layer = 2+1; layer--; )
1545 {
1546 object *ob = ms.faces_obj [layer];
1547
1548 // If there is no object for this space, or if the face for the object
1549 // is the blank face, set the smoothlevel to zero.
1550 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1551
1552 // We've gotten what face we want to use for the object. Now see if
1553 // if it has changed since we last sent it to the client.
1554 if (lastcell.smooth[layer] != smoothlevel)
1555 {
1556 lastcell.smooth[layer] = smoothlevel;
1557 esl << uint8 (smoothlevel);
1558 emask |= 1 << layer;
1559 }
1560 }
1561
1965 if (emask & 0xf) 1562 if (emask & 0xf)
1966 esl[eoldlen + 1] = emask & 0xff; 1563 esl[eoldlen + 1] = emask & 0xff;
1967 else 1564 else
1968 esl.reset (eoldlen); 1565 esl.reset (eoldlen);
1566 }
1969 } /* else this is a viewable space */ 1567 } /* else this is a viewable space */
1970 } /* for x loop */ 1568 } /* for x loop */
1971 } /* for y loop */ 1569 } /* for y loop */
1972 1570
1973 /* Verify that we in fact do need to send this */ 1571 /* Verify that we in fact do need to send this */
… …
1976 if (!(sl.length () > startlen || socket.sent_scroll)) 1574 if (!(sl.length () > startlen || socket.sent_scroll))
1977 { 1575 {
1978 /* No map data will follow, so don't say the client 1576 /* No map data will follow, so don't say the client
1979 * it doesn't need draw! 1577 * it doesn't need draw!
1980 */ 1578 */
1981 ewhatflag &= (~EMI_NOREDRAW); 1579 ewhatflag &= ~EMI_NOREDRAW;
1982 esl[ewhatstart + 1] = ewhatflag & 0xff; 1580 esl[ewhatstart + 1] = ewhatflag & 0xff;
1983 } 1581 }
1984 1582
1985 if (esl.length () > estartlen) 1583 if (esl.length () > estartlen)
1986 socket.send_packet (esl); 1584 socket.send_packet (esl);
… …
1998 */ 1596 */
1999void 1597void
2000draw_client_map (object *pl) 1598draw_client_map (object *pl)
2001{ 1599{
2002 int i, j; 1600 int i, j;
2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1601 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2004 facetile *face, *floor;
2005 facetile *floor2;
2006 int d, mflags; 1602 int mflags;
2007 struct Map newmap; 1603 struct Map newmap;
2008 maptile *m, *pm; 1604 maptile *m, *pm;
2009 1605
2010 if (pl->type != PLAYER) 1606 if (pl->type != PLAYER)
2011 { 1607 {
… …
2192 1788
2193/* appends the spell *spell to the Socklist we will send the data to. */ 1789/* appends the spell *spell to the Socklist we will send the data to. */
2194static void 1790static void
2195append_spell (player *pl, packet &sl, object *spell) 1791append_spell (player *pl, packet &sl, object *spell)
2196{ 1792{
2197 int len, i, skill = 0; 1793 int i, skill = 0;
2198 1794
2199 if (!(spell->name)) 1795 if (!(spell->name))
2200 { 1796 {
2201 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1797 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2202 return; 1798 return;
… …
2214 if (!strcmp (spell->skill, skill_names[i])) 1810 if (!strcmp (spell->skill, skill_names[i]))
2215 { 1811 {
2216 skill = i + CS_STAT_SKILLINFO; 1812 skill = i + CS_STAT_SKILLINFO;
2217 break; 1813 break;
2218 } 1814 }
1815 }
1816
1817 // spells better have a face
1818 if (!spell->face)
1819 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face);
2219 } 1822 }
2220 1823
2221 /* send the current values */ 1824 /* send the current values */
2222 sl << uint32 (spell->count) 1825 sl << uint32 (spell->count)
2223 << uint16 (spell->level) 1826 << uint16 (spell->level)
… …
2225 << uint16 (spell->last_sp) 1828 << uint16 (spell->last_sp)
2226 << uint16 (spell->last_grace) 1829 << uint16 (spell->last_grace)
2227 << uint16 (spell->last_eat) 1830 << uint16 (spell->last_eat)
2228 << uint8 (skill) 1831 << uint8 (skill)
2229 << uint32 (spell->path_attuned) 1832 << uint32 (spell->path_attuned)
2230 << uint32 (spell->face ? spell->face->number : 0) 1833 << uint32 (spell->face)
2231 << data8 (spell->name) 1834 << data8 (spell->name)
2232 << data16 (spell->msg); 1835 << data16 (spell->msg);
2233} 1836}
2234 1837
2235/** 1838/**
… …
2250 1853
2251 packet sl ("addspell"); 1854 packet sl ("addspell");
2252 1855
2253 if (!spell) 1856 if (!spell)
2254 { 1857 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1858 for (spell = pl->ob->inv; spell; spell = spell->below)
2256 { 1859 {
2257 /* were we to simply keep appending data here, we could exceed 1860 /* were we to simply keep appending data here, we could exceed
2258 * MAXSOCKBUF if the player has enough spells to add, we know that 1861 * MAXSOCKBUF if the player has enough spells to add, we know that
2259 * append_spells will always append 19 data bytes, plus 4 length 1862 * append_spells will always append 19 data bytes, plus 4 length
2260 * bytes and 3 strings (because that is the spec) so we need to 1863 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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