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.39 by root, Fri Dec 15 03:53:44 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 }
213}
214
215/**
216 * RequestInfo is sort of a meta command. There is some specific
217 * request of information, but we call other functions to provide
218 * that information.
219 */
220void
221RequestInfo (char *buf, int len, client * ns)
222{
223 char *params = NULL, *cp;
224
225 /* No match */
226 char bigbuf[MAX_BUF];
227 int slen;
228
229 /* Set up replyinfo before we modify any of the buffers - this is used
230 * if we don't find a match.
231 */
232 strcpy (bigbuf, "replyinfo ");
233 slen = strlen (bigbuf);
234 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
235
236 /* find the first space, make it null, and update the
237 * params pointer.
238 */
239 for (cp = buf; *cp != '\0'; cp++)
240 if (*cp == ' ')
241 {
242 *cp = '\0';
243 params = cp + 1;
244 break;
245 }
246
247 if (!strcmp (buf, "image_info"))
248 send_image_info (ns, params);
249 else if (!strcmp (buf, "image_sums"))
250 send_image_sums (ns, params);
251 else if (!strcmp (buf, "skill_info"))
252 send_skill_info (ns, params);
253 else if (!strcmp (buf, "spell_paths"))
254 send_spell_paths (ns, params);
255 else
256 ns->send_packet (bigbuf, len);
219} 257}
220 258
221void 259void
222ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
223{ 261{
224 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 262 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
263}
264
265void
266ExtiCmd (char *buf, int len, client *ns)
267{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
225} 269}
226 270
227void 271void
228MapInfoCmd (char *buf, int len, player *pl) 272MapInfoCmd (char *buf, int len, player *pl)
229{ 273{
… …
244 buf += 8; 288 buf += 8;
245 289
246 // initial map and its origin 290 // initial map and its origin
247 maptile *map = pl->ob->map; 291 maptile *map = pl->ob->map;
248 sint16 dx, dy; 292 sint16 dx, dy;
249 int mapx = pl->socket->mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->ob->x;
250 int mapy = pl->socket->mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
251 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
252 296
253 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
254 { 298 {
255 int dir = *buf++; 299 int dir = *buf++;
256 300
257 switch (dir) 301 switch (dir)
258 { 302 {
259 case '1': 303 case '1':
260 dx = 0; 304 dx = 0;
261 dy = -1; 305 dy = -1;
262 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
263 map && (mapy -= map->height); 307 map && (mapy -= map->height);
264 break; 308 break;
265 case '2': 309 case '2':
266 mapx += map->width; 310 mapx += map->width;
267 dx = map->width; 311 dx = map->width;
268 dy = 0; 312 dy = 0;
269 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
270 break; 314 break;
271 case '3': 315 case '3':
272 mapy += map->height; 316 mapy += map->height;
273 dx = 0; 317 dx = 0;
274 dy = map->height; 318 dy = map->height;
275 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
276 break; 320 break;
277 case '4': 321 case '4':
278 dx = -1; 322 dx = -1;
279 dy = 0; 323 dy = 0;
280 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
281 map && (mapx -= map->width); 325 map && (mapx -= map->width);
282 break; 326 break;
283 } 327 }
284 328
285 --max_distance; 329 --max_distance;
286 } 330 }
287 331
… …
298 if (map->tile_path[2]) 342 if (map->tile_path[2])
299 flags |= 4; 343 flags |= 4;
300 if (map->tile_path[3]) 344 if (map->tile_path[3])
301 flags |= 8; 345 flags |= 8;
302 346
303 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);
304 } 348 }
305 else 349 else
306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
307 } 351 }
308 else 352 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
310 354
311 pl->socket->send_packet (bigbuf); 355 pl->ns->send_packet (bigbuf);
312} 356}
313 357
314/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
315void 359void
316SetUp (char *buf, int len, client_socket * ns) 360SetUp (char *buf, int len, client * ns)
317{ 361{
318 int s, slen; 362 int s, slen;
319 char *cmd, *param, cmdback[HUGE_BUF]; 363 char *cmd, *param, cmdback[HUGE_BUF];
320 364
321 /* run through the cmds of setup 365 /* run through the cmds of setup
… …
363 { 407 {
364 ns->sound = atoi (param); 408 ns->sound = atoi (param);
365 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
366 } 410 }
367 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
368 {
369 ns->exp64 = atoi (param);
370 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 }
372 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
373 { 414 {
374 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
375 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 } 417 }
… …
531 * 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.
532 * 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,
533 * 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.
534 */ 575 */
535void 576void
536AddMeCmd (char *buf, int len, client_socket * ns) 577AddMeCmd (char *buf, int len, client * ns)
537{ 578{
538 Settings oldsettings; 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
539
540 oldsettings = settings;
541 if (ns->status != Ns_Add || add_player (ns))
542 ns->send_packet ("addme_failed");
543 else
544 ns->send_packet ("addme_success");
545
546 settings = oldsettings;
547} 580}
548 581
549/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
550void 583void
551ToggleExtendedInfos (char *buf, int len, client_socket * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
552{ 585{
553 char cmdback[MAX_BUF]; 586 char cmdback[MAX_BUF];
554 char command[50]; 587 char command[50];
555 int info, nextinfo; 588 int info, nextinfo;
556 589
… …
607#define MSG_TYPE_MONUMENT 5 640#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 641#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609 642
610/** Reply to ExtendedInfos command */ 643/** Reply to ExtendedInfos command */
611void 644void
612ToggleExtendedText (char *buf, int len, client_socket * ns) 645ToggleExtendedText (char *buf, int len, client * ns)
613{ 646{
614 char cmdback[MAX_BUF]; 647 char cmdback[MAX_BUF];
615 char temp[10]; 648 char temp[10];
616 char command[50]; 649 char command[50];
617 int info, nextinfo, i, flag; 650 int info, nextinfo, i, flag;
… …
668 * 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
669 * 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
670 * client. 703 * client.
671 */ 704 */
672static void 705static void
673SendSmooth (client_socket * ns, uint16 face) 706SendSmooth (client *ns, uint16 face)
674{ 707{
675 uint16 smoothface; 708 uint16 smoothface;
676 709
677 /* 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
678 * again. 711 * again.
… …
688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
689 esrv_send_face (ns, smoothface, 0); 722 esrv_send_face (ns, smoothface, 0);
690 723
691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
692 725
693 packet sl; 726 packet sl ("smooth");
694 727
695 sl << "smooth "
696 << uint16 (face) 728 sl << uint16 (face)
697 << uint16 (smoothface); 729 << uint16 (smoothface);
698 730
699 ns->send_packet (sl); 731 ns->send_packet (sl);
700} 732}
701 733
702 /** 734 /**
703 * Tells client the picture it has to use 735 * Tells client the picture it has to use
704 * to smooth a picture number given as argument. 736 * to smooth a picture number given as argument.
705 */ 737 */
706void 738void
707AskSmooth (char *buf, int len, client_socket * ns) 739AskSmooth (char *buf, int len, client *ns)
708{ 740{
709 uint16 facenbr; 741 SendSmooth (ns, atoi (buf));
710
711 facenbr = atoi (buf);
712 SendSmooth (ns, facenbr);
713} 742}
714 743
715/** 744/**
716 * 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,
717 * etc.) 746 * etc.)
718 */ 747 */
719void 748void
720PlayerCmd (char *buf, int len, player *pl) 749PlayerCmd (char *buf, int len, player *pl)
721{ 750{
722
723 /* The following should never happen with a proper or honest client.
724 * Therefore, the error message doesn't have to be too clear - if
725 * someone is playing with a hacked/non working client, this gives them
726 * an idea of the problem, but they deserve what they get
727 */
728 if (pl->state != ST_PLAYING)
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731 return;
732 }
733 /* 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
734 * sent, so check for that also. 752 * sent, so check for that also.
735 */ 753 */
736 if (atoi (buf) || buf[0] == '0') 754 if (atoi (buf) || buf[0] == '0')
737 { 755 {
738 pl->count = atoi ((char *) buf); 756 pl->count = atoi ((char *) buf);
757
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 758 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 759 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 760 return;
746 } 761
747 buf++; 762 buf++;
748 } 763 }
749 /* This should not happen anymore. */ 764
750 if (pl->ob->speed_left < -1.0)
751 {
752 LOG (llevError, "Player has negative time - shouldn't do command.\n");
753 }
754 /* In c_new.c */
755 execute_newserver_command (pl->ob, (char *) buf); 765 execute_newserver_command (pl->ob, (char *) buf);
766
756 /* Perhaps something better should be done with a left over count. 767 /* Perhaps something better should be done with a left over count.
757 * Cleaning up the input should probably be done first - all actions 768 * Cleaning up the input should probably be done first - all actions
758 * 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
759 * commands. 770 * commands.
760 */ 771 */
761
762 pl->count = 0; 772 pl->count = 0;
763
764} 773}
765 774
766 775
767/** 776/**
768 * 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,
… …
771 * can throttle. 780 * can throttle.
772 */ 781 */
773void 782void
774NewPlayerCmd (char *buf, int len, player *pl) 783NewPlayerCmd (char *buf, int len, player *pl)
775{ 784{
776 int time, repeat;
777 char command[MAX_BUF];
778 int pktlen;
779
780 if (len < 7) 785 if (len <= 6)
781 { 786 {
782 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);
783 return; 788 return;
784 } 789 }
785 790
786 pktlen = net_uint16 ((uint8 *)buf); 791 uint16 cmdid = net_uint16 ((uint8 *)buf);
787 repeat = net_uint32 ((uint8 *)buf + 2); 792 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788 793
789 /* -1 is special - no repeat, but don't update */ 794 /* -1 is special - no repeat, but don't update */
790 if (repeat != -1) 795 if (repeat != -1)
791 pl->count = repeat; 796 pl->count = repeat;
792 797
793 if ((len - 4) >= MAX_BUF) 798 buf += 6; //len -= 6;
794 len = MAX_BUF - 5;
795 799
796 strncpy ((char *) command, (char *) buf + 6, len - 4);
797 command[len - 4] = 0;
798
799 /* This should not happen anymore. */
800 if (pl->ob->speed_left < -1.0)
801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
802
803 /* In c_new.c */
804 execute_newserver_command (pl->ob, (char *) command); 800 execute_newserver_command (pl->ob, buf);
801
805 /* Perhaps something better should be done with a left over count. 802 /* Perhaps something better should be done with a left over count.
806 * Cleaning up the input should probably be done first - all actions 803 * Cleaning up the input should probably be done first - all actions
807 * 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
808 * commands. 805 * commands.
809 */ 806 */
810 pl->count = 0; 807 pl->count = 0;
811 808
812 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
813 time = MAX_TIME * 100; 811 ? time = MAX_TIME * 100
814 else
815 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
816 813
817 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
818 815 packet sl ("comc");
819 packet sl;
820 sl << "comc " << uint16 (pktlen) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
821 pl->socket->send_packet (sl); 817 pl->ns->send_packet (sl);
822} 818}
823
824 819
825/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
826void 821void
827ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, client *ns)
828{ 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
829 /* 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
830 * 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
831 * once all the X11 code is removed from the server. 838 * once all the X11 code is removed from the server.
832 * 839 *
833 * 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
834 * think it was the carriage return that was entered, and the 841 * think it was the carriage return that was entered, and the
835 * function then does not try to do additional input. 842 * function then does not try to do additional input.
836 */ 843 */
837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 844 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
838 845
839 /* this avoids any hacking here */ 846 /* this avoids any hacking here */
840 847
841 switch (pl->state) 848 switch (ns->state)
842 { 849 {
843 case ST_PLAYING: 850 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 852 break;
846 853
847 case ST_PLAY_AGAIN:
848 /* We can check this for return value (2==quit). Maybe we
849 * should, and do something appropriate?
850 */
851 receive_play_again (pl->ob, buf[0]);
852 break;
853
854 case ST_ROLL_STAT:
855 key_roll_stat (pl->ob, buf[0]);
856 break;
857
858 case ST_CHANGE_CLASS: 854 case ST_CHANGE_CLASS:
859
860 key_change_class (pl->ob, buf[0]); 855 key_change_class (pl->ob, buf[0]);
861 break; 856 break;
862 857
863 case ST_CONFIRM_QUIT:
864 key_confirm_quit (pl->ob, buf[0]);
865 break;
866
867 case ST_CONFIGURE:
868 LOG (llevError, "In client input handling, but into configure state\n");
869 pl->state = ST_PLAYING;
870 break;
871
872 case ST_GET_NAME:
873 receive_player_name (pl->ob, 13);
874 break;
875
876 case ST_GET_PASSWORD:
877 case ST_CONFIRM_PASSWORD:
878 receive_player_password (pl->ob, 13);
879 break;
880
881 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
882 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
883 break; 860 break;
884 861
885 default: 862 default:
886 LOG (llevError, "Unknown input state: %d\n", pl->state); 863 LOG (llevError, "Unknown input state: %d\n", ns->state);
887 } 864 }
888} 865}
889 866
890/** 867/**
891 * 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
… …
893 * 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
894 * 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
895 * problem. 872 * problem.
896 */ 873 */
897void 874void
898VersionCmd (char *buf, int len, client_socket * ns) 875VersionCmd (char *buf, int len, client * ns)
899{ 876{
900 char *cp;
901 char version_warning[256];
902
903 if (!buf) 877 if (!buf)
904 { 878 {
905 LOG (llevError, "CS: received corrupted version command\n"); 879 LOG (llevError, "CS: received corrupted version command\n");
906 return; 880 return;
907 } 881 }
908 882
909 ns->cs_version = atoi (buf); 883 ns->cs_version = atoi (buf);
910 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
911 if (VERSION_CS != ns->cs_version) 891 //if (VERSION_CS != ns->cs_version)
912 { 892 // unchecked;
913#ifdef ESRV_DEBUG 893
914 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
915#endif
916 }
917 cp = strchr (buf + 1, ' '); 894 char *cp = strchr (buf + 1, ' ');
918 if (!cp) 895 if (!cp)
919 return; 896 return;
897
920 ns->sc_version = atoi (cp); 898 ns->sc_version = atoi (cp);
899
921 if (VERSION_SC != ns->sc_version) 900 //if (VERSION_SC != ns->sc_version)
922 { 901 // unchecked;
923#ifdef ESRV_DEBUG 902
924 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
925#endif
926 }
927 cp = strchr (cp + 1, ' '); 903 cp = strchr (cp + 1, ' ');
904
928 if (cp) 905 if (cp)
929 { 906 {
930 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 907 assign (ns->version, cp + 1);
931 908
932 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
933
934 /* This is first implementation - i skip all beta DX clients with it
935 * Add later stuff here for other clients
936 */
937
938 /* these are old dxclients */
939 /* Version 1024 added support for singular + plural name values -
940 * requiing this minimal value reduces complexity of that code, and it
941 * has been around for a long time.
942 */
943 if (ns->sc_version < 1026) 909 if (ns->sc_version < 1026)
944 { 910 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
945 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
946 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 911 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
947 ns->send_packet (version_warning);
948 }
949
950 } 912 }
951} 913}
952 914
953/** sound related functions. */ 915/** sound related functions. */
954
955void 916void
956SetSound (char *buf, int len, client_socket * ns) 917SetSound (char *buf, int len, client * ns)
957{ 918{
958 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
959} 920}
960 921
961/** client wants the map resent */ 922/** client wants the map resent */
962
963void 923void
964MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
965{ 925{
966
967/* 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
968 * 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.
969 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
970 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
971 */ 930 */
972#if 0
973 /* Okay, this is MAJOR UGLY. but the only way I know how to
974 * clear the "cache"
975 */
976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
977 draw_client_map (pl->ob);
978#endif
979} 931}
980 932
981/** 933/**
982 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
983 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
986MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
987{ 939{
988 int vals[3], i; 940 int vals[3], i;
989 941
990 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
991 * 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
992 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
993 * sscanf? 945 * sscanf?
994 */ 946 */
995 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
996 { 948 {
997 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
998 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
999 { 952 {
1000 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1001 return; 954 return;
1002 } 955 }
956
1003 buf++; 957 buf++;
1004 } 958 }
959
1005 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1006 961
1007/* 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]);*/
1008 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1009} 964}
1010
1011
1012 965
1013/****************************************************************************** 966/******************************************************************************
1014 * 967 *
1015 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1016 * 969 *
… …
1019/** 972/**
1020 * 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
1021 * 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)
1022 */ 975 */
1023void 976void
1024send_query (client_socket * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1025{ 978{
1026 char buf[MAX_BUF];
1027
1028 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1029 ns->send_packet (buf);
1030} 980}
1031 981
1032#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1033 Old = New; \ 983 Old = New; \
1034 sl << uint8 (Type) << uint64 (New); \ 984 sl << uint8 (Type) << uint64 (New); \
… …
1064esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1065{ 1015{
1066 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1067 uint16 flags; 1017 uint16 flags;
1068 1018
1069 packet sl; 1019 client *ns = pl->ns;
1070 sl << "stats "; 1020 if (!ns)
1021 return;
1071 1022
1072 if (pl->ob != NULL) 1023 object *ob = pl->ob;
1073 { 1024 if (!ob)
1025 return;
1026
1027 packet sl ("stats");
1028
1074 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1075 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1076 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1077 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1078 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1079 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1080 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1081 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1082 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1083 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1084 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1085 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);
1086 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1087 }
1088 1042
1089 if (pl->socket->exp64)
1090 {
1091 uint8 s;
1092
1093 for (s = 0; s < NUM_SKILLS; s++) 1043 for (int s = 0; s < NUM_SKILLS; s++)
1094 { 1044 if (object *skill = pl->last_skill_ob[s])
1095 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])
1096 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1097 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1098 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1099 */ 1051 */
1100 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1101 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1102 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1103
1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105 } 1055 }
1106 }
1107 }
1108 1056
1109 if (pl->socket->exp64)
1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1111 else
1112 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1113
1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1115 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1116 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1117 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1118 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1119 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1120 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);
1121 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
1122 flags = 0; 1067 flags = 0;
1123 1068
1124 if (pl->fire_on) 1069 if (pl->fire_on)
1125 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1126 1071
1127 if (pl->run_on) 1072 if (pl->run_on)
1128 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1129 1074
1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1131 1076
1132 if (pl->socket->sc_version < 1025) 1077 if (ns->sc_version < 1025)
1133 { 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) }
1134 else 1079 else
1135 {
1136 int i;
1137
1138 for (i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1139 { 1081 {
1140 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1141 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1142 continue; 1084 continue;
1143 1085
1144 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]);
1145 } 1087 }
1146 }
1147 1088
1148 if (pl->socket->monitor_spells) 1089 if (pl->ns->monitor_spells)
1149 { 1090 {
1150 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);
1151 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);
1152 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);
1153 } 1094 }
1154 1095
1155 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 */
1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1157 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1159 1100
1160 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1161 if (sl.length () > 6) 1102 if (sl.length () > 6)
1162 pl->socket->send_packet (sl); 1103 ns->send_packet (sl);
1163} 1104}
1164 1105
1165/** 1106/**
1166 * 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.
1167 */ 1108 */
1168void 1109void
1169esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1170{ 1111{
1171 pl->last_weight = weight; 1112 packet sl ("player");
1172
1173 packet sl;
1174 sl << "player ";
1175 1113
1176 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1177 << uint32 (weight) 1115 << uint32 (weight)
1178 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1179 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1180 1118
1119 pl->ns->last_weight = weight;
1181 pl->socket->send_packet (sl); 1120 pl->ns->send_packet (sl);
1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1183} 1122}
1184 1123
1185/** 1124/**
1186 * Need to send an animation sequence to the client. 1125 * Need to send an animation sequence to the client.
… …
1188 * 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
1189 * 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
1190 * when the player logs in and picks stuff up. 1129 * when the player logs in and picks stuff up.
1191 */ 1130 */
1192void 1131void
1193esrv_send_animation (client_socket * ns, short anim_num) 1132esrv_send_animation (client * ns, short anim_num)
1194{ 1133{
1195 int i;
1196
1197 /* 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
1198 * 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
1199 * range, it must be a valid animation. 1136 * range, it must be a valid animation.
1200 */ 1137 */
1201 if (anim_num < 0 || anim_num > num_animations) 1138 if (anim_num < 0 || anim_num > num_animations)
1202 { 1139 {
1203 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);
1204 return; 1141 return;
1205 } 1142 }
1206 1143
1207 packet sl; 1144 packet sl ("anim");
1208 1145
1209 sl << "anim "
1210 << uint16 (anim_num) 1146 sl << uint16 (anim_num)
1211 << uint16 (0); /* flags - not used right now */ 1147 << uint16 (0); /* flags - not used right now */
1212 1148
1213 /* 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
1214 * the face itself) down to the client. 1150 * the face itself) down to the client.
1215 */ 1151 */
1216 for (i = 0; i < animations[anim_num].num_animations; i++) 1152 for (int i = 0; i < animations[anim_num].num_animations; i++)
1217 { 1153 {
1218 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))
1219 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1155 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1220 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 */
1221 } 1158 }
1222 1159
1223 ns->send_packet (sl); 1160 ns->send_packet (sl);
1224 1161
… …
1235/** 1172/**
1236 * 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
1237 * the face yet, we will also send it. 1174 * the face yet, we will also send it.
1238 */ 1175 */
1239static void 1176static void
1240esrv_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)
1241{ 1178{
1242 if (newmap->cells[x][y].count >= MAP_LAYERS) 1179 if (newmap->cells[x][y].count >= MAP_LAYERS)
1243 { 1180 {
1181 //TODO: one or the other, can't both have abort and return, verify and act
1244 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);
1245 return; 1183 return;
1246 abort (); 1184 abort ();
1247 } 1185 }
1248 1186
1249 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;
1250 newmap->cells[x][y].count++; 1188 newmap->cells[x][y].count++;
1251 1189
1252 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1253 esrv_send_face (ns, face_num, 0); 1191 esrv_send_face (ns, face_num, 0);
1254}
1255
1256struct LayerCell
1257{
1258 uint16 xy;
1259 short face;
1260};
1261
1262struct MapLayer
1263{
1264 int count;
1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1266};
1267
1268/** Checkes if map cells have changed */
1269static int
1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1271{
1272 int k;
1273
1274 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1275 return 1;
1276 for (k = 0; k < newmap->cells[i][j].count; k++)
1277 {
1278 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1279 {
1280 return 1;
1281 }
1282 }
1283 return 0;
1284}
1285
1286/**
1287 * Basically, what this does is pack the data into layers.
1288 * cnum is the client number, cur is the the buffer we put all of
1289 * this data into. we return the end of the data. layers is
1290 * how many layers of data we should back.
1291 */
1292static uint8 *
1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1294{
1295 int x, y, k;
1296 int face;
1297 unsigned char *fcur;
1298 struct MapLayer layers[MAP_LAYERS];
1299
1300 for (k = 0; k < MAP_LAYERS; k++)
1301 layers[k].count = 0;
1302 fcur = cur;
1303 for (x = 0; x < ns->mapx; x++)
1304 {
1305 for (y = 0; y < ns->mapy; y++)
1306 {
1307 if (!mapcellchanged (ns, x, y, newmap))
1308 continue;
1309 if (newmap->cells[x][y].count == 0)
1310 {
1311 *cur = x * ns->mapy + y; /* mark empty space */
1312 cur++;
1313 continue;
1314 }
1315 for (k = 0; k < newmap->cells[x][y].count; k++)
1316 {
1317 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1318 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1319 layers[k].count++;
1320 }
1321 }
1322 }
1323 /* If no data, return now. */
1324 if (fcur == cur && layers[0].count == 0)
1325 return cur;
1326 *cur = 255; /* mark end of explicitly cleared cells */
1327 cur++;
1328 /* First pack by layers. */
1329 for (k = 0; k < numlayers; k++)
1330 {
1331 if (layers[k].count == 0)
1332 break; /* once a layer is entirely empty, no layer below it can
1333 have anything in it either */
1334 /* Pack by entries in thie layer */
1335 for (x = 0; x < layers[k].count;)
1336 {
1337 fcur = cur;
1338 *cur = layers[k].lcells[x].face >> 8;
1339 cur++;
1340 *cur = layers[k].lcells[x].face & 0xFF;
1341 cur++;
1342 face = layers[k].lcells[x].face;
1343 /* Now, we back the redundant data into 1 byte xy pairings */
1344 for (y = x; y < layers[k].count; y++)
1345 {
1346 if (layers[k].lcells[y].face == face)
1347 {
1348 *cur = (uint8) layers[k].lcells[y].xy;
1349 cur++;
1350 layers[k].lcells[y].face = -1;
1351 }
1352 }
1353 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1354 /* forward over the now redundant data */
1355 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1356 x++;
1357 }
1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1359 }
1360 return cur;
1361} 1192}
1362 1193
1363/** Clears a map cell */ 1194/** Clears a map cell */
1364static void 1195static void
1365map_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)
… …
1377#define MAX_LAYERS 3 1208#define MAX_LAYERS 3
1378 1209
1379/* 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
1380 * 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,
1381 * 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
1382 * 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
1383 * re-examined. 1214 * re-examined.
1384 */ 1215 */
1385
1386static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1216static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1387 1217
1388/** 1218/**
1389 * Returns true if any of the heads for this 1219 * Returns true if any of the heads for this
1390 * 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
1391 * for empty space checking. 1221 * for empty space checking.
1392 */ 1222 */
1393static inline int 1223static inline int
1394have_head (int ax, int ay) 1224have_head (int ax, int ay)
1395{ 1225{
1396
1397 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1226 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1398 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])
1399 return 1; 1228 return 1;
1229
1400 return 0; 1230 return 0;
1401} 1231}
1402 1232
1403/** 1233/**
1404 * check_head is a bit simplistic version of update_space below. 1234 * check_head is a bit simplistic version of update_space below.
1405 * 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
1406 * 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
1407 * 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
1408 * sent, it returns zero. 1238 * sent, it returns zero.
1409 */ 1239 */
1410static int 1240static int
1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1241check_head (packet &sl, client &ns, int ax, int ay, int layer)
1412{ 1242{
1413 short face_num; 1243 short face_num;
1414 1244
1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1416 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;
… …
1448 * numbers the spaces differently - I think this was a leftover from 1278 * numbers the spaces differently - I think this was a leftover from
1449 * 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
1450 * 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
1451 * actually match. 1281 * actually match.
1452 */ 1282 */
1453
1454static int 1283static int
1455update_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)
1456{ 1285{
1457 object *ob, *head; 1286 object *ob, *head;
1458 uint16 face_num; 1287 uint16 face_num;
1459 int bx, by, i; 1288 int bx, by, i;
1460 1289
… …
1673 * 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
1674 * take. 1503 * take.
1675 */ 1504 */
1676 1505
1677static inline int 1506static inline int
1678update_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)
1679{ 1508{
1680 object *ob; 1509 object *ob;
1681 int smoothlevel; /* old face_num; */ 1510 int smoothlevel; /* old face_num; */
1682 1511
1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1684 1513
1685 /* 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
1686 * is the blank face, set the smoothlevel to zero. 1515 * is the blank face, set the smoothlevel to zero.
1687 */ 1516 */
1688 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1689 smoothlevel = 0; 1518 smoothlevel = 0;
1690 else 1519 else
1691 { 1520 {
1692 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1693 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1717 * 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
1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1547 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1719 * available. 1548 * available.
1720 */ 1549 */
1721int 1550int
1722getExtendedMapInfoSize (client_socket * ns) 1551getExtendedMapInfoSize (client * ns)
1723{ 1552{
1724 int result = 0; 1553 int result = 0;
1725 1554
1726 if (ns->ext_mapinfos) 1555 if (ns->ext_mapinfos)
1727 { 1556 {
1728 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1729 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1730 } 1559 }
1560
1731 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);
1732} 1584}
1733 1585
1734/** 1586/**
1735 * 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
1736 * 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
… …
1742 * 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
1743 * 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,
1744 * 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
1745 * of what we send, see the doc/Protocol file. 1597 * of what we send, see the doc/Protocol file.
1746 * I will describe internally what we do: 1598 * I will describe internally what we do:
1747 * 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.
1748 * 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
1749 * maximum viewable size (As set in config.h). 1601 * maximum viewable size (As set in config.h).
1750 * in the cells, there are faces and a count value. 1602 * in the cells, there are faces and a count value.
1751 * 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
1752 * is not viewable. 1604 * is not viewable.
… …
1763 uint8 eentrysize; 1615 uint8 eentrysize;
1764 uint16 ewhatstart, ewhatflag; 1616 uint16 ewhatstart, ewhatflag;
1765 uint8 extendedinfos; 1617 uint8 extendedinfos;
1766 maptile *m; 1618 maptile *m;
1767 1619
1768 client_socket &socket = *pl->contr->socket; 1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active)
1623 return;
1769 1624
1770 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1771 1627
1772 packet sl; 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1773 packet esl; 1629 packet esl;
1774 1630
1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1776 startlen = sl.length (); 1631 startlen = sl.length ();
1777 1632
1778 /*Extendedmapinfo structure initialisation */ 1633 /*Extendedmapinfo structure initialisation */
1779 if (socket.ext_mapinfos) 1634 if (socket.ext_mapinfos)
1780 { 1635 {
… …
1824 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++)
1825 { 1680 {
1826 ax = 0; 1681 ax = 0;
1827 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++)
1828 { 1683 {
1829
1830 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1831 1685
1832 /* 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
1833 * 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
1834 * the client wants if using the map1a command - this is because 1688 * the client wants if using the map1a command - this is because
… …
1896 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1897 } 1751 }
1898 } 1752 }
1899 else if (d > 3) 1753 else if (d > 3)
1900 { 1754 {
1755 m->touch ();
1756
1901 int need_send = 0, count; 1757 int need_send = 0, count;
1902 1758
1903 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1904 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1905 */ 1761 */
… …
1938 else 1794 else
1939 sl.reset (oldlen); 1795 sl.reset (oldlen);
1940 } 1796 }
1941 else 1797 else
1942 { 1798 {
1799 m->touch ();
1800
1943 /* 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
1944 * we need to send. 1802 * we need to send.
1945 */ 1803 */
1946 1804
1947 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
… …
2141void 1999void
2142draw_client_map (object *pl) 2000draw_client_map (object *pl)
2143{ 2001{
2144 int i, j; 2002 int i, j;
2145 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 */
2146 New_Face *face, *floor; 2004 facetile *face, *floor;
2147 New_Face *floor2; 2005 facetile *floor2;
2148 int d, mflags; 2006 int d, mflags;
2149 struct Map newmap; 2007 struct Map newmap;
2150 maptile *m, *pm; 2008 maptile *m, *pm;
2151 2009
2152 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2165 return; 2023 return;
2166 2024
2167 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2168 2026
2169 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++)
2170 {
2171 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++)
2172 { 2029 {
2173 ax = i; 2030 ax = i;
2174 ay = j; 2031 ay = j;
2175 m = pm; 2032 m = pm;
2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2177 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2178 continue; 2036 continue;
2179 if (mflags & P_NEED_UPDATE) 2037
2180 update_position (m, ax, ay);
2181 /* 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
2182 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2183 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2184 */ 2041 */
2185 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2186 m->timeout = 50; 2043 m->timeout = 50;
2187 } 2044 }
2188 } 2045
2189 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2190 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2191 { 2048 {
2192 update_los (pl); 2049 update_los (pl);
2193 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2208 2065
2209/*****************************************************************************/ 2066/*****************************************************************************/
2210void 2067void
2211send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2212{ 2069{
2213 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2214} 2071}
2215 2072
2216/** 2073/**
2217 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2218 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
2219 */ 2076 */
2220void 2077void
2221send_skill_info (client_socket *ns, char *params) 2078send_skill_info (client *ns, char *params)
2222{ 2079{
2223 packet sl; 2080 packet sl;
2224 sl << "replyinfo skill_info\n"; 2081 sl << "replyinfo skill_info\n";
2225 2082
2226 for (int i = 1; i < NUM_SKILLS; i++) 2083 for (int i = 1; i < NUM_SKILLS; i++)
… …
2238/** 2095/**
2239 * This sends the spell path to name mapping. We ignore 2096 * This sends the spell path to name mapping. We ignore
2240 * the params - we always send the same info no matter what. 2097 * the params - we always send the same info no matter what.
2241 */ 2098 */
2242void 2099void
2243send_spell_paths (client_socket * ns, char *params) 2100send_spell_paths (client * ns, char *params)
2244{ 2101{
2245 packet sl; 2102 packet sl;
2246 2103
2247 sl << "replyinfo spell_paths\n"; 2104 sl << "replyinfo spell_paths\n";
2248 2105
… …
2263 * 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
2264 */ 2121 */
2265void 2122void
2266esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2267{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2268 if (!pl->socket->monitor_spells) 2128 if (!pl->ns->monitor_spells)
2269 return; 2129 return;
2270 2130
2271 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2272 { 2132 {
2273 if (spell->type == SPELL) 2133 if (spell->type == SPELL)
… …
2303 2163
2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2307 2167
2308 pl->socket->send_packet (sl); 2168 pl->ns->send_packet (sl);
2309 } 2169 }
2310 } 2170 }
2311 } 2171 }
2312} 2172}
2313 2173
2314void 2174void
2315esrv_remove_spell (player *pl, object *spell) 2175esrv_remove_spell (player *pl, object *spell)
2316{ 2176{
2317 if (!pl->socket->monitor_spells) 2177 if (!pl->ns->monitor_spells)
2318 return; 2178 return;
2319 2179
2320 if (!pl || !spell || spell->env != pl->ob) 2180 if (!pl || !spell || spell->env != pl->ob)
2321 { 2181 {
2322 LOG (llevError, "Invalid call to esrv_remove_spell"); 2182 LOG (llevError, "Invalid call to esrv_remove_spell");
2323 return; 2183 return;
2324 } 2184 }
2325 2185
2326 packet sl; 2186 packet sl ("delspell");
2327 2187
2328 sl << "delspell "
2329 << uint32 (spell->count); 2188 sl << uint32 (spell->count);
2330 2189
2331 pl->socket->send_packet (sl); 2190 pl->ns->send_packet (sl);
2332} 2191}
2333 2192
2334/* 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. */
2335static void 2194static void
2336append_spell (player *pl, packet &sl, object *spell) 2195append_spell (player *pl, packet &sl, object *spell)
… …
2384 { 2243 {
2385 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");
2386 return; 2245 return;
2387 } 2246 }
2388 2247
2389 if (!pl->socket->monitor_spells) 2248 if (!pl->ns->monitor_spells)
2390 return; 2249 return;
2391 2250
2392 packet sl; 2251 packet sl ("addspell");
2393
2394 sl << "addspell ";
2395 2252
2396 if (!spell) 2253 if (!spell)
2397 { 2254 {
2398 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2399 { 2256 {
… …
2413 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2414 continue; 2271 continue;
2415 2272
2416 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))))
2417 { 2274 {
2418 pl->socket->send_packet (sl); 2275 pl->ns->send_packet (sl);
2419 2276
2420 sl.reset (); 2277 sl.reset ();
2421 sl << "addspell "; 2278 sl << "addspell ";
2422 } 2279 }
2423 2280
… …
2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2438 fatal (0); 2295 fatal (0);
2439 } 2296 }
2440 2297
2441 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2442 pl->socket->send_packet (sl); 2299 pl->ns->send_packet (sl);
2443} 2300}
2444 2301

Diff Legend

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