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.71 by root, Mon Mar 12 01:13:10 2007 UTC

… …
97 * complexities for the client, and probably doesn't make 97 * complexities for the client, and probably doesn't make
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
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108 102
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
… …
437 } 431 }
438 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
439 { 433 {
440 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 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 } 436 }
446 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
447 { 438 {
448 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
505 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
506 { 497 {
507 y = atoi (cp + 1); 498 y = atoi (cp + 1);
508 break; 499 break;
509 } 500 }
501
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 { 503 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 } 506 }
… …
705 uint16 smoothface; 697 uint16 smoothface;
706 698
707 /* If we can't find a face, return and set it so we won't try to send this 699 /* If we can't find a face, return and set it so we won't try to send this
708 * again. 700 * again.
709 */ 701 */
710 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
711 { 703 {
712 704
713 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 705 LOG (llevError, "could not findsmooth for %d.\n", face);
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return; 707 return;
716 } 708 }
717 709
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
726 << uint16 (smoothface); 718 << uint16 (smoothface);
727 719
728 ns->send_packet (sl); 720 ns->send_packet (sl);
729} 721}
730 722
731 /** 723/**
732 * Tells client the picture it has to use 724 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
734 */ 726 */
735void 727void
736AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
737{ 729{
738 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
739} 731}
… …
879 871
880 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
882 874
883 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885 876
886 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
887 878
888 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 880 // unchecked;
… …
1108{ 1099{
1109 packet sl ("player"); 1100 packet sl ("player");
1110 1101
1111 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1112 << uint32 (weight) 1103 << uint32 (weight)
1113 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1114 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1115 1106
1116 pl->ns->last_weight = weight; 1107 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
… …
1166 * 1157 *
1167 ******************************************************************************/ 1158 ******************************************************************************/
1168 1159
1169/** Clears a map cell */ 1160/** Clears a map cell */
1170static void 1161static void
1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1172{ 1163{
1173 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1174 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1175 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1176 cell->count = count; 1167 cell->count = count;
1177 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1178 cell->flags = 0; 1169 cell->flags = 0;
1179 cell->player = 0; 1170 cell->player = 0;
1180} 1171}
1181 1172
1182#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1183#define MAX_LAYERS 3 1173#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 1174
1239/** 1175/**
1240 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1241 * this returns true if this space is now in fact different than 1177 * this returns true if this space is now in fact different than
1242 * it was. 1178 * it was.
… …
1256 * actually match. 1192 * actually match.
1257 */ 1193 */
1258static int 1194static int
1259update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1260{ 1196{
1261 object *ob, *head;
1262 uint16 face_num; 1197 uint16 face_num;
1263 int bx, by, i; 1198 int bx, by, i;
1264 1199
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); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1304 1201
1305 /* If there is no object for this space, or if the face for the object 1202 /* 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. 1203 * is the blank face, set the face number to zero.
1307 * else if we have the stored head object for this space, that takes 1204 * else if we have the stored head object for this space, that takes
1308 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1309 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1310 */ 1207 */
1311 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1312 face_num = 0; 1209 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 1210 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, 1211 /* In this case, we are already at the lower right or single part object,
1413 * so nothing special 1212 * 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 */ 1213 */
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; 1214 face_num = ob->face;
1444 1215
1445 /* We've gotten what face we want to use for the object. Now see if 1216 /* 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. 1217 * if it has changed since we last sent it to the client.
1447 */ 1218 */
1448 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1475 * holds the old values. 1246 * holds the old values.
1476 * layer is the layer to update, with 2 being the floor and 0 the 1247 * 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 1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1478 * take. 1249 * take.
1479 */ 1250 */
1480
1481static inline int 1251static inline int
1482update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{ 1253{
1484 object *ob; 1254 object *ob;
1485 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1492 if (!ob || ob->face == blank_face) 1262 if (!ob || ob->face == blank_face)
1493 smoothlevel = 0; 1263 smoothlevel = 0;
1494 else 1264 else
1495 { 1265 {
1496 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1498 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1499 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1500 1270
1501 /* We've gotten what face we want to use for the object. Now see if 1271 /* 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. 1272 * if it has changed since we last sent it to the client.
1503 */ 1273 */
… …
1629 ewhatstart = 0; 1399 ewhatstart = 0;
1630 ewhatflag = 0; 1400 ewhatflag = 0;
1631 estartlen = 0; 1401 estartlen = 0;
1632 } 1402 }
1633 1403
1634 /* Init data to zero */
1635 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1636
1637 /* x,y are the real map locations. ax, ay are viewport relative 1404 /* x,y are the real map locations. ax, ay are viewport relative
1638 * locations. 1405 * locations.
1639 */ 1406 */
1640 ay = 0; 1407 ay = 0;
1641 1408
… …
1643 * but that started to get a bit messy to look at. 1410 * but that started to get a bit messy to look at.
1644 */ 1411 */
1645 max_x = pl->x + (socket.mapx + 1) / 2; 1412 max_x = pl->x + (socket.mapx + 1) / 2;
1646 max_y = pl->y + (socket.mapy + 1) / 2; 1413 max_y = pl->y + (socket.mapy + 1) / 2;
1647 1414
1648 if (socket.mapmode == Map1aCmd)
1649 {
1650 max_x += MAX_HEAD_OFFSET;
1651 max_y += MAX_HEAD_OFFSET;
1652 }
1653
1654 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1655 { 1416 {
1656 ax = 0; 1417 ax = 0;
1657 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1418 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1658 { 1419 {
1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1660
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 1421
1705 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1706 1423
1707 d = pl->contr->blocked_los[ax][ay]; 1424 d = pl->contr->blocked_los[ax][ay];
1708 1425
… …
1720 * of the map, it shouldn't have a head 1437 * of the map, it shouldn't have a head
1721 */ 1438 */
1722 if (lastcell.count != -1) 1439 if (lastcell.count != -1)
1723 { 1440 {
1724 sl << uint16 (mask); 1441 sl << uint16 (mask);
1725 map_clearcell (&lastcell, 0, 0, 0, -1); 1442 map_clearcell (&lastcell, -1);
1726 } 1443 }
1727 } 1444 }
1728 else if (d > 3) 1445 else if (d > 3)
1729 { 1446 {
1730 m->touch (); 1447 m->touch ();
1731 1448
1732 int need_send = 0, count; 1449 int need_send = 0, count;
1733 1450
1734 /* This block deals with spaces that are not visible for whatever 1451 /* This block deals with spaces that are not visible for whatever
1735 * reason. Still may need to send the head for this space. 1452 * reason. Still may need to send the head for this space.
1736 */ 1453 */
1737 1454
1738 oldlen = sl.length (); 1455 oldlen = sl.length ();
1739 1456
1740 sl << uint16 (mask); 1457 sl << uint16 (mask);
… …
1742 if (lastcell.count != -1) 1459 if (lastcell.count != -1)
1743 need_send = 1; 1460 need_send = 1;
1744 1461
1745 count = -1; 1462 count = -1;
1746 1463
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 */ 1464 /* properly clear a previously sent big face */
1760 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1465 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1761 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1466 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1762 need_send = 1; 1467 need_send = 1;
1763 1468
1764 map_clearcell (&lastcell, 0, 0, 0, count); 1469 map_clearcell (&lastcell, count);
1765 }
1766 1470
1767 if ((mask & 0xf) || need_send) 1471 if ((mask & 0xf) || need_send)
1768 sl[oldlen + 1] = mask & 0xff; 1472 sl[oldlen + 1] = mask & 0xff;
1769 else 1473 else
1770 sl.reset (oldlen); 1474 sl.reset (oldlen);
1771 } 1475 }
1772 else 1476 else
1773 { 1477 {
1774 m->touch (); 1478 m->touch ();
1775 1479
1776 /* In this block, the space is visible or there are head objects 1480 /* In this block, the space is visible.
1777 * we need to send.
1778 */ 1481 */
1779 1482
1780 /* Rather than try to figure out what everything that we might 1483 /* Rather than try to figure out what everything that we might
1781 * need to send is, then form the packet after that, 1484 * need to send is, then form the packet after that,
1782 * we presume that we will in fact form a packet, and update 1485 * we presume that we will in fact form a packet, and update
… …
1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1904 emask |= 0x2; 1607 emask |= 0x2;
1905 1608
1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1609 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1907 { 1610 {
1908 if (lastcell.faces[0] != pl->face->number) 1611 if (lastcell.faces[0] != pl->face)
1909 { 1612 {
1910 lastcell.faces[0] = pl->face->number; 1613 lastcell.faces[0] = pl->face;
1911 mask |= 0x1; 1614 mask |= 0x1;
1912 1615
1913 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1914 esrv_send_face (&socket, pl->face->number, 0); 1617 esrv_send_face (&socket, pl->face, 0);
1915 1618
1916 sl << uint16 (pl->face->number); 1619 sl << uint16 (pl->face);
1917 } 1620 }
1918 } 1621 }
1919 else 1622 else
1920 { 1623 {
1921 /* Top face */ 1624 /* Top face */
… …
2189 skill = i + CS_STAT_SKILLINFO; 1892 skill = i + CS_STAT_SKILLINFO;
2190 break; 1893 break;
2191 } 1894 }
2192 } 1895 }
2193 1896
1897 // spells better have a face
1898 if (!spell->face)
1899 {
1900 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1901 spell->face = face_find ("burnout.x11", blank_face);
1902 }
1903
2194 /* send the current values */ 1904 /* send the current values */
2195 sl << uint32 (spell->count) 1905 sl << uint32 (spell->count)
2196 << uint16 (spell->level) 1906 << uint16 (spell->level)
2197 << uint16 (spell->casting_time) 1907 << uint16 (spell->casting_time)
2198 << uint16 (spell->last_sp) 1908 << uint16 (spell->last_sp)
2199 << uint16 (spell->last_grace) 1909 << uint16 (spell->last_grace)
2200 << uint16 (spell->last_eat) 1910 << uint16 (spell->last_eat)
2201 << uint8 (skill) 1911 << uint8 (skill)
2202 << uint32 (spell->path_attuned) 1912 << uint32 (spell->path_attuned)
2203 << uint32 (spell->face ? spell->face->number : 0) 1913 << uint32 (spell->face)
2204 << data8 (spell->name) 1914 << data8 (spell->name)
2205 << data16 (spell->msg); 1915 << data16 (spell->msg);
2206} 1916}
2207 1917
2208/** 1918/**
… …
2223 1933
2224 packet sl ("addspell"); 1934 packet sl ("addspell");
2225 1935
2226 if (!spell) 1936 if (!spell)
2227 { 1937 {
2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1938 for (spell = pl->ob->inv; spell; spell = spell->below)
2229 { 1939 {
2230 /* were we to simply keep appending data here, we could exceed 1940 /* were we to simply keep appending data here, we could exceed
2231 * MAXSOCKBUF if the player has enough spells to add, we know that 1941 * MAXSOCKBUF if the player has enough spells to add, we know that
2232 * append_spells will always append 19 data bytes, plus 4 length 1942 * 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 1943 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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