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.68 by root, Sun Mar 4 19:36:12 2007 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC

… …
98 * that much difference in bandwidth. 98 * that much difference in bandwidth.
99 */ 99 */
100 mx = ns->mapx; 100 mx = ns->mapx;
101 my = ns->mapy; 101 my = ns->mapy;
102 102
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108
109 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
110 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
111 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
112 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
113 * 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.
… …
138static void 132static void
139clear_map (player *pl) 133clear_map (player *pl)
140{ 134{
141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
142 136
137 pl->ns->force_newmap = false;
138
143 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
144 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
145 141
146 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
147} 143}
… …
152{ 148{
153 client &socket = *pl->ns; 149 client &socket = *pl->ns;
154 object *ob = pl->ob; 150 object *ob = pl->ob;
155 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
156 152
157 if (socket.current_map != ob->map) 153 if (socket.force_newmap && 0)
158 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
159 socket.current_map = ob->map; 157 socket.current_map = ob->map;
160
161 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
162 164
163 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
164 { 166 {
165 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
166 { 168 {
… …
437 } 439 }
438 else if (!strcmp (cmd, "newmapcmd")) 440 else if (!strcmp (cmd, "newmapcmd"))
439 { 441 {
440 ns->newmapcmd = atoi (param); 442 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF); 443 safe_strcat (cmdback, param, &slen, HUGE_BUF);
442// } else if (!strcmp(cmd,"plugincmd")) {
443// ns->plugincmd = atoi(param);
444// safe_strcat(cmdback, param, &slen, HUGE_BUF);
445 } 444 }
446 else if (!strcmp (cmd, "mapinfocmd")) 445 else if (!strcmp (cmd, "mapinfocmd"))
447 { 446 {
448 ns->mapinfocmd = atoi (param); 447 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
468 char tmpbuf[20]; 467 char tmpbuf[20];
469 int q = atoi (param); 468 int q = atoi (param);
470 469
471 if (is_valid_faceset (q)) 470 if (is_valid_faceset (q))
472 ns->faceset = q; 471 ns->faceset = q;
472
473 sprintf (tmpbuf, "%d", ns->faceset); 473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */ 475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1; 476 ns->image2 = 1;
477 } 477 }
… …
505 if (*cp == 'x' || *cp == 'X') 505 if (*cp == 'x' || *cp == 'X')
506 { 506 {
507 y = atoi (cp + 1); 507 y = atoi (cp + 1);
508 break; 508 break;
509 } 509 }
510
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 { 512 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 } 515 }
… …
569 * This is what takes care of it. We tell the client how things worked out. 570 * This is what takes care of it. We tell the client how things worked out.
570 * I am not sure if this file is the best place for this function. however, 571 * I am not sure if this file is the best place for this function. however,
571 * it either has to be here or init_sockets needs to be exported. 572 * it either has to be here or init_sockets needs to be exported.
572 */ 573 */
573void 574void
574AddMeCmd (char *buf, int len, client * ns) 575AddMeCmd (char *buf, int len, client *ns)
575{ 576{
577 // face caching is mandatory
578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
604 else
605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 613}
578 614
579/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
580void 616void
… …
691 727
692 ns->send_packet (cmdback); 728 ns->send_packet (cmdback);
693} 729}
694 730
695/** 731/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 732 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 733 * before flushing.
698 * a piece of data from us that we know the client wants. So
699 * if we know the client wants it, might as well push it to the
700 * client.
701 */
702static void
703SendSmooth (client *ns, uint16 face)
704{
705 uint16 smoothface;
706
707 /* If we can't find a face, return and set it so we won't try to send this
708 * again.
709 */ 734 */
710 if (!FindSmooth (face, &smoothface)) 735void
711 { 736AskFaceCmd (char *buf, int len, client *ns)
712 737{
713 LOG (llevError, "could not findsmooth for %d.\n", face); 738 ns->askface.push_back (atoi (buf));
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return;
716 }
717
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
719 esrv_send_face (ns, smoothface, 0);
720
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722
723 packet sl ("smooth");
724
725 sl << uint16 (face)
726 << uint16 (smoothface);
727
728 ns->send_packet (sl);
729} 739}
730 740
731/** 741/**
732 * Tells client the picture it has to use 742 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 743 * to smooth a picture number given as argument.
734 */ 744 */
735void 745void
736AskSmooth (char *buf, int len, client *ns) 746AskSmooth (char *buf, int len, client *ns)
737{ 747{
738 SendSmooth (ns, atoi (buf)); 748 ns->send_face (atoi (buf));
739} 749}
740 750
741/** 751/**
742 * This handles the general commands from the client (ie, north, fire, cast, 752 * This handles the general commands from the client (ie, north, fire, cast,
743 * etc.) 753 * etc.)
… …
879 889
880 ns->cs_version = atoi (buf); 890 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 891 ns->sc_version = ns->cs_version;
882 892
883 LOG (llevDebug, "connection from client <%s>\n", buf); 893 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885 894
886 //TODO: should log here just for statistics 895 //TODO: should log here just for statistics
887 896
888 //if (VERSION_CS != ns->cs_version) 897 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 898 // unchecked;
… …
1108{ 1117{
1109 packet sl ("player"); 1118 packet sl ("player");
1110 1119
1111 sl << uint32 (pl->ob->count) 1120 sl << uint32 (pl->ob->count)
1112 << uint32 (weight) 1121 << uint32 (weight)
1113 << uint32 (pl->ob->face->number) 1122 << uint32 (pl->ob->face)
1114 << data8 (pl->ob->name); 1123 << data8 (pl->ob->name);
1115 1124
1116 pl->ns->last_weight = weight; 1125 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 1126 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 1128}
1120
1121/**
1122 * Need to send an animation sequence to the client.
1123 * We will send appropriate face commands to the client if we haven't
1124 * sent them the face yet (this can become quite costly in terms of
1125 * how much we are sending - on the other hand, this should only happen
1126 * when the player logs in and picks stuff up.
1127 */
1128void
1129esrv_send_animation (client * ns, short anim_num)
1130{
1131 /* Do some checking on the anim_num we got. Note that the animations
1132 * are added in contigous order, so if the number is in the valid
1133 * range, it must be a valid animation.
1134 */
1135 if (anim_num < 0 || anim_num > num_animations)
1136 {
1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1138 return;
1139 }
1140
1141 packet sl ("anim");
1142
1143 sl << uint16 (anim_num)
1144 << uint16 (0); /* flags - not used right now */
1145
1146 /* Build up the list of faces. Also, send any information (ie, the
1147 * the face itself) down to the client.
1148 */
1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1150 {
1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1155 }
1156
1157 ns->send_packet (sl);
1158
1159 ns->anims_sent[anim_num] = 1;
1160}
1161
1162 1129
1163/****************************************************************************** 1130/******************************************************************************
1164 * 1131 *
1165 * Start of map related commands. 1132 * Start of map related commands.
1166 * 1133 *
1167 ******************************************************************************/ 1134 ******************************************************************************/
1168 1135
1169/** Clears a map cell */ 1136/** Clears a map cell */
1170static void 1137static void
1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1138map_clearcell (struct MapCell *cell, int count)
1172{ 1139{
1173 cell->faces[0] = face0; 1140 cell->faces[0] = 0;
1174 cell->faces[1] = face1; 1141 cell->faces[1] = 0;
1175 cell->faces[2] = face2; 1142 cell->faces[2] = 0;
1143 cell->smooth[0] = 0;
1144 cell->smooth[1] = 0;
1145 cell->smooth[2] = 0;
1176 cell->count = count; 1146 cell->count = count;
1177 cell->stat_hp = 0; 1147 cell->stat_hp = 0;
1178 cell->flags = 0; 1148 cell->flags = 0;
1179 cell->player = 0; 1149 cell->player = 0;
1180} 1150}
1181 1151
1182#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1183#define MAX_LAYERS 3 1152#define MAX_LAYERS 3
1184
1185/* Using a global really isn't a good approach, but saves the over head of
1186 * allocating and deallocating such a block of data each time run through,
1187 * and saves the space of allocating this in the socket object when we only
1188 * need it for this cycle. If the server is ever threaded, this needs to be
1189 * re-examined.
1190 */
1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1192
1193/**
1194 * Returns true if any of the heads for this
1195 * space is set. Returns false if all are blank - this is used
1196 * for empty space checking.
1197 */
1198static inline int
1199have_head (int ax, int ay)
1200{
1201 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1202 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1203 return 1;
1204
1205 return 0;
1206}
1207
1208/**
1209 * check_head is a bit simplistic version of update_space below.
1210 * basically, it only checks the that the head on space ax,ay at layer
1211 * needs to get sent - if so, it adds the data, sending the head
1212 * if needed, and returning 1. If this no data needs to get
1213 * sent, it returns zero.
1214 */
1215static int
1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1217{
1218 short face_num;
1219
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1222 else
1223 face_num = 0;
1224
1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1226 {
1227 sl << uint16 (face_num);
1228 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1229 esrv_send_face (&ns, face_num, 0);
1230
1231 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1232 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1233 return 1;
1234 }
1235
1236 return 0; /* No change */
1237}
1238 1153
1239/** 1154/**
1240 * Removes the need to replicate the same code for each layer. 1155 * Removes the need to replicate the same code for each layer.
1241 * this returns true if this space is now in fact different than 1156 * this returns true if this space is now in fact different than
1242 * it was. 1157 * it was.
1243 * sl is the socklist this data is going into. 1158 * sl is the socklist this data is going into.
1244 * ns is the socket we are working on - all the info we care 1159 * ns is the socket we are working on - all the info we care
1245 * about is in this socket structure, so now need not pass the 1160 * about is in this socket structure, so now need not pass the
1246 * entire player object. 1161 * entire player object.
1247 * mx and my are map coordinate offsets for map mp
1248 * sx and sy are the offsets into the socket structure that
1249 * holds the old values.
1250 * layer is the layer to update, with 2 being the floor and 0 the 1162 * layer is the layer to update, with 2 being the floor and 0 the
1251 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1163 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1252 * take. Interesting to note that before this function, the map1 function 1164 * take. Interesting to note that before this function, the map1 function
1253 * numbers the spaces differently - I think this was a leftover from 1165 * numbers the spaces differently - I think this was a leftover from
1254 * the map command, where the faces stack up. Sinces that is no longer 1166 * the map command, where the faces stack up. Sinces that is no longer
1255 * the case, it seems to make more sense to have these layer values 1167 * the case, it seems to make more sense to have these layer values
1256 * actually match. 1168 * actually match.
1257 */ 1169 */
1258static int 1170static int
1259update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1171update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1260{ 1172{
1261 object *ob, *head; 1173 object *ob = ms.faces_obj [layer];
1262 uint16 face_num;
1263 int bx, by, i;
1264
1265 /* If there is a multipart object stored away, treat that as more important.
1266 * If not, then do the normal processing.
1267 */
1268 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1269
1270 /* Check to see if this head is part of the set of objects
1271 * we would normally send for this space. If so, then
1272 * don't use the head value. We need to do the check
1273 * here and not when setting up the heads[] value for two reasons -
1274 * 1) the heads[] values will get used even if the space is not visible.
1275 * 2) its possible the head is not on the same map as a part, and I'd
1276 * rather not need to do the map translation overhead.
1277 * 3) We need to do some extra checking to make sure that we will
1278 * otherwise send the image as this layer, eg, either it matches
1279 * the head value, or is not multipart.
1280 */
1281 if (head && !head->more)
1282 {
1283 for (i = 0; i < MAP_LAYERS; i++)
1284 {
1285 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1286 if (!ob)
1287 continue;
1288
1289 if (ob->head)
1290 ob = ob->head;
1291
1292 if (ob == head)
1293 {
1294 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1295 head = NULL;
1296 break;
1297 }
1298 }
1299 }
1300
1301 ob = head;
1302 if (!ob)
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1304 1174
1305 /* If there is no object for this space, or if the face for the object 1175 /* If there is no object for this space, or if the face for the object
1306 * is the blank face, set the face number to zero. 1176 * is the blank face, set the face number to zero.
1307 * else if we have the stored head object for this space, that takes 1177 * else if we have the stored head object for this space, that takes
1308 * precedence over the other object for this space. 1178 * precedence over the other object for this space.
1309 * otherwise, we do special head processing 1179 * otherwise, we do special head processing
1310 */ 1180 */
1311 if (!ob || ob->face == blank_face) 1181 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1312 face_num = 0;
1313 else if (head)
1314 {
1315 /* if this is a head that had previously been stored */
1316 face_num = ob->face->number;
1317 }
1318 else
1319 {
1320 /* if the faces for the different parts of a multipart object
1321 * are the same, we only want to send the bottom right most
1322 * portion of the object. That info is in the tail_.. values
1323 * of the head. Note that for the head itself, ob->head will
1324 * be null, so we only do this block if we are working on
1325 * a tail piece.
1326 */
1327
1328 /* tail_x and tail_y will only be set in the head object. If
1329 * this is the head object and these are set, we proceed
1330 * with logic to only send bottom right. Similarly, if
1331 * this is one of the more parts but the head has those values
1332 * set, we want to do the processing. There can be cases where
1333 * the head is not visible but one of its parts is, so we just
1334 * can always expect that ob->arch->tail_x will be true for all
1335 * object we may want to display.
1336 */
1337 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1338 {
1339
1340 if (ob->head)
1341 head = ob->head;
1342 else
1343 head = ob;
1344
1345 /* Basically figure out where the offset is from where we are right
1346 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1347 * piece is from the head, and the tail is where the tail is from the
1348 * head. Note that bx and by will equal sx and sy if we are already working
1349 * on the bottom right corner. If ob is the head, the clone values
1350 * will be zero, so the right thing will still happen.
1351 */
1352 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1353 by = sy + head->arch->tail_y - ob->arch->clone.y;
1354
1355 /* I don't think this can ever happen, but better to check for it just
1356 * in case.
1357 */
1358 if (bx < sx || by < sy)
1359 {
1360 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1361 face_num = 0;
1362 }
1363 /* single part object, multipart object with non merged faces,
1364 * of multipart object already at lower right.
1365 */
1366 else if (bx == sx && by == sy)
1367 {
1368 face_num = ob->face->number;
1369
1370 /* if this face matches one stored away, clear that one away.
1371 * this code relies on the fact that the map1 commands
1372 * goes from 2 down to 0.
1373 */
1374 for (i = 0; i < MAP_LAYERS; i++)
1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1378 }
1379 else
1380 {
1381 /* If this head is stored away, clear it - otherwise,
1382 * there can be cases where a object is on multiple layers -
1383 * we only want to send it once.
1384 */
1385 face_num = head->face->number;
1386 for (i = 0; i < MAP_LAYERS; i++)
1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1390
1391 /* First, try to put the new head on the same layer. If that is used up,
1392 * then find another layer.
1393 */
1394 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1395 {
1396 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1397 }
1398 else
1399 for (i = 0; i < MAX_LAYERS; i++)
1400 {
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1403 {
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1405 }
1406 }
1407 face_num = 0; /* Don't send this object - we'll send the head later */
1408 }
1409 }
1410 else
1411 {
1412 /* In this case, we are already at the lower right or single part object,
1413 * so nothing special
1414 */
1415 face_num = ob->face->number;
1416
1417 /* clear out any head entries that have the same face as this one */
1418 for (bx = 0; bx < layer; bx++)
1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1422 }
1423 } /* else not already head object or blank face */
1424
1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
1426 * but there is a head on the next layer, send that instead.
1427 * Without this, what happens is you can get the case where the player stands
1428 * on the same space as the head. However, if you have overlapping big objects
1429 * of the same type, what happens then is it doesn't think it needs to send
1430 * This tends to make stacking also work/look better.
1431 */
1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1433 {
1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1436 }
1437
1438 /* Another hack - because of heads and whatnot, this face may match one
1439 * we already sent for a lower layer. In that case, don't send
1440 * this one.
1441 */
1442 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1443 face_num = 0;
1444 1182
1445 /* We've gotten what face we want to use for the object. Now see if 1183 /* We've gotten what face we want to use for the object. Now see if
1446 * if it has changed since we last sent it to the client. 1184 * if it has changed since we last sent it to the client.
1447 */ 1185 */
1448 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1186 if (lastcell.faces[layer] != face_num)
1449 { 1187 {
1450 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1188 lastcell.faces[layer] = face_num;
1189
1451 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!ns.faces_sent[face_num])
1191 if (ob)
1192 ns.send_faces (ob);
1193 else
1452 esrv_send_face (&ns, face_num, 0); 1194 ns.send_face (face_num);
1453 1195
1454 sl << uint16 (face_num); 1196 sl << uint16 (face_num);
1455 return 1;
1456 }
1457
1458 /* Nothing changed */
1459 return 0;
1460}
1461
1462/**
1463 * This function is mainly a copy of update_space,
1464 * except it handles update of the smoothing updates,
1465 * not the face updates.
1466 * Removes the need to replicate the same code for each layer.
1467 * this returns true if this smooth is now in fact different
1468 * than it was.
1469 * sl is the socklist this data is going into.
1470 * ns is the socket we are working on - all the info we care
1471 * about is in this socket structure, so know need to pass the
1472 * entire player object.
1473 * mx and my are map coordinate offsets for map mp
1474 * sx and sy are the offsets into the socket structure that
1475 * holds the old values.
1476 * layer is the layer to update, with 2 being the floor and 0 the
1477 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1478 * take.
1479 */
1480
1481static inline int
1482update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{
1484 object *ob;
1485 int smoothlevel; /* old face_num; */
1486
1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1488
1489 /* If there is no object for this space, or if the face for the object
1490 * is the blank face, set the smoothlevel to zero.
1491 */
1492 if (!ob || ob->face == blank_face)
1493 smoothlevel = 0;
1494 else
1495 {
1496 smoothlevel = ob->smoothlevel;
1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1498 SendSmooth (&ns, ob->face->number);
1499 } /* else not already head object or blank face */
1500
1501 /* We've gotten what face we want to use for the object. Now see if
1502 * if it has changed since we last sent it to the client.
1503 */
1504 if (smoothlevel > 255)
1505 smoothlevel = 255;
1506 else if (smoothlevel < 0)
1507 smoothlevel = 0;
1508
1509 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1510 {
1511 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1512 sl << uint8 (smoothlevel);
1513 return 1; 1197 return 1;
1514 } 1198 }
1515 1199
1516 /* Nothing changed */ 1200 /* Nothing changed */
1517 return 0; 1201 return 0;
… …
1581 * look like. 1265 * look like.
1582 */ 1266 */
1583void 1267void
1584draw_client_map1 (object *pl) 1268draw_client_map1 (object *pl)
1585{ 1269{
1586 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1587 sint16 nx, ny; 1271 sint16 nx, ny;
1588 int estartlen, eoldlen; 1272 int estartlen, eoldlen;
1589 uint16 mask, emask;
1590 uint8 eentrysize; 1273 uint8 eentrysize;
1591 uint16 ewhatstart, ewhatflag; 1274 uint16 ewhatstart, ewhatflag;
1592 uint8 extendedinfos; 1275 uint8 extendedinfos;
1593 maptile *m; 1276 maptile *m;
1594 1277
… …
1621 << uint8 (extendedinfos) 1304 << uint8 (extendedinfos)
1622 << uint8 (eentrysize); 1305 << uint8 (eentrysize);
1623 1306
1624 estartlen = esl.length (); 1307 estartlen = esl.length ();
1625 } 1308 }
1626 else
1627 {
1628 /* suppress compiler warnings */
1629 ewhatstart = 0;
1630 ewhatflag = 0;
1631 estartlen = 0;
1632 }
1633
1634 /* Init data to zero */
1635 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1636 1309
1637 /* x,y are the real map locations. ax, ay are viewport relative 1310 /* x,y are the real map locations. ax, ay are viewport relative
1638 * locations. 1311 * locations.
1639 */ 1312 */
1640 ay = 0; 1313 ay = 0;
… …
1643 * but that started to get a bit messy to look at. 1316 * but that started to get a bit messy to look at.
1644 */ 1317 */
1645 max_x = pl->x + (socket.mapx + 1) / 2; 1318 max_x = pl->x + (socket.mapx + 1) / 2;
1646 max_y = pl->y + (socket.mapy + 1) / 2; 1319 max_y = pl->y + (socket.mapy + 1) / 2;
1647 1320
1648 if (socket.mapmode == Map1aCmd) 1321 maptile *plmap = pl->map;
1649 {
1650 max_x += MAX_HEAD_OFFSET;
1651 max_y += MAX_HEAD_OFFSET;
1652 }
1653 1322
1654 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1655 { 1324 {
1656 ax = 0; 1325 ax = 0;
1657 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1658 { 1327 {
1328 int emask, mask;
1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1660 1330
1661 /* If this space is out of the normal viewable area, we only check
1662 * the heads value ax or ay will only be greater than what
1663 * the client wants if using the map1a command - this is because
1664 * if the map1a command is not used, max_x and max_y will be
1665 * set to lower values.
1666 */
1667 if (ax >= socket.mapx || ay >= socket.mapy)
1668 {
1669 int i, got_one;
1670
1671 oldlen = sl.length ();
1672
1673 sl << uint16 (mask);
1674
1675 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1676 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1677 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1678
1679 /* If all we are doing is sending 0 (blank) faces, we don't
1680 * actually need to send that - just the coordinates
1681 * with no faces tells the client to blank out the
1682 * space.
1683 */
1684 got_one = 0;
1685 for (i = oldlen + 2; i < sl.length (); i++)
1686 if (sl[i])
1687 got_one = 1;
1688
1689 if (got_one && (mask & 0xf))
1690 sl[oldlen + 1] = mask & 0xff;
1691 else
1692 { /*either all faces blank, either no face at all */
1693 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1694 sl.reset (oldlen + 2);
1695 else
1696 sl.reset (oldlen);
1697 }
1698
1699 /*What concerns extendinfos, nothing to be done for now
1700 * (perhaps effects layer later)
1701 */
1702 continue; /* don't do processing below */
1703 }
1704
1705 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1331 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1706
1707 d = pl->contr->blocked_los[ax][ay];
1708 1332
1709 /* If the coordinates are not valid, or it is too dark to see, 1333 /* If the coordinates are not valid, or it is too dark to see,
1710 * we tell the client as such 1334 * we tell the client as such
1711 */ 1335 */
1712 nx = x; 1336 nx = x;
1713 ny = y; 1337 ny = y;
1714 m = get_map_from_coord (pl->map, &nx, &ny); 1338 m = get_map_from_coord (plmap, &nx, &ny);
1715 1339
1716 if (!m) 1340 if (!m)
1717 { 1341 {
1718 /* space is out of map. Update space and clear values 1342 /* space is out of map. Update space and clear values
1719 * if this hasn't already been done. If the space is out 1343 * if this hasn't already been done. If the space is out
1720 * of the map, it shouldn't have a head 1344 * of the map, it shouldn't have a head
1721 */ 1345 */
1722 if (lastcell.count != -1) 1346 if (lastcell.count != -1)
1723 { 1347 {
1724 sl << uint16 (mask); 1348 sl << uint16 (mask);
1725 map_clearcell (&lastcell, 0, 0, 0, -1); 1349 map_clearcell (&lastcell, -1);
1726 } 1350 }
1351
1352 continue;
1727 } 1353 }
1354
1355 m->touch ();
1356
1357 int d = pl->contr->blocked_los[ax][ay];
1358
1728 else if (d > 3) 1359 if (d > 3)
1729 { 1360 {
1730 m->touch ();
1731 1361
1732 int need_send = 0, count; 1362 int need_send = 0, count;
1733 1363
1734 /* This block deals with spaces that are not visible for whatever 1364 /* This block deals with spaces that are not visible for whatever
1735 * reason. Still may need to send the head for this space. 1365 * reason. Still may need to send the head for this space.
1736 */ 1366 */
1737 1367
1738 oldlen = sl.length (); 1368 oldlen = sl.length ();
1739 1369
1740 sl << uint16 (mask); 1370 sl << uint16 (mask);
… …
1742 if (lastcell.count != -1) 1372 if (lastcell.count != -1)
1743 need_send = 1; 1373 need_send = 1;
1744 1374
1745 count = -1; 1375 count = -1;
1746 1376
1747 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1748 {
1749 /* Now check to see if any heads need to be sent */
1750
1751 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1752 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1753 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1754
1755 lastcell.count = count;
1756 }
1757 else
1758 {
1759 /* properly clear a previously sent big face */ 1377 /* properly clear a previously sent big face */
1760 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1378 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1761 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1379 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1762 need_send = 1; 1380 need_send = 1;
1763 1381
1764 map_clearcell (&lastcell, 0, 0, 0, count); 1382 map_clearcell (&lastcell, count);
1765 }
1766 1383
1767 if ((mask & 0xf) || need_send) 1384 if ((mask & 0xf) || need_send)
1768 sl[oldlen + 1] = mask & 0xff; 1385 sl[oldlen + 1] = mask & 0xff;
1769 else 1386 else
1770 sl.reset (oldlen); 1387 sl.reset (oldlen);
1771 } 1388 }
1772 else 1389 else
1773 { 1390 {
1774 m->touch ();
1775
1776 /* In this block, the space is visible or there are head objects 1391 /* In this block, the space is visible.
1777 * we need to send.
1778 */ 1392 */
1779 1393
1780 /* Rather than try to figure out what everything that we might 1394 /* Rather than try to figure out what everything that we might
1781 * need to send is, then form the packet after that, 1395 * need to send is, then form the packet after that,
1782 * we presume that we will in fact form a packet, and update 1396 * we presume that we will in fact form a packet, and update
… …
1785 * is done. 1399 * is done.
1786 * I think this is simpler than doing a bunch of checks to see 1400 * I think this is simpler than doing a bunch of checks to see
1787 * what if anything we need to send, setting the bits, then 1401 * what if anything we need to send, setting the bits, then
1788 * doing those checks again to add the real data. 1402 * doing those checks again to add the real data.
1789 */ 1403 */
1790 oldlen = sl.length (); 1404 oldlen = sl.length ();
1791 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1792 eoldlen = esl.length (); 1405 eoldlen = esl.length ();
1793 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1406
1794 sl << uint16 (mask); 1407 sl << uint16 (mask);
1795
1796 if (socket.ext_mapinfos)
1797 esl << uint16 (emask);
1798 1408
1799 unsigned char dummy; 1409 unsigned char dummy;
1800 unsigned char *last_ext = &dummy; 1410 unsigned char *last_ext = &dummy;
1801 1411
1802 /* Darkness changed */ 1412 /* Darkness changed */
… …
1814 sl << uint8 (255 - 64 * d); 1424 sl << uint8 (255 - 64 * d);
1815 } 1425 }
1816 1426
1817 lastcell.count = d; 1427 lastcell.count = d;
1818 1428
1429 mapspace &ms = m->at (nx, ny);
1430
1819 if (socket.extmap) 1431 if (socket.extmap)
1820 { 1432 {
1821 uint8 stat_hp = 0; 1433 uint8 stat_hp = 0;
1822 uint8 stat_width = 0; 1434 uint8 stat_width = 0;
1823 uint8 flags = 0; 1435 uint8 flags = 0;
1824 UUID player = 0; 1436 UUID player = 0;
1825 1437
1826 // send hp information, if applicable 1438 // send hp information, if applicable
1827 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1439 if (object *op = ms.faces_obj [0])
1828 { 1440 {
1829 if (op->head || op->invisible) 1441 if (op->head || op->invisible)
1830 ; // do not show 1442 ; // do not show
1831 else if (op->type == PLAYER 1443 else if (op->type == PLAYER
1832 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1886 sl << uint8 (8) << uint8 (flags); 1498 sl << uint8 (8) << uint8 (flags);
1887 } 1499 }
1888 } 1500 }
1889 1501
1890 /* Floor face */ 1502 /* Floor face */
1891 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1503 if (update_space (sl, socket, ms, lastcell, 2))
1892 mask |= 0x4; 1504 mask |= 0x4;
1893 1505
1894 if (socket.EMI_smooth)
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1896 emask |= 0x4;
1897
1898 /* Middle face */ 1506 /* Middle face */
1899 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1507 if (update_space (sl, socket, ms, lastcell, 1))
1900 mask |= 0x2; 1508 mask |= 0x2;
1901 1509
1902 if (socket.EMI_smooth) 1510 if (ms.player () == pl
1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1904 emask |= 0x2;
1905
1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1907 { 1512 {
1513 // force player to be visible to himself if invisible
1908 if (lastcell.faces[0] != pl->face->number) 1514 if (lastcell.faces[0] != pl->face)
1909 { 1515 {
1910 lastcell.faces[0] = pl->face->number; 1516 lastcell.faces[0] = pl->face;
1517
1911 mask |= 0x1; 1518 mask |= 0x1;
1912
1913 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1914 esrv_send_face (&socket, pl->face->number, 0);
1915
1916 sl << uint16 (pl->face->number); 1519 sl << uint16 (pl->face);
1520
1521 socket.send_faces (pl);
1917 } 1522 }
1918 } 1523 }
1919 else
1920 {
1921 /* Top face */ 1524 /* Top face */
1922 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1525 else if (update_space (sl, socket, ms, lastcell, 0))
1923 mask |= 0x1; 1526 mask |= 0x1;
1924
1925 if (socket.EMI_smooth)
1926 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1927 emask |= 0x1;
1928 } 1527
1929 1528
1930 /* Check to see if we are in fact sending anything for this 1529 /* Check to see if we are in fact sending anything for this
1931 * space by checking the mask. If so, update the mask. 1530 * space by checking the mask. If so, update the mask.
1932 * if not, reset the len to that from before adding the mask 1531 * if not, reset the len to that from before adding the mask
1933 * value, so we don't send those bits. 1532 * value, so we don't send those bits.
… …
1935 if (mask & 0xf) 1534 if (mask & 0xf)
1936 sl[oldlen + 1] = mask & 0xff; 1535 sl[oldlen + 1] = mask & 0xff;
1937 else 1536 else
1938 sl.reset (oldlen); 1537 sl.reset (oldlen);
1939 1538
1539 if (socket.ext_mapinfos)
1540 esl << uint16 (emask);
1541
1542 if (socket.EMI_smooth)
1543 {
1544 for (int layer = 2+1; layer--; )
1545 {
1546 object *ob = ms.faces_obj [layer];
1547
1548 // If there is no object for this space, or if the face for the object
1549 // is the blank face, set the smoothlevel to zero.
1550 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1551
1552 // We've gotten what face we want to use for the object. Now see if
1553 // if it has changed since we last sent it to the client.
1554 if (lastcell.smooth[layer] != smoothlevel)
1555 {
1556 lastcell.smooth[layer] = smoothlevel;
1557 esl << uint8 (smoothlevel);
1558 emask |= 1 << layer;
1559 }
1560 }
1561
1940 if (emask & 0xf) 1562 if (emask & 0xf)
1941 esl[eoldlen + 1] = emask & 0xff; 1563 esl[eoldlen + 1] = emask & 0xff;
1942 else 1564 else
1943 esl.reset (eoldlen); 1565 esl.reset (eoldlen);
1566 }
1944 } /* else this is a viewable space */ 1567 } /* else this is a viewable space */
1945 } /* for x loop */ 1568 } /* for x loop */
1946 } /* for y loop */ 1569 } /* for y loop */
1947 1570
1948 /* Verify that we in fact do need to send this */ 1571 /* Verify that we in fact do need to send this */
… …
1951 if (!(sl.length () > startlen || socket.sent_scroll)) 1574 if (!(sl.length () > startlen || socket.sent_scroll))
1952 { 1575 {
1953 /* No map data will follow, so don't say the client 1576 /* No map data will follow, so don't say the client
1954 * it doesn't need draw! 1577 * it doesn't need draw!
1955 */ 1578 */
1956 ewhatflag &= (~EMI_NOREDRAW); 1579 ewhatflag &= ~EMI_NOREDRAW;
1957 esl[ewhatstart + 1] = ewhatflag & 0xff; 1580 esl[ewhatstart + 1] = ewhatflag & 0xff;
1958 } 1581 }
1959 1582
1960 if (esl.length () > estartlen) 1583 if (esl.length () > estartlen)
1961 socket.send_packet (esl); 1584 socket.send_packet (esl);
… …
2187 if (!strcmp (spell->skill, skill_names[i])) 1810 if (!strcmp (spell->skill, skill_names[i]))
2188 { 1811 {
2189 skill = i + CS_STAT_SKILLINFO; 1812 skill = i + CS_STAT_SKILLINFO;
2190 break; 1813 break;
2191 } 1814 }
1815 }
1816
1817 // spells better have a face
1818 if (!spell->face)
1819 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face);
2192 } 1822 }
2193 1823
2194 /* send the current values */ 1824 /* send the current values */
2195 sl << uint32 (spell->count) 1825 sl << uint32 (spell->count)
2196 << uint16 (spell->level) 1826 << uint16 (spell->level)
… …
2198 << uint16 (spell->last_sp) 1828 << uint16 (spell->last_sp)
2199 << uint16 (spell->last_grace) 1829 << uint16 (spell->last_grace)
2200 << uint16 (spell->last_eat) 1830 << uint16 (spell->last_eat)
2201 << uint8 (skill) 1831 << uint8 (skill)
2202 << uint32 (spell->path_attuned) 1832 << uint32 (spell->path_attuned)
2203 << uint32 (spell->face ? spell->face->number : 0) 1833 << uint32 (spell->face)
2204 << data8 (spell->name) 1834 << data8 (spell->name)
2205 << data16 (spell->msg); 1835 << data16 (spell->msg);
2206} 1836}
2207 1837
2208/** 1838/**
… …
2223 1853
2224 packet sl ("addspell"); 1854 packet sl ("addspell");
2225 1855
2226 if (!spell) 1856 if (!spell)
2227 { 1857 {
2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1858 for (spell = pl->ob->inv; spell; spell = spell->below)
2229 { 1859 {
2230 /* were we to simply keep appending data here, we could exceed 1860 /* were we to simply keep appending data here, we could exceed
2231 * MAXSOCKBUF if the player has enough spells to add, we know that 1861 * MAXSOCKBUF if the player has enough spells to add, we know that
2232 * append_spells will always append 19 data bytes, plus 4 length 1862 * append_spells will always append 19 data bytes, plus 4 length
2233 * bytes and 3 strings (because that is the spec) so we need to 1863 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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