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.72 by root, Mon Mar 12 02:07:43 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
… …
100 * complexities for the client, and probably doesn't make 97 * complexities for the client, and probably doesn't make
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
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111 102
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
… …
440 } 431 }
441 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
442 { 433 {
443 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
444 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 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 } 436 }
449 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
450 { 438 {
451 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
452 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
508 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
509 { 497 {
510 y = atoi (cp + 1); 498 y = atoi (cp + 1);
511 break; 499 break;
512 } 500 }
501
513 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)
514 { 503 {
515 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 } 506 }
… …
708 uint16 smoothface; 697 uint16 smoothface;
709 698
710 /* 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
711 * again. 700 * again.
712 */ 701 */
713 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
714 { 703 {
715 704
716 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);
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718 return; 707 return;
719 } 708 }
720 709
721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
729 << uint16 (smoothface); 718 << uint16 (smoothface);
730 719
731 ns->send_packet (sl); 720 ns->send_packet (sl);
732} 721}
733 722
734 /** 723/**
735 * Tells client the picture it has to use 724 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
737 */ 726 */
738void 727void
739AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
740{ 729{
741 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
742} 731}
… …
882 871
883 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
884 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
885 874
886 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
887
888 876
889 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
890 878
891 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
892 // unchecked; 880 // unchecked;
… …
1111{ 1099{
1112 packet sl ("player"); 1100 packet sl ("player");
1113 1101
1114 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 1103 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1118 1106
1119 pl->ns->last_weight = weight; 1107 pl->ns->last_weight = weight;
1120 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
… …
1167 * 1155 *
1168 * Start of map related commands. 1156 * Start of map related commands.
1169 * 1157 *
1170 ******************************************************************************/ 1158 ******************************************************************************/
1171 1159
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 */ 1160/** Clears a map cell */
1195static void 1161static void
1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1197{ 1163{
1198 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1199 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1200 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1201 cell->count = count; 1167 cell->count = count;
1202 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1203 cell->flags = 0; 1169 cell->flags = 0;
1204 cell->player = 0; 1170 cell->player = 0;
1205} 1171}
1206 1172
1207#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1208#define MAX_LAYERS 3 1173#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 1174
1264/** 1175/**
1265 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1266 * 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
1267 * it was. 1178 * it was.
… …
1281 * actually match. 1192 * actually match.
1282 */ 1193 */
1283static int 1194static int
1284update_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)
1285{ 1196{
1286 object *ob, *head;
1287 uint16 face_num; 1197 uint16 face_num;
1288 int bx, by, i; 1198 int bx, by, i;
1289 1199
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); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1329 1201
1330 /* 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
1331 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1332 * 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
1333 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1334 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1335 */ 1207 */
1336 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1337 face_num = 0; 1209 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 1210 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, 1211 /* In this case, we are already at the lower right or single part object,
1438 * so nothing special 1212 * 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 */ 1213 */
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; 1214 face_num = ob->face;
1469 1215
1470 /* 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
1471 * 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.
1472 */ 1218 */
1473 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1500 * holds the old values. 1246 * holds the old values.
1501 * 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
1502 * 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
1503 * take. 1249 * take.
1504 */ 1250 */
1505
1506static inline int 1251static inline int
1507update_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)
1508{ 1253{
1509 object *ob; 1254 object *ob;
1510 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1517 if (!ob || ob->face == blank_face) 1262 if (!ob || ob->face == blank_face)
1518 smoothlevel = 0; 1263 smoothlevel = 0;
1519 else 1264 else
1520 { 1265 {
1521 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1523 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1524 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1525 1270
1526 /* 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
1527 * 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.
1528 */ 1273 */
… …
1606 * look like. 1351 * look like.
1607 */ 1352 */
1608void 1353void
1609draw_client_map1 (object *pl) 1354draw_client_map1 (object *pl)
1610{ 1355{
1611 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1356 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1612 sint16 nx, ny; 1357 sint16 nx, ny;
1613 int estartlen, eoldlen; 1358 int estartlen, eoldlen;
1614 uint16 mask, emask;
1615 uint8 eentrysize; 1359 uint8 eentrysize;
1616 uint16 ewhatstart, ewhatflag; 1360 uint16 ewhatstart, ewhatflag;
1617 uint8 extendedinfos; 1361 uint8 extendedinfos;
1618 maptile *m; 1362 maptile *m;
1619 1363
… …
1654 ewhatstart = 0; 1398 ewhatstart = 0;
1655 ewhatflag = 0; 1399 ewhatflag = 0;
1656 estartlen = 0; 1400 estartlen = 0;
1657 } 1401 }
1658 1402
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 1403 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations. 1404 * locations.
1664 */ 1405 */
1665 ay = 0; 1406 ay = 0;
1666 1407
… …
1668 * but that started to get a bit messy to look at. 1409 * but that started to get a bit messy to look at.
1669 */ 1410 */
1670 max_x = pl->x + (socket.mapx + 1) / 2; 1411 max_x = pl->x + (socket.mapx + 1) / 2;
1671 max_y = pl->y + (socket.mapy + 1) / 2; 1412 max_y = pl->y + (socket.mapy + 1) / 2;
1672 1413
1673 if (socket.mapmode == Map1aCmd)
1674 {
1675 max_x += MAX_HEAD_OFFSET;
1676 max_y += MAX_HEAD_OFFSET;
1677 }
1678
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1414 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 { 1415 {
1681 ax = 0; 1416 ax = 0;
1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1417 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1683 { 1418 {
1419 int emask, mask;
1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1685 1421
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]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1731
1732 d = pl->contr->blocked_los[ax][ay];
1733 1423
1734 /* If the coordinates are not valid, or it is too dark to see, 1424 /* If the coordinates are not valid, or it is too dark to see,
1735 * we tell the client as such 1425 * we tell the client as such
1736 */ 1426 */
1737 nx = x; 1427 nx = x;
… …
1745 * of the map, it shouldn't have a head 1435 * of the map, it shouldn't have a head
1746 */ 1436 */
1747 if (lastcell.count != -1) 1437 if (lastcell.count != -1)
1748 { 1438 {
1749 sl << uint16 (mask); 1439 sl << uint16 (mask);
1750 map_clearcell (&lastcell, 0, 0, 0, -1); 1440 map_clearcell (&lastcell, -1);
1751 } 1441 }
1442
1443 continue;
1752 } 1444 }
1445
1446 m->touch ();
1447
1448 int d = pl->contr->blocked_los[ax][ay];
1449
1753 else if (d > 3) 1450 if (d > 3)
1754 { 1451 {
1755 m->touch ();
1756 1452
1757 int need_send = 0, count; 1453 int need_send = 0, count;
1758 1454
1759 /* This block deals with spaces that are not visible for whatever 1455 /* This block deals with spaces that are not visible for whatever
1760 * reason. Still may need to send the head for this space. 1456 * reason. Still may need to send the head for this space.
1761 */ 1457 */
1762 1458
1763 oldlen = sl.length (); 1459 oldlen = sl.length ();
1764 1460
1765 sl << uint16 (mask); 1461 sl << uint16 (mask);
… …
1767 if (lastcell.count != -1) 1463 if (lastcell.count != -1)
1768 need_send = 1; 1464 need_send = 1;
1769 1465
1770 count = -1; 1466 count = -1;
1771 1467
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 */ 1468 /* properly clear a previously sent big face */
1785 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1469 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1786 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1470 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1787 need_send = 1; 1471 need_send = 1;
1788 1472
1789 map_clearcell (&lastcell, 0, 0, 0, count); 1473 map_clearcell (&lastcell, count);
1790 }
1791 1474
1792 if ((mask & 0xf) || need_send) 1475 if ((mask & 0xf) || need_send)
1793 sl[oldlen + 1] = mask & 0xff; 1476 sl[oldlen + 1] = mask & 0xff;
1794 else 1477 else
1795 sl.reset (oldlen); 1478 sl.reset (oldlen);
1796 } 1479 }
1797 else 1480 else
1798 { 1481 {
1799 m->touch ();
1800
1801 /* In this block, the space is visible or there are head objects 1482 /* In this block, the space is visible.
1802 * we need to send.
1803 */ 1483 */
1804 1484
1805 /* Rather than try to figure out what everything that we might 1485 /* Rather than try to figure out what everything that we might
1806 * need to send is, then form the packet after that, 1486 * need to send is, then form the packet after that,
1807 * we presume that we will in fact form a packet, and update 1487 * we presume that we will in fact form a packet, and update
… …
1810 * is done. 1490 * is done.
1811 * I think this is simpler than doing a bunch of checks to see 1491 * 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 1492 * what if anything we need to send, setting the bits, then
1813 * doing those checks again to add the real data. 1493 * doing those checks again to add the real data.
1814 */ 1494 */
1815 oldlen = sl.length (); 1495 oldlen = sl.length ();
1816 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817 eoldlen = esl.length (); 1496 eoldlen = esl.length ();
1818 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1497
1819 sl << uint16 (mask); 1498 sl << uint16 (mask);
1820 1499
1821 if (socket.ext_mapinfos) 1500 if (socket.ext_mapinfos)
1822 esl << uint16 (emask); 1501 esl << uint16 (emask);
1823 1502
… …
1928 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1607 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1929 emask |= 0x2; 1608 emask |= 0x2;
1930 1609
1931 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1610 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932 { 1611 {
1933 if (lastcell.faces[0] != pl->face->number) 1612 if (lastcell.faces[0] != pl->face)
1934 { 1613 {
1935 lastcell.faces[0] = pl->face->number; 1614 lastcell.faces[0] = pl->face;
1936 mask |= 0x1; 1615 mask |= 0x1;
1937 1616
1938 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1617 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1939 esrv_send_face (&socket, pl->face->number, 0); 1618 esrv_send_face (&socket, pl->face, 0);
1940 1619
1941 sl << uint16 (pl->face->number); 1620 sl << uint16 (pl->face);
1942 } 1621 }
1943 } 1622 }
1944 else 1623 else
1945 { 1624 {
1946 /* Top face */ 1625 /* Top face */
… …
1976 if (!(sl.length () > startlen || socket.sent_scroll)) 1655 if (!(sl.length () > startlen || socket.sent_scroll))
1977 { 1656 {
1978 /* No map data will follow, so don't say the client 1657 /* No map data will follow, so don't say the client
1979 * it doesn't need draw! 1658 * it doesn't need draw!
1980 */ 1659 */
1981 ewhatflag &= (~EMI_NOREDRAW); 1660 ewhatflag &= ~EMI_NOREDRAW;
1982 esl[ewhatstart + 1] = ewhatflag & 0xff; 1661 esl[ewhatstart + 1] = ewhatflag & 0xff;
1983 } 1662 }
1984 1663
1985 if (esl.length () > estartlen) 1664 if (esl.length () > estartlen)
1986 socket.send_packet (esl); 1665 socket.send_packet (esl);
… …
1998 */ 1677 */
1999void 1678void
2000draw_client_map (object *pl) 1679draw_client_map (object *pl)
2001{ 1680{
2002 int i, j; 1681 int i, j;
2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1682 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; 1683 int mflags;
2007 struct Map newmap; 1684 struct Map newmap;
2008 maptile *m, *pm; 1685 maptile *m, *pm;
2009 1686
2010 if (pl->type != PLAYER) 1687 if (pl->type != PLAYER)
2011 { 1688 {
… …
2192 1869
2193/* appends the spell *spell to the Socklist we will send the data to. */ 1870/* appends the spell *spell to the Socklist we will send the data to. */
2194static void 1871static void
2195append_spell (player *pl, packet &sl, object *spell) 1872append_spell (player *pl, packet &sl, object *spell)
2196{ 1873{
2197 int len, i, skill = 0; 1874 int i, skill = 0;
2198 1875
2199 if (!(spell->name)) 1876 if (!(spell->name))
2200 { 1877 {
2201 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1878 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2202 return; 1879 return;
… …
2214 if (!strcmp (spell->skill, skill_names[i])) 1891 if (!strcmp (spell->skill, skill_names[i]))
2215 { 1892 {
2216 skill = i + CS_STAT_SKILLINFO; 1893 skill = i + CS_STAT_SKILLINFO;
2217 break; 1894 break;
2218 } 1895 }
1896 }
1897
1898 // spells better have a face
1899 if (!spell->face)
1900 {
1901 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1902 spell->face = face_find ("burnout.x11", blank_face);
2219 } 1903 }
2220 1904
2221 /* send the current values */ 1905 /* send the current values */
2222 sl << uint32 (spell->count) 1906 sl << uint32 (spell->count)
2223 << uint16 (spell->level) 1907 << uint16 (spell->level)
… …
2225 << uint16 (spell->last_sp) 1909 << uint16 (spell->last_sp)
2226 << uint16 (spell->last_grace) 1910 << uint16 (spell->last_grace)
2227 << uint16 (spell->last_eat) 1911 << uint16 (spell->last_eat)
2228 << uint8 (skill) 1912 << uint8 (skill)
2229 << uint32 (spell->path_attuned) 1913 << uint32 (spell->path_attuned)
2230 << uint32 (spell->face ? spell->face->number : 0) 1914 << uint32 (spell->face)
2231 << data8 (spell->name) 1915 << data8 (spell->name)
2232 << data16 (spell->msg); 1916 << data16 (spell->msg);
2233} 1917}
2234 1918
2235/** 1919/**
… …
2250 1934
2251 packet sl ("addspell"); 1935 packet sl ("addspell");
2252 1936
2253 if (!spell) 1937 if (!spell)
2254 { 1938 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1939 for (spell = pl->ob->inv; spell; spell = spell->below)
2256 { 1940 {
2257 /* were we to simply keep appending data here, we could exceed 1941 /* were we to simply keep appending data here, we could exceed
2258 * MAXSOCKBUF if the player has enough spells to add, we know that 1942 * MAXSOCKBUF if the player has enough spells to add, we know that
2259 * append_spells will always append 19 data bytes, plus 4 length 1943 * 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 1944 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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