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.34 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.70 by root, Sun Mar 11 21:26:05 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.
… …
60#include <sys/time.h> 53#include <sys/time.h>
61#include <sys/socket.h> 54#include <sys/socket.h>
62#include <netinet/in.h> 55#include <netinet/in.h>
63#include <netdb.h> 56#include <netdb.h>
64 57
65#ifdef HAVE_UNISTD_H
66# include <unistd.h> 58#include <unistd.h>
67#endif
68
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h> 59#include <sys/time.h>
71#endif
72 60
73#include "sounds.h" 61#include "sounds.h"
74 62
75/** 63/**
76 * This table translates the attack numbers as used within the 64 * This table translates the attack numbers as used within the
… …
93 -1, /* life stealing */ 81 -1, /* life stealing */
94 -1 /* Disease - not fully done yet */ 82 -1 /* Disease - not fully done yet */
95}; 83};
96 84
97static void 85static void
98socket_map_scroll (NewSocket * ns, int dx, int dy) 86socket_map_scroll (client *ns, int dx, int dy)
99{ 87{
100 struct Map newmap; 88 struct Map newmap;
101 int x, y, mx, my; 89 int x, y, mx, my;
102 90
103 {
104 packet sl;
105
106 sl.printf ("map_scroll %d %d", dx, dy); 91 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107 ns->send_packet (sl);
108 }
109 92
110 /* If we are using the Map1aCmd, we may in fact send 93 /* If we are using the Map1aCmd, we may in fact send
111 * head information that is outside the viewable map. 94 * head information that is outside the viewable map.
112 * 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
113 * look for. Removed code to do so - it caused extra 96 * look for. Removed code to do so - it caused extra
… …
153} 136}
154 137
155static void 138static void
156clear_map (player *pl) 139clear_map (player *pl)
157{ 140{
158 NewSocket & socket = pl->socket;
159
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
161 142
162 if (socket.newmapcmd == 1) 143 if (pl->ns->newmapcmd == 1)
163 socket.send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
164 145
165 socket.update_look = 1; 146 pl->ns->floorbox_reset ();
166 socket.look_position = 0;
167} 147}
168 148
169/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
170static void 150static void
171check_map_change (player *pl) 151check_map_change (player *pl)
172{ 152{
173 NewSocket & socket = pl->socket; 153 client &socket = *pl->ns;
174 object *ob = pl->ob; 154 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 155 char buf[MAX_BUF]; /* eauugggh */
176 156
177 if (socket.current_map != ob->map) 157 if (socket.current_map != ob->map)
178 { 158 {
… …
194 flags |= 4; 174 flags |= 4;
195 if (ob->map->tile_path[3]) 175 if (ob->map->tile_path[3])
196 flags |= 8; 176 flags |= 8;
197 177
198 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",
199 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);
200 } 180 }
201 else 181 else
202 snprintf (buf, MAX_BUF, "mapinfo current"); 182 snprintf (buf, MAX_BUF, "mapinfo current");
203 183
204 socket.send_packet (buf); 184 socket.send_packet (buf);
… …
212 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 192 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213 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
214 else 194 else
215 { 195 {
216 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);
217 socket.update_look = 1; 197 socket.floorbox_reset ();
218 socket.look_position = 0;
219 } 198 }
220 } 199 }
221 200
222 socket.current_x = ob->x; 201 socket.current_x = ob->x;
223 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);
224} 254}
225 255
226void 256void
227ExtCmd (char *buf, int len, player *pl) 257ExtCmd (char *buf, int len, player *pl)
228{ 258{
229 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));
230} 266}
231 267
232void 268void
233MapInfoCmd (char *buf, int len, player *pl) 269MapInfoCmd (char *buf, int len, player *pl)
234{ 270{
… …
249 buf += 8; 285 buf += 8;
250 286
251 // initial map and its origin 287 // initial map and its origin
252 maptile *map = pl->ob->map; 288 maptile *map = pl->ob->map;
253 sint16 dx, dy; 289 sint16 dx, dy;
254 int mapx = pl->socket.mapx / 2 - pl->ob->x; 290 int mapx = pl->ns->mapx / 2 - pl->ob->x;
255 int mapy = pl->socket.mapy / 2 - pl->ob->y; 291 int mapy = pl->ns->mapy / 2 - pl->ob->y;
256 int max_distance = 8; // limit maximum path length to something generous 292 int max_distance = 8; // limit maximum path length to something generous
257 293
258 while (*buf && map && max_distance) 294 while (*buf && map && max_distance)
259 { 295 {
260 int dir = *buf++; 296 int dir = *buf++;
261 297
262 switch (dir) 298 switch (dir)
263 { 299 {
264 case '1': 300 case '1':
265 dx = 0; 301 dx = 0;
266 dy = -1; 302 dy = -1;
267 map = get_map_from_coord (map, &dx, &dy); 303 map = map->xy_find (dx, dy);
268 map && (mapy -= map->height); 304 map && (mapy -= map->height);
269 break; 305 break;
270 case '2': 306 case '2':
271 mapx += map->width; 307 mapx += map->width;
272 dx = map->width; 308 dx = map->width;
273 dy = 0; 309 dy = 0;
274 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
275 break; 311 break;
276 case '3': 312 case '3':
277 mapy += map->height; 313 mapy += map->height;
278 dx = 0; 314 dx = 0;
279 dy = map->height; 315 dy = map->height;
280 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
281 break; 317 break;
282 case '4': 318 case '4':
283 dx = -1; 319 dx = -1;
284 dy = 0; 320 dy = 0;
285 map = get_map_from_coord (map, &dx, &dy); 321 map = map->xy_find (dx, dy);
286 map && (mapx -= map->width); 322 map && (mapx -= map->width);
287 break; 323 break;
288 } 324 }
289 325
290 --max_distance; 326 --max_distance;
291 } 327 }
292 328
… …
303 if (map->tile_path[2]) 339 if (map->tile_path[2])
304 flags |= 4; 340 flags |= 4;
305 if (map->tile_path[3]) 341 if (map->tile_path[3])
306 flags |= 8; 342 flags |= 8;
307 343
308 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);
309 } 345 }
310 else 346 else
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312 } 348 }
313 else 349 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315 351
316 pl->socket.send_packet (bigbuf); 352 pl->ns->send_packet (bigbuf);
317} 353}
318 354
319/** This is the Setup cmd - easy first implementation */ 355/** This is the Setup cmd - easy first implementation */
320void 356void
321SetUp (char *buf, int len, NewSocket * ns) 357SetUp (char *buf, int len, client * ns)
322{ 358{
323 int s, slen; 359 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 360 char *cmd, *param, cmdback[HUGE_BUF];
325 361
326 /* run through the cmds of setup 362 /* run through the cmds of setup
… …
368 { 404 {
369 ns->sound = atoi (param); 405 ns->sound = atoi (param);
370 safe_strcat (cmdback, param, &slen, HUGE_BUF); 406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 } 407 }
372 else if (!strcmp (cmd, "exp64")) 408 else if (!strcmp (cmd, "exp64"))
373 {
374 ns->exp64 = atoi (param);
375 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 }
377 else if (!strcmp (cmd, "spellmon")) 410 else if (!strcmp (cmd, "spellmon"))
378 { 411 {
379 ns->monitor_spells = atoi (param); 412 ns->monitor_spells = atoi (param);
380 safe_strcat (cmdback, param, &slen, HUGE_BUF); 413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
381 } 414 }
… …
536 * 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.
537 * 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,
538 * 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.
539 */ 572 */
540void 573void
541AddMeCmd (char *buf, int len, NewSocket * ns) 574AddMeCmd (char *buf, int len, client * ns)
542{ 575{
543 Settings oldsettings; 576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed");
548 else
549 {
550 /* Basically, the add_player copies the socket structure into
551 * the player structure, so this one (which is from init_sockets)
552 * is not needed anymore. The write below should still work, as the
553 * stuff in ns is still relevant.
554 */
555 ns->send_packet ("addme_success");
556 socket_info.nconns--;
557 ns->status = Ns_Avail;
558 }
559
560 settings = oldsettings;
561} 577}
562 578
563/** Reply to ExtendedInfos command */ 579/** Reply to ExtendedInfos command */
564void 580void
565ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 581ToggleExtendedInfos (char *buf, int len, client * ns)
566{ 582{
567 char cmdback[MAX_BUF]; 583 char cmdback[MAX_BUF];
568 char command[50]; 584 char command[50];
569 int info, nextinfo; 585 int info, nextinfo;
570 586
… …
621#define MSG_TYPE_MONUMENT 5 637#define MSG_TYPE_MONUMENT 5
622#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 638#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623 639
624/** Reply to ExtendedInfos command */ 640/** Reply to ExtendedInfos command */
625void 641void
626ToggleExtendedText (char *buf, int len, NewSocket * ns) 642ToggleExtendedText (char *buf, int len, client * ns)
627{ 643{
628 char cmdback[MAX_BUF]; 644 char cmdback[MAX_BUF];
629 char temp[10]; 645 char temp[10];
630 char command[50]; 646 char command[50];
631 int info, nextinfo, i, flag; 647 int info, nextinfo, i, flag;
… …
682 * 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
683 * 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
684 * client. 700 * client.
685 */ 701 */
686static void 702static void
687SendSmooth (NewSocket * ns, uint16 face) 703SendSmooth (client *ns, uint16 face)
688{ 704{
689 uint16 smoothface; 705 uint16 smoothface;
690 706
691 /* 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
692 * again. 708 * again.
693 */ 709 */
694 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
695 { 711 {
696 712
697 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);
698 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
699 return; 715 return;
700 } 716 }
701 717
702 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
703 esrv_send_face (ns, smoothface, 0); 719 esrv_send_face (ns, smoothface, 0);
704 720
705 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
706 722
707 packet sl; 723 packet sl ("smooth");
708 724
709 sl << "smooth "
710 << uint16 (face) 725 sl << uint16 (face)
711 << uint16 (smoothface); 726 << uint16 (smoothface);
712 727
713 Send_With_Handling (ns, &sl); 728 ns->send_packet (sl);
714} 729}
715 730
716 /** 731/**
717 * Tells client the picture it has to use 732 * Tells client the picture it has to use
718 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
719 */ 734 */
720void 735void
721AskSmooth (char *buf, int len, NewSocket * ns) 736AskSmooth (char *buf, int len, client *ns)
722{ 737{
723 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
724
725 facenbr = atoi (buf);
726 SendSmooth (ns, facenbr);
727} 739}
728 740
729/** 741/**
730 * 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,
731 * etc.) 743 * etc.)
732 */ 744 */
733void 745void
734PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
735{ 747{
736
737 /* The following should never happen with a proper or honest client.
738 * Therefore, the error message doesn't have to be too clear - if
739 * someone is playing with a hacked/non working client, this gives them
740 * an idea of the problem, but they deserve what they get
741 */
742 if (pl->state != ST_PLAYING)
743 {
744 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
745 return;
746 }
747 /* 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
748 * sent, so check for that also. 749 * sent, so check for that also.
749 */ 750 */
750 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
751 { 752 {
752 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
753 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
754 if (!buf) 756 if (!buf)
755 {
756#ifdef ESRV_DEBUG
757 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758#endif
759 return; 757 return;
760 } 758
761 buf++; 759 buf++;
762 } 760 }
763 /* This should not happen anymore. */ 761
764 if (pl->ob->speed_left < -1.0)
765 {
766 LOG (llevError, "Player has negative time - shouldn't do command.\n");
767 }
768 /* In c_new.c */
769 execute_newserver_command (pl->ob, (char *) buf); 762 execute_newserver_command (pl->ob, (char *) buf);
770 /* Perhaps something better should be done with a left over count.
771 * Cleaning up the input should probably be done first - all actions
772 * for the command that issued the count should be done before any other
773 * commands.
774 */
775 763
776 pl->count = 0;
777
778}
779
780
781/**
782 * This handles the general commands from the client (ie, north, fire, cast,
783 * etc.). It is a lot like PlayerCmd above, but is called with the
784 * 'ncom' method which gives more information back to the client so it
785 * can throttle.
786 */
787void
788NewPlayerCmd (uint8 * buf, int len, player *pl)
789{
790 int time, repeat;
791 char command[MAX_BUF];
792 int pktlen;
793
794 if (len < 7)
795 {
796 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
797 return;
798 }
799
800 pktlen = net_uint16 (buf);
801 repeat = net_uint32 (buf + 2);
802
803 /* -1 is special - no repeat, but don't update */
804 if (repeat != -1)
805 pl->count = repeat;
806
807 if ((len - 4) >= MAX_BUF)
808 len = MAX_BUF - 5;
809
810 strncpy ((char *) command, (char *) buf + 6, len - 4);
811 command[len - 4] = '\0';
812
813 /* The following should never happen with a proper or honest client.
814 * Therefore, the error message doesn't have to be too clear - if
815 * someone is playing with a hacked/non working client, this gives them
816 * an idea of the problem, but they deserve what they get
817 */
818 if (pl->state != ST_PLAYING)
819 {
820 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
821 return;
822 }
823
824 /* This should not happen anymore. */
825 if (pl->ob->speed_left < -1.0)
826 LOG (llevError, "Player has negative time - shouldn't do command.\n");
827
828 /* In c_new.c */
829 execute_newserver_command (pl->ob, (char *) command);
830 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
831 * Cleaning up the input should probably be done first - all actions 765 * Cleaning up the input should probably be done first - all actions
832 * 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
833 * commands. 767 * commands.
834 */ 768 */
835 pl->count = 0; 769 pl->count = 0;
770}
836 771
837 if (FABS (pl->ob->speed) < 0.001) 772
773/**
774 * This handles the general commands from the client (ie, north, fire, cast,
775 * etc.). It is a lot like PlayerCmd above, but is called with the
776 * 'ncom' method which gives more information back to the client so it
777 * can throttle.
778 */
779void
780NewPlayerCmd (char *buf, int len, player *pl)
781{
782 if (len <= 6)
783 {
784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
785 return;
786 }
787
788 uint16 cmdid = net_uint16 ((uint8 *)buf);
789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
790
791 /* -1 is special - no repeat, but don't update */
792 if (repeat != -1)
793 pl->count = repeat;
794
795 buf += 6; //len -= 6;
796
797 execute_newserver_command (pl->ob, buf);
798
799 /* Perhaps something better should be done with a left over count.
800 * Cleaning up the input should probably be done first - all actions
801 * for the command that issued the count should be done before any other
802 * commands.
803 */
804 pl->count = 0;
805
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
807 int time = fabs (pl->ob->speed) < 0.001
838 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
839 else
840 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
841 810
842 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
843 812 packet sl ("comc");
844 packet sl;
845 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
846 Send_With_Handling (&pl->socket, &sl); 814 pl->ns->send_packet (sl);
847} 815}
848
849 816
850/** This is a reply to a previous query. */ 817/** This is a reply to a previous query. */
851void 818void
852ReplyCmd (char *buf, int len, player *pl) 819ReplyCmd (char *buf, int len, client *ns)
853{ 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
854 /* 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
855 * 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
856 * once all the X11 code is removed from the server. 835 * once all the X11 code is removed from the server.
857 * 836 *
858 * 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
859 * think it was the carriage return that was entered, and the 838 * think it was the carriage return that was entered, and the
860 * function then does not try to do additional input. 839 * function then does not try to do additional input.
861 */ 840 */
862 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 841 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
863 842
864 /* this avoids any hacking here */ 843 /* this avoids any hacking here */
865 844
866 switch (pl->state) 845 switch (ns->state)
867 { 846 {
868 case ST_PLAYING: 847 case ST_PLAYING:
869 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 848 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
870 break; 849 break;
871 850
872 case ST_PLAY_AGAIN:
873 /* We can check this for return value (2==quit). Maybe we
874 * should, and do something appropriate?
875 */
876 receive_play_again (pl->ob, buf[0]);
877 break;
878
879 case ST_ROLL_STAT:
880 key_roll_stat (pl->ob, buf[0]);
881 break;
882
883 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
884
885 key_change_class (pl->ob, buf[0]); 852 key_change_class (pl->ob, buf[0]);
886 break; 853 break;
887 854
888 case ST_CONFIRM_QUIT:
889 key_confirm_quit (pl->ob, buf[0]);
890 break;
891
892 case ST_CONFIGURE:
893 LOG (llevError, "In client input handling, but into configure state\n");
894 pl->state = ST_PLAYING;
895 break;
896
897 case ST_GET_NAME:
898 receive_player_name (pl->ob, 13);
899 break;
900
901 case ST_GET_PASSWORD:
902 case ST_CONFIRM_PASSWORD:
903 receive_player_password (pl->ob, 13);
904 break;
905
906 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
907 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
908 break; 857 break;
909 858
910 default: 859 default:
911 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
912 } 861 }
913} 862}
914 863
915/** 864/**
916 * 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
… …
918 * 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
919 * 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
920 * problem. 869 * problem.
921 */ 870 */
922void 871void
923VersionCmd (char *buf, int len, NewSocket * ns) 872VersionCmd (char *buf, int len, client * ns)
924{ 873{
925 char *cp;
926 char version_warning[256];
927
928 if (!buf) 874 if (!buf)
929 { 875 {
930 LOG (llevError, "CS: received corrupted version command\n"); 876 LOG (llevError, "CS: received corrupted version command\n");
931 return; 877 return;
932 } 878 }
933 879
934 ns->cs_version = atoi (buf); 880 ns->cs_version = atoi (buf);
935 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
936 if (VERSION_CS != ns->cs_version) 888 //if (VERSION_CS != ns->cs_version)
937 { 889 // unchecked;
938#ifdef ESRV_DEBUG 890
939 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
940#endif
941 }
942 cp = strchr (buf + 1, ' '); 891 char *cp = strchr (buf + 1, ' ');
943 if (!cp) 892 if (!cp)
944 return; 893 return;
894
945 ns->sc_version = atoi (cp); 895 ns->sc_version = atoi (cp);
896
946 if (VERSION_SC != ns->sc_version) 897 //if (VERSION_SC != ns->sc_version)
947 { 898 // unchecked;
948#ifdef ESRV_DEBUG 899
949 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
950#endif
951 }
952 cp = strchr (cp + 1, ' '); 900 cp = strchr (cp + 1, ' ');
901
953 if (cp) 902 if (cp)
954 { 903 {
955 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 904 assign (ns->version, cp + 1);
956 905
957 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
958
959 /* This is first implementation - i skip all beta DX clients with it
960 * Add later stuff here for other clients
961 */
962
963 /* these are old dxclients */
964 /* Version 1024 added support for singular + plural name values -
965 * requiing this minimal value reduces complexity of that code, and it
966 * has been around for a long time.
967 */
968 if (ns->sc_version < 1026) 906 if (ns->sc_version < 1026)
969 { 907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
970 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
971 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
972 ns->send_packet (version_warning);
973 }
974
975 } 909 }
976} 910}
977 911
978/** sound related functions. */ 912/** sound related functions. */
979
980void 913void
981SetSound (char *buf, int len, NewSocket * ns) 914SetSound (char *buf, int len, client * ns)
982{ 915{
983 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
984} 917}
985 918
986/** client wants the map resent */ 919/** client wants the map resent */
987
988void 920void
989MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
990{ 922{
991
992/* 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
993 * 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.
994 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
995 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
996 */ 927 */
997#if 0
998 /* Okay, this is MAJOR UGLY. but the only way I know how to
999 * clear the "cache"
1000 */
1001 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1002 draw_client_map (pl->ob);
1003#endif
1004} 928}
1005 929
1006/** 930/**
1007 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
1008 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
1011MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
1012{ 936{
1013 int vals[3], i; 937 int vals[3], i;
1014 938
1015 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
1016 * 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
1017 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
1018 * sscanf? 942 * sscanf?
1019 */ 943 */
1020 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
1021 { 945 {
1022 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
1023 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
1024 { 949 {
1025 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1026 return; 951 return;
1027 } 952 }
953
1028 buf++; 954 buf++;
1029 } 955 }
956
1030 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1031 958
1032/* 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]);*/
1033 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1034} 961}
1035
1036
1037 962
1038/****************************************************************************** 963/******************************************************************************
1039 * 964 *
1040 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1041 * 966 *
… …
1044/** 969/**
1045 * 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
1046 * 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)
1047 */ 972 */
1048void 973void
1049send_query (NewSocket * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1050{ 975{
1051 char buf[MAX_BUF];
1052
1053 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1054 ns->send_packet (buf);
1055} 977}
1056 978
1057#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1058 Old = New; \ 980 Old = New; \
1059 sl << uint8 (Type) << uint64 (New); \ 981 sl << uint8 (Type) << uint64 (New); \
… …
1089esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1090{ 1012{
1091 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1092 uint16 flags; 1014 uint16 flags;
1093 1015
1094 packet sl; 1016 client *ns = pl->ns;
1095 sl << "stats "; 1017 if (!ns)
1018 return;
1096 1019
1097 if (pl->ob != NULL) 1020 object *ob = pl->ob;
1098 { 1021 if (!ob)
1022 return;
1023
1024 packet sl ("stats");
1025
1099 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1100 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1101 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1102 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1103 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1104 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1105 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1106 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1107 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1108 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1109 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1110 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);
1111 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1112 }
1113 1039
1114 if (pl->socket.exp64)
1115 {
1116 uint8 s;
1117
1118 for (s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1119 { 1041 if (object *skill = pl->last_skill_ob[s])
1120 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])
1121 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1122 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1123 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1124 */ 1048 */
1125 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1126 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1127 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1128
1129 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1130 } 1052 }
1131 }
1132 }
1133 1053
1134 if (pl->socket.exp64)
1135 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1136 else
1137 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1138
1139 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1140 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1141 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1142 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1143 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1144 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1145 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);
1146 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
1147 flags = 0; 1064 flags = 0;
1148 1065
1149 if (pl->fire_on) 1066 if (pl->fire_on)
1150 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1151 1068
1152 if (pl->run_on) 1069 if (pl->run_on)
1153 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1154 1071
1155 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1156 1073
1157 if (pl->socket.sc_version < 1025) 1074 if (ns->sc_version < 1025)
1158 { 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) }
1159 else 1076 else
1160 {
1161 int i;
1162
1163 for (i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1164 { 1078 {
1165 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1166 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1167 continue; 1081 continue;
1168 1082
1169 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]);
1170 } 1084 }
1171 }
1172 1085
1173 if (pl->socket.monitor_spells) 1086 if (pl->ns->monitor_spells)
1174 { 1087 {
1175 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);
1176 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);
1177 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);
1178 } 1091 }
1179 1092
1180 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 */
1181 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1182 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1183 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1184 1097
1185 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1186 if (sl.length () > 6) 1099 if (sl.length () > 6)
1187 Send_With_Handling (&pl->socket, &sl); 1100 ns->send_packet (sl);
1188} 1101}
1189 1102
1190/** 1103/**
1191 * 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.
1192 */ 1105 */
1193void 1106void
1194esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1195{ 1108{
1196 pl->last_weight = weight; 1109 packet sl ("player");
1197
1198 packet sl;
1199 sl << "player ";
1200 1110
1201 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1202 << uint32 (weight) 1112 << uint32 (weight)
1203 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face)
1204 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1205 1115
1206 Send_With_Handling (&pl->socket, &sl); 1116 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl);
1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208} 1119}
1209 1120
1210/** 1121/**
1211 * Need to send an animation sequence to the client. 1122 * Need to send an animation sequence to the client.
… …
1213 * 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
1214 * 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
1215 * when the player logs in and picks stuff up. 1126 * when the player logs in and picks stuff up.
1216 */ 1127 */
1217void 1128void
1218esrv_send_animation (NewSocket * ns, short anim_num) 1129esrv_send_animation (client * ns, short anim_num)
1219{ 1130{
1220 int i;
1221
1222 /* 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
1223 * 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
1224 * range, it must be a valid animation. 1133 * range, it must be a valid animation.
1225 */ 1134 */
1226 if (anim_num < 0 || anim_num > num_animations) 1135 if (anim_num < 0 || anim_num > num_animations)
1227 { 1136 {
1228 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);
1229 return; 1138 return;
1230 } 1139 }
1231 1140
1232 packet sl; 1141 packet sl ("anim");
1233 1142
1234 sl << "anim "
1235 << uint16 (anim_num) 1143 sl << uint16 (anim_num)
1236 << uint16 (0); /* flags - not used right now */ 1144 << uint16 (0); /* flags - not used right now */
1237 1145
1238 /* 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
1239 * the face itself) down to the client. 1147 * the face itself) down to the client.
1240 */ 1148 */
1241 for (i = 0; i < animations[anim_num].num_animations; i++) 1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1242 { 1150 {
1243 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))
1244 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1245 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 */
1246 } 1155 }
1247 1156
1248 Send_With_Handling (ns, &sl); 1157 ns->send_packet (sl);
1249 1158
1250 ns->anims_sent[anim_num] = 1; 1159 ns->anims_sent[anim_num] = 1;
1251} 1160}
1252 1161
1253 1162
… …
1255 * 1164 *
1256 * Start of map related commands. 1165 * Start of map related commands.
1257 * 1166 *
1258 ******************************************************************************/ 1167 ******************************************************************************/
1259 1168
1260/**
1261 * This adds face_num to a map cell at x,y. If the client doesn't have
1262 * the face yet, we will also send it.
1263 */
1264static void
1265esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1266{
1267 if (newmap->cells[x][y].count >= MAP_LAYERS)
1268 {
1269 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270 return;
1271 abort ();
1272 }
1273
1274 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1275 newmap->cells[x][y].count++;
1276
1277 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1278 esrv_send_face (ns, face_num, 0);
1279}
1280
1281struct LayerCell
1282{
1283 uint16 xy;
1284 short face;
1285};
1286
1287struct MapLayer
1288{
1289 int count;
1290 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1291};
1292
1293/** Checkes if map cells have changed */
1294static int
1295mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1296{
1297 int k;
1298
1299 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1300 return 1;
1301 for (k = 0; k < newmap->cells[i][j].count; k++)
1302 {
1303 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1304 {
1305 return 1;
1306 }
1307 }
1308 return 0;
1309}
1310
1311/**
1312 * Basically, what this does is pack the data into layers.
1313 * cnum is the client number, cur is the the buffer we put all of
1314 * this data into. we return the end of the data. layers is
1315 * how many layers of data we should back.
1316 */
1317static uint8 *
1318compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1319{
1320 int x, y, k;
1321 int face;
1322 unsigned char *fcur;
1323 struct MapLayer layers[MAP_LAYERS];
1324
1325 for (k = 0; k < MAP_LAYERS; k++)
1326 layers[k].count = 0;
1327 fcur = cur;
1328 for (x = 0; x < ns->mapx; x++)
1329 {
1330 for (y = 0; y < ns->mapy; y++)
1331 {
1332 if (!mapcellchanged (ns, x, y, newmap))
1333 continue;
1334 if (newmap->cells[x][y].count == 0)
1335 {
1336 *cur = x * ns->mapy + y; /* mark empty space */
1337 cur++;
1338 continue;
1339 }
1340 for (k = 0; k < newmap->cells[x][y].count; k++)
1341 {
1342 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1343 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1344 layers[k].count++;
1345 }
1346 }
1347 }
1348 /* If no data, return now. */
1349 if (fcur == cur && layers[0].count == 0)
1350 return cur;
1351 *cur = 255; /* mark end of explicitly cleared cells */
1352 cur++;
1353 /* First pack by layers. */
1354 for (k = 0; k < numlayers; k++)
1355 {
1356 if (layers[k].count == 0)
1357 break; /* once a layer is entirely empty, no layer below it can
1358 have anything in it either */
1359 /* Pack by entries in thie layer */
1360 for (x = 0; x < layers[k].count;)
1361 {
1362 fcur = cur;
1363 *cur = layers[k].lcells[x].face >> 8;
1364 cur++;
1365 *cur = layers[k].lcells[x].face & 0xFF;
1366 cur++;
1367 face = layers[k].lcells[x].face;
1368 /* Now, we back the redundant data into 1 byte xy pairings */
1369 for (y = x; y < layers[k].count; y++)
1370 {
1371 if (layers[k].lcells[y].face == face)
1372 {
1373 *cur = (uint8) layers[k].lcells[y].xy;
1374 cur++;
1375 layers[k].lcells[y].face = -1;
1376 }
1377 }
1378 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1379 /* forward over the now redundant data */
1380 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1381 x++;
1382 }
1383 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1384 }
1385 return cur;
1386}
1387
1388/** Clears a map cell */ 1169/** Clears a map cell */
1389static void 1170static void
1390map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int count)
1391{ 1172{
1392 cell->faces[0] = face0; 1173 cell->faces[0] = 0;
1393 cell->faces[1] = face1; 1174 cell->faces[1] = 0;
1394 cell->faces[2] = face2; 1175 cell->faces[2] = 0;
1395 cell->count = count; 1176 cell->count = count;
1396 cell->stat_hp = 0; 1177 cell->stat_hp = 0;
1397 cell->flags = 0; 1178 cell->flags = 0;
1398 cell->player = 0; 1179 cell->player = 0;
1399} 1180}
1400 1181
1401#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1402#define MAX_LAYERS 3 1182#define MAX_LAYERS 3
1403
1404/* Using a global really isn't a good approach, but saves the over head of
1405 * allocating and deallocating such a block of data each time run through,
1406 * and saves the space of allocating this in the socket object when we only
1407 * need it for this cycle. If the serve is ever threaded, this needs to be
1408 * re-examined.
1409 */
1410
1411static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1412
1413/**
1414 * Returns true if any of the heads for this
1415 * space is set. Returns false if all are blank - this is used
1416 * for empty space checking.
1417 */
1418static inline int
1419have_head (int ax, int ay)
1420{
1421
1422 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1423 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1424 return 1;
1425 return 0;
1426}
1427
1428/**
1429 * check_head is a bit simplistic version of update_space below.
1430 * basically, it only checks the that the head on space ax,ay at layer
1431 * needs to get sent - if so, it adds the data, sending the head
1432 * if needed, and returning 1. If this no data needs to get
1433 * sent, it returns zero.
1434 */
1435static int
1436check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
1437{
1438 short face_num;
1439
1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1442 else
1443 face_num = 0;
1444
1445 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1446 {
1447 sl << uint16 (face_num);
1448 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1449 esrv_send_face (&ns, face_num, 0);
1450
1451 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1452 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1453 return 1;
1454 }
1455
1456 return 0; /* No change */
1457}
1458 1183
1459/** 1184/**
1460 * Removes the need to replicate the same code for each layer. 1185 * Removes the need to replicate the same code for each layer.
1461 * this returns true if this space is now in fact different than 1186 * this returns true if this space is now in fact different than
1462 * it was. 1187 * it was.
… …
1473 * numbers the spaces differently - I think this was a leftover from 1198 * numbers the spaces differently - I think this was a leftover from
1474 * the map command, where the faces stack up. Sinces that is no longer 1199 * the map command, where the faces stack up. Sinces that is no longer
1475 * the case, it seems to make more sense to have these layer values 1200 * the case, it seems to make more sense to have these layer values
1476 * actually match. 1201 * actually match.
1477 */ 1202 */
1478
1479static int 1203static int
1480update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1481{ 1205{
1482 object *ob, *head;
1483 uint16 face_num; 1206 uint16 face_num;
1484 int bx, by, i; 1207 int bx, by, i;
1485 1208
1486 /* If there is a multipart object stored away, treat that as more important.
1487 * If not, then do the normal processing.
1488 */
1489 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1490
1491 /* Check to see if this head is part of the set of objects
1492 * we would normally send for this space. If so, then
1493 * don't use the head value. We need to do the check
1494 * here and not when setting up the heads[] value for two reasons -
1495 * 1) the heads[] values will get used even if the space is not visible.
1496 * 2) its possible the head is not on the same map as a part, and I'd
1497 * rather not need to do the map translation overhead.
1498 * 3) We need to do some extra checking to make sure that we will
1499 * otherwise send the image as this layer, eg, either it matches
1500 * the head value, or is not multipart.
1501 */
1502 if (head && !head->more)
1503 {
1504 for (i = 0; i < MAP_LAYERS; i++)
1505 {
1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1507 if (!ob)
1508 continue;
1509
1510 if (ob->head)
1511 ob = ob->head;
1512
1513 if (ob == head)
1514 {
1515 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1516 head = NULL;
1517 break;
1518 }
1519 }
1520 }
1521
1522 ob = head;
1523 if (!ob)
1524 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1525 1210
1526 /* If there is no object for this space, or if the face for the object 1211 /* If there is no object for this space, or if the face for the object
1527 * is the blank face, set the face number to zero. 1212 * is the blank face, set the face number to zero.
1528 * else if we have the stored head object for this space, that takes 1213 * else if we have the stored head object for this space, that takes
1529 * precedence over the other object for this space. 1214 * precedence over the other object for this space.
1530 * otherwise, we do special head processing 1215 * otherwise, we do special head processing
1531 */ 1216 */
1532 if (!ob || ob->face == blank_face) 1217 if (!ob || ob->face == blank_face)
1533 face_num = 0; 1218 face_num = 0;
1534 else if (head)
1535 {
1536 /* if this is a head that had previously been stored */
1537 face_num = ob->face->number;
1538 }
1539 else 1219 else
1540 {
1541 /* if the faces for the different parts of a multipart object
1542 * are the same, we only want to send the bottom right most
1543 * portion of the object. That info is in the tail_.. values
1544 * of the head. Note that for the head itself, ob->head will
1545 * be null, so we only do this block if we are working on
1546 * a tail piece.
1547 */
1548
1549 /* tail_x and tail_y will only be set in the head object. If
1550 * this is the head object and these are set, we proceed
1551 * with logic to only send bottom right. Similarly, if
1552 * this is one of the more parts but the head has those values
1553 * set, we want to do the processing. There can be cases where
1554 * the head is not visible but one of its parts is, so we just
1555 * can always expect that ob->arch->tail_x will be true for all
1556 * object we may want to display.
1557 */
1558 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1559 {
1560
1561 if (ob->head)
1562 head = ob->head;
1563 else
1564 head = ob;
1565
1566 /* Basically figure out where the offset is from where we are right
1567 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1568 * piece is from the head, and the tail is where the tail is from the
1569 * head. Note that bx and by will equal sx and sy if we are already working
1570 * on the bottom right corner. If ob is the head, the clone values
1571 * will be zero, so the right thing will still happen.
1572 */
1573 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1574 by = sy + head->arch->tail_y - ob->arch->clone.y;
1575
1576 /* I don't think this can ever happen, but better to check for it just
1577 * in case.
1578 */
1579 if (bx < sx || by < sy)
1580 {
1581 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1582 face_num = 0;
1583 }
1584 /* single part object, multipart object with non merged faces,
1585 * of multipart object already at lower right.
1586 */
1587 else if (bx == sx && by == sy)
1588 {
1589 face_num = ob->face->number;
1590
1591 /* if this face matches one stored away, clear that one away.
1592 * this code relies on the fact that the map1 commands
1593 * goes from 2 down to 0.
1594 */
1595 for (i = 0; i < MAP_LAYERS; i++)
1596 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1597 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1598 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1599 }
1600 else
1601 {
1602 /* If this head is stored away, clear it - otherwise,
1603 * there can be cases where a object is on multiple layers -
1604 * we only want to send it once.
1605 */
1606 face_num = head->face->number;
1607 for (i = 0; i < MAP_LAYERS; i++)
1608 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1609 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1610 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1611
1612 /* First, try to put the new head on the same layer. If that is used up,
1613 * then find another layer.
1614 */
1615 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1616 {
1617 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1618 }
1619 else
1620 for (i = 0; i < MAX_LAYERS; i++)
1621 {
1622 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1623 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1624 {
1625 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1626 }
1627 }
1628 face_num = 0; /* Don't send this object - we'll send the head later */
1629 }
1630 }
1631 else
1632 {
1633 /* In this case, we are already at the lower right or single part object, 1220 /* In this case, we are already at the lower right or single part object,
1634 * so nothing special 1221 * so nothing special
1635 */
1636 face_num = ob->face->number;
1637
1638 /* clear out any head entries that have the same face as this one */
1639 for (bx = 0; bx < layer; bx++)
1640 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1641 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1642 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1643 }
1644 } /* else not already head object or blank face */
1645
1646 /* This is a real hack. Basically, if we have nothing to send for this layer,
1647 * but there is a head on the next layer, send that instead.
1648 * Without this, what happens is you can get the case where the player stands
1649 * on the same space as the head. However, if you have overlapping big objects
1650 * of the same type, what happens then is it doesn't think it needs to send
1651 * This tends to make stacking also work/look better.
1652 */ 1222 */
1653 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1654 {
1655 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1656 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1657 }
1658
1659 /* Another hack - because of heads and whatnot, this face may match one
1660 * we already sent for a lower layer. In that case, don't send
1661 * this one.
1662 */
1663 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1664 face_num = 0; 1223 face_num = ob->face;
1665 1224
1666 /* We've gotten what face we want to use for the object. Now see if 1225 /* We've gotten what face we want to use for the object. Now see if
1667 * if it has changed since we last sent it to the client. 1226 * if it has changed since we last sent it to the client.
1668 */ 1227 */
1669 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1257 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699 * take. 1258 * take.
1700 */ 1259 */
1701 1260
1702static inline int 1261static inline int
1703update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1262update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704{ 1263{
1705 object *ob; 1264 object *ob;
1706 int smoothlevel; /* old face_num; */ 1265 int smoothlevel; /* old face_num; */
1707 1266
1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1267 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1709 1268
1710 /* If there is no object for this space, or if the face for the object 1269 /* If there is no object for this space, or if the face for the object
1711 * is the blank face, set the smoothlevel to zero. 1270 * is the blank face, set the smoothlevel to zero.
1712 */ 1271 */
1713 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1272 if (!ob || ob->face == blank_face)
1714 smoothlevel = 0; 1273 smoothlevel = 0;
1715 else 1274 else
1716 { 1275 {
1717 smoothlevel = ob->smoothlevel; 1276 smoothlevel = ob->smoothlevel;
1718 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1277 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1719 SendSmooth (&ns, ob->face->number); 1278 SendSmooth (&ns, ob->face);
1720 } /* else not already head object or blank face */ 1279 } /* else not already head object or blank face */
1721 1280
1722 /* We've gotten what face we want to use for the object. Now see if 1281 /* We've gotten what face we want to use for the object. Now see if
1723 * if it has changed since we last sent it to the client. 1282 * if it has changed since we last sent it to the client.
1724 */ 1283 */
… …
1742 * Returns the size of a data for a map square as returned by 1301 * Returns the size of a data for a map square as returned by
1743 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1302 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744 * available. 1303 * available.
1745 */ 1304 */
1746int 1305int
1747getExtendedMapInfoSize (NewSocket * ns) 1306getExtendedMapInfoSize (client * ns)
1748{ 1307{
1749 int result = 0; 1308 int result = 0;
1750 1309
1751 if (ns->ext_mapinfos) 1310 if (ns->ext_mapinfos)
1752 { 1311 {
1753 if (ns->EMI_smooth) 1312 if (ns->EMI_smooth)
1754 result += 1; /*One byte for smoothlevel */ 1313 result += 1; /*One byte for smoothlevel */
1755 } 1314 }
1315
1756 return result; 1316 return result;
1317}
1318
1319// prefetch (and touch) all maps within a specific distancd
1320static void
1321prefetch_surrounding_maps (maptile *map, int distance)
1322{
1323 map->last_access = runtime;
1324
1325 if (--distance)
1326 for (int dir = 4; --dir; )
1327 if (const shstr &path = map->tile_path [dir])
1328 if (maptile *&neigh = map->tile_map [dir])
1329 prefetch_surrounding_maps (neigh, distance);
1330 else
1331 neigh = maptile::find_async (path, map);
1332}
1333
1334// prefetch a generous area around the player
1335static void
1336prefetch_surrounding_maps (object *op)
1337{
1338 prefetch_surrounding_maps (op->map, 3);
1757} 1339}
1758 1340
1759/** 1341/**
1760 * This function uses the new map1 protocol command to send the map 1342 * This function uses the new map1 protocol command to send the map
1761 * to the client. It is necessary because the old map command supports 1343 * to the client. It is necessary because the old map command supports
… …
1767 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1349 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1768 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1350 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1769 * and use the other 4 bits for other informatiion. For full documentation 1351 * and use the other 4 bits for other informatiion. For full documentation
1770 * of what we send, see the doc/Protocol file. 1352 * of what we send, see the doc/Protocol file.
1771 * I will describe internally what we do: 1353 * I will describe internally what we do:
1772 * the socket->lastmap shows how the map last looked when sent to the client. 1354 * the ns->lastmap shows how the map last looked when sent to the client.
1773 * in the lastmap structure, there is a cells array, which is set to the 1355 * in the lastmap structure, there is a cells array, which is set to the
1774 * maximum viewable size (As set in config.h). 1356 * maximum viewable size (As set in config.h).
1775 * in the cells, there are faces and a count value. 1357 * in the cells, there are faces and a count value.
1776 * we use the count value to hold the darkness value. If -1, then this space 1358 * we use the count value to hold the darkness value. If -1, then this space
1777 * is not viewable. 1359 * is not viewable.
… …
1788 uint8 eentrysize; 1370 uint8 eentrysize;
1789 uint16 ewhatstart, ewhatflag; 1371 uint16 ewhatstart, ewhatflag;
1790 uint8 extendedinfos; 1372 uint8 extendedinfos;
1791 maptile *m; 1373 maptile *m;
1792 1374
1793 NewSocket &socket = pl->contr->socket; 1375 client &socket = *pl->contr->ns;
1376
1377 if (!pl->active)
1378 return;
1794 1379
1795 check_map_change (pl->contr); 1380 check_map_change (pl->contr);
1381 prefetch_surrounding_maps (pl);
1796 1382
1797 packet sl; 1383 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1798 packet esl; 1384 packet esl;
1799 1385
1800 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1801 startlen = sl.length (); 1386 startlen = sl.length ();
1802 1387
1803 /*Extendedmapinfo structure initialisation */ 1388 /*Extendedmapinfo structure initialisation */
1804 if (socket.ext_mapinfos) 1389 if (socket.ext_mapinfos)
1805 { 1390 {
… …
1824 ewhatstart = 0; 1409 ewhatstart = 0;
1825 ewhatflag = 0; 1410 ewhatflag = 0;
1826 estartlen = 0; 1411 estartlen = 0;
1827 } 1412 }
1828 1413
1829 /* Init data to zero */
1830 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1831
1832 /* x,y are the real map locations. ax, ay are viewport relative 1414 /* x,y are the real map locations. ax, ay are viewport relative
1833 * locations. 1415 * locations.
1834 */ 1416 */
1835 ay = 0; 1417 ay = 0;
1836 1418
… …
1849 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1431 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1850 { 1432 {
1851 ax = 0; 1433 ax = 0;
1852 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1434 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1853 { 1435 {
1854
1855 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1436 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1856 1437
1857 /* If this space is out of the normal viewable area, we only check 1438 /* If this space is out of the normal viewable area, we only check
1858 * the heads value ax or ay will only be greater than what 1439 * the heads value ax or ay will only be greater than what
1859 * the client wants if using the map1a command - this is because 1440 * the client wants if using the map1a command - this is because
… …
1866 1447
1867 oldlen = sl.length (); 1448 oldlen = sl.length ();
1868 1449
1869 sl << uint16 (mask); 1450 sl << uint16 (mask);
1870 1451
1871 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1872 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1873 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1874
1875 /* If all we are doing is sending 0 (blank) faces, we don't 1452 /* If all we are doing is sending 0 (blank) faces, we don't
1876 * actually need to send that - just the coordinates 1453 * actually need to send that - just the coordinates
1877 * with no faces tells the client to blank out the 1454 * with no faces tells the client to blank out the
1878 * space. 1455 * space.
1879 */ 1456 */
1880 got_one = 0; 1457 got_one = 0;
1881 for (i = oldlen + 2; i < sl.length (); i++) 1458 for (i = oldlen + 2; i < sl.length (); i++)
1882 if (sl.buf[i]) 1459 if (sl[i])
1883 got_one = 1; 1460 got_one = 1;
1884 1461
1885 if (got_one && (mask & 0xf)) 1462 if (got_one && (mask & 0xf))
1886 sl.buf[oldlen + 1] = mask & 0xff; 1463 sl[oldlen + 1] = mask & 0xff;
1887 else 1464 else
1888 { /*either all faces blank, either no face at all */ 1465 { /*either all faces blank, either no face at all */
1889 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1466 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890 sl.reset (oldlen + 2); 1467 sl.reset (oldlen + 2);
1891 else 1468 else
… …
1916 * of the map, it shouldn't have a head 1493 * of the map, it shouldn't have a head
1917 */ 1494 */
1918 if (lastcell.count != -1) 1495 if (lastcell.count != -1)
1919 { 1496 {
1920 sl << uint16 (mask); 1497 sl << uint16 (mask);
1921 map_clearcell (&lastcell, 0, 0, 0, -1); 1498 map_clearcell (&lastcell, -1);
1922 } 1499 }
1923 } 1500 }
1924 else if (d > 3) 1501 else if (d > 3)
1925 { 1502 {
1503 m->touch ();
1504
1926 int need_send = 0, count; 1505 int need_send = 0, count;
1927 1506
1928 /* This block deals with spaces that are not visible for whatever 1507 /* This block deals with spaces that are not visible for whatever
1929 * reason. Still may need to send the head for this space. 1508 * reason. Still may need to send the head for this space.
1930 */ 1509 */
… …
1936 if (lastcell.count != -1) 1515 if (lastcell.count != -1)
1937 need_send = 1; 1516 need_send = 1;
1938 1517
1939 count = -1; 1518 count = -1;
1940 1519
1941 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1942 {
1943 /* Now check to see if any heads need to be sent */
1944
1945 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1948
1949 lastcell.count = count;
1950 }
1951 else
1952 {
1953 /* properly clear a previously sent big face */ 1520 /* properly clear a previously sent big face */
1954 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1955 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1522 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1956 need_send = 1; 1523 need_send = 1;
1957 1524
1958 map_clearcell (&lastcell, 0, 0, 0, count); 1525 map_clearcell (&lastcell, count);
1959 }
1960 1526
1961 if ((mask & 0xf) || need_send) 1527 if ((mask & 0xf) || need_send)
1962 sl.buf[oldlen + 1] = mask & 0xff; 1528 sl[oldlen + 1] = mask & 0xff;
1963 else 1529 else
1964 sl.reset (oldlen); 1530 sl.reset (oldlen);
1965 } 1531 }
1966 else 1532 else
1967 { 1533 {
1534 m->touch ();
1535
1968 /* In this block, the space is visible or there are head objects 1536 /* In this block, the space is visible or there are head objects
1969 * we need to send. 1537 * we need to send.
1970 */ 1538 */
1971 1539
1972 /* Rather than try to figure out what everything that we might 1540 /* Rather than try to figure out what everything that we might
… …
1997 mask |= 0x8; 1565 mask |= 0x8;
1998 1566
1999 if (socket.extmap) 1567 if (socket.extmap)
2000 { 1568 {
2001 *last_ext |= 0x80; 1569 *last_ext |= 0x80;
2002 last_ext = sl.buf + sl.length (); 1570 last_ext = &sl[sl.length ()];
2003 sl << uint8 (d); 1571 sl << uint8 (d);
2004 } 1572 }
2005 else 1573 else
2006 sl << uint8 (255 - 64 * d); 1574 sl << uint8 (255 - 64 * d);
2007 } 1575 }
… …
2041 { 1609 {
2042 lastcell.stat_hp = stat_hp; 1610 lastcell.stat_hp = stat_hp;
2043 1611
2044 mask |= 0x8; 1612 mask |= 0x8;
2045 *last_ext |= 0x80; 1613 *last_ext |= 0x80;
2046 last_ext = sl.buf + sl.length (); 1614 last_ext = &sl[sl.length ()];
2047 1615
2048 sl << uint8 (5) << uint8 (stat_hp); 1616 sl << uint8 (5) << uint8 (stat_hp);
2049 1617
2050 if (stat_width > 1) 1618 if (stat_width > 1)
2051 { 1619 {
2052 *last_ext |= 0x80; 1620 *last_ext |= 0x80;
2053 last_ext = sl.buf + sl.length (); 1621 last_ext = &sl[sl.length ()];
2054 1622
2055 sl << uint8 (6) << uint8 (stat_width); 1623 sl << uint8 (6) << uint8 (stat_width);
2056 } 1624 }
2057 } 1625 }
2058 1626
… …
2060 { 1628 {
2061 lastcell.player = player; 1629 lastcell.player = player;
2062 1630
2063 mask |= 0x8; 1631 mask |= 0x8;
2064 *last_ext |= 0x80; 1632 *last_ext |= 0x80;
2065 last_ext = sl.buf + sl.length (); 1633 last_ext = &sl[sl.length ()];
2066 1634
2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1635 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068 } 1636 }
2069 1637
2070 if (lastcell.flags != flags) 1638 if (lastcell.flags != flags)
2071 { 1639 {
2072 lastcell.flags = flags; 1640 lastcell.flags = flags;
2073 1641
2074 mask |= 0x8; 1642 mask |= 0x8;
2075 *last_ext |= 0x80; 1643 *last_ext |= 0x80;
2076 last_ext = sl.buf + sl.length (); 1644 last_ext = &sl[sl.length ()];
2077 1645
2078 sl << uint8 (8) << uint8 (flags); 1646 sl << uint8 (8) << uint8 (flags);
2079 } 1647 }
2080 } 1648 }
2081 1649
… …
2095 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2096 emask |= 0x2; 1664 emask |= 0x2;
2097 1665
2098 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2099 { 1667 {
2100 if (lastcell.faces[0] != pl->face->number) 1668 if (lastcell.faces[0] != pl->face)
2101 { 1669 {
2102 lastcell.faces[0] = pl->face->number; 1670 lastcell.faces[0] = pl->face;
2103 mask |= 0x1; 1671 mask |= 0x1;
2104 1672
2105 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1673 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
2106 esrv_send_face (&socket, pl->face->number, 0); 1674 esrv_send_face (&socket, pl->face, 0);
2107 1675
2108 sl << uint16 (pl->face->number); 1676 sl << uint16 (pl->face);
2109 } 1677 }
2110 } 1678 }
2111 else 1679 else
2112 { 1680 {
2113 /* Top face */ 1681 /* Top face */
… …
2123 * space by checking the mask. If so, update the mask. 1691 * space by checking the mask. If so, update the mask.
2124 * if not, reset the len to that from before adding the mask 1692 * if not, reset the len to that from before adding the mask
2125 * value, so we don't send those bits. 1693 * value, so we don't send those bits.
2126 */ 1694 */
2127 if (mask & 0xf) 1695 if (mask & 0xf)
2128 sl.buf[oldlen + 1] = mask & 0xff; 1696 sl[oldlen + 1] = mask & 0xff;
2129 else 1697 else
2130 sl.reset (oldlen); 1698 sl.reset (oldlen);
2131 1699
2132 if (emask & 0xf) 1700 if (emask & 0xf)
2133 esl.buf[eoldlen + 1] = emask & 0xff; 1701 esl[eoldlen + 1] = emask & 0xff;
2134 else 1702 else
2135 esl.reset (eoldlen); 1703 esl.reset (eoldlen);
2136 } /* else this is a viewable space */ 1704 } /* else this is a viewable space */
2137 } /* for x loop */ 1705 } /* for x loop */
2138 } /* for y loop */ 1706 } /* for y loop */
… …
2144 { 1712 {
2145 /* No map data will follow, so don't say the client 1713 /* No map data will follow, so don't say the client
2146 * it doesn't need draw! 1714 * it doesn't need draw!
2147 */ 1715 */
2148 ewhatflag &= (~EMI_NOREDRAW); 1716 ewhatflag &= (~EMI_NOREDRAW);
2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1717 esl[ewhatstart + 1] = ewhatflag & 0xff;
2150 } 1718 }
2151 1719
2152 if (esl.length () > estartlen) 1720 if (esl.length () > estartlen)
2153 Send_With_Handling (&socket, &esl); 1721 socket.send_packet (esl);
2154 } 1722 }
2155 1723
2156 if (sl.length () > startlen || socket.sent_scroll) 1724 if (sl.length () > startlen || socket.sent_scroll)
2157 { 1725 {
2158 Send_With_Handling (&socket, &sl); 1726 socket.send_packet (sl);
2159 socket.sent_scroll = 0; 1727 socket.sent_scroll = 0;
2160 } 1728 }
2161} 1729}
2162 1730
2163/** 1731/**
… …
2165 */ 1733 */
2166void 1734void
2167draw_client_map (object *pl) 1735draw_client_map (object *pl)
2168{ 1736{
2169 int i, j; 1737 int i, j;
2170 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1738 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2171 New_Face *face, *floor;
2172 New_Face *floor2;
2173 int d, mflags; 1739 int mflags;
2174 struct Map newmap; 1740 struct Map newmap;
2175 maptile *m, *pm; 1741 maptile *m, *pm;
2176 1742
2177 if (pl->type != PLAYER) 1743 if (pl->type != PLAYER)
2178 { 1744 {
… …
2189 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1755 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190 return; 1756 return;
2191 1757
2192 memset (&newmap, 0, sizeof (struct Map)); 1758 memset (&newmap, 0, sizeof (struct Map));
2193 1759
2194 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1760 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2195 {
2196 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1761 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2197 { 1762 {
2198 ax = i; 1763 ax = i;
2199 ay = j; 1764 ay = j;
2200 m = pm; 1765 m = pm;
2201 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1766 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1767
2202 if (mflags & P_OUT_OF_MAP) 1768 if (mflags & P_OUT_OF_MAP)
2203 continue; 1769 continue;
2204 if (mflags & P_NEED_UPDATE) 1770
2205 update_position (m, ax, ay);
2206 /* If a map is visible to the player, we don't want to swap it out 1771 /* If a map is visible to the player, we don't want to swap it out
2207 * just to reload it. This should really call something like 1772 * just to reload it. This should really call something like
2208 * swap_map, but this is much more efficient and 'good enough' 1773 * swap_map, but this is much more efficient and 'good enough'
2209 */ 1774 */
2210 if (mflags & P_NEW_MAP) 1775 if (mflags & P_NEW_MAP)
2211 m->timeout = 50; 1776 m->timeout = 50;
2212 } 1777 }
2213 } 1778
2214 /* do LOS after calls to update_position */ 1779 /* do LOS after calls to update_position */
2215 if (pl->contr->do_los) 1780 if (pl->contr->do_los)
2216 { 1781 {
2217 update_los (pl); 1782 update_los (pl);
2218 pl->contr->do_los = 0; 1783 pl->contr->do_los = 0;
… …
2233 1798
2234/*****************************************************************************/ 1799/*****************************************************************************/
2235void 1800void
2236send_plugin_custom_message (object *pl, char *buf) 1801send_plugin_custom_message (object *pl, char *buf)
2237{ 1802{
2238 pl->contr->socket.send_packet (buf); 1803 pl->contr->ns->send_packet (buf);
2239} 1804}
2240 1805
2241/** 1806/**
2242 * This sends the skill number to name mapping. We ignore 1807 * This sends the skill number to name mapping. We ignore
2243 * the params - we always send the same info no matter what. 1808 * the params - we always send the same info no matter what.
2244 */ 1809 */
2245void 1810void
2246send_skill_info (NewSocket *ns, char *params) 1811send_skill_info (client *ns, char *params)
2247{ 1812{
2248 packet sl; 1813 packet sl;
2249 sl << "replyinfo skill_info\n"; 1814 sl << "replyinfo skill_info\n";
2250 1815
2251 for (int i = 1; i < NUM_SKILLS; i++) 1816 for (int i = 1; i < NUM_SKILLS; i++)
… …
2255 { 1820 {
2256 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1821 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257 fatal (0); 1822 fatal (0);
2258 } 1823 }
2259 1824
2260 Send_With_Handling (ns, &sl); 1825 ns->send_packet (sl);
2261} 1826}
2262 1827
2263/** 1828/**
2264 * This sends the spell path to name mapping. We ignore 1829 * This sends the spell path to name mapping. We ignore
2265 * the params - we always send the same info no matter what. 1830 * the params - we always send the same info no matter what.
2266 */ 1831 */
2267void 1832void
2268send_spell_paths (NewSocket * ns, char *params) 1833send_spell_paths (client * ns, char *params)
2269{ 1834{
2270 packet sl; 1835 packet sl;
2271 1836
2272 sl << "replyinfo spell_paths\n"; 1837 sl << "replyinfo spell_paths\n";
2273 1838
… …
2278 { 1843 {
2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1844 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280 fatal (0); 1845 fatal (0);
2281 } 1846 }
2282 1847
2283 Send_With_Handling (ns, &sl); 1848 ns->send_packet (sl);
2284} 1849}
2285 1850
2286/** 1851/**
2287 * This looks for any spells the player may have that have changed their stats. 1852 * This looks for any spells the player may have that have changed their stats.
2288 * it then sends an updspell packet for each spell that has changed in this way 1853 * it then sends an updspell packet for each spell that has changed in this way
2289 */ 1854 */
2290void 1855void
2291esrv_update_spells (player *pl) 1856esrv_update_spells (player *pl)
2292{ 1857{
1858 if (!pl->ns)
1859 return;
1860
2293 if (!pl->socket.monitor_spells) 1861 if (!pl->ns->monitor_spells)
2294 return; 1862 return;
2295 1863
2296 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1864 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297 { 1865 {
2298 if (spell->type == SPELL) 1866 if (spell->type == SPELL)
… …
2328 1896
2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1897 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1898 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1899 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332 1900
2333 Send_With_Handling (&pl->socket, &sl); 1901 pl->ns->send_packet (sl);
2334 } 1902 }
2335 } 1903 }
2336 } 1904 }
2337} 1905}
2338 1906
2339void 1907void
2340esrv_remove_spell (player *pl, object *spell) 1908esrv_remove_spell (player *pl, object *spell)
2341{ 1909{
2342 if (!pl->socket.monitor_spells) 1910 if (!pl->ns->monitor_spells)
2343 return; 1911 return;
2344 1912
2345 if (!pl || !spell || spell->env != pl->ob) 1913 if (!pl || !spell || spell->env != pl->ob)
2346 { 1914 {
2347 LOG (llevError, "Invalid call to esrv_remove_spell"); 1915 LOG (llevError, "Invalid call to esrv_remove_spell");
2348 return; 1916 return;
2349 } 1917 }
2350 1918
2351 packet sl; 1919 packet sl ("delspell");
2352 1920
2353 sl << "delspell "
2354 << uint32 (spell->count); 1921 sl << uint32 (spell->count);
2355 1922
2356 Send_With_Handling (&pl->socket, &sl); 1923 pl->ns->send_packet (sl);
2357} 1924}
2358 1925
2359/* appends the spell *spell to the Socklist we will send the data to. */ 1926/* appends the spell *spell to the Socklist we will send the data to. */
2360static void 1927static void
2361append_spell (player *pl, packet &sl, object *spell) 1928append_spell (player *pl, packet &sl, object *spell)
2362{ 1929{
2363 int len, i, skill = 0; 1930 int i, skill = 0;
2364 1931
2365 if (!(spell->name)) 1932 if (!(spell->name))
2366 { 1933 {
2367 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1934 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2368 return; 1935 return;
… …
2380 if (!strcmp (spell->skill, skill_names[i])) 1947 if (!strcmp (spell->skill, skill_names[i]))
2381 { 1948 {
2382 skill = i + CS_STAT_SKILLINFO; 1949 skill = i + CS_STAT_SKILLINFO;
2383 break; 1950 break;
2384 } 1951 }
1952 }
1953
1954 // spells better have a face
1955 if (!spell->face)
1956 {
1957 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1958 spell->face = face_find ("burnout.x11", blank_face);
2385 } 1959 }
2386 1960
2387 /* send the current values */ 1961 /* send the current values */
2388 sl << uint32 (spell->count) 1962 sl << uint32 (spell->count)
2389 << uint16 (spell->level) 1963 << uint16 (spell->level)
… …
2391 << uint16 (spell->last_sp) 1965 << uint16 (spell->last_sp)
2392 << uint16 (spell->last_grace) 1966 << uint16 (spell->last_grace)
2393 << uint16 (spell->last_eat) 1967 << uint16 (spell->last_eat)
2394 << uint8 (skill) 1968 << uint8 (skill)
2395 << uint32 (spell->path_attuned) 1969 << uint32 (spell->path_attuned)
2396 << uint32 (spell->face ? spell->face->number : 0) 1970 << uint32 (spell->face)
2397 << data8 (spell->name) 1971 << data8 (spell->name)
2398 << data16 (spell->msg); 1972 << data16 (spell->msg);
2399} 1973}
2400 1974
2401/** 1975/**
… …
2409 { 1983 {
2410 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1984 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411 return; 1985 return;
2412 } 1986 }
2413 1987
2414 if (!pl->socket.monitor_spells) 1988 if (!pl->ns->monitor_spells)
2415 return; 1989 return;
2416 1990
2417 packet sl; 1991 packet sl ("addspell");
2418
2419 sl << "addspell ";
2420 1992
2421 if (!spell) 1993 if (!spell)
2422 { 1994 {
2423 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1995 for (spell = pl->ob->inv; spell; spell = spell->below)
2424 { 1996 {
2425 /* were we to simply keep appending data here, we could exceed 1997 /* were we to simply keep appending data here, we could exceed
2426 * MAXSOCKBUF if the player has enough spells to add, we know that 1998 * MAXSOCKBUF if the player has enough spells to add, we know that
2427 * append_spells will always append 19 data bytes, plus 4 length 1999 * append_spells will always append 19 data bytes, plus 4 length
2428 * bytes and 3 strings (because that is the spec) so we need to 2000 * bytes and 3 strings (because that is the spec) so we need to
… …
2438 if (spell->type != SPELL) 2010 if (spell->type != SPELL)
2439 continue; 2011 continue;
2440 2012
2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2013 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442 { 2014 {
2443 Send_With_Handling (&pl->socket, &sl); 2015 pl->ns->send_packet (sl);
2444 2016
2445 sl.reset (); 2017 sl.reset ();
2446 sl << "addspell "; 2018 sl << "addspell ";
2447 } 2019 }
2448 2020
… …
2462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2034 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463 fatal (0); 2035 fatal (0);
2464 } 2036 }
2465 2037
2466 /* finally, we can send the packet */ 2038 /* finally, we can send the packet */
2467 Send_With_Handling (&pl->socket, &sl); 2039 pl->ns->send_packet (sl);
2468
2469} 2040}
2470 2041

Diff Legend

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