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.41 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 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 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 41 */
47 42
48#include <global.h> 43#include <global.h>
49#include <sproto.h> 44#include <sproto.h>
50 45
… …
86 -1, /* life stealing */ 81 -1, /* life stealing */
87 -1 /* Disease - not fully done yet */ 82 -1 /* Disease - not fully done yet */
88}; 83};
89 84
90static void 85static void
91socket_map_scroll (client * ns, int dx, int dy) 86socket_map_scroll (client *ns, int dx, int dy)
92{ 87{
93 struct Map newmap; 88 struct Map newmap;
94 int x, y, mx, my; 89 int x, y, mx, my;
95 90
96 {
97 packet sl;
98
99 sl.printf ("map_scroll %d %d", dx, dy); 91 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
100 ns->send_packet (sl);
101 }
102 92
103 /* If we are using the Map1aCmd, we may in fact send 93 /* If we are using the Map1aCmd, we may in fact send
104 * head information that is outside the viewable map. 94 * head information that is outside the viewable map.
105 * So set the mx,my to the max value we want to 95 * So set the mx,my to the max value we want to
106 * look for. Removed code to do so - it caused extra 96 * look for. Removed code to do so - it caused extra
… …
108 * that much difference in bandwidth. 98 * that much difference in bandwidth.
109 */ 99 */
110 mx = ns->mapx; 100 mx = ns->mapx;
111 my = ns->mapy; 101 my = ns->mapy;
112 102
113 if (ns->mapmode == Map1aCmd)
114 {
115 mx += MAX_HEAD_OFFSET;
116 my += MAX_HEAD_OFFSET;
117 }
118
119 /* 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
120 * (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,
121 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
122 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
123 * 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.
… …
146} 130}
147 131
148static void 132static void
149clear_map (player *pl) 133clear_map (player *pl)
150{ 134{
151 client &socket = *pl->socket;
152
153 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
154 136
137 pl->ns->force_newmap = false;
138
155 if (socket.newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
156 socket.send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
157 141
158 socket.update_look = 1; 142 pl->ns->floorbox_reset ();
159 socket.look_position = 0;
160} 143}
161 144
162/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
163static void 146static void
164check_map_change (player *pl) 147check_map_change (player *pl)
165{ 148{
166 client &socket = *pl->socket; 149 client &socket = *pl->ns;
167 object *ob = pl->ob; 150 object *ob = pl->ob;
168 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
169 152
170 if (socket.current_map != ob->map) 153 if (socket.force_newmap && 0)
171 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
172 socket.current_map = ob->map; 157 socket.current_map = ob->map;
173 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
174 clear_map (pl); 162 clear_map (pl);
175 163
176 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
177 { 165 {
178 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
… …
187 flags |= 4; 175 flags |= 4;
188 if (ob->map->tile_path[3]) 176 if (ob->map->tile_path[3])
189 flags |= 8; 177 flags |= 8;
190 178
191 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 179 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
192 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 180 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
193 } 181 }
194 else 182 else
195 snprintf (buf, MAX_BUF, "mapinfo current"); 183 snprintf (buf, MAX_BUF, "mapinfo current");
196 184
197 socket.send_packet (buf); 185 socket.send_packet (buf);
… …
205 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 193 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
206 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 194 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
207 else 195 else
208 { 196 {
209 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 197 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
210 socket.update_look = 1; 198 socket.floorbox_reset ();
211 socket.look_position = 0;
212 } 199 }
213 } 200 }
214 201
215 socket.current_x = ob->x; 202 socket.current_x = ob->x;
216 socket.current_y = ob->y; 203 socket.current_y = ob->y;
204
205 region *reg = ob->region ();
206 if (socket.current_region != reg)
207 {
208 socket.current_region = reg;
209 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
210 }
217} 211}
218 212
219/** 213/**
220 * RequestInfo is sort of a meta command. There is some specific 214 * RequestInfo is sort of a meta command. There is some specific
221 * request of information, but we call other functions to provide 215 * request of information, but we call other functions to provide
… …
265{ 259{
266 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 260 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
267} 261}
268 262
269void 263void
264ExtiCmd (char *buf, int len, client *ns)
265{
266 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
267}
268
269void
270MapInfoCmd (char *buf, int len, player *pl) 270MapInfoCmd (char *buf, int len, player *pl)
271{ 271{
272 // <mapinfo tag spatial tile-path 272 // <mapinfo tag spatial tile-path
273 // >mapinfo tag spatial flags x y w h hash 273 // >mapinfo tag spatial flags x y w h hash
274 274
… …
286 buf += 8; 286 buf += 8;
287 287
288 // initial map and its origin 288 // initial map and its origin
289 maptile *map = pl->ob->map; 289 maptile *map = pl->ob->map;
290 sint16 dx, dy; 290 sint16 dx, dy;
291 int mapx = pl->socket->mapx / 2 - pl->ob->x; 291 int mapx = pl->ns->mapx / 2 - pl->ob->x;
292 int mapy = pl->socket->mapy / 2 - pl->ob->y; 292 int mapy = pl->ns->mapy / 2 - pl->ob->y;
293 int max_distance = 8; // limit maximum path length to something generous 293 int max_distance = 8; // limit maximum path length to something generous
294 294
295 while (*buf && map && max_distance) 295 while (*buf && map && max_distance)
296 { 296 {
297 int dir = *buf++; 297 int dir = *buf++;
298 298
299 switch (dir) 299 switch (dir)
300 { 300 {
301 case '1': 301 case '1':
302 dx = 0; 302 dx = 0;
303 dy = -1; 303 dy = -1;
304 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
305 map && (mapy -= map->height); 305 map && (mapy -= map->height);
306 break; 306 break;
307 case '2': 307 case '2':
308 mapx += map->width; 308 mapx += map->width;
309 dx = map->width; 309 dx = map->width;
310 dy = 0; 310 dy = 0;
311 map = get_map_from_coord (map, &dx, &dy); 311 map = map->xy_find (dx, dy);
312 break; 312 break;
313 case '3': 313 case '3':
314 mapy += map->height; 314 mapy += map->height;
315 dx = 0; 315 dx = 0;
316 dy = map->height; 316 dy = map->height;
317 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
318 break; 318 break;
319 case '4': 319 case '4':
320 dx = -1; 320 dx = -1;
321 dy = 0; 321 dy = 0;
322 map = get_map_from_coord (map, &dx, &dy); 322 map = map->xy_find (dx, dy);
323 map && (mapx -= map->width); 323 map && (mapx -= map->width);
324 break; 324 break;
325 } 325 }
326 326
327 --max_distance; 327 --max_distance;
328 } 328 }
329 329
… …
340 if (map->tile_path[2]) 340 if (map->tile_path[2])
341 flags |= 4; 341 flags |= 4;
342 if (map->tile_path[3]) 342 if (map->tile_path[3])
343 flags |= 8; 343 flags |= 8;
344 344
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
346 } 346 }
347 else 347 else
348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
349 } 349 }
350 else 350 else
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
352 352
353 pl->socket->send_packet (bigbuf); 353 pl->ns->send_packet (bigbuf);
354} 354}
355 355
356/** This is the Setup cmd - easy first implementation */ 356/** This is the Setup cmd - easy first implementation */
357void 357void
358SetUp (char *buf, int len, client * ns) 358SetUp (char *buf, int len, client * ns)
… …
405 { 405 {
406 ns->sound = atoi (param); 406 ns->sound = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 } 408 }
409 else if (!strcmp (cmd, "exp64")) 409 else if (!strcmp (cmd, "exp64"))
410 {
411 ns->exp64 = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF); 410 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "spellmon")) 411 else if (!strcmp (cmd, "spellmon"))
415 { 412 {
416 ns->monitor_spells = atoi (param); 413 ns->monitor_spells = atoi (param);
417 safe_strcat (cmdback, param, &slen, HUGE_BUF); 414 safe_strcat (cmdback, param, &slen, HUGE_BUF);
418 } 415 }
… …
441 } 438 }
442 else if (!strcmp (cmd, "newmapcmd")) 439 else if (!strcmp (cmd, "newmapcmd"))
443 { 440 {
444 ns->newmapcmd = atoi (param); 441 ns->newmapcmd = atoi (param);
445 safe_strcat (cmdback, param, &slen, HUGE_BUF); 442 safe_strcat (cmdback, param, &slen, HUGE_BUF);
446// } else if (!strcmp(cmd,"plugincmd")) {
447// ns->plugincmd = atoi(param);
448// safe_strcat(cmdback, param, &slen, HUGE_BUF);
449 } 443 }
450 else if (!strcmp (cmd, "mapinfocmd")) 444 else if (!strcmp (cmd, "mapinfocmd"))
451 { 445 {
452 ns->mapinfocmd = atoi (param); 446 ns->mapinfocmd = atoi (param);
453 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 447 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
472 char tmpbuf[20]; 466 char tmpbuf[20];
473 int q = atoi (param); 467 int q = atoi (param);
474 468
475 if (is_valid_faceset (q)) 469 if (is_valid_faceset (q))
476 ns->faceset = q; 470 ns->faceset = q;
471
477 sprintf (tmpbuf, "%d", ns->faceset); 472 sprintf (tmpbuf, "%d", ns->faceset);
478 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
479 /* if the client is using faceset, it knows about image2 command */ 474 /* if the client is using faceset, it knows about image2 command */
480 ns->image2 = 1; 475 ns->image2 = 1;
481 } 476 }
… …
509 if (*cp == 'x' || *cp == 'X') 504 if (*cp == 'x' || *cp == 'X')
510 { 505 {
511 y = atoi (cp + 1); 506 y = atoi (cp + 1);
512 break; 507 break;
513 } 508 }
509
514 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
515 { 511 {
516 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
517 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
518 } 514 }
… …
573 * This is what takes care of it. We tell the client how things worked out. 569 * This is what takes care of it. We tell the client how things worked out.
574 * I am not sure if this file is the best place for this function. however, 570 * I am not sure if this file is the best place for this function. however,
575 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
576 */ 572 */
577void 573void
578AddMeCmd (char *buf, int len, client * ns) 574AddMeCmd (char *buf, int len, client *ns)
579{ 575{
580 Settings oldsettings; 576 // face caching is mandatory
577 if (!ns->facecache)
578 {
579 ns->send_drawinfo (
580 "\n"
581 "\n"
582 "***\n"
583 "*** WARNING:\n"
584 "*** Your client does not support face/image caching,\n"
585 "*** or it has been disabled. Face caching is mandatory\n"
586 "*** so please enable it or use a newer client.\n"
587 "***\n"
588 "*** Look at your client preferences:\n"
589 "***\n"
590 "*** CFPlus: all known versions automatically enable the facecache.\n"
591 "*** cfclient: use the -cache commandline option.\n"
592 "*** cfclient: map will not redraw automatically (bug).\n"
593 "*** gcfclient: use -cache commandline option, or enable\n"
594 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596 "***\n"
597 "***\n",
598 NDI_RED
599 );
581 600
582 oldsettings = settings; 601 if (strstr (ns->version, "jcrossclient"))
583 if (ns->status != Ns_Add || add_player (ns)) 602 /* let them, for now*/;
584 ns->send_packet ("addme_failed");
585 else 603 else
586 ns->send_packet ("addme_success"); 604 {
605 ns->flush ();
606 //ns->destroy ();
607 }
608 //ns->facecache = true;
609 }
587 610
588 settings = oldsettings; 611 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
589} 612}
590 613
591/** Reply to ExtendedInfos command */ 614/** Reply to ExtendedInfos command */
592void 615void
593ToggleExtendedInfos (char *buf, int len, client * ns) 616ToggleExtendedInfos (char *buf, int len, client * ns)
… …
703 726
704 ns->send_packet (cmdback); 727 ns->send_packet (cmdback);
705} 728}
706 729
707/** 730/**
708 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 731 * client requested an image. send it rate-limited
709 * Basically, it makes no sense to wait for the client to request a 732 * before flushing.
710 * a piece of data from us that we know the client wants. So
711 * if we know the client wants it, might as well push it to the
712 * client.
713 */
714static void
715SendSmooth (client * ns, uint16 face)
716{
717 uint16 smoothface;
718
719 /* If we can't find a face, return and set it so we won't try to send this
720 * again.
721 */ 733 */
722 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 734void
723 { 735AskFaceCmd (char *buf, int len, client *ns)
724 736{
725 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 737 ns->askface.push_back (atoi (buf));
726 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
727 return;
728 }
729
730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
731 esrv_send_face (ns, smoothface, 0);
732
733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
734
735 packet sl;
736
737 sl << "smooth "
738 << uint16 (face)
739 << uint16 (smoothface);
740
741 ns->send_packet (sl);
742} 738}
743 739
744 /** 740/**
745 * Tells client the picture it has to use 741 * Tells client the picture it has to use
746 * to smooth a picture number given as argument. 742 * to smooth a picture number given as argument.
747 */ 743 */
748void 744void
749AskSmooth (char *buf, int len, client * ns) 745AskSmooth (char *buf, int len, client *ns)
750{ 746{
751 uint16 facenbr; 747 ns->send_face (atoi (buf));
752
753 facenbr = atoi (buf);
754 SendSmooth (ns, facenbr);
755} 748}
756 749
757/** 750/**
758 * This handles the general commands from the client (ie, north, fire, cast, 751 * This handles the general commands from the client (ie, north, fire, cast,
759 * etc.) 752 * etc.)
760 */ 753 */
761void 754void
762PlayerCmd (char *buf, int len, player *pl) 755PlayerCmd (char *buf, int len, player *pl)
763{ 756{
764
765 /* The following should never happen with a proper or honest client.
766 * Therefore, the error message doesn't have to be too clear - if
767 * someone is playing with a hacked/non working client, this gives them
768 * an idea of the problem, but they deserve what they get
769 */
770 if (pl->state != ST_PLAYING)
771 {
772 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
773 return;
774 }
775 /* Check if there is a count. In theory, a zero count could also be 757 /* Check if there is a count. In theory, a zero count could also be
776 * sent, so check for that also. 758 * sent, so check for that also.
777 */ 759 */
778 if (atoi (buf) || buf[0] == '0') 760 if (atoi (buf) || buf[0] == '0')
779 { 761 {
780 pl->count = atoi ((char *) buf); 762 pl->count = atoi ((char *) buf);
763
781 buf = strchr (buf, ' '); /* advance beyond the numbers */ 764 buf = strchr (buf, ' '); /* advance beyond the numbers */
782 if (!buf) 765 if (!buf)
783 {
784#ifdef ESRV_DEBUG
785 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
786#endif
787 return; 766 return;
788 } 767
789 buf++; 768 buf++;
790 } 769 }
791 /* This should not happen anymore. */ 770
792 if (pl->ob->speed_left < -1.0)
793 {
794 LOG (llevError, "Player has negative time - shouldn't do command.\n");
795 }
796 /* In c_new.c */
797 execute_newserver_command (pl->ob, (char *) buf); 771 execute_newserver_command (pl->ob, (char *) buf);
798 /* Perhaps something better should be done with a left over count.
799 * Cleaning up the input should probably be done first - all actions
800 * for the command that issued the count should be done before any other
801 * commands.
802 */
803 772
804 pl->count = 0;
805
806}
807
808
809/**
810 * This handles the general commands from the client (ie, north, fire, cast,
811 * etc.). It is a lot like PlayerCmd above, but is called with the
812 * 'ncom' method which gives more information back to the client so it
813 * can throttle.
814 */
815void
816NewPlayerCmd (char *buf, int len, player *pl)
817{
818 int time, repeat;
819 char command[MAX_BUF];
820 int pktlen;
821
822 if (len < 7)
823 {
824 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
825 return;
826 }
827
828 pktlen = net_uint16 ((uint8 *)buf);
829 repeat = net_uint32 ((uint8 *)buf + 2);
830
831 /* -1 is special - no repeat, but don't update */
832 if (repeat != -1)
833 pl->count = repeat;
834
835 if ((len - 4) >= MAX_BUF)
836 len = MAX_BUF - 5;
837
838 strncpy ((char *) command, (char *) buf + 6, len - 4);
839 command[len - 4] = 0;
840
841 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0)
843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
844
845 /* In c_new.c */
846 execute_newserver_command (pl->ob, (char *) command);
847 /* Perhaps something better should be done with a left over count. 773 /* Perhaps something better should be done with a left over count.
848 * Cleaning up the input should probably be done first - all actions 774 * Cleaning up the input should probably be done first - all actions
849 * for the command that issued the count should be done before any other 775 * for the command that issued the count should be done before any other
850 * commands. 776 * commands.
851 */ 777 */
852 pl->count = 0; 778 pl->count = 0;
779}
853 780
854 if (FABS (pl->ob->speed) < 0.001) 781
782/**
783 * This handles the general commands from the client (ie, north, fire, cast,
784 * etc.). It is a lot like PlayerCmd above, but is called with the
785 * 'ncom' method which gives more information back to the client so it
786 * can throttle.
787 */
788void
789NewPlayerCmd (char *buf, int len, player *pl)
790{
791 if (len <= 6)
792 {
793 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
794 return;
795 }
796
797 uint16 cmdid = net_uint16 ((uint8 *)buf);
798 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
799
800 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1)
802 pl->count = repeat;
803
804 buf += 6; //len -= 6;
805
806 execute_newserver_command (pl->ob, buf);
807
808 /* Perhaps something better should be done with a left over count.
809 * Cleaning up the input should probably be done first - all actions
810 * for the command that issued the count should be done before any other
811 * commands.
812 */
813 pl->count = 0;
814
815 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
816 int time = fabs (pl->ob->speed) < 0.001
855 time = MAX_TIME * 100; 817 ? time = MAX_TIME * 100
856 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 818 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
858 819
859 /* Send confirmation of command execution now */ 820 /* Send confirmation of command execution now */
860 821 packet sl ("comc");
861 packet sl;
862 sl << "comc " << uint16 (pktlen) << uint32 (time); 822 sl << uint16 (cmdid) << uint32 (time);
863 pl->socket->send_packet (sl); 823 pl->ns->send_packet (sl);
864} 824}
865
866 825
867/** This is a reply to a previous query. */ 826/** This is a reply to a previous query. */
868void 827void
869ReplyCmd (char *buf, int len, player *pl) 828ReplyCmd (char *buf, int len, client *ns)
870{ 829{
830 if (ns->state == ST_CUSTOM)
831 {
832 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
833 return;
834 }
835
836 if (!ns->pl)
837 return; //TODO: depends on the exact reply we are after
838 //TODO: but right now, we always have a ns->pl
839
840 player *pl = ns->pl;
841
871 /* This is to synthesize how the data would be stored if it 842 /* This is to synthesize how the data would be stored if it
872 * was normally entered. A bit of a hack, and should be cleaned up 843 * was normally entered. A bit of a hack, and should be cleaned up
873 * once all the X11 code is removed from the server. 844 * once all the X11 code is removed from the server.
874 * 845 *
875 * We pass 13 to many of the functions because this way they 846 * We pass 13 to many of the functions because this way they
876 * think it was the carriage return that was entered, and the 847 * think it was the carriage return that was entered, and the
877 * function then does not try to do additional input. 848 * function then does not try to do additional input.
878 */ 849 */
879 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 850 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
880 851
881 /* this avoids any hacking here */ 852 /* this avoids any hacking here */
882 853
883 switch (pl->state) 854 switch (ns->state)
884 { 855 {
885 case ST_PLAYING: 856 case ST_PLAYING:
886 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 857 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
887 break; 858 break;
888 859
889 case ST_PLAY_AGAIN:
890 /* We can check this for return value (2==quit). Maybe we
891 * should, and do something appropriate?
892 */
893 receive_play_again (pl->ob, buf[0]);
894 break;
895
896 case ST_ROLL_STAT:
897 key_roll_stat (pl->ob, buf[0]);
898 break;
899
900 case ST_CHANGE_CLASS: 860 case ST_CHANGE_CLASS:
901
902 key_change_class (pl->ob, buf[0]); 861 key_change_class (pl->ob, buf[0]);
903 break; 862 break;
904 863
905 case ST_CONFIRM_QUIT:
906 key_confirm_quit (pl->ob, buf[0]);
907 break;
908
909 case ST_CONFIGURE:
910 LOG (llevError, "In client input handling, but into configure state\n");
911 pl->state = ST_PLAYING;
912 break;
913
914 case ST_GET_NAME:
915 receive_player_name (pl->ob, 13);
916 break;
917
918 case ST_GET_PASSWORD:
919 case ST_CONFIRM_PASSWORD:
920 receive_player_password (pl->ob, 13);
921 break;
922
923 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 864 case ST_GET_PARTY_PASSWORD: /* Get password for party */
924 receive_party_password (pl->ob, 13); 865 receive_party_password (pl->ob, 13);
925 break; 866 break;
926 867
927 default: 868 default:
928 LOG (llevError, "Unknown input state: %d\n", pl->state); 869 LOG (llevError, "Unknown input state: %d\n", ns->state);
929 } 870 }
930} 871}
931 872
932/** 873/**
933 * Client tells its version. If there is a mismatch, we close the 874 * Client tells its version. If there is a mismatch, we close the
… …
937 * problem. 878 * problem.
938 */ 879 */
939void 880void
940VersionCmd (char *buf, int len, client * ns) 881VersionCmd (char *buf, int len, client * ns)
941{ 882{
942 char *cp;
943 char version_warning[256];
944
945 if (!buf) 883 if (!buf)
946 { 884 {
947 LOG (llevError, "CS: received corrupted version command\n"); 885 LOG (llevError, "CS: received corrupted version command\n");
948 return; 886 return;
949 } 887 }
950 888
951 ns->cs_version = atoi (buf); 889 ns->cs_version = atoi (buf);
952 ns->sc_version = ns->cs_version; 890 ns->sc_version = ns->cs_version;
891
892 LOG (llevDebug, "connection from client <%s>\n", buf);
893
894 //TODO: should log here just for statistics
895
953 if (VERSION_CS != ns->cs_version) 896 //if (VERSION_CS != ns->cs_version)
954 { 897 // unchecked;
955#ifdef ESRV_DEBUG 898
956 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
957#endif
958 }
959 cp = strchr (buf + 1, ' '); 899 char *cp = strchr (buf + 1, ' ');
960 if (!cp) 900 if (!cp)
961 return; 901 return;
902
962 ns->sc_version = atoi (cp); 903 ns->sc_version = atoi (cp);
904
963 if (VERSION_SC != ns->sc_version) 905 //if (VERSION_SC != ns->sc_version)
964 { 906 // unchecked;
965#ifdef ESRV_DEBUG 907
966 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
967#endif
968 }
969 cp = strchr (cp + 1, ' '); 908 cp = strchr (cp + 1, ' ');
909
970 if (cp) 910 if (cp)
971 { 911 {
972 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
973
974 assign (ns->version, cp + 1); 912 assign (ns->version, cp + 1);
975 913
976 if (ns->sc_version < 1026) 914 if (ns->sc_version < 1026)
977 { 915 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 916 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
980 ns->send_packet (version_warning);
981 }
982
983 } 917 }
984} 918}
985 919
986/** sound related functions. */ 920/** sound related functions. */
987void 921void
… …
989{ 923{
990 ns->sound = atoi (buf); 924 ns->sound = atoi (buf);
991} 925}
992 926
993/** client wants the map resent */ 927/** client wants the map resent */
994
995void 928void
996MapRedrawCmd (char *buf, int len, player *pl) 929MapRedrawCmd (char *buf, int len, player *pl)
997{ 930{
998
999/* This function is currently disabled; just clearing the map state results in 931/* This function is currently disabled; just clearing the map state results in
1000 * display errors. It should clear the cache and send a newmap command. 932 * display errors. It should clear the cache and send a newmap command.
1001 * Unfortunately this solution does not work because some client versions send 933 * Unfortunately this solution does not work because some client versions send
1002 * a mapredraw command after receiving a newmap command. 934 * a mapredraw command after receiving a newmap command.
1003 */ 935 */
1004#if 0
1005 /* Okay, this is MAJOR UGLY. but the only way I know how to
1006 * clear the "cache"
1007 */
1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009 draw_client_map (pl->ob);
1010#endif
1011} 936}
1012 937
1013/** 938/**
1014 * Moves an object (typically, container to inventory). 939 * Moves an object (typically, container to inventory).
1015 * syntax is: move (to) (tag) (nrof) 940 * syntax is: move (to) (tag) (nrof)
… …
1018MoveCmd (char *buf, int len, player *pl) 943MoveCmd (char *buf, int len, player *pl)
1019{ 944{
1020 int vals[3], i; 945 int vals[3], i;
1021 946
1022 /* A little funky here. We only cycle for 2 records, because 947 /* A little funky here. We only cycle for 2 records, because
1023 * we obviously am not going to find a space after the third 948 * we obviously are not going to find a space after the third
1024 * record. Perhaps we should just replace this with a 949 * record. Perhaps we should just replace this with a
1025 * sscanf? 950 * sscanf?
1026 */ 951 */
1027 for (i = 0; i < 2; i++) 952 for (i = 0; i < 2; i++)
1028 { 953 {
1029 vals[i] = atoi (buf); 954 vals[i] = atoi (buf);
955
1030 if (!(buf = strchr (buf, ' '))) 956 if (!(buf = strchr (buf, ' ')))
1031 { 957 {
1032 LOG (llevError, "Incomplete move command: %s\n", buf); 958 LOG (llevError, "Incomplete move command: %s\n", buf);
1033 return; 959 return;
1034 } 960 }
961
1035 buf++; 962 buf++;
1036 } 963 }
964
1037 vals[2] = atoi (buf); 965 vals[2] = atoi (buf);
1038 966
1039/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 967/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1040 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 968 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1041} 969}
1042
1043
1044 970
1045/****************************************************************************** 971/******************************************************************************
1046 * 972 *
1047 * Start of commands the server sends to the client. 973 * Start of commands the server sends to the client.
1048 * 974 *
… …
1051/** 977/**
1052 * Asks the client to query the user. This way, the client knows 978 * Asks the client to query the user. This way, the client knows
1053 * it needs to send something back (vs just printing out a message) 979 * it needs to send something back (vs just printing out a message)
1054 */ 980 */
1055void 981void
1056send_query (client * ns, uint8 flags, char *text) 982send_query (client *ns, uint8 flags, char *text)
1057{ 983{
1058 char buf[MAX_BUF];
1059
1060 sprintf (buf, "query %d %s", flags, text ? text : ""); 984 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1061 ns->send_packet (buf);
1062} 985}
1063 986
1064#define AddIfInt64(Old,New,Type) if (Old != New) {\ 987#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065 Old = New; \ 988 Old = New; \
1066 sl << uint8 (Type) << uint64 (New); \ 989 sl << uint8 (Type) << uint64 (New); \
… …
1096esrv_update_stats (player *pl) 1019esrv_update_stats (player *pl)
1097{ 1020{
1098 char buf[MAX_BUF]; 1021 char buf[MAX_BUF];
1099 uint16 flags; 1022 uint16 flags;
1100 1023
1101 packet sl; 1024 client *ns = pl->ns;
1102 sl << "stats "; 1025 if (!ns)
1026 return;
1103 1027
1104 if (pl->ob != NULL) 1028 object *ob = pl->ob;
1105 { 1029 if (!ob)
1030 return;
1031
1032 packet sl ("stats");
1033
1106 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1034 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1107 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1035 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1108 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1036 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1109 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1037 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1110 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1038 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1111 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1039 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1112 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1040 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1113 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1114 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1115 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1116 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1041 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1117 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1042 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1043 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1044 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1045 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1118 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1046 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1119 }
1120 1047
1121 if (pl->socket->exp64)
1122 {
1123 uint8 s;
1124
1125 for (s = 0; s < NUM_SKILLS; s++) 1048 for (int s = 0; s < NUM_SKILLS; s++)
1126 { 1049 if (object *skill = pl->last_skill_ob[s])
1127 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1050 if (skill->stats.exp != ns->last_skill_exp [s])
1128 { 1051 {
1052 ns->last_skill_exp [s] = skill->stats.exp;
1053
1129 /* Always send along the level if exp changes. This is only 1054 /* Always send along the level if exp changes. This is only
1130 * 1 extra byte, but keeps processing simpler. 1055 * 1 extra byte, but keeps processing simpler.
1131 */ 1056 */
1132 sl << uint8 (s + CS_STAT_SKILLINFO) 1057 sl << uint8 (s + CS_STAT_SKILLINFO)
1133 << uint8 (pl->last_skill_ob[s]->level) 1058 << uint8 (skill->level)
1134 << uint64 (pl->last_skill_ob[s]->stats.exp); 1059 << uint64 (skill->stats.exp);
1135
1136 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1137 } 1060 }
1138 }
1139 }
1140 1061
1141 if (pl->socket->exp64)
1142 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1062 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1143 else
1144 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1145
1146 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1063 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1147 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1064 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1148 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1065 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1149 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1066 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1150 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1067 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1151 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1068 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1152 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1069 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1153 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1070 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1071
1154 flags = 0; 1072 flags = 0;
1155 1073
1156 if (pl->fire_on) 1074 if (pl->fire_on)
1157 flags |= SF_FIREON; 1075 flags |= SF_FIREON;
1158 1076
1159 if (pl->run_on) 1077 if (pl->run_on)
1160 flags |= SF_RUNON; 1078 flags |= SF_RUNON;
1161 1079
1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1080 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1163 1081
1164 if (pl->socket->sc_version < 1025) 1082 if (ns->sc_version < 1025)
1165 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1083 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1166 else 1084 else
1167 {
1168 int i;
1169
1170 for (i = 0; i < NROFATTACKS; i++) 1085 for (int i = 0; i < NROFATTACKS; i++)
1171 { 1086 {
1172 /* Skip ones we won't send */ 1087 /* Skip ones we won't send */
1173 if (atnr_cs_stat[i] == -1) 1088 if (atnr_cs_stat[i] == -1)
1174 continue; 1089 continue;
1175 1090
1176 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1091 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1177 } 1092 }
1178 }
1179 1093
1180 if (pl->socket->monitor_spells) 1094 if (pl->ns->monitor_spells)
1181 { 1095 {
1182 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1096 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1183 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1097 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1184 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1098 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1185 } 1099 }
1186 1100
1187 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1101 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1188 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1102 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1189 set_title (pl->ob, buf); 1103 set_title (ob, buf);
1190 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1104 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1191 1105
1192 /* Only send it away if we have some actual data */ 1106 /* Only send it away if we have some actual data */
1193 if (sl.length () > 6) 1107 if (sl.length () > 6)
1194 pl->socket->send_packet (sl); 1108 ns->send_packet (sl);
1195} 1109}
1196 1110
1197/** 1111/**
1198 * Tells the client that here is a player it should start using. 1112 * Tells the client that here is a player it should start using.
1199 */ 1113 */
1200void 1114void
1201esrv_new_player (player *pl, uint32 weight) 1115esrv_new_player (player *pl, uint32 weight)
1202{ 1116{
1203 pl->last_weight = weight; 1117 packet sl ("player");
1204
1205 packet sl;
1206 sl << "player ";
1207 1118
1208 sl << uint32 (pl->ob->count) 1119 sl << uint32 (pl->ob->count)
1209 << uint32 (weight) 1120 << uint32 (weight)
1210 << uint32 (pl->ob->face->number) 1121 << uint32 (pl->ob->face)
1211 << data8 (pl->ob->name); 1122 << data8 (pl->ob->name);
1212 1123
1124 pl->ns->last_weight = weight;
1213 pl->socket->send_packet (sl); 1125 pl->ns->send_packet (sl);
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1126 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 1127}
1216
1217/**
1218 * Need to send an animation sequence to the client.
1219 * We will send appropriate face commands to the client if we haven't
1220 * sent them the face yet (this can become quite costly in terms of
1221 * how much we are sending - on the other hand, this should only happen
1222 * when the player logs in and picks stuff up.
1223 */
1224void
1225esrv_send_animation (client * ns, short anim_num)
1226{
1227 int i;
1228
1229 /* Do some checking on the anim_num we got. Note that the animations
1230 * are added in contigous order, so if the number is in the valid
1231 * range, it must be a valid animation.
1232 */
1233 if (anim_num < 0 || anim_num > num_animations)
1234 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return;
1237 }
1238
1239 packet sl;
1240
1241 sl << "anim "
1242 << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */
1244
1245 /* Build up the list of faces. Also, send any information (ie, the
1246 * the face itself) down to the client.
1247 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++)
1249 {
1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 }
1254
1255 ns->send_packet (sl);
1256
1257 ns->anims_sent[anim_num] = 1;
1258}
1259
1260 1128
1261/****************************************************************************** 1129/******************************************************************************
1262 * 1130 *
1263 * Start of map related commands. 1131 * Start of map related commands.
1264 * 1132 *
1265 ******************************************************************************/ 1133 ******************************************************************************/
1266 1134
1267/**
1268 * This adds face_num to a map cell at x,y. If the client doesn't have
1269 * the face yet, we will also send it.
1270 */
1271static void
1272esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1273{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 {
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return;
1278 abort ();
1279 }
1280
1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1282 newmap->cells[x][y].count++;
1283
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0);
1286}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393}
1394
1395/** Clears a map cell */ 1135/** Clears a map cell */
1396static void 1136static void
1397map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1137map_clearcell (struct MapCell *cell, int count)
1398{ 1138{
1399 cell->faces[0] = face0; 1139 cell->faces[0] = 0;
1400 cell->faces[1] = face1; 1140 cell->faces[1] = 0;
1401 cell->faces[2] = face2; 1141 cell->faces[2] = 0;
1142 cell->smooth[0] = 0;
1143 cell->smooth[1] = 0;
1144 cell->smooth[2] = 0;
1402 cell->count = count; 1145 cell->count = count;
1403 cell->stat_hp = 0; 1146 cell->stat_hp = 0;
1404 cell->flags = 0; 1147 cell->flags = 0;
1405 cell->player = 0; 1148 cell->player = 0;
1406} 1149}
1407 1150
1408#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1409#define MAX_LAYERS 3 1151#define MAX_LAYERS 3
1410
1411/* Using a global really isn't a good approach, but saves the over head of
1412 * allocating and deallocating such a block of data each time run through,
1413 * and saves the space of allocating this in the socket object when we only
1414 * need it for this cycle. If the serve is ever threaded, this needs to be
1415 * re-examined.
1416 */
1417
1418static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1419
1420/**
1421 * Returns true if any of the heads for this
1422 * space is set. Returns false if all are blank - this is used
1423 * for empty space checking.
1424 */
1425static inline int
1426have_head (int ax, int ay)
1427{
1428
1429 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1430 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1431 return 1;
1432 return 0;
1433}
1434
1435/**
1436 * check_head is a bit simplistic version of update_space below.
1437 * basically, it only checks the that the head on space ax,ay at layer
1438 * needs to get sent - if so, it adds the data, sending the head
1439 * if needed, and returning 1. If this no data needs to get
1440 * sent, it returns zero.
1441 */
1442static int
1443check_head (packet &sl, client &ns, int ax, int ay, int layer)
1444{
1445 short face_num;
1446
1447 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1448 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1449 else
1450 face_num = 0;
1451
1452 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1453 {
1454 sl << uint16 (face_num);
1455 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1456 esrv_send_face (&ns, face_num, 0);
1457
1458 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1459 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1460 return 1;
1461 }
1462
1463 return 0; /* No change */
1464}
1465 1152
1466/** 1153/**
1467 * Removes the need to replicate the same code for each layer. 1154 * Removes the need to replicate the same code for each layer.
1468 * this returns true if this space is now in fact different than 1155 * this returns true if this space is now in fact different than
1469 * it was. 1156 * it was.
1470 * sl is the socklist this data is going into. 1157 * sl is the socklist this data is going into.
1471 * ns is the socket we are working on - all the info we care 1158 * ns is the socket we are working on - all the info we care
1472 * about is in this socket structure, so now need not pass the 1159 * about is in this socket structure, so now need not pass the
1473 * entire player object. 1160 * entire player object.
1474 * mx and my are map coordinate offsets for map mp
1475 * sx and sy are the offsets into the socket structure that
1476 * holds the old values.
1477 * layer is the layer to update, with 2 being the floor and 0 the 1161 * layer is the layer to update, with 2 being the floor and 0 the
1478 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1162 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1479 * take. Interesting to note that before this function, the map1 function 1163 * take. Interesting to note that before this function, the map1 function
1480 * numbers the spaces differently - I think this was a leftover from 1164 * numbers the spaces differently - I think this was a leftover from
1481 * the map command, where the faces stack up. Sinces that is no longer 1165 * the map command, where the faces stack up. Sinces that is no longer
1482 * the case, it seems to make more sense to have these layer values 1166 * the case, it seems to make more sense to have these layer values
1483 * actually match. 1167 * actually match.
1484 */ 1168 */
1485
1486static int 1169static int
1487update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1170update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1488{ 1171{
1489 object *ob, *head; 1172 object *ob = ms.faces_obj [layer];
1490 uint16 face_num;
1491 int bx, by, i;
1492
1493 /* If there is a multipart object stored away, treat that as more important.
1494 * If not, then do the normal processing.
1495 */
1496 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1497
1498 /* Check to see if this head is part of the set of objects
1499 * we would normally send for this space. If so, then
1500 * don't use the head value. We need to do the check
1501 * here and not when setting up the heads[] value for two reasons -
1502 * 1) the heads[] values will get used even if the space is not visible.
1503 * 2) its possible the head is not on the same map as a part, and I'd
1504 * rather not need to do the map translation overhead.
1505 * 3) We need to do some extra checking to make sure that we will
1506 * otherwise send the image as this layer, eg, either it matches
1507 * the head value, or is not multipart.
1508 */
1509 if (head && !head->more)
1510 {
1511 for (i = 0; i < MAP_LAYERS; i++)
1512 {
1513 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1514 if (!ob)
1515 continue;
1516
1517 if (ob->head)
1518 ob = ob->head;
1519
1520 if (ob == head)
1521 {
1522 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1523 head = NULL;
1524 break;
1525 }
1526 }
1527 }
1528
1529 ob = head;
1530 if (!ob)
1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1532 1173
1533 /* If there is no object for this space, or if the face for the object 1174 /* If there is no object for this space, or if the face for the object
1534 * is the blank face, set the face number to zero. 1175 * is the blank face, set the face number to zero.
1535 * else if we have the stored head object for this space, that takes 1176 * else if we have the stored head object for this space, that takes
1536 * precedence over the other object for this space. 1177 * precedence over the other object for this space.
1537 * otherwise, we do special head processing 1178 * otherwise, we do special head processing
1538 */ 1179 */
1539 if (!ob || ob->face == blank_face) 1180 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1540 face_num = 0;
1541 else if (head)
1542 {
1543 /* if this is a head that had previously been stored */
1544 face_num = ob->face->number;
1545 }
1546 else
1547 {
1548 /* if the faces for the different parts of a multipart object
1549 * are the same, we only want to send the bottom right most
1550 * portion of the object. That info is in the tail_.. values
1551 * of the head. Note that for the head itself, ob->head will
1552 * be null, so we only do this block if we are working on
1553 * a tail piece.
1554 */
1555
1556 /* tail_x and tail_y will only be set in the head object. If
1557 * this is the head object and these are set, we proceed
1558 * with logic to only send bottom right. Similarly, if
1559 * this is one of the more parts but the head has those values
1560 * set, we want to do the processing. There can be cases where
1561 * the head is not visible but one of its parts is, so we just
1562 * can always expect that ob->arch->tail_x will be true for all
1563 * object we may want to display.
1564 */
1565 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1566 {
1567
1568 if (ob->head)
1569 head = ob->head;
1570 else
1571 head = ob;
1572
1573 /* Basically figure out where the offset is from where we are right
1574 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1575 * piece is from the head, and the tail is where the tail is from the
1576 * head. Note that bx and by will equal sx and sy if we are already working
1577 * on the bottom right corner. If ob is the head, the clone values
1578 * will be zero, so the right thing will still happen.
1579 */
1580 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1581 by = sy + head->arch->tail_y - ob->arch->clone.y;
1582
1583 /* I don't think this can ever happen, but better to check for it just
1584 * in case.
1585 */
1586 if (bx < sx || by < sy)
1587 {
1588 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1589 face_num = 0;
1590 }
1591 /* single part object, multipart object with non merged faces,
1592 * of multipart object already at lower right.
1593 */
1594 else if (bx == sx && by == sy)
1595 {
1596 face_num = ob->face->number;
1597
1598 /* if this face matches one stored away, clear that one away.
1599 * this code relies on the fact that the map1 commands
1600 * goes from 2 down to 0.
1601 */
1602 for (i = 0; i < MAP_LAYERS; i++)
1603 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1604 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1605 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1606 }
1607 else
1608 {
1609 /* If this head is stored away, clear it - otherwise,
1610 * there can be cases where a object is on multiple layers -
1611 * we only want to send it once.
1612 */
1613 face_num = head->face->number;
1614 for (i = 0; i < MAP_LAYERS; i++)
1615 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1616 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1617 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1618
1619 /* First, try to put the new head on the same layer. If that is used up,
1620 * then find another layer.
1621 */
1622 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1623 {
1624 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1625 }
1626 else
1627 for (i = 0; i < MAX_LAYERS; i++)
1628 {
1629 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1630 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1631 {
1632 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1633 }
1634 }
1635 face_num = 0; /* Don't send this object - we'll send the head later */
1636 }
1637 }
1638 else
1639 {
1640 /* In this case, we are already at the lower right or single part object,
1641 * so nothing special
1642 */
1643 face_num = ob->face->number;
1644
1645 /* clear out any head entries that have the same face as this one */
1646 for (bx = 0; bx < layer; bx++)
1647 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1648 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1649 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1650 }
1651 } /* else not already head object or blank face */
1652
1653 /* This is a real hack. Basically, if we have nothing to send for this layer,
1654 * but there is a head on the next layer, send that instead.
1655 * Without this, what happens is you can get the case where the player stands
1656 * on the same space as the head. However, if you have overlapping big objects
1657 * of the same type, what happens then is it doesn't think it needs to send
1658 * This tends to make stacking also work/look better.
1659 */
1660 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1661 {
1662 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1663 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1664 }
1665
1666 /* Another hack - because of heads and whatnot, this face may match one
1667 * we already sent for a lower layer. In that case, don't send
1668 * this one.
1669 */
1670 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1671 face_num = 0;
1672 1181
1673 /* We've gotten what face we want to use for the object. Now see if 1182 /* We've gotten what face we want to use for the object. Now see if
1674 * if it has changed since we last sent it to the client. 1183 * if it has changed since we last sent it to the client.
1675 */ 1184 */
1676 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1185 if (lastcell.faces[layer] != face_num)
1677 { 1186 {
1678 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1187 lastcell.faces[layer] = face_num;
1188
1679 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!ns.faces_sent[face_num])
1190 if (ob)
1191 ns.send_faces (ob);
1192 else
1680 esrv_send_face (&ns, face_num, 0); 1193 ns.send_face (face_num);
1681 1194
1682 sl << uint16 (face_num); 1195 sl << uint16 (face_num);
1683 return 1;
1684 }
1685
1686 /* Nothing changed */
1687 return 0;
1688}
1689
1690/**
1691 * This function is mainly a copy of update_space,
1692 * except it handles update of the smoothing updates,
1693 * not the face updates.
1694 * Removes the need to replicate the same code for each layer.
1695 * this returns true if this smooth is now in fact different
1696 * than it was.
1697 * sl is the socklist this data is going into.
1698 * ns is the socket we are working on - all the info we care
1699 * about is in this socket structure, so know need to pass the
1700 * entire player object.
1701 * mx and my are map coordinate offsets for map mp
1702 * sx and sy are the offsets into the socket structure that
1703 * holds the old values.
1704 * layer is the layer to update, with 2 being the floor and 0 the
1705 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1706 * take.
1707 */
1708
1709static inline int
1710update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1711{
1712 object *ob;
1713 int smoothlevel; /* old face_num; */
1714
1715 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1716
1717 /* If there is no object for this space, or if the face for the object
1718 * is the blank face, set the smoothlevel to zero.
1719 */
1720 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1721 smoothlevel = 0;
1722 else
1723 {
1724 smoothlevel = ob->smoothlevel;
1725 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1726 SendSmooth (&ns, ob->face->number);
1727 } /* else not already head object or blank face */
1728
1729 /* We've gotten what face we want to use for the object. Now see if
1730 * if it has changed since we last sent it to the client.
1731 */
1732 if (smoothlevel > 255)
1733 smoothlevel = 255;
1734 else if (smoothlevel < 0)
1735 smoothlevel = 0;
1736
1737 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1738 {
1739 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1740 sl << uint8 (smoothlevel);
1741 return 1; 1196 return 1;
1742 } 1197 }
1743 1198
1744 /* Nothing changed */ 1199 /* Nothing changed */
1745 return 0; 1200 return 0;
… …
1758 if (ns->ext_mapinfos) 1213 if (ns->ext_mapinfos)
1759 { 1214 {
1760 if (ns->EMI_smooth) 1215 if (ns->EMI_smooth)
1761 result += 1; /*One byte for smoothlevel */ 1216 result += 1; /*One byte for smoothlevel */
1762 } 1217 }
1218
1763 return result; 1219 return result;
1220}
1221
1222// prefetch (and touch) all maps within a specific distancd
1223static void
1224prefetch_surrounding_maps (maptile *map, int distance)
1225{
1226 map->last_access = runtime;
1227
1228 if (--distance)
1229 for (int dir = 4; --dir; )
1230 if (const shstr &path = map->tile_path [dir])
1231 if (maptile *&neigh = map->tile_map [dir])
1232 prefetch_surrounding_maps (neigh, distance);
1233 else
1234 neigh = maptile::find_async (path, map);
1235}
1236
1237// prefetch a generous area around the player
1238static void
1239prefetch_surrounding_maps (object *op)
1240{
1241 prefetch_surrounding_maps (op->map, 3);
1764} 1242}
1765 1243
1766/** 1244/**
1767 * This function uses the new map1 protocol command to send the map 1245 * This function uses the new map1 protocol command to send the map
1768 * to the client. It is necessary because the old map command supports 1246 * to the client. It is necessary because the old map command supports
… …
1774 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1252 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1775 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1253 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1776 * and use the other 4 bits for other informatiion. For full documentation 1254 * and use the other 4 bits for other informatiion. For full documentation
1777 * of what we send, see the doc/Protocol file. 1255 * of what we send, see the doc/Protocol file.
1778 * I will describe internally what we do: 1256 * I will describe internally what we do:
1779 * the socket->lastmap shows how the map last looked when sent to the client. 1257 * the ns->lastmap shows how the map last looked when sent to the client.
1780 * in the lastmap structure, there is a cells array, which is set to the 1258 * in the lastmap structure, there is a cells array, which is set to the
1781 * maximum viewable size (As set in config.h). 1259 * maximum viewable size (As set in config.h).
1782 * in the cells, there are faces and a count value. 1260 * in the cells, there are faces and a count value.
1783 * we use the count value to hold the darkness value. If -1, then this space 1261 * we use the count value to hold the darkness value. If -1, then this space
1784 * is not viewable. 1262 * is not viewable.
… …
1786 * look like. 1264 * look like.
1787 */ 1265 */
1788void 1266void
1789draw_client_map1 (object *pl) 1267draw_client_map1 (object *pl)
1790{ 1268{
1791 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1269 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1792 sint16 nx, ny; 1270 sint16 nx, ny;
1793 int estartlen, eoldlen; 1271 int estartlen, eoldlen;
1794 uint16 mask, emask;
1795 uint8 eentrysize; 1272 uint8 eentrysize;
1796 uint16 ewhatstart, ewhatflag; 1273 uint16 ewhatstart, ewhatflag;
1797 uint8 extendedinfos; 1274 uint8 extendedinfos;
1798 maptile *m; 1275 maptile *m;
1799 1276
1800 client &socket = *pl->contr->socket; 1277 client &socket = *pl->contr->ns;
1278
1279 if (!pl->active)
1280 return;
1801 1281
1802 check_map_change (pl->contr); 1282 check_map_change (pl->contr);
1283 prefetch_surrounding_maps (pl);
1803 1284
1804 packet sl; 1285 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1805 packet esl; 1286 packet esl;
1806 1287
1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1808 startlen = sl.length (); 1288 startlen = sl.length ();
1809 1289
1810 /*Extendedmapinfo structure initialisation */ 1290 /*Extendedmapinfo structure initialisation */
1811 if (socket.ext_mapinfos) 1291 if (socket.ext_mapinfos)
1812 { 1292 {
… …
1823 << uint8 (extendedinfos) 1303 << uint8 (extendedinfos)
1824 << uint8 (eentrysize); 1304 << uint8 (eentrysize);
1825 1305
1826 estartlen = esl.length (); 1306 estartlen = esl.length ();
1827 } 1307 }
1828 else
1829 {
1830 /* suppress compiler warnings */
1831 ewhatstart = 0;
1832 ewhatflag = 0;
1833 estartlen = 0;
1834 }
1835
1836 /* Init data to zero */
1837 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1838 1308
1839 /* x,y are the real map locations. ax, ay are viewport relative 1309 /* x,y are the real map locations. ax, ay are viewport relative
1840 * locations. 1310 * locations.
1841 */ 1311 */
1842 ay = 0; 1312 ay = 0;
… …
1845 * but that started to get a bit messy to look at. 1315 * but that started to get a bit messy to look at.
1846 */ 1316 */
1847 max_x = pl->x + (socket.mapx + 1) / 2; 1317 max_x = pl->x + (socket.mapx + 1) / 2;
1848 max_y = pl->y + (socket.mapy + 1) / 2; 1318 max_y = pl->y + (socket.mapy + 1) / 2;
1849 1319
1850 if (socket.mapmode == Map1aCmd) 1320 maptile *plmap = pl->map;
1851 {
1852 max_x += MAX_HEAD_OFFSET;
1853 max_y += MAX_HEAD_OFFSET;
1854 }
1855 1321
1856 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1322 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1857 { 1323 {
1858 ax = 0; 1324 ax = 0;
1859 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1325 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1860 { 1326 {
1861 1327 int emask, mask;
1862 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1328 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1863 1329
1864 /* If this space is out of the normal viewable area, we only check
1865 * the heads value ax or ay will only be greater than what
1866 * the client wants if using the map1a command - this is because
1867 * if the map1a command is not used, max_x and max_y will be
1868 * set to lower values.
1869 */
1870 if (ax >= socket.mapx || ay >= socket.mapy)
1871 {
1872 int i, got_one;
1873
1874 oldlen = sl.length ();
1875
1876 sl << uint16 (mask);
1877
1878 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1879 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1880 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1881
1882 /* If all we are doing is sending 0 (blank) faces, we don't
1883 * actually need to send that - just the coordinates
1884 * with no faces tells the client to blank out the
1885 * space.
1886 */
1887 got_one = 0;
1888 for (i = oldlen + 2; i < sl.length (); i++)
1889 if (sl[i])
1890 got_one = 1;
1891
1892 if (got_one && (mask & 0xf))
1893 sl[oldlen + 1] = mask & 0xff;
1894 else
1895 { /*either all faces blank, either no face at all */
1896 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1897 sl.reset (oldlen + 2);
1898 else
1899 sl.reset (oldlen);
1900 }
1901
1902 /*What concerns extendinfos, nothing to be done for now
1903 * (perhaps effects layer later)
1904 */
1905 continue; /* don't do processing below */
1906 }
1907
1908 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1330 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1909
1910 d = pl->contr->blocked_los[ax][ay];
1911 1331
1912 /* If the coordinates are not valid, or it is too dark to see, 1332 /* If the coordinates are not valid, or it is too dark to see,
1913 * we tell the client as such 1333 * we tell the client as such
1914 */ 1334 */
1915 nx = x; 1335 nx = x;
1916 ny = y; 1336 ny = y;
1917 m = get_map_from_coord (pl->map, &nx, &ny); 1337 m = get_map_from_coord (plmap, &nx, &ny);
1918 1338
1919 if (!m) 1339 if (!m)
1920 { 1340 {
1921 /* space is out of map. Update space and clear values 1341 /* space is out of map. Update space and clear values
1922 * if this hasn't already been done. If the space is out 1342 * if this hasn't already been done. If the space is out
1923 * of the map, it shouldn't have a head 1343 * of the map, it shouldn't have a head
1924 */ 1344 */
1925 if (lastcell.count != -1) 1345 if (lastcell.count != -1)
1926 { 1346 {
1927 sl << uint16 (mask); 1347 sl << uint16 (mask);
1928 map_clearcell (&lastcell, 0, 0, 0, -1); 1348 map_clearcell (&lastcell, -1);
1929 } 1349 }
1350
1351 continue;
1930 } 1352 }
1353
1354 m->touch ();
1355
1356 int d = pl->contr->blocked_los[ax][ay];
1357
1931 else if (d > 3) 1358 if (d > 3)
1932 { 1359 {
1360
1933 int need_send = 0, count; 1361 int need_send = 0, count;
1934 1362
1935 /* This block deals with spaces that are not visible for whatever 1363 /* This block deals with spaces that are not visible for whatever
1936 * reason. Still may need to send the head for this space. 1364 * reason. Still may need to send the head for this space.
1937 */ 1365 */
1938 1366
1939 oldlen = sl.length (); 1367 oldlen = sl.length ();
1940 1368
1941 sl << uint16 (mask); 1369 sl << uint16 (mask);
… …
1943 if (lastcell.count != -1) 1371 if (lastcell.count != -1)
1944 need_send = 1; 1372 need_send = 1;
1945 1373
1946 count = -1; 1374 count = -1;
1947 1375
1948 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1949 {
1950 /* Now check to see if any heads need to be sent */
1951
1952 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1953 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1954 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1955
1956 lastcell.count = count;
1957 }
1958 else
1959 {
1960 /* properly clear a previously sent big face */ 1376 /* properly clear a previously sent big face */
1961 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1377 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1962 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1378 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1963 need_send = 1; 1379 need_send = 1;
1964 1380
1965 map_clearcell (&lastcell, 0, 0, 0, count); 1381 map_clearcell (&lastcell, count);
1966 }
1967 1382
1968 if ((mask & 0xf) || need_send) 1383 if ((mask & 0xf) || need_send)
1969 sl[oldlen + 1] = mask & 0xff; 1384 sl[oldlen + 1] = mask & 0xff;
1970 else 1385 else
1971 sl.reset (oldlen); 1386 sl.reset (oldlen);
1972 } 1387 }
1973 else 1388 else
1974 { 1389 {
1975 /* In this block, the space is visible or there are head objects 1390 /* In this block, the space is visible.
1976 * we need to send.
1977 */ 1391 */
1978 1392
1979 /* Rather than try to figure out what everything that we might 1393 /* Rather than try to figure out what everything that we might
1980 * need to send is, then form the packet after that, 1394 * need to send is, then form the packet after that,
1981 * we presume that we will in fact form a packet, and update 1395 * we presume that we will in fact form a packet, and update
… …
1984 * is done. 1398 * is done.
1985 * I think this is simpler than doing a bunch of checks to see 1399 * I think this is simpler than doing a bunch of checks to see
1986 * what if anything we need to send, setting the bits, then 1400 * what if anything we need to send, setting the bits, then
1987 * doing those checks again to add the real data. 1401 * doing those checks again to add the real data.
1988 */ 1402 */
1989 oldlen = sl.length (); 1403 oldlen = sl.length ();
1990 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1991 eoldlen = esl.length (); 1404 eoldlen = esl.length ();
1992 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1405
1993 sl << uint16 (mask); 1406 sl << uint16 (mask);
1994
1995 if (socket.ext_mapinfos)
1996 esl << uint16 (emask);
1997 1407
1998 unsigned char dummy; 1408 unsigned char dummy;
1999 unsigned char *last_ext = &dummy; 1409 unsigned char *last_ext = &dummy;
2000 1410
2001 /* Darkness changed */ 1411 /* Darkness changed */
… …
2013 sl << uint8 (255 - 64 * d); 1423 sl << uint8 (255 - 64 * d);
2014 } 1424 }
2015 1425
2016 lastcell.count = d; 1426 lastcell.count = d;
2017 1427
1428 mapspace &ms = m->at (nx, ny);
1429
2018 if (socket.extmap) 1430 if (socket.extmap)
2019 { 1431 {
2020 uint8 stat_hp = 0; 1432 uint8 stat_hp = 0;
2021 uint8 stat_width = 0; 1433 uint8 stat_width = 0;
2022 uint8 flags = 0; 1434 uint8 flags = 0;
2023 UUID player = 0; 1435 UUID player = 0;
2024 1436
2025 // send hp information, if applicable 1437 // send hp information, if applicable
2026 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1438 if (object *op = ms.faces_obj [0])
2027 { 1439 {
2028 if (op->head || op->invisible) 1440 if (op->head || op->invisible)
2029 ; // do not show 1441 ; // do not show
2030 else if (op->type == PLAYER 1442 else if (op->type == PLAYER
2031 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1443 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
2085 sl << uint8 (8) << uint8 (flags); 1497 sl << uint8 (8) << uint8 (flags);
2086 } 1498 }
2087 } 1499 }
2088 1500
2089 /* Floor face */ 1501 /* Floor face */
2090 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1502 if (update_space (sl, socket, ms, lastcell, 2))
2091 mask |= 0x4; 1503 mask |= 0x4;
2092 1504
2093 if (socket.EMI_smooth)
2094 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2095 emask |= 0x4;
2096
2097 /* Middle face */ 1505 /* Middle face */
2098 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1506 if (update_space (sl, socket, ms, lastcell, 1))
2099 mask |= 0x2; 1507 mask |= 0x2;
2100 1508
2101 if (socket.EMI_smooth) 1509 if (ms.player () == pl
2102 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1510 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2103 emask |= 0x2;
2104
2105 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2106 { 1511 {
1512 // force player to be visible to himself if invisible
2107 if (lastcell.faces[0] != pl->face->number) 1513 if (lastcell.faces[0] != pl->face)
2108 { 1514 {
2109 lastcell.faces[0] = pl->face->number; 1515 lastcell.faces[0] = pl->face;
1516
2110 mask |= 0x1; 1517 mask |= 0x1;
2111
2112 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2113 esrv_send_face (&socket, pl->face->number, 0);
2114
2115 sl << uint16 (pl->face->number); 1518 sl << uint16 (pl->face);
1519
1520 socket.send_faces (pl);
2116 } 1521 }
2117 } 1522 }
2118 else
2119 {
2120 /* Top face */ 1523 /* Top face */
2121 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1524 else if (update_space (sl, socket, ms, lastcell, 0))
2122 mask |= 0x1; 1525 mask |= 0x1;
2123
2124 if (socket.EMI_smooth)
2125 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2126 emask |= 0x1;
2127 } 1526
2128 1527
2129 /* Check to see if we are in fact sending anything for this 1528 /* Check to see if we are in fact sending anything for this
2130 * space by checking the mask. If so, update the mask. 1529 * space by checking the mask. If so, update the mask.
2131 * if not, reset the len to that from before adding the mask 1530 * if not, reset the len to that from before adding the mask
2132 * value, so we don't send those bits. 1531 * value, so we don't send those bits.
… …
2134 if (mask & 0xf) 1533 if (mask & 0xf)
2135 sl[oldlen + 1] = mask & 0xff; 1534 sl[oldlen + 1] = mask & 0xff;
2136 else 1535 else
2137 sl.reset (oldlen); 1536 sl.reset (oldlen);
2138 1537
1538 if (socket.ext_mapinfos)
1539 esl << uint16 (emask);
1540
1541 if (socket.EMI_smooth)
1542 {
1543 for (int layer = 2+1; layer--; )
1544 {
1545 object *ob = ms.faces_obj [layer];
1546
1547 // If there is no object for this space, or if the face for the object
1548 // is the blank face, set the smoothlevel to zero.
1549 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1550
1551 // 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.
1553 if (lastcell.smooth[layer] != smoothlevel)
1554 {
1555 lastcell.smooth[layer] = smoothlevel;
1556 esl << uint8 (smoothlevel);
1557 emask |= 1 << layer;
1558 }
1559 }
1560
2139 if (emask & 0xf) 1561 if (emask & 0xf)
2140 esl[eoldlen + 1] = emask & 0xff; 1562 esl[eoldlen + 1] = emask & 0xff;
2141 else 1563 else
2142 esl.reset (eoldlen); 1564 esl.reset (eoldlen);
1565 }
2143 } /* else this is a viewable space */ 1566 } /* else this is a viewable space */
2144 } /* for x loop */ 1567 } /* for x loop */
2145 } /* for y loop */ 1568 } /* for y loop */
2146 1569
2147 /* Verify that we in fact do need to send this */ 1570 /* Verify that we in fact do need to send this */
… …
2150 if (!(sl.length () > startlen || socket.sent_scroll)) 1573 if (!(sl.length () > startlen || socket.sent_scroll))
2151 { 1574 {
2152 /* No map data will follow, so don't say the client 1575 /* No map data will follow, so don't say the client
2153 * it doesn't need draw! 1576 * it doesn't need draw!
2154 */ 1577 */
2155 ewhatflag &= (~EMI_NOREDRAW); 1578 ewhatflag &= ~EMI_NOREDRAW;
2156 esl[ewhatstart + 1] = ewhatflag & 0xff; 1579 esl[ewhatstart + 1] = ewhatflag & 0xff;
2157 } 1580 }
2158 1581
2159 if (esl.length () > estartlen) 1582 if (esl.length () > estartlen)
2160 socket.send_packet (esl); 1583 socket.send_packet (esl);
… …
2172 */ 1595 */
2173void 1596void
2174draw_client_map (object *pl) 1597draw_client_map (object *pl)
2175{ 1598{
2176 int i, j; 1599 int i, j;
2177 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1600 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2178 New_Face *face, *floor;
2179 New_Face *floor2;
2180 int d, mflags; 1601 int mflags;
2181 struct Map newmap; 1602 struct Map newmap;
2182 maptile *m, *pm; 1603 maptile *m, *pm;
2183 1604
2184 if (pl->type != PLAYER) 1605 if (pl->type != PLAYER)
2185 { 1606 {
… …
2196 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2197 return; 1618 return;
2198 1619
2199 memset (&newmap, 0, sizeof (struct Map)); 1620 memset (&newmap, 0, sizeof (struct Map));
2200 1621
2201 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1622 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2202 {
2203 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2204 { 1624 {
2205 ax = i; 1625 ax = i;
2206 ay = j; 1626 ay = j;
2207 m = pm; 1627 m = pm;
2208 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1628 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
2209 if (mflags & P_OUT_OF_MAP) 1630 if (mflags & P_OUT_OF_MAP)
2210 continue; 1631 continue;
2211 if (mflags & P_NEED_UPDATE) 1632
2212 update_position (m, ax, ay);
2213 /* If a map is visible to the player, we don't want to swap it out 1633 /* If a map is visible to the player, we don't want to swap it out
2214 * just to reload it. This should really call something like 1634 * just to reload it. This should really call something like
2215 * swap_map, but this is much more efficient and 'good enough' 1635 * swap_map, but this is much more efficient and 'good enough'
2216 */ 1636 */
2217 if (mflags & P_NEW_MAP) 1637 if (mflags & P_NEW_MAP)
2218 m->timeout = 50; 1638 m->timeout = 50;
2219 } 1639 }
2220 } 1640
2221 /* do LOS after calls to update_position */ 1641 /* do LOS after calls to update_position */
2222 if (pl->contr->do_los) 1642 if (pl->contr->do_los)
2223 { 1643 {
2224 update_los (pl); 1644 update_los (pl);
2225 pl->contr->do_los = 0; 1645 pl->contr->do_los = 0;
… …
2240 1660
2241/*****************************************************************************/ 1661/*****************************************************************************/
2242void 1662void
2243send_plugin_custom_message (object *pl, char *buf) 1663send_plugin_custom_message (object *pl, char *buf)
2244{ 1664{
2245 pl->contr->socket->send_packet (buf); 1665 pl->contr->ns->send_packet (buf);
2246} 1666}
2247 1667
2248/** 1668/**
2249 * This sends the skill number to name mapping. We ignore 1669 * This sends the skill number to name mapping. We ignore
2250 * the params - we always send the same info no matter what. 1670 * the params - we always send the same info no matter what.
… …
2295 * it then sends an updspell packet for each spell that has changed in this way 1715 * it then sends an updspell packet for each spell that has changed in this way
2296 */ 1716 */
2297void 1717void
2298esrv_update_spells (player *pl) 1718esrv_update_spells (player *pl)
2299{ 1719{
1720 if (!pl->ns)
1721 return;
1722
2300 if (!pl->socket->monitor_spells) 1723 if (!pl->ns->monitor_spells)
2301 return; 1724 return;
2302 1725
2303 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1726 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2304 { 1727 {
2305 if (spell->type == SPELL) 1728 if (spell->type == SPELL)
… …
2335 1758
2336 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1759 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2337 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1760 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2338 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1761 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2339 1762
2340 pl->socket->send_packet (sl); 1763 pl->ns->send_packet (sl);
2341 } 1764 }
2342 } 1765 }
2343 } 1766 }
2344} 1767}
2345 1768
2346void 1769void
2347esrv_remove_spell (player *pl, object *spell) 1770esrv_remove_spell (player *pl, object *spell)
2348{ 1771{
2349 if (!pl->socket->monitor_spells) 1772 if (!pl->ns->monitor_spells)
2350 return; 1773 return;
2351 1774
2352 if (!pl || !spell || spell->env != pl->ob) 1775 if (!pl || !spell || spell->env != pl->ob)
2353 { 1776 {
2354 LOG (llevError, "Invalid call to esrv_remove_spell"); 1777 LOG (llevError, "Invalid call to esrv_remove_spell");
2355 return; 1778 return;
2356 } 1779 }
2357 1780
2358 packet sl; 1781 packet sl ("delspell");
2359 1782
2360 sl << "delspell "
2361 << uint32 (spell->count); 1783 sl << uint32 (spell->count);
2362 1784
2363 pl->socket->send_packet (sl); 1785 pl->ns->send_packet (sl);
2364} 1786}
2365 1787
2366/* appends the spell *spell to the Socklist we will send the data to. */ 1788/* appends the spell *spell to the Socklist we will send the data to. */
2367static void 1789static void
2368append_spell (player *pl, packet &sl, object *spell) 1790append_spell (player *pl, packet &sl, object *spell)
2369{ 1791{
2370 int len, i, skill = 0; 1792 int i, skill = 0;
2371 1793
2372 if (!(spell->name)) 1794 if (!(spell->name))
2373 { 1795 {
2374 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1796 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2375 return; 1797 return;
… …
2387 if (!strcmp (spell->skill, skill_names[i])) 1809 if (!strcmp (spell->skill, skill_names[i]))
2388 { 1810 {
2389 skill = i + CS_STAT_SKILLINFO; 1811 skill = i + CS_STAT_SKILLINFO;
2390 break; 1812 break;
2391 } 1813 }
1814 }
1815
1816 // spells better have a face
1817 if (!spell->face)
1818 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face);
2392 } 1821 }
2393 1822
2394 /* send the current values */ 1823 /* send the current values */
2395 sl << uint32 (spell->count) 1824 sl << uint32 (spell->count)
2396 << uint16 (spell->level) 1825 << uint16 (spell->level)
… …
2398 << uint16 (spell->last_sp) 1827 << uint16 (spell->last_sp)
2399 << uint16 (spell->last_grace) 1828 << uint16 (spell->last_grace)
2400 << uint16 (spell->last_eat) 1829 << uint16 (spell->last_eat)
2401 << uint8 (skill) 1830 << uint8 (skill)
2402 << uint32 (spell->path_attuned) 1831 << uint32 (spell->path_attuned)
2403 << uint32 (spell->face ? spell->face->number : 0) 1832 << uint32 (spell->face)
2404 << data8 (spell->name) 1833 << data8 (spell->name)
2405 << data16 (spell->msg); 1834 << data16 (spell->msg);
2406} 1835}
2407 1836
2408/** 1837/**
… …
2416 { 1845 {
2417 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1846 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2418 return; 1847 return;
2419 } 1848 }
2420 1849
2421 if (!pl->socket->monitor_spells) 1850 if (!pl->ns->monitor_spells)
2422 return; 1851 return;
2423 1852
2424 packet sl; 1853 packet sl ("addspell");
2425
2426 sl << "addspell ";
2427 1854
2428 if (!spell) 1855 if (!spell)
2429 { 1856 {
2430 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1857 for (spell = pl->ob->inv; spell; spell = spell->below)
2431 { 1858 {
2432 /* were we to simply keep appending data here, we could exceed 1859 /* were we to simply keep appending data here, we could exceed
2433 * MAXSOCKBUF if the player has enough spells to add, we know that 1860 * MAXSOCKBUF if the player has enough spells to add, we know that
2434 * append_spells will always append 19 data bytes, plus 4 length 1861 * append_spells will always append 19 data bytes, plus 4 length
2435 * bytes and 3 strings (because that is the spec) so we need to 1862 * bytes and 3 strings (because that is the spec) so we need to
… …
2445 if (spell->type != SPELL) 1872 if (spell->type != SPELL)
2446 continue; 1873 continue;
2447 1874
2448 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1875 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2449 { 1876 {
2450 pl->socket->send_packet (sl); 1877 pl->ns->send_packet (sl);
2451 1878
2452 sl.reset (); 1879 sl.reset ();
2453 sl << "addspell "; 1880 sl << "addspell ";
2454 } 1881 }
2455 1882
… …
2469 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2470 fatal (0); 1897 fatal (0);
2471 } 1898 }
2472 1899
2473 /* finally, we can send the packet */ 1900 /* finally, we can send the packet */
2474 pl->socket->send_packet (sl); 1901 pl->ns->send_packet (sl);
2475} 1902}
2476 1903

Diff Legend

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