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.45 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13: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) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 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>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * 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
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 41 */
44 42
45#include <global.h> 43#include <global.h>
46#include <sproto.h> 44#include <sproto.h>
47 45
… …
100 * that much difference in bandwidth. 98 * that much difference in bandwidth.
101 */ 99 */
102 mx = ns->mapx; 100 mx = ns->mapx;
103 my = ns->mapy; 101 my = ns->mapy;
104 102
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* 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
112 * (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,
113 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
115 * 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.
… …
138} 130}
139 131
140static void 132static void
141clear_map (player *pl) 133clear_map (player *pl)
142{ 134{
143 client &socket = *pl->socket;
144
145 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
146 136
147 if (socket.newmapcmd == 1) 137 if (pl->ns->newmapcmd == 1)
148 socket.send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
149 139
150 socket.update_look = 1; 140 pl->ns->floorbox_reset ();
151 socket.look_position = 0;
152} 141}
153 142
154/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
155static void 144static void
156check_map_change (player *pl) 145check_map_change (player *pl)
157{ 146{
158 client &socket = *pl->socket; 147 client &socket = *pl->ns;
159 object *ob = pl->ob; 148 object *ob = pl->ob;
160 char buf[MAX_BUF]; /* eauugggh */ 149 char buf[MAX_BUF]; /* eauugggh */
161 150
162 if (socket.current_map != ob->map) 151 if (socket.current_map != ob->map)
163 { 152 {
… …
179 flags |= 4; 168 flags |= 4;
180 if (ob->map->tile_path[3]) 169 if (ob->map->tile_path[3])
181 flags |= 8; 170 flags |= 8;
182 171
183 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
184 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
185 } 174 }
186 else 175 else
187 snprintf (buf, MAX_BUF, "mapinfo current"); 176 snprintf (buf, MAX_BUF, "mapinfo current");
188 177
189 socket.send_packet (buf); 178 socket.send_packet (buf);
… …
197 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 186 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
198 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 187 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
199 else 188 else
200 { 189 {
201 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 190 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
202 socket.update_look = 1; 191 socket.floorbox_reset ();
203 socket.look_position = 0;
204 } 192 }
205 } 193 }
206 194
207 socket.current_x = ob->x; 195 socket.current_x = ob->x;
208 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 }
209} 204}
210 205
211/** 206/**
212 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
284 buf += 8; 279 buf += 8;
285 280
286 // initial map and its origin 281 // initial map and its origin
287 maptile *map = pl->ob->map; 282 maptile *map = pl->ob->map;
288 sint16 dx, dy; 283 sint16 dx, dy;
289 int mapx = pl->socket->mapx / 2 - pl->ob->x; 284 int mapx = pl->ns->mapx / 2 - pl->ob->x;
290 int mapy = pl->socket->mapy / 2 - pl->ob->y; 285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
291 int max_distance = 8; // limit maximum path length to something generous 286 int max_distance = 8; // limit maximum path length to something generous
292 287
293 while (*buf && map && max_distance) 288 while (*buf && map && max_distance)
294 { 289 {
295 int dir = *buf++; 290 int dir = *buf++;
296 291
297 switch (dir) 292 switch (dir)
298 { 293 {
299 case '1': 294 case '1':
300 dx = 0; 295 dx = 0;
301 dy = -1; 296 dy = -1;
302 map = get_map_from_coord (map, &dx, &dy); 297 map = map->xy_find (dx, dy);
303 map && (mapy -= map->height); 298 map && (mapy -= map->height);
304 break; 299 break;
305 case '2': 300 case '2':
306 mapx += map->width; 301 mapx += map->width;
307 dx = map->width; 302 dx = map->width;
308 dy = 0; 303 dy = 0;
309 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
310 break; 305 break;
311 case '3': 306 case '3':
312 mapy += map->height; 307 mapy += map->height;
313 dx = 0; 308 dx = 0;
314 dy = map->height; 309 dy = map->height;
315 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
316 break; 311 break;
317 case '4': 312 case '4':
318 dx = -1; 313 dx = -1;
319 dy = 0; 314 dy = 0;
320 map = get_map_from_coord (map, &dx, &dy); 315 map = map->xy_find (dx, dy);
321 map && (mapx -= map->width); 316 map && (mapx -= map->width);
322 break; 317 break;
323 } 318 }
324 319
325 --max_distance; 320 --max_distance;
326 } 321 }
327 322
… …
338 if (map->tile_path[2]) 333 if (map->tile_path[2])
339 flags |= 4; 334 flags |= 4;
340 if (map->tile_path[3]) 335 if (map->tile_path[3])
341 flags |= 8; 336 flags |= 8;
342 337
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
344 } 339 }
345 else 340 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
347 } 342 }
348 else 343 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
350 345
351 pl->socket->send_packet (bigbuf); 346 pl->ns->send_packet (bigbuf);
352} 347}
353 348
354/** This is the Setup cmd - easy first implementation */ 349/** This is the Setup cmd - easy first implementation */
355void 350void
356SetUp (char *buf, int len, client * ns) 351SetUp (char *buf, int len, client * ns)
… …
403 { 398 {
404 ns->sound = atoi (param); 399 ns->sound = atoi (param);
405 safe_strcat (cmdback, param, &slen, HUGE_BUF); 400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406 } 401 }
407 else if (!strcmp (cmd, "exp64")) 402 else if (!strcmp (cmd, "exp64"))
408 {
409 ns->exp64 = atoi (param);
410 safe_strcat (cmdback, param, &slen, HUGE_BUF); 403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
411 }
412 else if (!strcmp (cmd, "spellmon")) 404 else if (!strcmp (cmd, "spellmon"))
413 { 405 {
414 ns->monitor_spells = atoi (param); 406 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 } 408 }
… …
439 } 431 }
440 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
441 { 433 {
442 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
443 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
444// } else if (!strcmp(cmd,"plugincmd")) {
445// ns->plugincmd = atoi(param);
446// safe_strcat(cmdback, param, &slen, HUGE_BUF);
447 } 436 }
448 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
449 { 438 {
450 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
451 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
507 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
508 { 497 {
509 y = atoi (cp + 1); 498 y = atoi (cp + 1);
510 break; 499 break;
511 } 500 }
501
512 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)
513 { 503 {
514 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 } 506 }
… …
573 * it either has to be here or init_sockets needs to be exported. 563 * it either has to be here or init_sockets needs to be exported.
574 */ 564 */
575void 565void
576AddMeCmd (char *buf, int len, client * ns) 566AddMeCmd (char *buf, int len, client * ns)
577{ 567{
578 if (ns->status != Ns_Add || add_player (ns)) 568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582} 569}
583 570
584/** Reply to ExtendedInfos command */ 571/** Reply to ExtendedInfos command */
585void 572void
586ToggleExtendedInfos (char *buf, int len, client * ns) 573ToggleExtendedInfos (char *buf, int len, client * ns)
… …
710 uint16 smoothface; 697 uint16 smoothface;
711 698
712 /* 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
713 * again. 700 * again.
714 */ 701 */
715 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
716 { 703 {
717 704
718 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);
719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
720 return; 707 return;
721 } 708 }
722 709
723 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
724 esrv_send_face (ns, smoothface, 0); 711 esrv_send_face (ns, smoothface, 0);
725 712
726 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 713 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
727 714
728 packet sl; 715 packet sl ("smooth");
729 716
730 sl << "smooth "
731 << uint16 (face) 717 sl << uint16 (face)
732 << uint16 (smoothface); 718 << uint16 (smoothface);
733 719
734 ns->send_packet (sl); 720 ns->send_packet (sl);
735} 721}
736 722
737 /** 723/**
738 * Tells client the picture it has to use 724 * Tells client the picture it has to use
739 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
740 */ 726 */
741void 727void
742AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
743{ 729{
744 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
745} 731}
… …
808 * commands. 794 * commands.
809 */ 795 */
810 pl->count = 0; 796 pl->count = 0;
811 797
812 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 798 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
813 int time = FABS (pl->ob->speed) < 0.001 799 int time = fabs (pl->ob->speed) < 0.001
814 ? time = MAX_TIME * 100 800 ? time = MAX_TIME * 100
815 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 801 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
816 802
817 /* Send confirmation of command execution now */ 803 /* Send confirmation of command execution now */
818 packet sl; 804 packet sl ("comc");
819 sl << "comc " << uint16 (cmdid) << uint32 (time); 805 sl << uint16 (cmdid) << uint32 (time);
820 pl->socket->send_packet (sl); 806 pl->ns->send_packet (sl);
821} 807}
822
823 808
824/** This is a reply to a previous query. */ 809/** This is a reply to a previous query. */
825void 810void
826ReplyCmd (char *buf, int len, player *pl) 811ReplyCmd (char *buf, int len, client *ns)
827{ 812{
813 if (ns->state == ST_CUSTOM)
814 {
815 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
816 return;
817 }
818
819 if (!ns->pl)
820 return; //TODO: depends on the exact reply we are after
821 //TODO: but right now, we always have a ns->pl
822
823 player *pl = ns->pl;
824
828 /* This is to synthesize how the data would be stored if it 825 /* This is to synthesize how the data would be stored if it
829 * was normally entered. A bit of a hack, and should be cleaned up 826 * was normally entered. A bit of a hack, and should be cleaned up
830 * once all the X11 code is removed from the server. 827 * once all the X11 code is removed from the server.
831 * 828 *
832 * We pass 13 to many of the functions because this way they 829 * We pass 13 to many of the functions because this way they
… …
835 */ 832 */
836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 833 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
837 834
838 /* this avoids any hacking here */ 835 /* this avoids any hacking here */
839 836
840 switch (pl->state) 837 switch (ns->state)
841 { 838 {
842 case ST_PLAYING: 839 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 840 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 841 break;
845 842
846 case ST_PLAY_AGAIN:
847 /* We can check this for return value (2==quit). Maybe we
848 * should, and do something appropriate?
849 */
850 receive_play_again (pl->ob, buf[0]);
851 break;
852
853 case ST_ROLL_STAT:
854 key_roll_stat (pl->ob, buf[0]);
855 break;
856
857 case ST_CHANGE_CLASS: 843 case ST_CHANGE_CLASS:
858
859 key_change_class (pl->ob, buf[0]); 844 key_change_class (pl->ob, buf[0]);
860 break;
861
862 case ST_CONFIRM_QUIT:
863 key_confirm_quit (pl->ob, buf[0]);
864 break;
865
866 case ST_CONFIGURE:
867 LOG (llevError, "In client input handling, but into configure state\n");
868 pl->state = ST_PLAYING;
869 break;
870
871 case ST_GET_NAME:
872 receive_player_name (pl->ob, 13);
873 break;
874
875 case ST_GET_PASSWORD:
876 case ST_CONFIRM_PASSWORD:
877 receive_player_password (pl->ob, 13);
878 break; 845 break;
879 846
880 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 847 case ST_GET_PARTY_PASSWORD: /* Get password for party */
881 receive_party_password (pl->ob, 13); 848 receive_party_password (pl->ob, 13);
882 break; 849 break;
883 850
884 default: 851 default:
885 LOG (llevError, "Unknown input state: %d\n", pl->state); 852 LOG (llevError, "Unknown input state: %d\n", ns->state);
886 } 853 }
887} 854}
888 855
889/** 856/**
890 * Client tells its version. If there is a mismatch, we close the 857 * Client tells its version. If there is a mismatch, we close the
… …
905 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
906 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
907 874
908 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
909 876
910
911 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
912 878
913 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
914 // unchecked; 880 // unchecked;
915 881
… …
940{ 906{
941 ns->sound = atoi (buf); 907 ns->sound = atoi (buf);
942} 908}
943 909
944/** client wants the map resent */ 910/** client wants the map resent */
945
946void 911void
947MapRedrawCmd (char *buf, int len, player *pl) 912MapRedrawCmd (char *buf, int len, player *pl)
948{ 913{
949/* This function is currently disabled; just clearing the map state results in 914/* This function is currently disabled; just clearing the map state results in
950 * display errors. It should clear the cache and send a newmap command. 915 * display errors. It should clear the cache and send a newmap command.
… …
1037esrv_update_stats (player *pl) 1002esrv_update_stats (player *pl)
1038{ 1003{
1039 char buf[MAX_BUF]; 1004 char buf[MAX_BUF];
1040 uint16 flags; 1005 uint16 flags;
1041 1006
1042 packet sl; 1007 client *ns = pl->ns;
1043 sl << "stats "; 1008 if (!ns)
1009 return;
1044 1010
1011 object *ob = pl->ob;
1045 if (pl->ob) 1012 if (!ob)
1046 { 1013 return;
1014
1015 packet sl ("stats");
1016
1047 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1048 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1049 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1019 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1050 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1020 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1051 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1021 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1052 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1022 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1053 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1023 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1054 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1055 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1056 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1057 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1024 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1058 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1025 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1026 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1059 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1060 }
1061 1030
1062 if (pl->socket->exp64)
1063 for (int s = 0; s < NUM_SKILLS; s++) 1031 for (int s = 0; s < NUM_SKILLS; s++)
1064 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1032 if (object *skill = pl->last_skill_ob[s])
1033 if (skill->stats.exp != ns->last_skill_exp [s])
1065 { 1034 {
1035 ns->last_skill_exp [s] = skill->stats.exp;
1036
1066 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1067 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1068 */ 1039 */
1069 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1070 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (skill->level)
1071 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (skill->stats.exp);
1072
1073 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1074 } 1043 }
1075 1044
1076 if (pl->socket->exp64)
1077 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1078 else
1079 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1080
1081 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1082 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1083 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1084 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1085 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1086 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1087 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1052 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1088 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1053 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054
1089 flags = 0; 1055 flags = 0;
1090 1056
1091 if (pl->fire_on) 1057 if (pl->fire_on)
1092 flags |= SF_FIREON; 1058 flags |= SF_FIREON;
1093 1059
1094 if (pl->run_on) 1060 if (pl->run_on)
1095 flags |= SF_RUNON; 1061 flags |= SF_RUNON;
1096 1062
1097 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1098 1064
1099 if (pl->socket->sc_version < 1025) 1065 if (ns->sc_version < 1025)
1100 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1066 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1101 else 1067 else
1102 for (int i = 0; i < NROFATTACKS; i++) 1068 for (int i = 0; i < NROFATTACKS; i++)
1103 { 1069 {
1104 /* Skip ones we won't send */ 1070 /* Skip ones we won't send */
1105 if (atnr_cs_stat[i] == -1) 1071 if (atnr_cs_stat[i] == -1)
1106 continue; 1072 continue;
1107 1073
1108 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1074 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1109 } 1075 }
1110 1076
1111 if (pl->socket->monitor_spells) 1077 if (pl->ns->monitor_spells)
1112 { 1078 {
1113 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1079 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1114 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1080 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1115 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1081 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1116 } 1082 }
1117 1083
1118 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1084 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1119 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1120 set_title (pl->ob, buf); 1086 set_title (ob, buf);
1121 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1122 1088
1123 /* Only send it away if we have some actual data */ 1089 /* Only send it away if we have some actual data */
1124 if (sl.length () > 6) 1090 if (sl.length () > 6)
1125 pl->socket->send_packet (sl); 1091 ns->send_packet (sl);
1126} 1092}
1127 1093
1128/** 1094/**
1129 * Tells the client that here is a player it should start using. 1095 * Tells the client that here is a player it should start using.
1130 */ 1096 */
1131void 1097void
1132esrv_new_player (player *pl, uint32 weight) 1098esrv_new_player (player *pl, uint32 weight)
1133{ 1099{
1134 pl->last_weight = weight; 1100 packet sl ("player");
1135
1136 packet sl;
1137 sl << "player ";
1138 1101
1139 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1103 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1142 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1143 1106
1107 pl->ns->last_weight = weight;
1144 pl->socket->send_packet (sl); 1108 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1110}
1147 1111
1148/** 1112/**
1149 * Need to send an animation sequence to the client. 1113 * Need to send an animation sequence to the client.
… …
1163 { 1127 {
1164 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1128 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1165 return; 1129 return;
1166 } 1130 }
1167 1131
1168 packet sl; 1132 packet sl ("anim");
1169 1133
1170 sl << "anim "
1171 << uint16 (anim_num) 1134 sl << uint16 (anim_num)
1172 << uint16 (0); /* flags - not used right now */ 1135 << uint16 (0); /* flags - not used right now */
1173 1136
1174 /* Build up the list of faces. Also, send any information (ie, the 1137 /* Build up the list of faces. Also, send any information (ie, the
1175 * the face itself) down to the client. 1138 * the face itself) down to the client.
1176 */ 1139 */
… …
1192 * 1155 *
1193 * Start of map related commands. 1156 * Start of map related commands.
1194 * 1157 *
1195 ******************************************************************************/ 1158 ******************************************************************************/
1196 1159
1197/**
1198 * This adds face_num to a map cell at x,y. If the client doesn't have
1199 * the face yet, we will also send it.
1200 */
1201static void
1202esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1203{
1204 if (newmap->cells[x][y].count >= MAP_LAYERS)
1205 {
1206 //TODO: one or the other, can't both have abort and return, verify and act
1207 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1208 return;
1209 abort ();
1210 }
1211
1212 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1213 newmap->cells[x][y].count++;
1214
1215 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1216 esrv_send_face (ns, face_num, 0);
1217}
1218
1219/** Clears a map cell */ 1160/** Clears a map cell */
1220static void 1161static void
1221map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1222{ 1163{
1223 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1224 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1225 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1226 cell->count = count; 1167 cell->count = count;
1227 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1228 cell->flags = 0; 1169 cell->flags = 0;
1229 cell->player = 0; 1170 cell->player = 0;
1230} 1171}
1231 1172
1232#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1233#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1234
1235/* Using a global really isn't a good approach, but saves the over head of
1236 * allocating and deallocating such a block of data each time run through,
1237 * and saves the space of allocating this in the socket object when we only
1238 * need it for this cycle. If the server is ever threaded, this needs to be
1239 * re-examined.
1240 */
1241static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1242
1243/**
1244 * Returns true if any of the heads for this
1245 * space is set. Returns false if all are blank - this is used
1246 * for empty space checking.
1247 */
1248static inline int
1249have_head (int ax, int ay)
1250{
1251 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1252 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1253 return 1;
1254
1255 return 0;
1256}
1257
1258/**
1259 * check_head is a bit simplistic version of update_space below.
1260 * basically, it only checks the that the head on space ax,ay at layer
1261 * needs to get sent - if so, it adds the data, sending the head
1262 * if needed, and returning 1. If this no data needs to get
1263 * sent, it returns zero.
1264 */
1265static int
1266check_head (packet &sl, client &ns, int ax, int ay, int layer)
1267{
1268 short face_num;
1269
1270 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1271 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1272 else
1273 face_num = 0;
1274
1275 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1276 {
1277 sl << uint16 (face_num);
1278 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1279 esrv_send_face (&ns, face_num, 0);
1280
1281 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1282 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1283 return 1;
1284 }
1285
1286 return 0; /* No change */
1287}
1288 1174
1289/** 1175/**
1290 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1291 * 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
1292 * it was. 1178 * it was.
… …
1306 * actually match. 1192 * actually match.
1307 */ 1193 */
1308static int 1194static int
1309update_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)
1310{ 1196{
1311 object *ob, *head;
1312 uint16 face_num; 1197 uint16 face_num;
1313 int bx, by, i; 1198 int bx, by, i;
1314 1199
1315 /* If there is a multipart object stored away, treat that as more important.
1316 * If not, then do the normal processing.
1317 */
1318 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1319
1320 /* Check to see if this head is part of the set of objects
1321 * we would normally send for this space. If so, then
1322 * don't use the head value. We need to do the check
1323 * here and not when setting up the heads[] value for two reasons -
1324 * 1) the heads[] values will get used even if the space is not visible.
1325 * 2) its possible the head is not on the same map as a part, and I'd
1326 * rather not need to do the map translation overhead.
1327 * 3) We need to do some extra checking to make sure that we will
1328 * otherwise send the image as this layer, eg, either it matches
1329 * the head value, or is not multipart.
1330 */
1331 if (head && !head->more)
1332 {
1333 for (i = 0; i < MAP_LAYERS; i++)
1334 {
1335 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1336 if (!ob)
1337 continue;
1338
1339 if (ob->head)
1340 ob = ob->head;
1341
1342 if (ob == head)
1343 {
1344 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1345 head = NULL;
1346 break;
1347 }
1348 }
1349 }
1350
1351 ob = head;
1352 if (!ob)
1353 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1354 1201
1355 /* 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
1356 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1357 * 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
1358 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1359 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1360 */ 1207 */
1361 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1362 face_num = 0; 1209 face_num = 0;
1363 else if (head)
1364 {
1365 /* if this is a head that had previously been stored */
1366 face_num = ob->face->number;
1367 }
1368 else 1210 else
1369 {
1370 /* if the faces for the different parts of a multipart object
1371 * are the same, we only want to send the bottom right most
1372 * portion of the object. That info is in the tail_.. values
1373 * of the head. Note that for the head itself, ob->head will
1374 * be null, so we only do this block if we are working on
1375 * a tail piece.
1376 */
1377
1378 /* tail_x and tail_y will only be set in the head object. If
1379 * this is the head object and these are set, we proceed
1380 * with logic to only send bottom right. Similarly, if
1381 * this is one of the more parts but the head has those values
1382 * set, we want to do the processing. There can be cases where
1383 * the head is not visible but one of its parts is, so we just
1384 * can always expect that ob->arch->tail_x will be true for all
1385 * object we may want to display.
1386 */
1387 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1388 {
1389
1390 if (ob->head)
1391 head = ob->head;
1392 else
1393 head = ob;
1394
1395 /* Basically figure out where the offset is from where we are right
1396 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1397 * piece is from the head, and the tail is where the tail is from the
1398 * head. Note that bx and by will equal sx and sy if we are already working
1399 * on the bottom right corner. If ob is the head, the clone values
1400 * will be zero, so the right thing will still happen.
1401 */
1402 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1403 by = sy + head->arch->tail_y - ob->arch->clone.y;
1404
1405 /* I don't think this can ever happen, but better to check for it just
1406 * in case.
1407 */
1408 if (bx < sx || by < sy)
1409 {
1410 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1411 face_num = 0;
1412 }
1413 /* single part object, multipart object with non merged faces,
1414 * of multipart object already at lower right.
1415 */
1416 else if (bx == sx && by == sy)
1417 {
1418 face_num = ob->face->number;
1419
1420 /* if this face matches one stored away, clear that one away.
1421 * this code relies on the fact that the map1 commands
1422 * goes from 2 down to 0.
1423 */
1424 for (i = 0; i < MAP_LAYERS; i++)
1425 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1426 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1427 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1428 }
1429 else
1430 {
1431 /* If this head is stored away, clear it - otherwise,
1432 * there can be cases where a object is on multiple layers -
1433 * we only want to send it once.
1434 */
1435 face_num = head->face->number;
1436 for (i = 0; i < MAP_LAYERS; i++)
1437 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1438 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1439 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1440
1441 /* First, try to put the new head on the same layer. If that is used up,
1442 * then find another layer.
1443 */
1444 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1445 {
1446 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1447 }
1448 else
1449 for (i = 0; i < MAX_LAYERS; i++)
1450 {
1451 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1452 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1453 {
1454 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1455 }
1456 }
1457 face_num = 0; /* Don't send this object - we'll send the head later */
1458 }
1459 }
1460 else
1461 {
1462 /* 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,
1463 * so nothing special 1212 * so nothing special
1464 */
1465 face_num = ob->face->number;
1466
1467 /* clear out any head entries that have the same face as this one */
1468 for (bx = 0; bx < layer; bx++)
1469 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1470 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1471 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1472 }
1473 } /* else not already head object or blank face */
1474
1475 /* This is a real hack. Basically, if we have nothing to send for this layer,
1476 * but there is a head on the next layer, send that instead.
1477 * Without this, what happens is you can get the case where the player stands
1478 * on the same space as the head. However, if you have overlapping big objects
1479 * of the same type, what happens then is it doesn't think it needs to send
1480 * This tends to make stacking also work/look better.
1481 */ 1213 */
1482 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1483 {
1484 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1485 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1486 }
1487
1488 /* Another hack - because of heads and whatnot, this face may match one
1489 * we already sent for a lower layer. In that case, don't send
1490 * this one.
1491 */
1492 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1493 face_num = 0; 1214 face_num = ob->face;
1494 1215
1495 /* 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
1496 * 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.
1497 */ 1218 */
1498 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1525 * holds the old values. 1246 * holds the old values.
1526 * 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
1527 * 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
1528 * take. 1249 * take.
1529 */ 1250 */
1530
1531static inline int 1251static inline int
1532update_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)
1533{ 1253{
1534 object *ob; 1254 object *ob;
1535 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1537 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1538 1258
1539 /* If there is no object for this space, or if the face for the object 1259 /* If there is no object for this space, or if the face for the object
1540 * is the blank face, set the smoothlevel to zero. 1260 * is the blank face, set the smoothlevel to zero.
1541 */ 1261 */
1542 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1262 if (!ob || ob->face == blank_face)
1543 smoothlevel = 0; 1263 smoothlevel = 0;
1544 else 1264 else
1545 { 1265 {
1546 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1547 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1548 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1549 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1550 1270
1551 /* 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
1552 * 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.
1553 */ 1273 */
… …
1582 if (ns->EMI_smooth) 1302 if (ns->EMI_smooth)
1583 result += 1; /*One byte for smoothlevel */ 1303 result += 1; /*One byte for smoothlevel */
1584 } 1304 }
1585 1305
1586 return result; 1306 return result;
1307}
1308
1309// prefetch (and touch) all maps within a specific distancd
1310static void
1311prefetch_surrounding_maps (maptile *map, int distance)
1312{
1313 map->last_access = runtime;
1314
1315 if (--distance)
1316 for (int dir = 4; --dir; )
1317 if (const shstr &path = map->tile_path [dir])
1318 if (maptile *&neigh = map->tile_map [dir])
1319 prefetch_surrounding_maps (neigh, distance);
1320 else
1321 neigh = maptile::find_async (path, map);
1322}
1323
1324// prefetch a generous area around the player
1325static void
1326prefetch_surrounding_maps (object *op)
1327{
1328 prefetch_surrounding_maps (op->map, 3);
1587} 1329}
1588 1330
1589/** 1331/**
1590 * This function uses the new map1 protocol command to send the map 1332 * This function uses the new map1 protocol command to send the map
1591 * to the client. It is necessary because the old map command supports 1333 * to the client. It is necessary because the old map command supports
… …
1597 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1339 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1598 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1340 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1599 * and use the other 4 bits for other informatiion. For full documentation 1341 * and use the other 4 bits for other informatiion. For full documentation
1600 * of what we send, see the doc/Protocol file. 1342 * of what we send, see the doc/Protocol file.
1601 * I will describe internally what we do: 1343 * I will describe internally what we do:
1602 * the socket->lastmap shows how the map last looked when sent to the client. 1344 * the ns->lastmap shows how the map last looked when sent to the client.
1603 * in the lastmap structure, there is a cells array, which is set to the 1345 * in the lastmap structure, there is a cells array, which is set to the
1604 * maximum viewable size (As set in config.h). 1346 * maximum viewable size (As set in config.h).
1605 * in the cells, there are faces and a count value. 1347 * in the cells, there are faces and a count value.
1606 * we use the count value to hold the darkness value. If -1, then this space 1348 * we use the count value to hold the darkness value. If -1, then this space
1607 * is not viewable. 1349 * is not viewable.
… …
1618 uint8 eentrysize; 1360 uint8 eentrysize;
1619 uint16 ewhatstart, ewhatflag; 1361 uint16 ewhatstart, ewhatflag;
1620 uint8 extendedinfos; 1362 uint8 extendedinfos;
1621 maptile *m; 1363 maptile *m;
1622 1364
1623 client &socket = *pl->contr->socket; 1365 client &socket = *pl->contr->ns;
1366
1367 if (!pl->active)
1368 return;
1624 1369
1625 check_map_change (pl->contr); 1370 check_map_change (pl->contr);
1371 prefetch_surrounding_maps (pl);
1626 1372
1627 packet sl; 1373 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1628 packet esl; 1374 packet esl;
1629 1375
1630 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1631 startlen = sl.length (); 1376 startlen = sl.length ();
1632 1377
1633 /*Extendedmapinfo structure initialisation */ 1378 /*Extendedmapinfo structure initialisation */
1634 if (socket.ext_mapinfos) 1379 if (socket.ext_mapinfos)
1635 { 1380 {
… …
1654 ewhatstart = 0; 1399 ewhatstart = 0;
1655 ewhatflag = 0; 1400 ewhatflag = 0;
1656 estartlen = 0; 1401 estartlen = 0;
1657 } 1402 }
1658 1403
1659 /* Init data to zero */
1660 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661
1662 /* x,y are the real map locations. ax, ay are viewport relative 1404 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations. 1405 * locations.
1664 */ 1406 */
1665 ay = 0; 1407 ay = 0;
1666 1408
… …
1668 * but that started to get a bit messy to look at. 1410 * but that started to get a bit messy to look at.
1669 */ 1411 */
1670 max_x = pl->x + (socket.mapx + 1) / 2; 1412 max_x = pl->x + (socket.mapx + 1) / 2;
1671 max_y = pl->y + (socket.mapy + 1) / 2; 1413 max_y = pl->y + (socket.mapy + 1) / 2;
1672 1414
1673 if (socket.mapmode == Map1aCmd)
1674 {
1675 max_x += MAX_HEAD_OFFSET;
1676 max_y += MAX_HEAD_OFFSET;
1677 }
1678
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 { 1416 {
1681 ax = 0; 1417 ax = 0;
1682 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++)
1683 { 1419 {
1684
1685 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1686
1687 /* If this space is out of the normal viewable area, we only check
1688 * the heads value ax or ay will only be greater than what
1689 * the client wants if using the map1a command - this is because
1690 * if the map1a command is not used, max_x and max_y will be
1691 * set to lower values.
1692 */
1693 if (ax >= socket.mapx || ay >= socket.mapy)
1694 {
1695 int i, got_one;
1696
1697 oldlen = sl.length ();
1698
1699 sl << uint16 (mask);
1700
1701 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1702 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1703 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1704
1705 /* If all we are doing is sending 0 (blank) faces, we don't
1706 * actually need to send that - just the coordinates
1707 * with no faces tells the client to blank out the
1708 * space.
1709 */
1710 got_one = 0;
1711 for (i = oldlen + 2; i < sl.length (); i++)
1712 if (sl[i])
1713 got_one = 1;
1714
1715 if (got_one && (mask & 0xf))
1716 sl[oldlen + 1] = mask & 0xff;
1717 else
1718 { /*either all faces blank, either no face at all */
1719 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1720 sl.reset (oldlen + 2);
1721 else
1722 sl.reset (oldlen);
1723 }
1724
1725 /*What concerns extendinfos, nothing to be done for now
1726 * (perhaps effects layer later)
1727 */
1728 continue; /* don't do processing below */
1729 }
1730 1421
1731 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1732 1423
1733 d = pl->contr->blocked_los[ax][ay]; 1424 d = pl->contr->blocked_los[ax][ay];
1734 1425
… …
1746 * of the map, it shouldn't have a head 1437 * of the map, it shouldn't have a head
1747 */ 1438 */
1748 if (lastcell.count != -1) 1439 if (lastcell.count != -1)
1749 { 1440 {
1750 sl << uint16 (mask); 1441 sl << uint16 (mask);
1751 map_clearcell (&lastcell, 0, 0, 0, -1); 1442 map_clearcell (&lastcell, -1);
1752 } 1443 }
1753 } 1444 }
1754 else if (d > 3) 1445 else if (d > 3)
1755 { 1446 {
1447 m->touch ();
1448
1756 int need_send = 0, count; 1449 int need_send = 0, count;
1757 1450
1758 /* This block deals with spaces that are not visible for whatever 1451 /* This block deals with spaces that are not visible for whatever
1759 * reason. Still may need to send the head for this space. 1452 * reason. Still may need to send the head for this space.
1760 */ 1453 */
1761 1454
1762 oldlen = sl.length (); 1455 oldlen = sl.length ();
1763 1456
1764 sl << uint16 (mask); 1457 sl << uint16 (mask);
… …
1766 if (lastcell.count != -1) 1459 if (lastcell.count != -1)
1767 need_send = 1; 1460 need_send = 1;
1768 1461
1769 count = -1; 1462 count = -1;
1770 1463
1771 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1772 {
1773 /* Now check to see if any heads need to be sent */
1774
1775 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1776 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1777 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1778
1779 lastcell.count = count;
1780 }
1781 else
1782 {
1783 /* properly clear a previously sent big face */ 1464 /* properly clear a previously sent big face */
1784 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
1785 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1466 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1786 need_send = 1; 1467 need_send = 1;
1787 1468
1788 map_clearcell (&lastcell, 0, 0, 0, count); 1469 map_clearcell (&lastcell, count);
1789 }
1790 1470
1791 if ((mask & 0xf) || need_send) 1471 if ((mask & 0xf) || need_send)
1792 sl[oldlen + 1] = mask & 0xff; 1472 sl[oldlen + 1] = mask & 0xff;
1793 else 1473 else
1794 sl.reset (oldlen); 1474 sl.reset (oldlen);
1795 } 1475 }
1796 else 1476 else
1797 { 1477 {
1478 m->touch ();
1479
1798 /* In this block, the space is visible or there are head objects 1480 /* In this block, the space is visible.
1799 * we need to send.
1800 */ 1481 */
1801 1482
1802 /* Rather than try to figure out what everything that we might 1483 /* Rather than try to figure out what everything that we might
1803 * need to send is, then form the packet after that, 1484 * need to send is, then form the packet after that,
1804 * 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
… …
1925 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1926 emask |= 0x2; 1607 emask |= 0x2;
1927 1608
1928 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))
1929 { 1610 {
1930 if (lastcell.faces[0] != pl->face->number) 1611 if (lastcell.faces[0] != pl->face)
1931 { 1612 {
1932 lastcell.faces[0] = pl->face->number; 1613 lastcell.faces[0] = pl->face;
1933 mask |= 0x1; 1614 mask |= 0x1;
1934 1615
1935 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1936 esrv_send_face (&socket, pl->face->number, 0); 1617 esrv_send_face (&socket, pl->face, 0);
1937 1618
1938 sl << uint16 (pl->face->number); 1619 sl << uint16 (pl->face);
1939 } 1620 }
1940 } 1621 }
1941 else 1622 else
1942 { 1623 {
1943 /* Top face */ 1624 /* Top face */
… …
1995 */ 1676 */
1996void 1677void
1997draw_client_map (object *pl) 1678draw_client_map (object *pl)
1998{ 1679{
1999 int i, j; 1680 int i, j;
2000 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 */
2001 New_Face *face, *floor;
2002 New_Face *floor2;
2003 int d, mflags; 1682 int mflags;
2004 struct Map newmap; 1683 struct Map newmap;
2005 maptile *m, *pm; 1684 maptile *m, *pm;
2006 1685
2007 if (pl->type != PLAYER) 1686 if (pl->type != PLAYER)
2008 { 1687 {
… …
2019 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1698 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2020 return; 1699 return;
2021 1700
2022 memset (&newmap, 0, sizeof (struct Map)); 1701 memset (&newmap, 0, sizeof (struct Map));
2023 1702
2024 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1703 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2025 {
2026 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1704 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2027 { 1705 {
2028 ax = i; 1706 ax = i;
2029 ay = j; 1707 ay = j;
2030 m = pm; 1708 m = pm;
2031 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1709 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2032 1710
2033 if (mflags & P_OUT_OF_MAP) 1711 if (mflags & P_OUT_OF_MAP)
2034 continue; 1712 continue;
2035 1713
2036 if (mflags & P_NEED_UPDATE)
2037 update_position (m, ax, ay);
2038
2039 /* If a map is visible to the player, we don't want to swap it out 1714 /* If a map is visible to the player, we don't want to swap it out
2040 * just to reload it. This should really call something like 1715 * just to reload it. This should really call something like
2041 * swap_map, but this is much more efficient and 'good enough' 1716 * swap_map, but this is much more efficient and 'good enough'
2042 */ 1717 */
2043 if (mflags & P_NEW_MAP) 1718 if (mflags & P_NEW_MAP)
2044 m->timeout = 50; 1719 m->timeout = 50;
2045 } 1720 }
2046 } 1721
2047 /* do LOS after calls to update_position */ 1722 /* do LOS after calls to update_position */
2048 if (pl->contr->do_los) 1723 if (pl->contr->do_los)
2049 { 1724 {
2050 update_los (pl); 1725 update_los (pl);
2051 pl->contr->do_los = 0; 1726 pl->contr->do_los = 0;
… …
2066 1741
2067/*****************************************************************************/ 1742/*****************************************************************************/
2068void 1743void
2069send_plugin_custom_message (object *pl, char *buf) 1744send_plugin_custom_message (object *pl, char *buf)
2070{ 1745{
2071 pl->contr->socket->send_packet (buf); 1746 pl->contr->ns->send_packet (buf);
2072} 1747}
2073 1748
2074/** 1749/**
2075 * This sends the skill number to name mapping. We ignore 1750 * This sends the skill number to name mapping. We ignore
2076 * the params - we always send the same info no matter what. 1751 * the params - we always send the same info no matter what.
… …
2121 * it then sends an updspell packet for each spell that has changed in this way 1796 * it then sends an updspell packet for each spell that has changed in this way
2122 */ 1797 */
2123void 1798void
2124esrv_update_spells (player *pl) 1799esrv_update_spells (player *pl)
2125{ 1800{
1801 if (!pl->ns)
1802 return;
1803
2126 if (!pl->socket->monitor_spells) 1804 if (!pl->ns->monitor_spells)
2127 return; 1805 return;
2128 1806
2129 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1807 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2130 { 1808 {
2131 if (spell->type == SPELL) 1809 if (spell->type == SPELL)
… …
2161 1839
2162 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1840 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2163 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1841 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2164 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1842 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2165 1843
2166 pl->socket->send_packet (sl); 1844 pl->ns->send_packet (sl);
2167 } 1845 }
2168 } 1846 }
2169 } 1847 }
2170} 1848}
2171 1849
2172void 1850void
2173esrv_remove_spell (player *pl, object *spell) 1851esrv_remove_spell (player *pl, object *spell)
2174{ 1852{
2175 if (!pl->socket->monitor_spells) 1853 if (!pl->ns->monitor_spells)
2176 return; 1854 return;
2177 1855
2178 if (!pl || !spell || spell->env != pl->ob) 1856 if (!pl || !spell || spell->env != pl->ob)
2179 { 1857 {
2180 LOG (llevError, "Invalid call to esrv_remove_spell"); 1858 LOG (llevError, "Invalid call to esrv_remove_spell");
2181 return; 1859 return;
2182 } 1860 }
2183 1861
2184 packet sl; 1862 packet sl ("delspell");
2185 1863
2186 sl << "delspell "
2187 << uint32 (spell->count); 1864 sl << uint32 (spell->count);
2188 1865
2189 pl->socket->send_packet (sl); 1866 pl->ns->send_packet (sl);
2190} 1867}
2191 1868
2192/* 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. */
2193static void 1870static void
2194append_spell (player *pl, packet &sl, object *spell) 1871append_spell (player *pl, packet &sl, object *spell)
2195{ 1872{
2196 int len, i, skill = 0; 1873 int i, skill = 0;
2197 1874
2198 if (!(spell->name)) 1875 if (!(spell->name))
2199 { 1876 {
2200 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);
2201 return; 1878 return;
… …
2213 if (!strcmp (spell->skill, skill_names[i])) 1890 if (!strcmp (spell->skill, skill_names[i]))
2214 { 1891 {
2215 skill = i + CS_STAT_SKILLINFO; 1892 skill = i + CS_STAT_SKILLINFO;
2216 break; 1893 break;
2217 } 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);
2218 } 1902 }
2219 1903
2220 /* send the current values */ 1904 /* send the current values */
2221 sl << uint32 (spell->count) 1905 sl << uint32 (spell->count)
2222 << uint16 (spell->level) 1906 << uint16 (spell->level)
… …
2224 << uint16 (spell->last_sp) 1908 << uint16 (spell->last_sp)
2225 << uint16 (spell->last_grace) 1909 << uint16 (spell->last_grace)
2226 << uint16 (spell->last_eat) 1910 << uint16 (spell->last_eat)
2227 << uint8 (skill) 1911 << uint8 (skill)
2228 << uint32 (spell->path_attuned) 1912 << uint32 (spell->path_attuned)
2229 << uint32 (spell->face ? spell->face->number : 0) 1913 << uint32 (spell->face)
2230 << data8 (spell->name) 1914 << data8 (spell->name)
2231 << data16 (spell->msg); 1915 << data16 (spell->msg);
2232} 1916}
2233 1917
2234/** 1918/**
… …
2242 { 1926 {
2243 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1927 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2244 return; 1928 return;
2245 } 1929 }
2246 1930
2247 if (!pl->socket->monitor_spells) 1931 if (!pl->ns->monitor_spells)
2248 return; 1932 return;
2249 1933
2250 packet sl; 1934 packet sl ("addspell");
2251 sl << "addspell ";
2252 1935
2253 if (!spell) 1936 if (!spell)
2254 { 1937 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1938 for (spell = pl->ob->inv; spell; spell = spell->below)
2256 { 1939 {
2257 /* were we to simply keep appending data here, we could exceed 1940 /* were we to simply keep appending data here, we could exceed
2258 * 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
2259 * append_spells will always append 19 data bytes, plus 4 length 1942 * append_spells will always append 19 data bytes, plus 4 length
2260 * bytes and 3 strings (because that is the spec) so we need to 1943 * bytes and 3 strings (because that is the spec) so we need to
… …
2270 if (spell->type != SPELL) 1953 if (spell->type != SPELL)
2271 continue; 1954 continue;
2272 1955
2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1956 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2274 { 1957 {
2275 pl->socket->send_packet (sl); 1958 pl->ns->send_packet (sl);
2276 1959
2277 sl.reset (); 1960 sl.reset ();
2278 sl << "addspell "; 1961 sl << "addspell ";
2279 } 1962 }
2280 1963
… …
2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1977 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2295 fatal (0); 1978 fatal (0);
2296 } 1979 }
2297 1980
2298 /* finally, we can send the packet */ 1981 /* finally, we can send the packet */
2299 pl->socket->send_packet (sl); 1982 pl->ns->send_packet (sl);
2300} 1983}
2301 1984

Diff Legend

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