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.40 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 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 *
… …
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 * 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 * if a face has not already been sent to the client, it is sent now.
42 * 43 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 44 */
47 45
48#include <global.h> 46#include <global.h>
49#include <sproto.h> 47#include <sproto.h>
50 48
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 49#include <living.h>
54#include <commands.h> 50#include <commands.h>
55 51
56/* This block is basically taken from socket.c - I assume if it works there, 52/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 53 * it should work here.
… …
88 -1, /* life stealing */ 84 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 85 -1 /* Disease - not fully done yet */
90}; 86};
91 87
92static void 88static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 89socket_map_scroll (client *ns, int dx, int dy)
94{ 90{
95 struct Map newmap; 91 struct Map newmap;
96 int x, y, mx, my; 92 int x, y, mx, my;
97 93
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 94 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 95
105 /* If we are using the Map1aCmd, we may in fact send 96 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 97 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 98 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 99 * look for. Removed code to do so - it caused extra
… …
148} 139}
149 140
150static void 141static void
151clear_map (player *pl) 142clear_map (player *pl)
152{ 143{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 145
157 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
159 148
160 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 150}
163 151
164/** check for map change and send new map data */ 152/** check for map/region change and send new map data */
165static void 153static void
166check_map_change (player *pl) 154check_map_change (player *pl)
167{ 155{
168 client_socket &socket = *pl->socket; 156 client &socket = *pl->ns;
169 object *ob = pl->ob; 157 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
171 159
172 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
173 { 161 {
… …
189 flags |= 4; 177 flags |= 4;
190 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
191 flags |= 8; 179 flags |= 8;
192 180
193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
195 } 183 }
196 else 184 else
197 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
198 186
199 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209 else 197 else
210 { 198 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 199 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212 socket.update_look = 1; 200 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 201 }
215 } 202 }
216 203
217 socket.current_x = ob->x; 204 socket.current_x = ob->x;
218 socket.current_y = ob->y; 205 socket.current_y = ob->y;
206
207 region *reg = ob->region ();
208 if (socket.current_region != reg)
209 {
210 socket.current_region = reg;
211 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
212 }
219} 213}
220 214
221/** 215/**
222 * RequestInfo is sort of a meta command. There is some specific 216 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 217 * request of information, but we call other functions to provide
224 * that information. 218 * that information.
225 */ 219 */
226void 220void
227RequestInfo (char *buf, int len, client_socket * ns) 221RequestInfo (char *buf, int len, client * ns)
228{ 222{
229 char *params = NULL, *cp; 223 char *params = NULL, *cp;
230 224
231 /* No match */ 225 /* No match */
232 char bigbuf[MAX_BUF]; 226 char bigbuf[MAX_BUF];
… …
267{ 261{
268 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 262 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
269} 263}
270 264
271void 265void
266ExtiCmd (char *buf, int len, client *ns)
267{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272MapInfoCmd (char *buf, int len, player *pl) 272MapInfoCmd (char *buf, int len, player *pl)
273{ 273{
274 // <mapinfo tag spatial tile-path 274 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 275 // >mapinfo tag spatial flags x y w h hash
276 276
… …
288 buf += 8; 288 buf += 8;
289 289
290 // initial map and its origin 290 // initial map and its origin
291 maptile *map = pl->ob->map; 291 maptile *map = pl->ob->map;
292 sint16 dx, dy; 292 sint16 dx, dy;
293 int mapx = pl->socket->mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->ob->x;
294 int mapy = pl->socket->mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
295 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
296 296
297 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
298 { 298 {
299 int dir = *buf++; 299 int dir = *buf++;
300 300
301 switch (dir) 301 switch (dir)
302 { 302 {
303 case '1': 303 case '1':
304 dx = 0; 304 dx = 0;
305 dy = -1; 305 dy = -1;
306 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
307 map && (mapy -= map->height); 307 map && (mapy -= map->height);
308 break; 308 break;
309 case '2': 309 case '2':
310 mapx += map->width; 310 mapx += map->width;
311 dx = map->width; 311 dx = map->width;
312 dy = 0; 312 dy = 0;
313 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
314 break; 314 break;
315 case '3': 315 case '3':
316 mapy += map->height; 316 mapy += map->height;
317 dx = 0; 317 dx = 0;
318 dy = map->height; 318 dy = map->height;
319 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
320 break; 320 break;
321 case '4': 321 case '4':
322 dx = -1; 322 dx = -1;
323 dy = 0; 323 dy = 0;
324 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
325 map && (mapx -= map->width); 325 map && (mapx -= map->width);
326 break; 326 break;
327 } 327 }
328 328
329 --max_distance; 329 --max_distance;
330 } 330 }
331 331
… …
342 if (map->tile_path[2]) 342 if (map->tile_path[2])
343 flags |= 4; 343 flags |= 4;
344 if (map->tile_path[3]) 344 if (map->tile_path[3])
345 flags |= 8; 345 flags |= 8;
346 346
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
348 } 348 }
349 else 349 else
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
351 } 351 }
352 else 352 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354 354
355 pl->socket->send_packet (bigbuf); 355 pl->ns->send_packet (bigbuf);
356} 356}
357 357
358/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
359void 359void
360SetUp (char *buf, int len, client_socket * ns) 360SetUp (char *buf, int len, client * ns)
361{ 361{
362 int s, slen; 362 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 363 char *cmd, *param, cmdback[HUGE_BUF];
364 364
365 /* run through the cmds of setup 365 /* run through the cmds of setup
… …
407 { 407 {
408 ns->sound = atoi (param); 408 ns->sound = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 } 410 }
411 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
412 {
413 ns->exp64 = atoi (param);
414 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
415 }
416 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
417 { 414 {
418 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
419 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
420 } 417 }
… …
575 * This is what takes care of it. We tell the client how things worked out. 572 * This is what takes care of it. We tell the client how things worked out.
576 * I am not sure if this file is the best place for this function. however, 573 * I am not sure if this file is the best place for this function. however,
577 * it either has to be here or init_sockets needs to be exported. 574 * it either has to be here or init_sockets needs to be exported.
578 */ 575 */
579void 576void
580AddMeCmd (char *buf, int len, client_socket * ns) 577AddMeCmd (char *buf, int len, client * ns)
581{ 578{
582 Settings oldsettings; 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
583
584 oldsettings = settings;
585 if (ns->status != Ns_Add || add_player (ns))
586 ns->send_packet ("addme_failed");
587 else
588 ns->send_packet ("addme_success");
589
590 settings = oldsettings;
591} 580}
592 581
593/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
594void 583void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 585{
597 char cmdback[MAX_BUF]; 586 char cmdback[MAX_BUF];
598 char command[50]; 587 char command[50];
599 int info, nextinfo; 588 int info, nextinfo;
600 589
… …
651#define MSG_TYPE_MONUMENT 5 640#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 641#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 642
654/** Reply to ExtendedInfos command */ 643/** Reply to ExtendedInfos command */
655void 644void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 645ToggleExtendedText (char *buf, int len, client * ns)
657{ 646{
658 char cmdback[MAX_BUF]; 647 char cmdback[MAX_BUF];
659 char temp[10]; 648 char temp[10];
660 char command[50]; 649 char command[50];
661 int info, nextinfo, i, flag; 650 int info, nextinfo, i, flag;
… …
712 * a piece of data from us that we know the client wants. So 701 * a piece of data from us that we know the client wants. So
713 * if we know the client wants it, might as well push it to the 702 * if we know the client wants it, might as well push it to the
714 * client. 703 * client.
715 */ 704 */
716static void 705static void
717SendSmooth (client_socket * ns, uint16 face) 706SendSmooth (client *ns, uint16 face)
718{ 707{
719 uint16 smoothface; 708 uint16 smoothface;
720 709
721 /* If we can't find a face, return and set it so we won't try to send this 710 /* If we can't find a face, return and set it so we won't try to send this
722 * again. 711 * again.
… …
732 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
733 esrv_send_face (ns, smoothface, 0); 722 esrv_send_face (ns, smoothface, 0);
734 723
735 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
736 725
737 packet sl; 726 packet sl ("smooth");
738 727
739 sl << "smooth "
740 << uint16 (face) 728 sl << uint16 (face)
741 << uint16 (smoothface); 729 << uint16 (smoothface);
742 730
743 ns->send_packet (sl); 731 ns->send_packet (sl);
744} 732}
745 733
746 /** 734 /**
747 * Tells client the picture it has to use 735 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 736 * to smooth a picture number given as argument.
749 */ 737 */
750void 738void
751AskSmooth (char *buf, int len, client_socket * ns) 739AskSmooth (char *buf, int len, client *ns)
752{ 740{
753 uint16 facenbr; 741 SendSmooth (ns, atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 742}
758 743
759/** 744/**
760 * This handles the general commands from the client (ie, north, fire, cast, 745 * This handles the general commands from the client (ie, north, fire, cast,
761 * etc.) 746 * etc.)
762 */ 747 */
763void 748void
764PlayerCmd (char *buf, int len, player *pl) 749PlayerCmd (char *buf, int len, player *pl)
765{ 750{
766
767 /* The following should never happen with a proper or honest client.
768 * Therefore, the error message doesn't have to be too clear - if
769 * someone is playing with a hacked/non working client, this gives them
770 * an idea of the problem, but they deserve what they get
771 */
772 if (pl->state != ST_PLAYING)
773 {
774 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
775 return;
776 }
777 /* Check if there is a count. In theory, a zero count could also be 751 /* Check if there is a count. In theory, a zero count could also be
778 * sent, so check for that also. 752 * sent, so check for that also.
779 */ 753 */
780 if (atoi (buf) || buf[0] == '0') 754 if (atoi (buf) || buf[0] == '0')
781 { 755 {
782 pl->count = atoi ((char *) buf); 756 pl->count = atoi ((char *) buf);
757
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 758 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 759 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 760 return;
790 } 761
791 buf++; 762 buf++;
792 } 763 }
793 /* This should not happen anymore. */ 764
794 if (pl->ob->speed_left < -1.0)
795 {
796 LOG (llevError, "Player has negative time - shouldn't do command.\n");
797 }
798 /* In c_new.c */
799 execute_newserver_command (pl->ob, (char *) buf); 765 execute_newserver_command (pl->ob, (char *) buf);
766
800 /* Perhaps something better should be done with a left over count. 767 /* Perhaps something better should be done with a left over count.
801 * Cleaning up the input should probably be done first - all actions 768 * Cleaning up the input should probably be done first - all actions
802 * for the command that issued the count should be done before any other 769 * for the command that issued the count should be done before any other
803 * commands. 770 * commands.
804 */ 771 */
805
806 pl->count = 0; 772 pl->count = 0;
807
808} 773}
809 774
810 775
811/** 776/**
812 * This handles the general commands from the client (ie, north, fire, cast, 777 * This handles the general commands from the client (ie, north, fire, cast,
… …
815 * can throttle. 780 * can throttle.
816 */ 781 */
817void 782void
818NewPlayerCmd (char *buf, int len, player *pl) 783NewPlayerCmd (char *buf, int len, player *pl)
819{ 784{
820 int time, repeat;
821 char command[MAX_BUF];
822 int pktlen;
823
824 if (len < 7) 785 if (len <= 6)
825 { 786 {
826 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
827 return; 788 return;
828 } 789 }
829 790
830 pktlen = net_uint16 ((uint8 *)buf); 791 uint16 cmdid = net_uint16 ((uint8 *)buf);
831 repeat = net_uint32 ((uint8 *)buf + 2); 792 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832 793
833 /* -1 is special - no repeat, but don't update */ 794 /* -1 is special - no repeat, but don't update */
834 if (repeat != -1) 795 if (repeat != -1)
835 pl->count = repeat; 796 pl->count = repeat;
836 797
837 if ((len - 4) >= MAX_BUF) 798 buf += 6; //len -= 6;
838 len = MAX_BUF - 5;
839 799
840 strncpy ((char *) command, (char *) buf + 6, len - 4);
841 command[len - 4] = 0;
842
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 LOG (llevError, "Player has negative time - shouldn't do command.\n");
846
847 /* In c_new.c */
848 execute_newserver_command (pl->ob, (char *) command); 800 execute_newserver_command (pl->ob, buf);
801
849 /* Perhaps something better should be done with a left over count. 802 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 803 * Cleaning up the input should probably be done first - all actions
851 * for the command that issued the count should be done before any other 804 * for the command that issued the count should be done before any other
852 * commands. 805 * commands.
853 */ 806 */
854 pl->count = 0; 807 pl->count = 0;
855 808
856 if (FABS (pl->ob->speed) < 0.001) 809 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
810 int time = fabs (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 811 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
860 813
861 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
862 815 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 817 pl->ns->send_packet (sl);
866} 818}
867
868 819
869/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
870void 821void
871ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, client *ns)
872{ 823{
824 if (ns->state == ST_CUSTOM)
825 {
826 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
827 return;
828 }
829
830 if (!ns->pl)
831 return; //TODO: depends on the exact reply we are after
832 //TODO: but right now, we always have a ns->pl
833
834 player *pl = ns->pl;
835
873 /* This is to synthesize how the data would be stored if it 836 /* This is to synthesize how the data would be stored if it
874 * was normally entered. A bit of a hack, and should be cleaned up 837 * was normally entered. A bit of a hack, and should be cleaned up
875 * once all the X11 code is removed from the server. 838 * once all the X11 code is removed from the server.
876 * 839 *
877 * We pass 13 to many of the functions because this way they 840 * We pass 13 to many of the functions because this way they
878 * think it was the carriage return that was entered, and the 841 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 842 * function then does not try to do additional input.
880 */ 843 */
881 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 844 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882 845
883 /* this avoids any hacking here */ 846 /* this avoids any hacking here */
884 847
885 switch (pl->state) 848 switch (ns->state)
886 { 849 {
887 case ST_PLAYING: 850 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 852 break;
890 853
891 case ST_PLAY_AGAIN:
892 /* We can check this for return value (2==quit). Maybe we
893 * should, and do something appropriate?
894 */
895 receive_play_again (pl->ob, buf[0]);
896 break;
897
898 case ST_ROLL_STAT:
899 key_roll_stat (pl->ob, buf[0]);
900 break;
901
902 case ST_CHANGE_CLASS: 854 case ST_CHANGE_CLASS:
903
904 key_change_class (pl->ob, buf[0]); 855 key_change_class (pl->ob, buf[0]);
905 break; 856 break;
906 857
907 case ST_CONFIRM_QUIT:
908 key_confirm_quit (pl->ob, buf[0]);
909 break;
910
911 case ST_CONFIGURE:
912 LOG (llevError, "In client input handling, but into configure state\n");
913 pl->state = ST_PLAYING;
914 break;
915
916 case ST_GET_NAME:
917 receive_player_name (pl->ob, 13);
918 break;
919
920 case ST_GET_PASSWORD:
921 case ST_CONFIRM_PASSWORD:
922 receive_player_password (pl->ob, 13);
923 break;
924
925 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
927 break; 860 break;
928 861
929 default: 862 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 863 LOG (llevError, "Unknown input state: %d\n", ns->state);
931 } 864 }
932} 865}
933 866
934/** 867/**
935 * Client tells its version. If there is a mismatch, we close the 868 * Client tells its version. If there is a mismatch, we close the
… …
937 * something older than the server. If we assume the client will be 870 * something older than the server. If we assume the client will be
938 * backwards compatible, having it be a later version should not be a 871 * backwards compatible, having it be a later version should not be a
939 * problem. 872 * problem.
940 */ 873 */
941void 874void
942VersionCmd (char *buf, int len, client_socket * ns) 875VersionCmd (char *buf, int len, client * ns)
943{ 876{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 877 if (!buf)
948 { 878 {
949 LOG (llevError, "CS: received corrupted version command\n"); 879 LOG (llevError, "CS: received corrupted version command\n");
950 return; 880 return;
951 } 881 }
952 882
953 ns->cs_version = atoi (buf); 883 ns->cs_version = atoi (buf);
954 ns->sc_version = ns->cs_version; 884 ns->sc_version = ns->cs_version;
885
886 LOG (llevDebug, "connection from client <%s>\n", buf);
887
888
889 //TODO: should log here just for statistics
890
955 if (VERSION_CS != ns->cs_version) 891 //if (VERSION_CS != ns->cs_version)
956 { 892 // unchecked;
957#ifdef ESRV_DEBUG 893
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 894 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 895 if (!cp)
963 return; 896 return;
897
964 ns->sc_version = atoi (cp); 898 ns->sc_version = atoi (cp);
899
965 if (VERSION_SC != ns->sc_version) 900 //if (VERSION_SC != ns->sc_version)
966 { 901 // unchecked;
967#ifdef ESRV_DEBUG 902
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 903 cp = strchr (cp + 1, ' ');
904
972 if (cp) 905 if (cp)
973 { 906 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 907 assign (ns->version, cp + 1);
975 908
976 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
977
978 /* This is first implementation - i skip all beta DX clients with it
979 * Add later stuff here for other clients
980 */
981
982 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time.
986 */
987 if (ns->sc_version < 1026) 909 if (ns->sc_version < 1026)
988 { 910 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 911 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 912 }
995} 913}
996 914
997/** sound related functions. */ 915/** sound related functions. */
998
999void 916void
1000SetSound (char *buf, int len, client_socket * ns) 917SetSound (char *buf, int len, client * ns)
1001{ 918{
1002 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
1003} 920}
1004 921
1005/** client wants the map resent */ 922/** client wants the map resent */
1006
1007void 923void
1008MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
1009{ 925{
1010
1011/* This function is currently disabled; just clearing the map state results in 926/* This function is currently disabled; just clearing the map state results in
1012 * display errors. It should clear the cache and send a newmap command. 927 * display errors. It should clear the cache and send a newmap command.
1013 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
1015 */ 930 */
1016#if 0
1017 /* Okay, this is MAJOR UGLY. but the only way I know how to
1018 * clear the "cache"
1019 */
1020 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021 draw_client_map (pl->ob);
1022#endif
1023} 931}
1024 932
1025/** 933/**
1026 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
1031{ 939{
1032 int vals[3], i; 940 int vals[3], i;
1033 941
1034 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
1035 * we obviously am not going to find a space after the third 943 * we obviously are not going to find a space after the third
1036 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
1037 * sscanf? 945 * sscanf?
1038 */ 946 */
1039 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
1040 { 948 {
1041 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
1042 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
1043 { 952 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 954 return;
1046 } 955 }
956
1047 buf++; 957 buf++;
1048 } 958 }
959
1049 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1050 961
1051/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 962/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 964}
1054
1055
1056 965
1057/****************************************************************************** 966/******************************************************************************
1058 * 967 *
1059 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1060 * 969 *
… …
1063/** 972/**
1064 * Asks the client to query the user. This way, the client knows 973 * Asks the client to query the user. This way, the client knows
1065 * it needs to send something back (vs just printing out a message) 974 * it needs to send something back (vs just printing out a message)
1066 */ 975 */
1067void 976void
1068send_query (client_socket * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1069{ 978{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 980}
1075 981
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 983 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 984 sl << uint8 (Type) << uint64 (New); \
… …
1108esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1109{ 1015{
1110 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1111 uint16 flags; 1017 uint16 flags;
1112 1018
1113 packet sl; 1019 client *ns = pl->ns;
1114 sl << "stats "; 1020 if (!ns)
1021 return;
1115 1022
1116 if (pl->ob != NULL) 1023 object *ob = pl->ob;
1117 { 1024 if (!ob)
1025 return;
1026
1027 packet sl ("stats");
1028
1118 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1119 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1120 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1121 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1122 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1123 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1124 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1125 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1126 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1127 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1128 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1129 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1037 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1038 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1039 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1040 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1131 }
1132 1042
1133 if (pl->socket->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1043 for (int s = 0; s < NUM_SKILLS; s++)
1138 { 1044 if (object *skill = pl->last_skill_ob[s])
1139 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1045 if (skill->stats.exp != ns->last_skill_exp [s])
1140 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1141 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1143 */ 1051 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1147
1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149 } 1055 }
1150 }
1151 }
1152 1056
1153 if (pl->socket->exp64)
1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1155 else
1156 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1157
1158 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1159 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1160 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1161 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1162 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1163 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1164 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1064 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1165 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1065 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066
1166 flags = 0; 1067 flags = 0;
1167 1068
1168 if (pl->fire_on) 1069 if (pl->fire_on)
1169 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1170 1071
1171 if (pl->run_on) 1072 if (pl->run_on)
1172 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1173 1074
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1175 1076
1176 if (pl->socket->sc_version < 1025) 1077 if (ns->sc_version < 1025)
1177 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1078 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1178 else 1079 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1081 {
1184 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1186 continue; 1084 continue;
1187 1085
1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1086 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1189 } 1087 }
1190 }
1191 1088
1192 if (pl->socket->monitor_spells) 1089 if (pl->ns->monitor_spells)
1193 { 1090 {
1194 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1091 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1195 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1092 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1196 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1093 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1197 } 1094 }
1198 1095
1199 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1096 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1201 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1203 1100
1204 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1205 if (sl.length () > 6) 1102 if (sl.length () > 6)
1206 pl->socket->send_packet (sl); 1103 ns->send_packet (sl);
1207} 1104}
1208 1105
1209/** 1106/**
1210 * Tells the client that here is a player it should start using. 1107 * Tells the client that here is a player it should start using.
1211 */ 1108 */
1212void 1109void
1213esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1214{ 1111{
1215 pl->last_weight = weight; 1112 packet sl ("player");
1216
1217 packet sl;
1218 sl << "player ";
1219 1113
1220 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 1115 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1223 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1224 1118
1119 pl->ns->last_weight = weight;
1225 pl->socket->send_packet (sl); 1120 pl->ns->send_packet (sl);
1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227} 1122}
1228 1123
1229/** 1124/**
1230 * Need to send an animation sequence to the client. 1125 * Need to send an animation sequence to the client.
… …
1232 * sent them the face yet (this can become quite costly in terms of 1127 * sent them the face yet (this can become quite costly in terms of
1233 * how much we are sending - on the other hand, this should only happen 1128 * how much we are sending - on the other hand, this should only happen
1234 * when the player logs in and picks stuff up. 1129 * when the player logs in and picks stuff up.
1235 */ 1130 */
1236void 1131void
1237esrv_send_animation (client_socket * ns, short anim_num) 1132esrv_send_animation (client * ns, short anim_num)
1238{ 1133{
1239 int i;
1240
1241 /* Do some checking on the anim_num we got. Note that the animations 1134 /* Do some checking on the anim_num we got. Note that the animations
1242 * are added in contigous order, so if the number is in the valid 1135 * are added in contigous order, so if the number is in the valid
1243 * range, it must be a valid animation. 1136 * range, it must be a valid animation.
1244 */ 1137 */
1245 if (anim_num < 0 || anim_num > num_animations) 1138 if (anim_num < 0 || anim_num > num_animations)
1246 { 1139 {
1247 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1140 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1248 return; 1141 return;
1249 } 1142 }
1250 1143
1251 packet sl; 1144 packet sl ("anim");
1252 1145
1253 sl << "anim "
1254 << uint16 (anim_num) 1146 sl << uint16 (anim_num)
1255 << uint16 (0); /* flags - not used right now */ 1147 << uint16 (0); /* flags - not used right now */
1256 1148
1257 /* Build up the list of faces. Also, send any information (ie, the 1149 /* Build up the list of faces. Also, send any information (ie, the
1258 * the face itself) down to the client. 1150 * the face itself) down to the client.
1259 */ 1151 */
1260 for (i = 0; i < animations[anim_num].num_animations; i++) 1152 for (int i = 0; i < animations[anim_num].num_animations; i++)
1261 { 1153 {
1262 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1154 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1263 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1155 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1264 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1157 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1265 } 1158 }
1266 1159
1267 ns->send_packet (sl); 1160 ns->send_packet (sl);
1268 1161
… …
1279/** 1172/**
1280 * This adds face_num to a map cell at x,y. If the client doesn't have 1173 * This adds face_num to a map cell at x,y. If the client doesn't have
1281 * the face yet, we will also send it. 1174 * the face yet, we will also send it.
1282 */ 1175 */
1283static void 1176static void
1284esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1177esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1285{ 1178{
1286 if (newmap->cells[x][y].count >= MAP_LAYERS) 1179 if (newmap->cells[x][y].count >= MAP_LAYERS)
1287 { 1180 {
1181 //TODO: one or the other, can't both have abort and return, verify and act
1288 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1182 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1289 return; 1183 return;
1290 abort (); 1184 abort ();
1291 } 1185 }
1292 1186
1293 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1187 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1294 newmap->cells[x][y].count++; 1188 newmap->cells[x][y].count++;
1295 1189
1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297 esrv_send_face (ns, face_num, 0); 1191 esrv_send_face (ns, face_num, 0);
1298}
1299
1300struct LayerCell
1301{
1302 uint16 xy;
1303 short face;
1304};
1305
1306struct MapLayer
1307{
1308 int count;
1309 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1310};
1311
1312/** Checkes if map cells have changed */
1313static int
1314mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1315{
1316 int k;
1317
1318 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1319 return 1;
1320 for (k = 0; k < newmap->cells[i][j].count; k++)
1321 {
1322 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1323 {
1324 return 1;
1325 }
1326 }
1327 return 0;
1328}
1329
1330/**
1331 * Basically, what this does is pack the data into layers.
1332 * cnum is the client number, cur is the the buffer we put all of
1333 * this data into. we return the end of the data. layers is
1334 * how many layers of data we should back.
1335 */
1336static uint8 *
1337compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1338{
1339 int x, y, k;
1340 int face;
1341 unsigned char *fcur;
1342 struct MapLayer layers[MAP_LAYERS];
1343
1344 for (k = 0; k < MAP_LAYERS; k++)
1345 layers[k].count = 0;
1346 fcur = cur;
1347 for (x = 0; x < ns->mapx; x++)
1348 {
1349 for (y = 0; y < ns->mapy; y++)
1350 {
1351 if (!mapcellchanged (ns, x, y, newmap))
1352 continue;
1353 if (newmap->cells[x][y].count == 0)
1354 {
1355 *cur = x * ns->mapy + y; /* mark empty space */
1356 cur++;
1357 continue;
1358 }
1359 for (k = 0; k < newmap->cells[x][y].count; k++)
1360 {
1361 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1362 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1363 layers[k].count++;
1364 }
1365 }
1366 }
1367 /* If no data, return now. */
1368 if (fcur == cur && layers[0].count == 0)
1369 return cur;
1370 *cur = 255; /* mark end of explicitly cleared cells */
1371 cur++;
1372 /* First pack by layers. */
1373 for (k = 0; k < numlayers; k++)
1374 {
1375 if (layers[k].count == 0)
1376 break; /* once a layer is entirely empty, no layer below it can
1377 have anything in it either */
1378 /* Pack by entries in thie layer */
1379 for (x = 0; x < layers[k].count;)
1380 {
1381 fcur = cur;
1382 *cur = layers[k].lcells[x].face >> 8;
1383 cur++;
1384 *cur = layers[k].lcells[x].face & 0xFF;
1385 cur++;
1386 face = layers[k].lcells[x].face;
1387 /* Now, we back the redundant data into 1 byte xy pairings */
1388 for (y = x; y < layers[k].count; y++)
1389 {
1390 if (layers[k].lcells[y].face == face)
1391 {
1392 *cur = (uint8) layers[k].lcells[y].xy;
1393 cur++;
1394 layers[k].lcells[y].face = -1;
1395 }
1396 }
1397 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1398 /* forward over the now redundant data */
1399 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1400 x++;
1401 }
1402 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1403 }
1404 return cur;
1405} 1192}
1406 1193
1407/** Clears a map cell */ 1194/** Clears a map cell */
1408static void 1195static void
1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1421#define MAX_LAYERS 3 1208#define MAX_LAYERS 3
1422 1209
1423/* Using a global really isn't a good approach, but saves the over head of 1210/* Using a global really isn't a good approach, but saves the over head of
1424 * allocating and deallocating such a block of data each time run through, 1211 * allocating and deallocating such a block of data each time run through,
1425 * and saves the space of allocating this in the socket object when we only 1212 * and saves the space of allocating this in the socket object when we only
1426 * need it for this cycle. If the serve is ever threaded, this needs to be 1213 * need it for this cycle. If the server is ever threaded, this needs to be
1427 * re-examined. 1214 * re-examined.
1428 */ 1215 */
1429
1430static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1216static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431 1217
1432/** 1218/**
1433 * Returns true if any of the heads for this 1219 * Returns true if any of the heads for this
1434 * space is set. Returns false if all are blank - this is used 1220 * space is set. Returns false if all are blank - this is used
1435 * for empty space checking. 1221 * for empty space checking.
1436 */ 1222 */
1437static inline int 1223static inline int
1438have_head (int ax, int ay) 1224have_head (int ax, int ay)
1439{ 1225{
1440
1441 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1226 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1442 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1227 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1443 return 1; 1228 return 1;
1229
1444 return 0; 1230 return 0;
1445} 1231}
1446 1232
1447/** 1233/**
1448 * check_head is a bit simplistic version of update_space below. 1234 * check_head is a bit simplistic version of update_space below.
1449 * basically, it only checks the that the head on space ax,ay at layer 1235 * basically, it only checks the that the head on space ax,ay at layer
1450 * needs to get sent - if so, it adds the data, sending the head 1236 * needs to get sent - if so, it adds the data, sending the head
1451 * if needed, and returning 1. If this no data needs to get 1237 * if needed, and returning 1. If this no data needs to get
1452 * sent, it returns zero. 1238 * sent, it returns zero.
1453 */ 1239 */
1454static int 1240static int
1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1241check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456{ 1242{
1457 short face_num; 1243 short face_num;
1458 1244
1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1246 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1492 * numbers the spaces differently - I think this was a leftover from 1278 * numbers the spaces differently - I think this was a leftover from
1493 * the map command, where the faces stack up. Sinces that is no longer 1279 * the map command, where the faces stack up. Sinces that is no longer
1494 * the case, it seems to make more sense to have these layer values 1280 * the case, it seems to make more sense to have these layer values
1495 * actually match. 1281 * actually match.
1496 */ 1282 */
1497
1498static int 1283static int
1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1284update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1500{ 1285{
1501 object *ob, *head; 1286 object *ob, *head;
1502 uint16 face_num; 1287 uint16 face_num;
1503 int bx, by, i; 1288 int bx, by, i;
1504 1289
… …
1717 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1502 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1718 * take. 1503 * take.
1719 */ 1504 */
1720 1505
1721static inline int 1506static inline int
1722update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1507update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1723{ 1508{
1724 object *ob; 1509 object *ob;
1725 int smoothlevel; /* old face_num; */ 1510 int smoothlevel; /* old face_num; */
1726 1511
1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1728 1513
1729 /* If there is no object for this space, or if the face for the object 1514 /* If there is no object for this space, or if the face for the object
1730 * is the blank face, set the smoothlevel to zero. 1515 * is the blank face, set the smoothlevel to zero.
1731 */ 1516 */
1732 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1733 smoothlevel = 0; 1518 smoothlevel = 0;
1734 else 1519 else
1735 { 1520 {
1736 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1737 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1761 * Returns the size of a data for a map square as returned by 1546 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1547 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1548 * available.
1764 */ 1549 */
1765int 1550int
1766getExtendedMapInfoSize (client_socket * ns) 1551getExtendedMapInfoSize (client * ns)
1767{ 1552{
1768 int result = 0; 1553 int result = 0;
1769 1554
1770 if (ns->ext_mapinfos) 1555 if (ns->ext_mapinfos)
1771 { 1556 {
1772 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1774 } 1559 }
1560
1775 return result; 1561 return result;
1562}
1563
1564// prefetch (and touch) all maps within a specific distancd
1565static void
1566prefetch_surrounding_maps (maptile *map, int distance)
1567{
1568 map->last_access = runtime;
1569
1570 if (--distance)
1571 for (int dir = 4; --dir; )
1572 if (const shstr &path = map->tile_path [dir])
1573 if (maptile *&neigh = map->tile_map [dir])
1574 prefetch_surrounding_maps (neigh, distance);
1575 else
1576 neigh = maptile::find_async (path, map);
1577}
1578
1579// prefetch a generous area around the player
1580static void
1581prefetch_surrounding_maps (object *op)
1582{
1583 prefetch_surrounding_maps (op->map, 3);
1776} 1584}
1777 1585
1778/** 1586/**
1779 * This function uses the new map1 protocol command to send the map 1587 * This function uses the new map1 protocol command to send the map
1780 * to the client. It is necessary because the old map command supports 1588 * to the client. It is necessary because the old map command supports
… …
1786 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1594 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1787 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1595 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1788 * and use the other 4 bits for other informatiion. For full documentation 1596 * and use the other 4 bits for other informatiion. For full documentation
1789 * of what we send, see the doc/Protocol file. 1597 * of what we send, see the doc/Protocol file.
1790 * I will describe internally what we do: 1598 * I will describe internally what we do:
1791 * the socket->lastmap shows how the map last looked when sent to the client. 1599 * the ns->lastmap shows how the map last looked when sent to the client.
1792 * in the lastmap structure, there is a cells array, which is set to the 1600 * in the lastmap structure, there is a cells array, which is set to the
1793 * maximum viewable size (As set in config.h). 1601 * maximum viewable size (As set in config.h).
1794 * in the cells, there are faces and a count value. 1602 * in the cells, there are faces and a count value.
1795 * we use the count value to hold the darkness value. If -1, then this space 1603 * we use the count value to hold the darkness value. If -1, then this space
1796 * is not viewable. 1604 * is not viewable.
… …
1807 uint8 eentrysize; 1615 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1616 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1617 uint8 extendedinfos;
1810 maptile *m; 1618 maptile *m;
1811 1619
1812 client_socket &socket = *pl->contr->socket; 1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active)
1623 return;
1813 1624
1814 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1815 1627
1816 packet sl; 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1629 packet esl;
1818 1630
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1631 startlen = sl.length ();
1821 1632
1822 /*Extendedmapinfo structure initialisation */ 1633 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1634 if (socket.ext_mapinfos)
1824 { 1635 {
… …
1868 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1869 { 1680 {
1870 ax = 0; 1681 ax = 0;
1871 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1872 { 1683 {
1873
1874 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875 1685
1876 /* If this space is out of the normal viewable area, we only check 1686 /* If this space is out of the normal viewable area, we only check
1877 * the heads value ax or ay will only be greater than what 1687 * the heads value ax or ay will only be greater than what
1878 * the client wants if using the map1a command - this is because 1688 * the client wants if using the map1a command - this is because
… …
1940 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1941 } 1751 }
1942 } 1752 }
1943 else if (d > 3) 1753 else if (d > 3)
1944 { 1754 {
1755 m->touch ();
1756
1945 int need_send = 0, count; 1757 int need_send = 0, count;
1946 1758
1947 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1948 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1949 */ 1761 */
… …
1982 else 1794 else
1983 sl.reset (oldlen); 1795 sl.reset (oldlen);
1984 } 1796 }
1985 else 1797 else
1986 { 1798 {
1799 m->touch ();
1800
1987 /* In this block, the space is visible or there are head objects 1801 /* In this block, the space is visible or there are head objects
1988 * we need to send. 1802 * we need to send.
1989 */ 1803 */
1990 1804
1991 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
… …
2185void 1999void
2186draw_client_map (object *pl) 2000draw_client_map (object *pl)
2187{ 2001{
2188 int i, j; 2002 int i, j;
2189 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2190 New_Face *face, *floor; 2004 facetile *face, *floor;
2191 New_Face *floor2; 2005 facetile *floor2;
2192 int d, mflags; 2006 int d, mflags;
2193 struct Map newmap; 2007 struct Map newmap;
2194 maptile *m, *pm; 2008 maptile *m, *pm;
2195 2009
2196 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2208 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2209 return; 2023 return;
2210 2024
2211 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2212 2026
2213 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2214 {
2215 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2216 { 2029 {
2217 ax = i; 2030 ax = i;
2218 ay = j; 2031 ay = j;
2219 m = pm; 2032 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2221 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2222 continue; 2036 continue;
2223 if (mflags & P_NEED_UPDATE) 2037
2224 update_position (m, ax, ay);
2225 /* If a map is visible to the player, we don't want to swap it out 2038 /* If a map is visible to the player, we don't want to swap it out
2226 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2228 */ 2041 */
2229 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2230 m->timeout = 50; 2043 m->timeout = 50;
2231 } 2044 }
2232 } 2045
2233 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2234 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2235 { 2048 {
2236 update_los (pl); 2049 update_los (pl);
2237 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2252 2065
2253/*****************************************************************************/ 2066/*****************************************************************************/
2254void 2067void
2255send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2256{ 2069{
2257 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2258} 2071}
2259 2072
2260/** 2073/**
2261 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
2263 */ 2076 */
2264void 2077void
2265send_skill_info (client_socket *ns, char *params) 2078send_skill_info (client *ns, char *params)
2266{ 2079{
2267 packet sl; 2080 packet sl;
2268 sl << "replyinfo skill_info\n"; 2081 sl << "replyinfo skill_info\n";
2269 2082
2270 for (int i = 1; i < NUM_SKILLS; i++) 2083 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 2095/**
2283 * This sends the spell path to name mapping. We ignore 2096 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 2097 * the params - we always send the same info no matter what.
2285 */ 2098 */
2286void 2099void
2287send_spell_paths (client_socket * ns, char *params) 2100send_spell_paths (client * ns, char *params)
2288{ 2101{
2289 packet sl; 2102 packet sl;
2290 2103
2291 sl << "replyinfo spell_paths\n"; 2104 sl << "replyinfo spell_paths\n";
2292 2105
… …
2307 * it then sends an updspell packet for each spell that has changed in this way 2120 * it then sends an updspell packet for each spell that has changed in this way
2308 */ 2121 */
2309void 2122void
2310esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2311{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2312 if (!pl->socket->monitor_spells) 2128 if (!pl->ns->monitor_spells)
2313 return; 2129 return;
2314 2130
2315 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316 { 2132 {
2317 if (spell->type == SPELL) 2133 if (spell->type == SPELL)
… …
2347 2163
2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2351 2167
2352 pl->socket->send_packet (sl); 2168 pl->ns->send_packet (sl);
2353 } 2169 }
2354 } 2170 }
2355 } 2171 }
2356} 2172}
2357 2173
2358void 2174void
2359esrv_remove_spell (player *pl, object *spell) 2175esrv_remove_spell (player *pl, object *spell)
2360{ 2176{
2361 if (!pl->socket->monitor_spells) 2177 if (!pl->ns->monitor_spells)
2362 return; 2178 return;
2363 2179
2364 if (!pl || !spell || spell->env != pl->ob) 2180 if (!pl || !spell || spell->env != pl->ob)
2365 { 2181 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 2182 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 2183 return;
2368 } 2184 }
2369 2185
2370 packet sl; 2186 packet sl ("delspell");
2371 2187
2372 sl << "delspell "
2373 << uint32 (spell->count); 2188 sl << uint32 (spell->count);
2374 2189
2375 pl->socket->send_packet (sl); 2190 pl->ns->send_packet (sl);
2376} 2191}
2377 2192
2378/* appends the spell *spell to the Socklist we will send the data to. */ 2193/* appends the spell *spell to the Socklist we will send the data to. */
2379static void 2194static void
2380append_spell (player *pl, packet &sl, object *spell) 2195append_spell (player *pl, packet &sl, object *spell)
… …
2428 { 2243 {
2429 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2244 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2430 return; 2245 return;
2431 } 2246 }
2432 2247
2433 if (!pl->socket->monitor_spells) 2248 if (!pl->ns->monitor_spells)
2434 return; 2249 return;
2435 2250
2436 packet sl; 2251 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 2252
2440 if (!spell) 2253 if (!spell)
2441 { 2254 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2443 { 2256 {
… …
2457 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2458 continue; 2271 continue;
2459 2272
2460 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2461 { 2274 {
2462 pl->socket->send_packet (sl); 2275 pl->ns->send_packet (sl);
2463 2276
2464 sl.reset (); 2277 sl.reset ();
2465 sl << "addspell "; 2278 sl << "addspell ";
2466 } 2279 }
2467 2280
… …
2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482 fatal (0); 2295 fatal (0);
2483 } 2296 }
2484 2297
2485 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2486 pl->socket->send_packet (sl); 2299 pl->ns->send_packet (sl);
2487} 2300}
2488 2301

Diff Legend

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