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.70 by root, Sun Mar 11 21:26:05 2007 UTC

… …
35 * Note: All functions that are used to process data from the client 35 * Note: All functions that are used to process data from the client
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 *
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 * 40 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
… …
708 uint16 smoothface; 705 uint16 smoothface;
709 706
710 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
711 * again. 708 * again.
712 */ 709 */
713 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
714 { 711 {
715 712
716 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718 return; 715 return;
719 } 716 }
720 717
721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
729 << uint16 (smoothface); 726 << uint16 (smoothface);
730 727
731 ns->send_packet (sl); 728 ns->send_packet (sl);
732} 729}
733 730
734 /** 731/**
735 * Tells client the picture it has to use 732 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
737 */ 734 */
738void 735void
739AskSmooth (char *buf, int len, client *ns) 736AskSmooth (char *buf, int len, client *ns)
740{ 737{
741 SendSmooth (ns, atoi (buf)); 738 SendSmooth (ns, atoi (buf));
742} 739}
… …
1111{ 1108{
1112 packet sl ("player"); 1109 packet sl ("player");
1113 1110
1114 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 1112 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1118 1115
1119 pl->ns->last_weight = weight; 1116 pl->ns->last_weight = weight;
1120 pl->ns->send_packet (sl); 1117 pl->ns->send_packet (sl);
1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
… …
1167 * 1164 *
1168 * Start of map related commands. 1165 * Start of map related commands.
1169 * 1166 *
1170 ******************************************************************************/ 1167 ******************************************************************************/
1171 1168
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 */ 1169/** Clears a map cell */
1195static void 1170static void
1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int count)
1197{ 1172{
1198 cell->faces[0] = face0; 1173 cell->faces[0] = 0;
1199 cell->faces[1] = face1; 1174 cell->faces[1] = 0;
1200 cell->faces[2] = face2; 1175 cell->faces[2] = 0;
1201 cell->count = count; 1176 cell->count = count;
1202 cell->stat_hp = 0; 1177 cell->stat_hp = 0;
1203 cell->flags = 0; 1178 cell->flags = 0;
1204 cell->player = 0; 1179 cell->player = 0;
1205} 1180}
1206 1181
1207#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1208#define MAX_LAYERS 3 1182#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 1183
1264/** 1184/**
1265 * Removes the need to replicate the same code for each layer. 1185 * Removes the need to replicate the same code for each layer.
1266 * this returns true if this space is now in fact different than 1186 * this returns true if this space is now in fact different than
1267 * it was. 1187 * it was.
… …
1281 * actually match. 1201 * actually match.
1282 */ 1202 */
1283static int 1203static int
1284update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1285{ 1205{
1286 object *ob, *head;
1287 uint16 face_num; 1206 uint16 face_num;
1288 int bx, by, i; 1207 int bx, by, i;
1289 1208
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); 1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1329 1210
1330 /* If there is no object for this space, or if the face for the object 1211 /* 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. 1212 * is the blank face, set the face number to zero.
1332 * else if we have the stored head object for this space, that takes 1213 * else if we have the stored head object for this space, that takes
1333 * precedence over the other object for this space. 1214 * precedence over the other object for this space.
1334 * otherwise, we do special head processing 1215 * otherwise, we do special head processing
1335 */ 1216 */
1336 if (!ob || ob->face == blank_face) 1217 if (!ob || ob->face == blank_face)
1337 face_num = 0; 1218 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 1219 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, 1220 /* In this case, we are already at the lower right or single part object,
1438 * so nothing special 1221 * 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 */ 1222 */
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; 1223 face_num = ob->face;
1469 1224
1470 /* We've gotten what face we want to use for the object. Now see if 1225 /* 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. 1226 * if it has changed since we last sent it to the client.
1472 */ 1227 */
1473 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1517 if (!ob || ob->face == blank_face) 1272 if (!ob || ob->face == blank_face)
1518 smoothlevel = 0; 1273 smoothlevel = 0;
1519 else 1274 else
1520 { 1275 {
1521 smoothlevel = ob->smoothlevel; 1276 smoothlevel = ob->smoothlevel;
1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1277 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1523 SendSmooth (&ns, ob->face->number); 1278 SendSmooth (&ns, ob->face);
1524 } /* else not already head object or blank face */ 1279 } /* else not already head object or blank face */
1525 1280
1526 /* We've gotten what face we want to use for the object. Now see if 1281 /* 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. 1282 * if it has changed since we last sent it to the client.
1528 */ 1283 */
… …
1654 ewhatstart = 0; 1409 ewhatstart = 0;
1655 ewhatflag = 0; 1410 ewhatflag = 0;
1656 estartlen = 0; 1411 estartlen = 0;
1657 } 1412 }
1658 1413
1659 /* Init data to zero */
1660 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661
1662 /* x,y are the real map locations. ax, ay are viewport relative 1414 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations. 1415 * locations.
1664 */ 1416 */
1665 ay = 0; 1417 ay = 0;
1666 1418
… …
1695 1447
1696 oldlen = sl.length (); 1448 oldlen = sl.length ();
1697 1449
1698 sl << uint16 (mask); 1450 sl << uint16 (mask);
1699 1451
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 1452 /* If all we are doing is sending 0 (blank) faces, we don't
1705 * actually need to send that - just the coordinates 1453 * actually need to send that - just the coordinates
1706 * with no faces tells the client to blank out the 1454 * with no faces tells the client to blank out the
1707 * space. 1455 * space.
1708 */ 1456 */
… …
1745 * of the map, it shouldn't have a head 1493 * of the map, it shouldn't have a head
1746 */ 1494 */
1747 if (lastcell.count != -1) 1495 if (lastcell.count != -1)
1748 { 1496 {
1749 sl << uint16 (mask); 1497 sl << uint16 (mask);
1750 map_clearcell (&lastcell, 0, 0, 0, -1); 1498 map_clearcell (&lastcell, -1);
1751 } 1499 }
1752 } 1500 }
1753 else if (d > 3) 1501 else if (d > 3)
1754 { 1502 {
1755 m->touch (); 1503 m->touch ();
… …
1767 if (lastcell.count != -1) 1515 if (lastcell.count != -1)
1768 need_send = 1; 1516 need_send = 1;
1769 1517
1770 count = -1; 1518 count = -1;
1771 1519
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 */ 1520 /* properly clear a previously sent big face */
1785 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1786 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1522 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1787 need_send = 1; 1523 need_send = 1;
1788 1524
1789 map_clearcell (&lastcell, 0, 0, 0, count); 1525 map_clearcell (&lastcell, count);
1790 }
1791 1526
1792 if ((mask & 0xf) || need_send) 1527 if ((mask & 0xf) || need_send)
1793 sl[oldlen + 1] = mask & 0xff; 1528 sl[oldlen + 1] = mask & 0xff;
1794 else 1529 else
1795 sl.reset (oldlen); 1530 sl.reset (oldlen);
… …
1928 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1929 emask |= 0x2; 1664 emask |= 0x2;
1930 1665
1931 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932 { 1667 {
1933 if (lastcell.faces[0] != pl->face->number) 1668 if (lastcell.faces[0] != pl->face)
1934 { 1669 {
1935 lastcell.faces[0] = pl->face->number; 1670 lastcell.faces[0] = pl->face;
1936 mask |= 0x1; 1671 mask |= 0x1;
1937 1672
1938 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1673 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1939 esrv_send_face (&socket, pl->face->number, 0); 1674 esrv_send_face (&socket, pl->face, 0);
1940 1675
1941 sl << uint16 (pl->face->number); 1676 sl << uint16 (pl->face);
1942 } 1677 }
1943 } 1678 }
1944 else 1679 else
1945 { 1680 {
1946 /* Top face */ 1681 /* Top face */
… …
1998 */ 1733 */
1999void 1734void
2000draw_client_map (object *pl) 1735draw_client_map (object *pl)
2001{ 1736{
2002 int i, j; 1737 int i, j;
2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1738 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; 1739 int mflags;
2007 struct Map newmap; 1740 struct Map newmap;
2008 maptile *m, *pm; 1741 maptile *m, *pm;
2009 1742
2010 if (pl->type != PLAYER) 1743 if (pl->type != PLAYER)
2011 { 1744 {
… …
2192 1925
2193/* appends the spell *spell to the Socklist we will send the data to. */ 1926/* appends the spell *spell to the Socklist we will send the data to. */
2194static void 1927static void
2195append_spell (player *pl, packet &sl, object *spell) 1928append_spell (player *pl, packet &sl, object *spell)
2196{ 1929{
2197 int len, i, skill = 0; 1930 int i, skill = 0;
2198 1931
2199 if (!(spell->name)) 1932 if (!(spell->name))
2200 { 1933 {
2201 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1934 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2202 return; 1935 return;
… …
2214 if (!strcmp (spell->skill, skill_names[i])) 1947 if (!strcmp (spell->skill, skill_names[i]))
2215 { 1948 {
2216 skill = i + CS_STAT_SKILLINFO; 1949 skill = i + CS_STAT_SKILLINFO;
2217 break; 1950 break;
2218 } 1951 }
1952 }
1953
1954 // spells better have a face
1955 if (!spell->face)
1956 {
1957 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1958 spell->face = face_find ("burnout.x11", blank_face);
2219 } 1959 }
2220 1960
2221 /* send the current values */ 1961 /* send the current values */
2222 sl << uint32 (spell->count) 1962 sl << uint32 (spell->count)
2223 << uint16 (spell->level) 1963 << uint16 (spell->level)
… …
2225 << uint16 (spell->last_sp) 1965 << uint16 (spell->last_sp)
2226 << uint16 (spell->last_grace) 1966 << uint16 (spell->last_grace)
2227 << uint16 (spell->last_eat) 1967 << uint16 (spell->last_eat)
2228 << uint8 (skill) 1968 << uint8 (skill)
2229 << uint32 (spell->path_attuned) 1969 << uint32 (spell->path_attuned)
2230 << uint32 (spell->face ? spell->face->number : 0) 1970 << uint32 (spell->face)
2231 << data8 (spell->name) 1971 << data8 (spell->name)
2232 << data16 (spell->msg); 1972 << data16 (spell->msg);
2233} 1973}
2234 1974
2235/** 1975/**
… …
2250 1990
2251 packet sl ("addspell"); 1991 packet sl ("addspell");
2252 1992
2253 if (!spell) 1993 if (!spell)
2254 { 1994 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1995 for (spell = pl->ob->inv; spell; spell = spell->below)
2256 { 1996 {
2257 /* were we to simply keep appending data here, we could exceed 1997 /* were we to simply keep appending data here, we could exceed
2258 * MAXSOCKBUF if the player has enough spells to add, we know that 1998 * MAXSOCKBUF if the player has enough spells to add, we know that
2259 * append_spells will always append 19 data bytes, plus 4 length 1999 * 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 2000 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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