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

Diff Legend

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