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.65 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 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.
… …
147 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
148 139
149 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
150} 141}
151 142
152/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
153static void 144static void
154check_map_change (player *pl) 145check_map_change (player *pl)
155{ 146{
156 client &socket = *pl->ns; 147 client &socket = *pl->ns;
157 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
201 } 192 }
202 } 193 }
203 194
204 socket.current_x = ob->x; 195 socket.current_x = ob->x;
205 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
206} 204}
207 205
208/** 206/**
209 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
433 } 431 }
434 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
435 { 433 {
436 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
437 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
438// } else if (!strcmp(cmd,"plugincmd")) {
439// ns->plugincmd = atoi(param);
440// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441 } 436 }
442 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
443 { 438 {
444 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
501 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
502 { 497 {
503 y = atoi (cp + 1); 498 y = atoi (cp + 1);
504 break; 499 break;
505 } 500 }
501
506 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)
507 { 503 {
508 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510 } 506 }
… …
701 uint16 smoothface; 697 uint16 smoothface;
702 698
703 /* 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
704 * again. 700 * again.
705 */ 701 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
707 { 703 {
708 704
709 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);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return; 707 return;
712 } 708 }
713 709
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
722 << uint16 (smoothface); 718 << uint16 (smoothface);
723 719
724 ns->send_packet (sl); 720 ns->send_packet (sl);
725} 721}
726 722
727 /** 723/**
728 * Tells client the picture it has to use 724 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
730 */ 726 */
731void 727void
732AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
733{ 729{
734 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
735} 731}
… …
875 871
876 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
878 874
879 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
880
881 876
882 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
883 878
884 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 880 // unchecked;
… …
1104{ 1099{
1105 packet sl ("player"); 1100 packet sl ("player");
1106 1101
1107 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1108 << uint32 (weight) 1103 << uint32 (weight)
1109 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1110 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1111 1106
1112 pl->ns->last_weight = weight; 1107 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
… …
1160 * 1155 *
1161 * Start of map related commands. 1156 * Start of map related commands.
1162 * 1157 *
1163 ******************************************************************************/ 1158 ******************************************************************************/
1164 1159
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 1160/** Clears a map cell */
1188static void 1161static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1190{ 1163{
1191 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1194 cell->count = count; 1167 cell->count = count;
1195 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1196 cell->flags = 0; 1169 cell->flags = 0;
1197 cell->player = 0; 1170 cell->player = 0;
1198} 1171}
1199 1172
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 1174
1257/** 1175/**
1258 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1259 * 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
1260 * it was. 1178 * it was.
… …
1274 * actually match. 1192 * actually match.
1275 */ 1193 */
1276static int 1194static int
1277update_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)
1278{ 1196{
1279 object *ob, *head;
1280 uint16 face_num; 1197 uint16 face_num;
1281 int bx, by, i; 1198 int bx, by, i;
1282 1199
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 1201
1323 /* 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
1324 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1325 * 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
1326 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1328 */ 1207 */
1329 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1330 face_num = 0; 1209 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else 1210 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* 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,
1431 * so nothing special 1212 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */ 1213 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0; 1214 face_num = ob->face;
1462 1215
1463 /* 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
1464 * 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.
1465 */ 1218 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1493 * holds the old values. 1246 * holds the old values.
1494 * 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
1495 * 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
1496 * take. 1249 * take.
1497 */ 1250 */
1498
1499static inline int 1251static inline int
1500update_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)
1501{ 1253{
1502 object *ob; 1254 object *ob;
1503 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1510 if (!ob || ob->face == blank_face) 1262 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0; 1263 smoothlevel = 0;
1512 else 1264 else
1513 { 1265 {
1514 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1517 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1518 1270
1519 /* 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
1520 * 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.
1521 */ 1273 */
… …
1647 ewhatstart = 0; 1399 ewhatstart = 0;
1648 ewhatflag = 0; 1400 ewhatflag = 0;
1649 estartlen = 0; 1401 estartlen = 0;
1650 } 1402 }
1651 1403
1652 /* Init data to zero */
1653 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1654
1655 /* 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
1656 * locations. 1405 * locations.
1657 */ 1406 */
1658 ay = 0; 1407 ay = 0;
1659 1408
… …
1661 * but that started to get a bit messy to look at. 1410 * but that started to get a bit messy to look at.
1662 */ 1411 */
1663 max_x = pl->x + (socket.mapx + 1) / 2; 1412 max_x = pl->x + (socket.mapx + 1) / 2;
1664 max_y = pl->y + (socket.mapy + 1) / 2; 1413 max_y = pl->y + (socket.mapy + 1) / 2;
1665 1414
1666 if (socket.mapmode == Map1aCmd)
1667 {
1668 max_x += MAX_HEAD_OFFSET;
1669 max_y += MAX_HEAD_OFFSET;
1670 }
1671
1672 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++)
1673 { 1416 {
1674 ax = 0; 1417 ax = 0;
1675 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++)
1676 { 1419 {
1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1678
1679 /* If this space is out of the normal viewable area, we only check
1680 * the heads value ax or ay will only be greater than what
1681 * the client wants if using the map1a command - this is because
1682 * if the map1a command is not used, max_x and max_y will be
1683 * set to lower values.
1684 */
1685 if (ax >= socket.mapx || ay >= socket.mapy)
1686 {
1687 int i, got_one;
1688
1689 oldlen = sl.length ();
1690
1691 sl << uint16 (mask);
1692
1693 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1694 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1695 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1696
1697 /* If all we are doing is sending 0 (blank) faces, we don't
1698 * actually need to send that - just the coordinates
1699 * with no faces tells the client to blank out the
1700 * space.
1701 */
1702 got_one = 0;
1703 for (i = oldlen + 2; i < sl.length (); i++)
1704 if (sl[i])
1705 got_one = 1;
1706
1707 if (got_one && (mask & 0xf))
1708 sl[oldlen + 1] = mask & 0xff;
1709 else
1710 { /*either all faces blank, either no face at all */
1711 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1712 sl.reset (oldlen + 2);
1713 else
1714 sl.reset (oldlen);
1715 }
1716
1717 /*What concerns extendinfos, nothing to be done for now
1718 * (perhaps effects layer later)
1719 */
1720 continue; /* don't do processing below */
1721 }
1722 1421
1723 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1724 1423
1725 d = pl->contr->blocked_los[ax][ay]; 1424 d = pl->contr->blocked_los[ax][ay];
1726 1425
… …
1738 * of the map, it shouldn't have a head 1437 * of the map, it shouldn't have a head
1739 */ 1438 */
1740 if (lastcell.count != -1) 1439 if (lastcell.count != -1)
1741 { 1440 {
1742 sl << uint16 (mask); 1441 sl << uint16 (mask);
1743 map_clearcell (&lastcell, 0, 0, 0, -1); 1442 map_clearcell (&lastcell, -1);
1744 } 1443 }
1745 } 1444 }
1746 else if (d > 3) 1445 else if (d > 3)
1747 { 1446 {
1748 m->touch (); 1447 m->touch ();
1749 1448
1750 int need_send = 0, count; 1449 int need_send = 0, count;
1751 1450
1752 /* This block deals with spaces that are not visible for whatever 1451 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space. 1452 * reason. Still may need to send the head for this space.
1754 */ 1453 */
1755 1454
1756 oldlen = sl.length (); 1455 oldlen = sl.length ();
1757 1456
1758 sl << uint16 (mask); 1457 sl << uint16 (mask);
… …
1760 if (lastcell.count != -1) 1459 if (lastcell.count != -1)
1761 need_send = 1; 1460 need_send = 1;
1762 1461
1763 count = -1; 1462 count = -1;
1764 1463
1765 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1766 {
1767 /* Now check to see if any heads need to be sent */
1768
1769 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1770 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1771 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1772
1773 lastcell.count = count;
1774 }
1775 else
1776 {
1777 /* properly clear a previously sent big face */ 1464 /* properly clear a previously sent big face */
1778 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
1779 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1466 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1780 need_send = 1; 1467 need_send = 1;
1781 1468
1782 map_clearcell (&lastcell, 0, 0, 0, count); 1469 map_clearcell (&lastcell, count);
1783 }
1784 1470
1785 if ((mask & 0xf) || need_send) 1471 if ((mask & 0xf) || need_send)
1786 sl[oldlen + 1] = mask & 0xff; 1472 sl[oldlen + 1] = mask & 0xff;
1787 else 1473 else
1788 sl.reset (oldlen); 1474 sl.reset (oldlen);
1789 } 1475 }
1790 else 1476 else
1791 { 1477 {
1792 m->touch (); 1478 m->touch ();
1793 1479
1794 /* In this block, the space is visible or there are head objects 1480 /* In this block, the space is visible.
1795 * we need to send.
1796 */ 1481 */
1797 1482
1798 /* Rather than try to figure out what everything that we might 1483 /* Rather than try to figure out what everything that we might
1799 * need to send is, then form the packet after that, 1484 * need to send is, then form the packet after that,
1800 * 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
… …
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1922 emask |= 0x2; 1607 emask |= 0x2;
1923 1608
1924 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))
1925 { 1610 {
1926 if (lastcell.faces[0] != pl->face->number) 1611 if (lastcell.faces[0] != pl->face)
1927 { 1612 {
1928 lastcell.faces[0] = pl->face->number; 1613 lastcell.faces[0] = pl->face;
1929 mask |= 0x1; 1614 mask |= 0x1;
1930 1615
1931 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1932 esrv_send_face (&socket, pl->face->number, 0); 1617 esrv_send_face (&socket, pl->face, 0);
1933 1618
1934 sl << uint16 (pl->face->number); 1619 sl << uint16 (pl->face);
1935 } 1620 }
1936 } 1621 }
1937 else 1622 else
1938 { 1623 {
1939 /* Top face */ 1624 /* Top face */
… …
1991 */ 1676 */
1992void 1677void
1993draw_client_map (object *pl) 1678draw_client_map (object *pl)
1994{ 1679{
1995 int i, j; 1680 int i, j;
1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1681 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1997 facetile *face, *floor;
1998 facetile *floor2;
1999 int d, mflags; 1682 int mflags;
2000 struct Map newmap; 1683 struct Map newmap;
2001 maptile *m, *pm; 1684 maptile *m, *pm;
2002 1685
2003 if (pl->type != PLAYER) 1686 if (pl->type != PLAYER)
2004 { 1687 {
… …
2185 1868
2186/* appends the spell *spell to the Socklist we will send the data to. */ 1869/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 1870static void
2188append_spell (player *pl, packet &sl, object *spell) 1871append_spell (player *pl, packet &sl, object *spell)
2189{ 1872{
2190 int len, i, skill = 0; 1873 int i, skill = 0;
2191 1874
2192 if (!(spell->name)) 1875 if (!(spell->name))
2193 { 1876 {
2194 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1877 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2195 return; 1878 return;
… …
2207 if (!strcmp (spell->skill, skill_names[i])) 1890 if (!strcmp (spell->skill, skill_names[i]))
2208 { 1891 {
2209 skill = i + CS_STAT_SKILLINFO; 1892 skill = i + CS_STAT_SKILLINFO;
2210 break; 1893 break;
2211 } 1894 }
1895 }
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);
2212 } 1902 }
2213 1903
2214 /* send the current values */ 1904 /* send the current values */
2215 sl << uint32 (spell->count) 1905 sl << uint32 (spell->count)
2216 << uint16 (spell->level) 1906 << uint16 (spell->level)
… …
2218 << uint16 (spell->last_sp) 1908 << uint16 (spell->last_sp)
2219 << uint16 (spell->last_grace) 1909 << uint16 (spell->last_grace)
2220 << uint16 (spell->last_eat) 1910 << uint16 (spell->last_eat)
2221 << uint8 (skill) 1911 << uint8 (skill)
2222 << uint32 (spell->path_attuned) 1912 << uint32 (spell->path_attuned)
2223 << uint32 (spell->face ? spell->face->number : 0) 1913 << uint32 (spell->face)
2224 << data8 (spell->name) 1914 << data8 (spell->name)
2225 << data16 (spell->msg); 1915 << data16 (spell->msg);
2226} 1916}
2227 1917
2228/** 1918/**
… …
2243 1933
2244 packet sl ("addspell"); 1934 packet sl ("addspell");
2245 1935
2246 if (!spell) 1936 if (!spell)
2247 { 1937 {
2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1938 for (spell = pl->ob->inv; spell; spell = spell->below)
2249 { 1939 {
2250 /* were we to simply keep appending data here, we could exceed 1940 /* were we to simply keep appending data here, we could exceed
2251 * 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
2252 * append_spells will always append 19 data bytes, plus 4 length 1942 * append_spells will always append 19 data bytes, plus 4 length
2253 * 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