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.62 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
28 * 28 *
… …
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 }
… …
687 683
688 ns->send_packet (cmdback); 684 ns->send_packet (cmdback);
689} 685}
690 686
691/** 687/**
692 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
693 * Basically, it makes no sense to wait for the client to request a
694 * a piece of data from us that we know the client wants. So
695 * if we know the client wants it, might as well push it to the
696 * client.
697 */
698static void
699SendSmooth (client *ns, uint16 face)
700{
701 uint16 smoothface;
702
703 /* If we can't find a face, return and set it so we won't try to send this
704 * again.
705 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
707 {
708
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return;
712 }
713
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
715 esrv_send_face (ns, smoothface, 0);
716
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718
719 packet sl ("smooth");
720
721 sl << uint16 (face)
722 << uint16 (smoothface);
723
724 ns->send_packet (sl);
725}
726
727 /**
728 * Tells client the picture it has to use 688 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 689 * to smooth a picture number given as argument.
730 */ 690 */
731void 691void
732AskSmooth (char *buf, int len, client *ns) 692AskSmooth (char *buf, int len, client *ns)
733{ 693{
734 SendSmooth (ns, atoi (buf)); 694 ns->send_face (atoi (buf));
735} 695}
736 696
737/** 697/**
738 * This handles the general commands from the client (ie, north, fire, cast, 698 * This handles the general commands from the client (ie, north, fire, cast,
739 * etc.) 699 * etc.)
… …
798 * commands. 758 * commands.
799 */ 759 */
800 pl->count = 0; 760 pl->count = 0;
801 761
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 762 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 763 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 764 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 765 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 766
807 /* Send confirmation of command execution now */ 767 /* Send confirmation of command execution now */
808 packet sl ("comc"); 768 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 769 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 770 pl->ns->send_packet (sl);
… …
875 835
876 ns->cs_version = atoi (buf); 836 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 837 ns->sc_version = ns->cs_version;
878 838
879 LOG (llevDebug, "connection from client <%s>\n", buf); 839 LOG (llevDebug, "connection from client <%s>\n", buf);
880
881 840
882 //TODO: should log here just for statistics 841 //TODO: should log here just for statistics
883 842
884 //if (VERSION_CS != ns->cs_version) 843 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 844 // unchecked;
… …
1104{ 1063{
1105 packet sl ("player"); 1064 packet sl ("player");
1106 1065
1107 sl << uint32 (pl->ob->count) 1066 sl << uint32 (pl->ob->count)
1108 << uint32 (weight) 1067 << uint32 (weight)
1109 << uint32 (pl->ob->face->number) 1068 << uint32 (pl->ob->face)
1110 << data8 (pl->ob->name); 1069 << data8 (pl->ob->name);
1111 1070
1112 pl->ns->last_weight = weight; 1071 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1072 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 1074}
1116
1117/**
1118 * Need to send an animation sequence to the client.
1119 * We will send appropriate face commands to the client if we haven't
1120 * sent them the face yet (this can become quite costly in terms of
1121 * how much we are sending - on the other hand, this should only happen
1122 * when the player logs in and picks stuff up.
1123 */
1124void
1125esrv_send_animation (client * ns, short anim_num)
1126{
1127 /* Do some checking on the anim_num we got. Note that the animations
1128 * are added in contigous order, so if the number is in the valid
1129 * range, it must be a valid animation.
1130 */
1131 if (anim_num < 0 || anim_num > num_animations)
1132 {
1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134 return;
1135 }
1136
1137 packet sl ("anim");
1138
1139 sl << uint16 (anim_num)
1140 << uint16 (0); /* flags - not used right now */
1141
1142 /* Build up the list of faces. Also, send any information (ie, the
1143 * the face itself) down to the client.
1144 */
1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1146 {
1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151 }
1152
1153 ns->send_packet (sl);
1154
1155 ns->anims_sent[anim_num] = 1;
1156}
1157
1158 1075
1159/****************************************************************************** 1076/******************************************************************************
1160 * 1077 *
1161 * Start of map related commands. 1078 * Start of map related commands.
1162 * 1079 *
1163 ******************************************************************************/ 1080 ******************************************************************************/
1164 1081
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 */ 1082/** Clears a map cell */
1188static void 1083static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1084map_clearcell (struct MapCell *cell, int count)
1190{ 1085{
1191 cell->faces[0] = face0; 1086 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 1087 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 1088 cell->faces[2] = 0;
1194 cell->count = count; 1089 cell->count = count;
1195 cell->stat_hp = 0; 1090 cell->stat_hp = 0;
1196 cell->flags = 0; 1091 cell->flags = 0;
1197 cell->player = 0; 1092 cell->player = 0;
1198} 1093}
1199 1094
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 1095#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 1096
1257/** 1097/**
1258 * Removes the need to replicate the same code for each layer. 1098 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 1099 * this returns true if this space is now in fact different than
1260 * it was. 1100 * it was.
… …
1274 * actually match. 1114 * actually match.
1275 */ 1115 */
1276static int 1116static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1278{ 1118{
1279 object *ob, *head;
1280 uint16 face_num; 1119 uint16 face_num;
1281 int bx, by, i; 1120 int bx, by, i;
1282 1121
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); 1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 1123
1323 /* If there is no object for this space, or if the face for the object 1124 /* 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. 1125 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 1126 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 1127 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 1128 * otherwise, we do special head processing
1328 */ 1129 */
1329 if (!ob || ob->face == blank_face) 1130 if (!ob || ob->face == blank_face)
1330 face_num = 0; 1131 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 1132 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, 1133 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special 1134 * 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 */ 1135 */
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; 1136 face_num = ob->face;
1462 1137
1463 /* We've gotten what face we want to use for the object. Now see if 1138 /* 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. 1139 * if it has changed since we last sent it to the client.
1465 */ 1140 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1467 { 1142 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1144
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1145 if (!ns.faces_sent[face_num])
1146 if (ob)
1147 ns.send_faces (ob);
1148 else
1470 esrv_send_face (&ns, face_num, 0); 1149 ns.send_face (face_num);
1471 1150
1472 sl << uint16 (face_num); 1151 sl << uint16 (face_num);
1473 return 1; 1152 return 1;
1474 } 1153 }
1475 1154
… …
1493 * holds the old values. 1172 * holds the old values.
1494 * layer is the layer to update, with 2 being the floor and 0 the 1173 * 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 1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496 * take. 1175 * take.
1497 */ 1176 */
1498
1499static inline int 1177static inline int
1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501{ 1179{
1502 object *ob;
1503 int smoothlevel; /* old face_num; */
1504
1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506 1181
1507 /* If there is no object for this space, or if the face for the object 1182 /* If there is no object for this space, or if the face for the object
1508 * is the blank face, set the smoothlevel to zero. 1183 * is the blank face, set the smoothlevel to zero.
1509 */ 1184 */
1510 if (!ob || ob->face == blank_face) 1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1511 smoothlevel = 0;
1512 else
1513 {
1514 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number);
1517 } /* else not already head object or blank face */
1518 1186
1519 /* We've gotten what face we want to use for the object. Now see if 1187 /* 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. 1188 * if it has changed since we last sent it to the client.
1521 */ 1189 */
1522 if (smoothlevel > 255) 1190 if (smoothlevel > 255)
… …
1599 * look like. 1267 * look like.
1600 */ 1268 */
1601void 1269void
1602draw_client_map1 (object *pl) 1270draw_client_map1 (object *pl)
1603{ 1271{
1604 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1272 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1605 sint16 nx, ny; 1273 sint16 nx, ny;
1606 int estartlen, eoldlen; 1274 int estartlen, eoldlen;
1607 uint16 mask, emask;
1608 uint8 eentrysize; 1275 uint8 eentrysize;
1609 uint16 ewhatstart, ewhatflag; 1276 uint16 ewhatstart, ewhatflag;
1610 uint8 extendedinfos; 1277 uint8 extendedinfos;
1611 maptile *m; 1278 maptile *m;
1612 1279
… …
1647 ewhatstart = 0; 1314 ewhatstart = 0;
1648 ewhatflag = 0; 1315 ewhatflag = 0;
1649 estartlen = 0; 1316 estartlen = 0;
1650 } 1317 }
1651 1318
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 1319 /* x,y are the real map locations. ax, ay are viewport relative
1656 * locations. 1320 * locations.
1657 */ 1321 */
1658 ay = 0; 1322 ay = 0;
1659 1323
… …
1661 * but that started to get a bit messy to look at. 1325 * but that started to get a bit messy to look at.
1662 */ 1326 */
1663 max_x = pl->x + (socket.mapx + 1) / 2; 1327 max_x = pl->x + (socket.mapx + 1) / 2;
1664 max_y = pl->y + (socket.mapy + 1) / 2; 1328 max_y = pl->y + (socket.mapy + 1) / 2;
1665 1329
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++) 1330 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1673 { 1331 {
1674 ax = 0; 1332 ax = 0;
1675 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1333 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1676 { 1334 {
1335 int emask, mask;
1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1336 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1678 1337
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
1723 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1338 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1724
1725 d = pl->contr->blocked_los[ax][ay];
1726 1339
1727 /* If the coordinates are not valid, or it is too dark to see, 1340 /* If the coordinates are not valid, or it is too dark to see,
1728 * we tell the client as such 1341 * we tell the client as such
1729 */ 1342 */
1730 nx = x; 1343 nx = x;
… …
1738 * of the map, it shouldn't have a head 1351 * of the map, it shouldn't have a head
1739 */ 1352 */
1740 if (lastcell.count != -1) 1353 if (lastcell.count != -1)
1741 { 1354 {
1742 sl << uint16 (mask); 1355 sl << uint16 (mask);
1743 map_clearcell (&lastcell, 0, 0, 0, -1); 1356 map_clearcell (&lastcell, -1);
1744 } 1357 }
1358
1359 continue;
1745 } 1360 }
1361
1362 m->touch ();
1363
1364 int d = pl->contr->blocked_los[ax][ay];
1365
1746 else if (d > 3) 1366 if (d > 3)
1747 { 1367 {
1748 m->touch ();
1749 1368
1750 int need_send = 0, count; 1369 int need_send = 0, count;
1751 1370
1752 /* This block deals with spaces that are not visible for whatever 1371 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space. 1372 * reason. Still may need to send the head for this space.
1754 */ 1373 */
1755 1374
1756 oldlen = sl.length (); 1375 oldlen = sl.length ();
1757 1376
1758 sl << uint16 (mask); 1377 sl << uint16 (mask);
… …
1760 if (lastcell.count != -1) 1379 if (lastcell.count != -1)
1761 need_send = 1; 1380 need_send = 1;
1762 1381
1763 count = -1; 1382 count = -1;
1764 1383
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 */ 1384 /* properly clear a previously sent big face */
1778 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1385 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1779 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1386 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1780 need_send = 1; 1387 need_send = 1;
1781 1388
1782 map_clearcell (&lastcell, 0, 0, 0, count); 1389 map_clearcell (&lastcell, count);
1783 }
1784 1390
1785 if ((mask & 0xf) || need_send) 1391 if ((mask & 0xf) || need_send)
1786 sl[oldlen + 1] = mask & 0xff; 1392 sl[oldlen + 1] = mask & 0xff;
1787 else 1393 else
1788 sl.reset (oldlen); 1394 sl.reset (oldlen);
1789 } 1395 }
1790 else 1396 else
1791 { 1397 {
1792 m->touch ();
1793
1794 /* In this block, the space is visible or there are head objects 1398 /* In this block, the space is visible.
1795 * we need to send.
1796 */ 1399 */
1797 1400
1798 /* Rather than try to figure out what everything that we might 1401 /* Rather than try to figure out what everything that we might
1799 * need to send is, then form the packet after that, 1402 * need to send is, then form the packet after that,
1800 * we presume that we will in fact form a packet, and update 1403 * we presume that we will in fact form a packet, and update
… …
1803 * is done. 1406 * is done.
1804 * I think this is simpler than doing a bunch of checks to see 1407 * I think this is simpler than doing a bunch of checks to see
1805 * what if anything we need to send, setting the bits, then 1408 * what if anything we need to send, setting the bits, then
1806 * doing those checks again to add the real data. 1409 * doing those checks again to add the real data.
1807 */ 1410 */
1808 oldlen = sl.length (); 1411 oldlen = sl.length ();
1809 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1810 eoldlen = esl.length (); 1412 eoldlen = esl.length ();
1811 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1413
1812 sl << uint16 (mask); 1414 sl << uint16 (mask);
1813 1415
1814 if (socket.ext_mapinfos) 1416 if (socket.ext_mapinfos)
1815 esl << uint16 (emask); 1417 esl << uint16 (emask);
1816 1418
… …
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1523 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1922 emask |= 0x2; 1524 emask |= 0x2;
1923 1525
1924 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1526 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1925 { 1527 {
1926 if (lastcell.faces[0] != pl->face->number) 1528 if (lastcell.faces[0] != pl->face)
1927 { 1529 {
1928 lastcell.faces[0] = pl->face->number; 1530 lastcell.faces[0] = pl->face;
1929 mask |= 0x1; 1531 mask |= 0x1;
1930 1532
1931 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1533 socket.send_faces (pl);
1932 esrv_send_face (&socket, pl->face->number, 0);
1933 1534
1934 sl << uint16 (pl->face->number); 1535 sl << uint16 (pl->face);
1935 } 1536 }
1936 } 1537 }
1937 else 1538 else
1938 { 1539 {
1939 /* Top face */ 1540 /* Top face */
… …
1969 if (!(sl.length () > startlen || socket.sent_scroll)) 1570 if (!(sl.length () > startlen || socket.sent_scroll))
1970 { 1571 {
1971 /* No map data will follow, so don't say the client 1572 /* No map data will follow, so don't say the client
1972 * it doesn't need draw! 1573 * it doesn't need draw!
1973 */ 1574 */
1974 ewhatflag &= (~EMI_NOREDRAW); 1575 ewhatflag &= ~EMI_NOREDRAW;
1975 esl[ewhatstart + 1] = ewhatflag & 0xff; 1576 esl[ewhatstart + 1] = ewhatflag & 0xff;
1976 } 1577 }
1977 1578
1978 if (esl.length () > estartlen) 1579 if (esl.length () > estartlen)
1979 socket.send_packet (esl); 1580 socket.send_packet (esl);
… …
1991 */ 1592 */
1992void 1593void
1993draw_client_map (object *pl) 1594draw_client_map (object *pl)
1994{ 1595{
1995 int i, j; 1596 int i, j;
1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1597 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1997 New_Face *face, *floor;
1998 New_Face *floor2;
1999 int d, mflags; 1598 int mflags;
2000 struct Map newmap; 1599 struct Map newmap;
2001 maptile *m, *pm; 1600 maptile *m, *pm;
2002 1601
2003 if (pl->type != PLAYER) 1602 if (pl->type != PLAYER)
2004 { 1603 {
… …
2185 1784
2186/* appends the spell *spell to the Socklist we will send the data to. */ 1785/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 1786static void
2188append_spell (player *pl, packet &sl, object *spell) 1787append_spell (player *pl, packet &sl, object *spell)
2189{ 1788{
2190 int len, i, skill = 0; 1789 int i, skill = 0;
2191 1790
2192 if (!(spell->name)) 1791 if (!(spell->name))
2193 { 1792 {
2194 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1793 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2195 return; 1794 return;
… …
2207 if (!strcmp (spell->skill, skill_names[i])) 1806 if (!strcmp (spell->skill, skill_names[i]))
2208 { 1807 {
2209 skill = i + CS_STAT_SKILLINFO; 1808 skill = i + CS_STAT_SKILLINFO;
2210 break; 1809 break;
2211 } 1810 }
1811 }
1812
1813 // spells better have a face
1814 if (!spell->face)
1815 {
1816 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1817 spell->face = face_find ("burnout.x11", blank_face);
2212 } 1818 }
2213 1819
2214 /* send the current values */ 1820 /* send the current values */
2215 sl << uint32 (spell->count) 1821 sl << uint32 (spell->count)
2216 << uint16 (spell->level) 1822 << uint16 (spell->level)
… …
2218 << uint16 (spell->last_sp) 1824 << uint16 (spell->last_sp)
2219 << uint16 (spell->last_grace) 1825 << uint16 (spell->last_grace)
2220 << uint16 (spell->last_eat) 1826 << uint16 (spell->last_eat)
2221 << uint8 (skill) 1827 << uint8 (skill)
2222 << uint32 (spell->path_attuned) 1828 << uint32 (spell->path_attuned)
2223 << uint32 (spell->face ? spell->face->number : 0) 1829 << uint32 (spell->face)
2224 << data8 (spell->name) 1830 << data8 (spell->name)
2225 << data16 (spell->msg); 1831 << data16 (spell->msg);
2226} 1832}
2227 1833
2228/** 1834/**
… …
2243 1849
2244 packet sl ("addspell"); 1850 packet sl ("addspell");
2245 1851
2246 if (!spell) 1852 if (!spell)
2247 { 1853 {
2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1854 for (spell = pl->ob->inv; spell; spell = spell->below)
2249 { 1855 {
2250 /* were we to simply keep appending data here, we could exceed 1856 /* were we to simply keep appending data here, we could exceed
2251 * MAXSOCKBUF if the player has enough spells to add, we know that 1857 * MAXSOCKBUF if the player has enough spells to add, we know that
2252 * append_spells will always append 19 data bytes, plus 4 length 1858 * 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 1859 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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