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.68 by root, Sun Mar 4 19:36:12 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 41 */
47 42
48#include <global.h> 43#include <global.h>
49#include <sproto.h> 44#include <sproto.h>
50 45
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 46#include <living.h>
54#include <commands.h> 47#include <commands.h>
55 48
56/* This block is basically taken from socket.c - I assume if it works there, 49/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 50 * it should work here.
… …
88 -1, /* life stealing */ 81 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 82 -1 /* Disease - not fully done yet */
90}; 83};
91 84
92static void 85static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 86socket_map_scroll (client *ns, int dx, int dy)
94{ 87{
95 struct Map newmap; 88 struct Map newmap;
96 int x, y, mx, my; 89 int x, y, mx, my;
97 90
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 91 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 92
105 /* If we are using the Map1aCmd, we may in fact send 93 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 94 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 95 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 96 * look for. Removed code to do so - it caused extra
… …
148} 136}
149 137
150static void 138static void
151clear_map (player *pl) 139clear_map (player *pl)
152{ 140{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 142
157 if (socket.newmapcmd == 1) 143 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
159 145
160 socket.update_look = 1; 146 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 147}
163 148
164/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
165static void 150static void
166check_map_change (player *pl) 151check_map_change (player *pl)
167{ 152{
168 client_socket &socket = *pl->socket; 153 client &socket = *pl->ns;
169 object *ob = pl->ob; 154 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 155 char buf[MAX_BUF]; /* eauugggh */
171 156
172 if (socket.current_map != ob->map) 157 if (socket.current_map != ob->map)
173 { 158 {
… …
189 flags |= 4; 174 flags |= 4;
190 if (ob->map->tile_path[3]) 175 if (ob->map->tile_path[3])
191 flags |= 8; 176 flags |= 8;
192 177
193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 178 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); 179 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
195 } 180 }
196 else 181 else
197 snprintf (buf, MAX_BUF, "mapinfo current"); 182 snprintf (buf, MAX_BUF, "mapinfo current");
198 183
199 socket.send_packet (buf); 184 socket.send_packet (buf);
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 192 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 193 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209 else 194 else
210 { 195 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 196 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212 socket.update_look = 1; 197 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 198 }
215 } 199 }
216 200
217 socket.current_x = ob->x; 201 socket.current_x = ob->x;
218 socket.current_y = ob->y; 202 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
210}
211
212/**
213 * RequestInfo is sort of a meta command. There is some specific
214 * request of information, but we call other functions to provide
215 * that information.
216 */
217void
218RequestInfo (char *buf, int len, client * ns)
219{
220 char *params = NULL, *cp;
221
222 /* No match */
223 char bigbuf[MAX_BUF];
224 int slen;
225
226 /* Set up replyinfo before we modify any of the buffers - this is used
227 * if we don't find a match.
228 */
229 strcpy (bigbuf, "replyinfo ");
230 slen = strlen (bigbuf);
231 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
232
233 /* find the first space, make it null, and update the
234 * params pointer.
235 */
236 for (cp = buf; *cp != '\0'; cp++)
237 if (*cp == ' ')
238 {
239 *cp = '\0';
240 params = cp + 1;
241 break;
242 }
243
244 if (!strcmp (buf, "image_info"))
245 send_image_info (ns, params);
246 else if (!strcmp (buf, "image_sums"))
247 send_image_sums (ns, params);
248 else if (!strcmp (buf, "skill_info"))
249 send_skill_info (ns, params);
250 else if (!strcmp (buf, "spell_paths"))
251 send_spell_paths (ns, params);
252 else
253 ns->send_packet (bigbuf, len);
219} 254}
220 255
221void 256void
222ExtCmd (char *buf, int len, player *pl) 257ExtCmd (char *buf, int len, player *pl)
223{ 258{
224 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 259 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
260}
261
262void
263ExtiCmd (char *buf, int len, client *ns)
264{
265 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
225} 266}
226 267
227void 268void
228MapInfoCmd (char *buf, int len, player *pl) 269MapInfoCmd (char *buf, int len, player *pl)
229{ 270{
… …
244 buf += 8; 285 buf += 8;
245 286
246 // initial map and its origin 287 // initial map and its origin
247 maptile *map = pl->ob->map; 288 maptile *map = pl->ob->map;
248 sint16 dx, dy; 289 sint16 dx, dy;
249 int mapx = pl->socket->mapx / 2 - pl->ob->x; 290 int mapx = pl->ns->mapx / 2 - pl->ob->x;
250 int mapy = pl->socket->mapy / 2 - pl->ob->y; 291 int mapy = pl->ns->mapy / 2 - pl->ob->y;
251 int max_distance = 8; // limit maximum path length to something generous 292 int max_distance = 8; // limit maximum path length to something generous
252 293
253 while (*buf && map && max_distance) 294 while (*buf && map && max_distance)
254 { 295 {
255 int dir = *buf++; 296 int dir = *buf++;
256 297
257 switch (dir) 298 switch (dir)
258 { 299 {
259 case '1': 300 case '1':
260 dx = 0; 301 dx = 0;
261 dy = -1; 302 dy = -1;
262 map = get_map_from_coord (map, &dx, &dy); 303 map = map->xy_find (dx, dy);
263 map && (mapy -= map->height); 304 map && (mapy -= map->height);
264 break; 305 break;
265 case '2': 306 case '2':
266 mapx += map->width; 307 mapx += map->width;
267 dx = map->width; 308 dx = map->width;
268 dy = 0; 309 dy = 0;
269 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
270 break; 311 break;
271 case '3': 312 case '3':
272 mapy += map->height; 313 mapy += map->height;
273 dx = 0; 314 dx = 0;
274 dy = map->height; 315 dy = map->height;
275 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
276 break; 317 break;
277 case '4': 318 case '4':
278 dx = -1; 319 dx = -1;
279 dy = 0; 320 dy = 0;
280 map = get_map_from_coord (map, &dx, &dy); 321 map = map->xy_find (dx, dy);
281 map && (mapx -= map->width); 322 map && (mapx -= map->width);
282 break; 323 break;
283 } 324 }
284 325
285 --max_distance; 326 --max_distance;
286 } 327 }
287 328
… …
298 if (map->tile_path[2]) 339 if (map->tile_path[2])
299 flags |= 4; 340 flags |= 4;
300 if (map->tile_path[3]) 341 if (map->tile_path[3])
301 flags |= 8; 342 flags |= 8;
302 343
303 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 344 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
304 } 345 }
305 else 346 else
306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
307 } 348 }
308 else 349 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
310 351
311 pl->socket->send_packet (bigbuf); 352 pl->ns->send_packet (bigbuf);
312} 353}
313 354
314/** This is the Setup cmd - easy first implementation */ 355/** This is the Setup cmd - easy first implementation */
315void 356void
316SetUp (char *buf, int len, client_socket * ns) 357SetUp (char *buf, int len, client * ns)
317{ 358{
318 int s, slen; 359 int s, slen;
319 char *cmd, *param, cmdback[HUGE_BUF]; 360 char *cmd, *param, cmdback[HUGE_BUF];
320 361
321 /* run through the cmds of setup 362 /* run through the cmds of setup
… …
363 { 404 {
364 ns->sound = atoi (param); 405 ns->sound = atoi (param);
365 safe_strcat (cmdback, param, &slen, HUGE_BUF); 406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
366 } 407 }
367 else if (!strcmp (cmd, "exp64")) 408 else if (!strcmp (cmd, "exp64"))
368 {
369 ns->exp64 = atoi (param);
370 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 }
372 else if (!strcmp (cmd, "spellmon")) 410 else if (!strcmp (cmd, "spellmon"))
373 { 411 {
374 ns->monitor_spells = atoi (param); 412 ns->monitor_spells = atoi (param);
375 safe_strcat (cmdback, param, &slen, HUGE_BUF); 413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 } 414 }
… …
531 * This is what takes care of it. We tell the client how things worked out. 569 * This is what takes care of it. We tell the client how things worked out.
532 * I am not sure if this file is the best place for this function. however, 570 * I am not sure if this file is the best place for this function. however,
533 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
534 */ 572 */
535void 573void
536AddMeCmd (char *buf, int len, client_socket * ns) 574AddMeCmd (char *buf, int len, client * ns)
537{ 575{
538 Settings oldsettings; 576 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} 577}
548 578
549/** Reply to ExtendedInfos command */ 579/** Reply to ExtendedInfos command */
550void 580void
551ToggleExtendedInfos (char *buf, int len, client_socket * ns) 581ToggleExtendedInfos (char *buf, int len, client * ns)
552{ 582{
553 char cmdback[MAX_BUF]; 583 char cmdback[MAX_BUF];
554 char command[50]; 584 char command[50];
555 int info, nextinfo; 585 int info, nextinfo;
556 586
… …
607#define MSG_TYPE_MONUMENT 5 637#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 638#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609 639
610/** Reply to ExtendedInfos command */ 640/** Reply to ExtendedInfos command */
611void 641void
612ToggleExtendedText (char *buf, int len, client_socket * ns) 642ToggleExtendedText (char *buf, int len, client * ns)
613{ 643{
614 char cmdback[MAX_BUF]; 644 char cmdback[MAX_BUF];
615 char temp[10]; 645 char temp[10];
616 char command[50]; 646 char command[50];
617 int info, nextinfo, i, flag; 647 int info, nextinfo, i, flag;
… …
668 * a piece of data from us that we know the client wants. So 698 * 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 699 * if we know the client wants it, might as well push it to the
670 * client. 700 * client.
671 */ 701 */
672static void 702static void
673SendSmooth (client_socket * ns, uint16 face) 703SendSmooth (client *ns, uint16 face)
674{ 704{
675 uint16 smoothface; 705 uint16 smoothface;
676 706
677 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
678 * again. 708 * again.
679 */ 709 */
680 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
681 { 711 {
682 712
683 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
684 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
685 return; 715 return;
686 } 716 }
687 717
688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
689 esrv_send_face (ns, smoothface, 0); 719 esrv_send_face (ns, smoothface, 0);
690 720
691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
692 722
693 packet sl; 723 packet sl ("smooth");
694 724
695 sl << "smooth "
696 << uint16 (face) 725 sl << uint16 (face)
697 << uint16 (smoothface); 726 << uint16 (smoothface);
698 727
699 ns->send_packet (sl); 728 ns->send_packet (sl);
700} 729}
701 730
702 /** 731/**
703 * Tells client the picture it has to use 732 * Tells client the picture it has to use
704 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
705 */ 734 */
706void 735void
707AskSmooth (char *buf, int len, client_socket * ns) 736AskSmooth (char *buf, int len, client *ns)
708{ 737{
709 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
710
711 facenbr = atoi (buf);
712 SendSmooth (ns, facenbr);
713} 739}
714 740
715/** 741/**
716 * This handles the general commands from the client (ie, north, fire, cast, 742 * This handles the general commands from the client (ie, north, fire, cast,
717 * etc.) 743 * etc.)
718 */ 744 */
719void 745void
720PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
721{ 747{
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 748 /* Check if there is a count. In theory, a zero count could also be
734 * sent, so check for that also. 749 * sent, so check for that also.
735 */ 750 */
736 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
737 { 752 {
738 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 756 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 757 return;
746 } 758
747 buf++; 759 buf++;
748 } 760 }
749 /* This should not happen anymore. */ 761
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); 762 execute_newserver_command (pl->ob, (char *) buf);
763
756 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
757 * Cleaning up the input should probably be done first - all actions 765 * 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 766 * for the command that issued the count should be done before any other
759 * commands. 767 * commands.
760 */ 768 */
761
762 pl->count = 0; 769 pl->count = 0;
763
764} 770}
765 771
766 772
767/** 773/**
768 * This handles the general commands from the client (ie, north, fire, cast, 774 * This handles the general commands from the client (ie, north, fire, cast,
… …
771 * can throttle. 777 * can throttle.
772 */ 778 */
773void 779void
774NewPlayerCmd (char *buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
775{ 781{
776 int time, repeat;
777 char command[MAX_BUF];
778 int pktlen;
779
780 if (len < 7) 782 if (len <= 6)
781 { 783 {
782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
783 return; 785 return;
784 } 786 }
785 787
786 pktlen = net_uint16 ((uint8 *)buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
787 repeat = net_uint32 ((uint8 *)buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788 790
789 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
790 if (repeat != -1) 792 if (repeat != -1)
791 pl->count = repeat; 793 pl->count = repeat;
792 794
793 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
794 len = MAX_BUF - 5;
795 796
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); 797 execute_newserver_command (pl->ob, buf);
798
805 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
806 * Cleaning up the input should probably be done first - all actions 800 * 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 801 * for the command that issued the count should be done before any other
808 * commands. 802 * commands.
809 */ 803 */
810 pl->count = 0; 804 pl->count = 0;
811 805
812 if (FABS (pl->ob->speed) < 0.001) 806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
807 int time = fabs (pl->ob->speed) < 0.001
813 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
814 else
815 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
816 810
817 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
818 812 packet sl ("comc");
819 packet sl;
820 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
821 pl->socket->send_packet (sl); 814 pl->ns->send_packet (sl);
822} 815}
823
824 816
825/** This is a reply to a previous query. */ 817/** This is a reply to a previous query. */
826void 818void
827ReplyCmd (char *buf, int len, player *pl) 819ReplyCmd (char *buf, int len, client *ns)
828{ 820{
821 if (ns->state == ST_CUSTOM)
822 {
823 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
824 return;
825 }
826
827 if (!ns->pl)
828 return; //TODO: depends on the exact reply we are after
829 //TODO: but right now, we always have a ns->pl
830
831 player *pl = ns->pl;
832
829 /* This is to synthesize how the data would be stored if it 833 /* 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 834 * was normally entered. A bit of a hack, and should be cleaned up
831 * once all the X11 code is removed from the server. 835 * once all the X11 code is removed from the server.
832 * 836 *
833 * We pass 13 to many of the functions because this way they 837 * We pass 13 to many of the functions because this way they
834 * think it was the carriage return that was entered, and the 838 * think it was the carriage return that was entered, and the
835 * function then does not try to do additional input. 839 * function then does not try to do additional input.
836 */ 840 */
837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 841 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
838 842
839 /* this avoids any hacking here */ 843 /* this avoids any hacking here */
840 844
841 switch (pl->state) 845 switch (ns->state)
842 { 846 {
843 case ST_PLAYING: 847 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 848 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 849 break;
846 850
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: 851 case ST_CHANGE_CLASS:
859
860 key_change_class (pl->ob, buf[0]); 852 key_change_class (pl->ob, buf[0]);
861 break; 853 break;
862 854
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 */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
882 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
883 break; 857 break;
884 858
885 default: 859 default:
886 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
887 } 861 }
888} 862}
889 863
890/** 864/**
891 * Client tells its version. If there is a mismatch, we close the 865 * 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 867 * 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 868 * backwards compatible, having it be a later version should not be a
895 * problem. 869 * problem.
896 */ 870 */
897void 871void
898VersionCmd (char *buf, int len, client_socket * ns) 872VersionCmd (char *buf, int len, client * ns)
899{ 873{
900 char *cp;
901 char version_warning[256];
902
903 if (!buf) 874 if (!buf)
904 { 875 {
905 LOG (llevError, "CS: received corrupted version command\n"); 876 LOG (llevError, "CS: received corrupted version command\n");
906 return; 877 return;
907 } 878 }
908 879
909 ns->cs_version = atoi (buf); 880 ns->cs_version = atoi (buf);
910 ns->sc_version = ns->cs_version; 881 ns->sc_version = ns->cs_version;
882
883 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885
886 //TODO: should log here just for statistics
887
911 if (VERSION_CS != ns->cs_version) 888 //if (VERSION_CS != ns->cs_version)
912 { 889 // unchecked;
913#ifdef ESRV_DEBUG 890
914 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
915#endif
916 }
917 cp = strchr (buf + 1, ' '); 891 char *cp = strchr (buf + 1, ' ');
918 if (!cp) 892 if (!cp)
919 return; 893 return;
894
920 ns->sc_version = atoi (cp); 895 ns->sc_version = atoi (cp);
896
921 if (VERSION_SC != ns->sc_version) 897 //if (VERSION_SC != ns->sc_version)
922 { 898 // unchecked;
923#ifdef ESRV_DEBUG 899
924 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
925#endif
926 }
927 cp = strchr (cp + 1, ' '); 900 cp = strchr (cp + 1, ' ');
901
928 if (cp) 902 if (cp)
929 { 903 {
930 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 904 assign (ns->version, cp + 1);
931 905
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) 906 if (ns->sc_version < 1026)
944 { 907 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!! ****"); 908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
947 ns->send_packet (version_warning);
948 }
949
950 } 909 }
951} 910}
952 911
953/** sound related functions. */ 912/** sound related functions. */
954
955void 913void
956SetSound (char *buf, int len, client_socket * ns) 914SetSound (char *buf, int len, client * ns)
957{ 915{
958 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
959} 917}
960 918
961/** client wants the map resent */ 919/** client wants the map resent */
962
963void 920void
964MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
965{ 922{
966
967/* This function is currently disabled; just clearing the map state results in 923/* 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. 924 * display errors. It should clear the cache and send a newmap command.
969 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
970 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
971 */ 927 */
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} 928}
980 929
981/** 930/**
982 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
983 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
986MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
987{ 936{
988 int vals[3], i; 937 int vals[3], i;
989 938
990 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
991 * we obviously am not going to find a space after the third 940 * we obviously are not going to find a space after the third
992 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
993 * sscanf? 942 * sscanf?
994 */ 943 */
995 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
996 { 945 {
997 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
998 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
999 { 949 {
1000 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1001 return; 951 return;
1002 } 952 }
953
1003 buf++; 954 buf++;
1004 } 955 }
956
1005 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1006 958
1007/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 959/* 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]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1009} 961}
1010
1011
1012 962
1013/****************************************************************************** 963/******************************************************************************
1014 * 964 *
1015 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1016 * 966 *
… …
1019/** 969/**
1020 * Asks the client to query the user. This way, the client knows 970 * 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) 971 * it needs to send something back (vs just printing out a message)
1022 */ 972 */
1023void 973void
1024send_query (client_socket * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1025{ 975{
1026 char buf[MAX_BUF];
1027
1028 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1029 ns->send_packet (buf);
1030} 977}
1031 978
1032#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1033 Old = New; \ 980 Old = New; \
1034 sl << uint8 (Type) << uint64 (New); \ 981 sl << uint8 (Type) << uint64 (New); \
… …
1064esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1065{ 1012{
1066 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1067 uint16 flags; 1014 uint16 flags;
1068 1015
1069 packet sl; 1016 client *ns = pl->ns;
1070 sl << "stats "; 1017 if (!ns)
1018 return;
1071 1019
1072 if (pl->ob != NULL) 1020 object *ob = pl->ob;
1073 { 1021 if (!ob)
1022 return;
1023
1024 packet sl ("stats");
1025
1074 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1075 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1076 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1077 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1078 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1079 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1080 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 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); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1085 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1034 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1035 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1036 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1037 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1086 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1087 }
1088 1039
1089 if (pl->socket->exp64)
1090 {
1091 uint8 s;
1092
1093 for (s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1094 { 1041 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) 1042 if (skill->stats.exp != ns->last_skill_exp [s])
1096 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1097 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1098 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1099 */ 1048 */
1100 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1101 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1102 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1103
1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105 } 1052 }
1106 }
1107 }
1108 1053
1109 if (pl->socket->exp64)
1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1054 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); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1115 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1116 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1117 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1118 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1119 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1120 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1061 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); 1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063
1122 flags = 0; 1064 flags = 0;
1123 1065
1124 if (pl->fire_on) 1066 if (pl->fire_on)
1125 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1126 1068
1127 if (pl->run_on) 1069 if (pl->run_on)
1128 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1129 1071
1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1131 1073
1132 if (pl->socket->sc_version < 1025) 1074 if (ns->sc_version < 1025)
1133 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1075 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1134 else 1076 else
1135 {
1136 int i;
1137
1138 for (i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1139 { 1078 {
1140 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1141 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1142 continue; 1081 continue;
1143 1082
1144 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1083 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1145 } 1084 }
1146 }
1147 1085
1148 if (pl->socket->monitor_spells) 1086 if (pl->ns->monitor_spells)
1149 { 1087 {
1150 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1088 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); 1089 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); 1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1153 } 1091 }
1154 1092
1155 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1157 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1159 1097
1160 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1161 if (sl.length () > 6) 1099 if (sl.length () > 6)
1162 pl->socket->send_packet (sl); 1100 ns->send_packet (sl);
1163} 1101}
1164 1102
1165/** 1103/**
1166 * Tells the client that here is a player it should start using. 1104 * Tells the client that here is a player it should start using.
1167 */ 1105 */
1168void 1106void
1169esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1170{ 1108{
1171 pl->last_weight = weight; 1109 packet sl ("player");
1172
1173 packet sl;
1174 sl << "player ";
1175 1110
1176 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1177 << uint32 (weight) 1112 << uint32 (weight)
1178 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face->number)
1179 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1180 1115
1116 pl->ns->last_weight = weight;
1181 pl->socket->send_packet (sl); 1117 pl->ns->send_packet (sl);
1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1183} 1119}
1184 1120
1185/** 1121/**
1186 * Need to send an animation sequence to the client. 1122 * Need to send an animation sequence to the client.
… …
1188 * sent them the face yet (this can become quite costly in terms of 1124 * 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 1125 * how much we are sending - on the other hand, this should only happen
1190 * when the player logs in and picks stuff up. 1126 * when the player logs in and picks stuff up.
1191 */ 1127 */
1192void 1128void
1193esrv_send_animation (client_socket * ns, short anim_num) 1129esrv_send_animation (client * ns, short anim_num)
1194{ 1130{
1195 int i;
1196
1197 /* Do some checking on the anim_num we got. Note that the animations 1131 /* 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 1132 * are added in contigous order, so if the number is in the valid
1199 * range, it must be a valid animation. 1133 * range, it must be a valid animation.
1200 */ 1134 */
1201 if (anim_num < 0 || anim_num > num_animations) 1135 if (anim_num < 0 || anim_num > num_animations)
1202 { 1136 {
1203 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1204 return; 1138 return;
1205 } 1139 }
1206 1140
1207 packet sl; 1141 packet sl ("anim");
1208 1142
1209 sl << "anim "
1210 << uint16 (anim_num) 1143 sl << uint16 (anim_num)
1211 << uint16 (0); /* flags - not used right now */ 1144 << uint16 (0); /* flags - not used right now */
1212 1145
1213 /* Build up the list of faces. Also, send any information (ie, the 1146 /* Build up the list of faces. Also, send any information (ie, the
1214 * the face itself) down to the client. 1147 * the face itself) down to the client.
1215 */ 1148 */
1216 for (i = 0; i < animations[anim_num].num_animations; i++) 1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1217 { 1150 {
1218 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1219 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1221 } 1155 }
1222 1156
1223 ns->send_packet (sl); 1157 ns->send_packet (sl);
1224 1158
… …
1229/****************************************************************************** 1163/******************************************************************************
1230 * 1164 *
1231 * Start of map related commands. 1165 * Start of map related commands.
1232 * 1166 *
1233 ******************************************************************************/ 1167 ******************************************************************************/
1234
1235/**
1236 * 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.
1238 */
1239static void
1240esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1241{
1242 if (newmap->cells[x][y].count >= MAP_LAYERS)
1243 {
1244 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1245 return;
1246 abort ();
1247 }
1248
1249 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1250 newmap->cells[x][y].count++;
1251
1252 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1253 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}
1362 1168
1363/** Clears a map cell */ 1169/** Clears a map cell */
1364static void 1170static void
1365map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1366{ 1172{
… …
1377#define MAX_LAYERS 3 1183#define MAX_LAYERS 3
1378 1184
1379/* Using a global really isn't a good approach, but saves the over head of 1185/* 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, 1186 * 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 1187 * 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 1188 * need it for this cycle. If the server is ever threaded, this needs to be
1383 * re-examined. 1189 * re-examined.
1384 */ 1190 */
1385
1386static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1387 1192
1388/** 1193/**
1389 * Returns true if any of the heads for this 1194 * Returns true if any of the heads for this
1390 * space is set. Returns false if all are blank - this is used 1195 * space is set. Returns false if all are blank - this is used
1391 * for empty space checking. 1196 * for empty space checking.
1392 */ 1197 */
1393static inline int 1198static inline int
1394have_head (int ax, int ay) 1199have_head (int ax, int ay)
1395{ 1200{
1396
1397 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1201 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]) 1202 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1399 return 1; 1203 return 1;
1204
1400 return 0; 1205 return 0;
1401} 1206}
1402 1207
1403/** 1208/**
1404 * check_head is a bit simplistic version of update_space below. 1209 * 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 1210 * 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 1211 * 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 1212 * if needed, and returning 1. If this no data needs to get
1408 * sent, it returns zero. 1213 * sent, it returns zero.
1409 */ 1214 */
1410static int 1215static int
1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1412{ 1217{
1413 short face_num; 1218 short face_num;
1414 1219
1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1416 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1221 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 1253 * 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 1254 * 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 1255 * the case, it seems to make more sense to have these layer values
1451 * actually match. 1256 * actually match.
1452 */ 1257 */
1453
1454static int 1258static int
1455update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1259update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1456{ 1260{
1457 object *ob, *head; 1261 object *ob, *head;
1458 uint16 face_num; 1262 uint16 face_num;
1459 int bx, by, i; 1263 int bx, by, i;
1460 1264
… …
1673 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1477 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1674 * take. 1478 * take.
1675 */ 1479 */
1676 1480
1677static inline int 1481static inline int
1678update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1482update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1679{ 1483{
1680 object *ob; 1484 object *ob;
1681 int smoothlevel; /* old face_num; */ 1485 int smoothlevel; /* old face_num; */
1682 1486
1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1684 1488
1685 /* If there is no object for this space, or if the face for the object 1489 /* 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. 1490 * is the blank face, set the smoothlevel to zero.
1687 */ 1491 */
1688 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1492 if (!ob || ob->face == blank_face)
1689 smoothlevel = 0; 1493 smoothlevel = 0;
1690 else 1494 else
1691 { 1495 {
1692 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1693 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 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 1521 * Returns the size of a data for a map square as returned by
1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1522 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1719 * available. 1523 * available.
1720 */ 1524 */
1721int 1525int
1722getExtendedMapInfoSize (client_socket * ns) 1526getExtendedMapInfoSize (client * ns)
1723{ 1527{
1724 int result = 0; 1528 int result = 0;
1725 1529
1726 if (ns->ext_mapinfos) 1530 if (ns->ext_mapinfos)
1727 { 1531 {
1728 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1729 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1730 } 1534 }
1535
1731 return result; 1536 return result;
1537}
1538
1539// prefetch (and touch) all maps within a specific distancd
1540static void
1541prefetch_surrounding_maps (maptile *map, int distance)
1542{
1543 map->last_access = runtime;
1544
1545 if (--distance)
1546 for (int dir = 4; --dir; )
1547 if (const shstr &path = map->tile_path [dir])
1548 if (maptile *&neigh = map->tile_map [dir])
1549 prefetch_surrounding_maps (neigh, distance);
1550 else
1551 neigh = maptile::find_async (path, map);
1552}
1553
1554// prefetch a generous area around the player
1555static void
1556prefetch_surrounding_maps (object *op)
1557{
1558 prefetch_surrounding_maps (op->map, 3);
1732} 1559}
1733 1560
1734/** 1561/**
1735 * This function uses the new map1 protocol command to send the map 1562 * 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 1563 * 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 1569 * 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, 1570 * 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 1571 * and use the other 4 bits for other informatiion. For full documentation
1745 * of what we send, see the doc/Protocol file. 1572 * of what we send, see the doc/Protocol file.
1746 * I will describe internally what we do: 1573 * I will describe internally what we do:
1747 * the socket->lastmap shows how the map last looked when sent to the client. 1574 * 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 1575 * in the lastmap structure, there is a cells array, which is set to the
1749 * maximum viewable size (As set in config.h). 1576 * maximum viewable size (As set in config.h).
1750 * in the cells, there are faces and a count value. 1577 * 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 1578 * we use the count value to hold the darkness value. If -1, then this space
1752 * is not viewable. 1579 * is not viewable.
… …
1763 uint8 eentrysize; 1590 uint8 eentrysize;
1764 uint16 ewhatstart, ewhatflag; 1591 uint16 ewhatstart, ewhatflag;
1765 uint8 extendedinfos; 1592 uint8 extendedinfos;
1766 maptile *m; 1593 maptile *m;
1767 1594
1768 client_socket &socket = *pl->contr->socket; 1595 client &socket = *pl->contr->ns;
1596
1597 if (!pl->active)
1598 return;
1769 1599
1770 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1771 1602
1772 packet sl; 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1773 packet esl; 1604 packet esl;
1774 1605
1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1776 startlen = sl.length (); 1606 startlen = sl.length ();
1777 1607
1778 /*Extendedmapinfo structure initialisation */ 1608 /*Extendedmapinfo structure initialisation */
1779 if (socket.ext_mapinfos) 1609 if (socket.ext_mapinfos)
1780 { 1610 {
… …
1824 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1654 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1825 { 1655 {
1826 ax = 0; 1656 ax = 0;
1827 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1657 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1828 { 1658 {
1829
1830 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1831 1660
1832 /* If this space is out of the normal viewable area, we only check 1661 /* 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 1662 * the heads value ax or ay will only be greater than what
1834 * the client wants if using the map1a command - this is because 1663 * the client wants if using the map1a command - this is because
… …
1896 map_clearcell (&lastcell, 0, 0, 0, -1); 1725 map_clearcell (&lastcell, 0, 0, 0, -1);
1897 } 1726 }
1898 } 1727 }
1899 else if (d > 3) 1728 else if (d > 3)
1900 { 1729 {
1730 m->touch ();
1731
1901 int need_send = 0, count; 1732 int need_send = 0, count;
1902 1733
1903 /* This block deals with spaces that are not visible for whatever 1734 /* This block deals with spaces that are not visible for whatever
1904 * reason. Still may need to send the head for this space. 1735 * reason. Still may need to send the head for this space.
1905 */ 1736 */
… …
1938 else 1769 else
1939 sl.reset (oldlen); 1770 sl.reset (oldlen);
1940 } 1771 }
1941 else 1772 else
1942 { 1773 {
1774 m->touch ();
1775
1943 /* In this block, the space is visible or there are head objects 1776 /* In this block, the space is visible or there are head objects
1944 * we need to send. 1777 * we need to send.
1945 */ 1778 */
1946 1779
1947 /* Rather than try to figure out what everything that we might 1780 /* Rather than try to figure out what everything that we might
… …
2140 */ 1973 */
2141void 1974void
2142draw_client_map (object *pl) 1975draw_client_map (object *pl)
2143{ 1976{
2144 int i, j; 1977 int i, j;
2145 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1978 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2146 New_Face *face, *floor;
2147 New_Face *floor2;
2148 int d, mflags; 1979 int mflags;
2149 struct Map newmap; 1980 struct Map newmap;
2150 maptile *m, *pm; 1981 maptile *m, *pm;
2151 1982
2152 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
2153 { 1984 {
… …
2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1995 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2165 return; 1996 return;
2166 1997
2167 memset (&newmap, 0, sizeof (struct Map)); 1998 memset (&newmap, 0, sizeof (struct Map));
2168 1999
2169 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2000 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++) 2001 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2172 { 2002 {
2173 ax = i; 2003 ax = i;
2174 ay = j; 2004 ay = j;
2175 m = pm; 2005 m = pm;
2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2006 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2007
2177 if (mflags & P_OUT_OF_MAP) 2008 if (mflags & P_OUT_OF_MAP)
2178 continue; 2009 continue;
2179 if (mflags & P_NEED_UPDATE) 2010
2180 update_position (m, ax, ay);
2181 /* If a map is visible to the player, we don't want to swap it out 2011 /* 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 2012 * just to reload it. This should really call something like
2183 * swap_map, but this is much more efficient and 'good enough' 2013 * swap_map, but this is much more efficient and 'good enough'
2184 */ 2014 */
2185 if (mflags & P_NEW_MAP) 2015 if (mflags & P_NEW_MAP)
2186 m->timeout = 50; 2016 m->timeout = 50;
2187 } 2017 }
2188 } 2018
2189 /* do LOS after calls to update_position */ 2019 /* do LOS after calls to update_position */
2190 if (pl->contr->do_los) 2020 if (pl->contr->do_los)
2191 { 2021 {
2192 update_los (pl); 2022 update_los (pl);
2193 pl->contr->do_los = 0; 2023 pl->contr->do_los = 0;
… …
2208 2038
2209/*****************************************************************************/ 2039/*****************************************************************************/
2210void 2040void
2211send_plugin_custom_message (object *pl, char *buf) 2041send_plugin_custom_message (object *pl, char *buf)
2212{ 2042{
2213 pl->contr->socket->send_packet (buf); 2043 pl->contr->ns->send_packet (buf);
2214} 2044}
2215 2045
2216/** 2046/**
2217 * This sends the skill number to name mapping. We ignore 2047 * This sends the skill number to name mapping. We ignore
2218 * the params - we always send the same info no matter what. 2048 * the params - we always send the same info no matter what.
2219 */ 2049 */
2220void 2050void
2221send_skill_info (client_socket *ns, char *params) 2051send_skill_info (client *ns, char *params)
2222{ 2052{
2223 packet sl; 2053 packet sl;
2224 sl << "replyinfo skill_info\n"; 2054 sl << "replyinfo skill_info\n";
2225 2055
2226 for (int i = 1; i < NUM_SKILLS; i++) 2056 for (int i = 1; i < NUM_SKILLS; i++)
… …
2238/** 2068/**
2239 * This sends the spell path to name mapping. We ignore 2069 * This sends the spell path to name mapping. We ignore
2240 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2241 */ 2071 */
2242void 2072void
2243send_spell_paths (client_socket * ns, char *params) 2073send_spell_paths (client * ns, char *params)
2244{ 2074{
2245 packet sl; 2075 packet sl;
2246 2076
2247 sl << "replyinfo spell_paths\n"; 2077 sl << "replyinfo spell_paths\n";
2248 2078
… …
2263 * it then sends an updspell packet for each spell that has changed in this way 2093 * it then sends an updspell packet for each spell that has changed in this way
2264 */ 2094 */
2265void 2095void
2266esrv_update_spells (player *pl) 2096esrv_update_spells (player *pl)
2267{ 2097{
2098 if (!pl->ns)
2099 return;
2100
2268 if (!pl->socket->monitor_spells) 2101 if (!pl->ns->monitor_spells)
2269 return; 2102 return;
2270 2103
2271 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2104 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2272 { 2105 {
2273 if (spell->type == SPELL) 2106 if (spell->type == SPELL)
… …
2303 2136
2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2137 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2138 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2139 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2307 2140
2308 pl->socket->send_packet (sl); 2141 pl->ns->send_packet (sl);
2309 } 2142 }
2310 } 2143 }
2311 } 2144 }
2312} 2145}
2313 2146
2314void 2147void
2315esrv_remove_spell (player *pl, object *spell) 2148esrv_remove_spell (player *pl, object *spell)
2316{ 2149{
2317 if (!pl->socket->monitor_spells) 2150 if (!pl->ns->monitor_spells)
2318 return; 2151 return;
2319 2152
2320 if (!pl || !spell || spell->env != pl->ob) 2153 if (!pl || !spell || spell->env != pl->ob)
2321 { 2154 {
2322 LOG (llevError, "Invalid call to esrv_remove_spell"); 2155 LOG (llevError, "Invalid call to esrv_remove_spell");
2323 return; 2156 return;
2324 } 2157 }
2325 2158
2326 packet sl; 2159 packet sl ("delspell");
2327 2160
2328 sl << "delspell "
2329 << uint32 (spell->count); 2161 sl << uint32 (spell->count);
2330 2162
2331 pl->socket->send_packet (sl); 2163 pl->ns->send_packet (sl);
2332} 2164}
2333 2165
2334/* appends the spell *spell to the Socklist we will send the data to. */ 2166/* appends the spell *spell to the Socklist we will send the data to. */
2335static void 2167static void
2336append_spell (player *pl, packet &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2337{ 2169{
2338 int len, i, skill = 0; 2170 int i, skill = 0;
2339 2171
2340 if (!(spell->name)) 2172 if (!(spell->name))
2341 { 2173 {
2342 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2174 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2343 return; 2175 return;
… …
2384 { 2216 {
2385 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2217 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2386 return; 2218 return;
2387 } 2219 }
2388 2220
2389 if (!pl->socket->monitor_spells) 2221 if (!pl->ns->monitor_spells)
2390 return; 2222 return;
2391 2223
2392 packet sl; 2224 packet sl ("addspell");
2393
2394 sl << "addspell ";
2395 2225
2396 if (!spell) 2226 if (!spell)
2397 { 2227 {
2398 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2399 { 2229 {
… …
2413 if (spell->type != SPELL) 2243 if (spell->type != SPELL)
2414 continue; 2244 continue;
2415 2245
2416 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2246 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2417 { 2247 {
2418 pl->socket->send_packet (sl); 2248 pl->ns->send_packet (sl);
2419 2249
2420 sl.reset (); 2250 sl.reset ();
2421 sl << "addspell "; 2251 sl << "addspell ";
2422 } 2252 }
2423 2253
… …
2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2267 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2438 fatal (0); 2268 fatal (0);
2439 } 2269 }
2440 2270
2441 /* finally, we can send the packet */ 2271 /* finally, we can send the packet */
2442 pl->socket->send_packet (sl); 2272 pl->ns->send_packet (sl);
2443} 2273}
2444 2274

Diff Legend

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