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.31 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.65 by root, Sun Jan 21 21:28:27 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 41 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 42 * if a face has not already been sent to the client, it is sent now.
42 * 43 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 44 */
50 45
51#include <global.h> 46#include <global.h>
52#include <sproto.h> 47#include <sproto.h>
53 48
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 49#include <living.h>
57#include <commands.h> 50#include <commands.h>
58 51
59/* This block is basically taken from socket.c - I assume if it works there, 52/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 53 * it should work here.
… …
63#include <sys/time.h> 56#include <sys/time.h>
64#include <sys/socket.h> 57#include <sys/socket.h>
65#include <netinet/in.h> 58#include <netinet/in.h>
66#include <netdb.h> 59#include <netdb.h>
67 60
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 61#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 62#include <sys/time.h>
74#endif
75 63
76#include "sounds.h" 64#include "sounds.h"
77 65
78/** 66/**
79 * This table translates the attack numbers as used within the 67 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 84 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 85 -1 /* Disease - not fully done yet */
98}; 86};
99 87
100static void 88static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 89socket_map_scroll (client *ns, int dx, int dy)
102{ 90{
103 struct Map newmap; 91 struct Map newmap;
104 int x, y, mx, my; 92 int x, y, mx, my;
105 93
106 {
107 char buf[MAXSOCKBUF];
108
109 sprintf (buf, "map_scroll %d %d", dx, dy); 94 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf));
111 }
112 95
113 /* If we are using the Map1aCmd, we may in fact send 96 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 97 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 98 * So set the mx,my to the max value we want to
116 * look for. Removed code to do so - it caused extra 99 * look for. Removed code to do so - it caused extra
… …
156} 139}
157 140
158static void 141static void
159clear_map (player *pl) 142clear_map (player *pl)
160{ 143{
161 NewSocket & socket = pl->socket;
162
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
164 145
165 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 147 pl->ns->send_packet ("newmap");
167 148
168 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
169 socket.look_position = 0;
170} 150}
171 151
172/** check for map change and send new map data */ 152/** check for map change and send new map data */
173static void 153static void
174check_map_change (player *pl) 154check_map_change (player *pl)
175{ 155{
176 NewSocket & socket = pl->socket; 156 client &socket = *pl->ns;
177 object *ob = pl->ob; 157 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
179 159
180 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
181 { 161 {
… …
197 flags |= 4; 177 flags |= 4;
198 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
199 flags |= 8; 179 flags |= 8;
200 180
201 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
203 } 183 }
204 else 184 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
206 186
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 187 socket.send_packet (buf);
208 } 188 }
209 } 189 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 190 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 191 {
212 int dx = ob->x - socket.current_x; 192 int dx = ob->x - socket.current_x;
… …
215 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
216 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
217 else 197 else
218 { 198 {
219 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 199 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
220 socket.update_look = 1; 200 socket.floorbox_reset ();
221 socket.look_position = 0;
222 } 201 }
223 } 202 }
224 203
225 socket.current_x = ob->x; 204 socket.current_x = ob->x;
226 socket.current_y = ob->y; 205 socket.current_y = ob->y;
227} 206}
228 207
208/**
209 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide
211 * that information.
212 */
213void
214RequestInfo (char *buf, int len, client * ns)
215{
216 char *params = NULL, *cp;
217
218 /* No match */
219 char bigbuf[MAX_BUF];
220 int slen;
221
222 /* Set up replyinfo before we modify any of the buffers - this is used
223 * if we don't find a match.
224 */
225 strcpy (bigbuf, "replyinfo ");
226 slen = strlen (bigbuf);
227 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
228
229 /* find the first space, make it null, and update the
230 * params pointer.
231 */
232 for (cp = buf; *cp != '\0'; cp++)
233 if (*cp == ' ')
234 {
235 *cp = '\0';
236 params = cp + 1;
237 break;
238 }
239
240 if (!strcmp (buf, "image_info"))
241 send_image_info (ns, params);
242 else if (!strcmp (buf, "image_sums"))
243 send_image_sums (ns, params);
244 else if (!strcmp (buf, "skill_info"))
245 send_skill_info (ns, params);
246 else if (!strcmp (buf, "spell_paths"))
247 send_spell_paths (ns, params);
248 else
249 ns->send_packet (bigbuf, len);
250}
251
229void 252void
230ExtCmd (char *buf, int len, player *pl) 253ExtCmd (char *buf, int len, player *pl)
231{ 254{
232 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 255 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
256}
257
258void
259ExtiCmd (char *buf, int len, client *ns)
260{
261 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
233} 262}
234 263
235void 264void
236MapInfoCmd (char *buf, int len, player *pl) 265MapInfoCmd (char *buf, int len, player *pl)
237{ 266{
… …
252 buf += 8; 281 buf += 8;
253 282
254 // initial map and its origin 283 // initial map and its origin
255 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
256 sint16 dx, dy; 285 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
260 289
261 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
262 { 291 {
263 int dir = *buf++; 292 int dir = *buf++;
264 293
265 switch (dir) 294 switch (dir)
266 { 295 {
267 case '1': 296 case '1':
268 dx = 0; 297 dx = 0;
269 dy = -1; 298 dy = -1;
270 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
271 map && (mapy -= map->height); 300 map && (mapy -= map->height);
272 break; 301 break;
273 case '2': 302 case '2':
274 mapx += map->width; 303 mapx += map->width;
275 dx = map->width; 304 dx = map->width;
276 dy = 0; 305 dy = 0;
277 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
278 break; 307 break;
279 case '3': 308 case '3':
280 mapy += map->height; 309 mapy += map->height;
281 dx = 0; 310 dx = 0;
282 dy = map->height; 311 dy = map->height;
283 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
284 break; 313 break;
285 case '4': 314 case '4':
286 dx = -1; 315 dx = -1;
287 dy = 0; 316 dy = 0;
288 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
289 map && (mapx -= map->width); 318 map && (mapx -= map->width);
290 break; 319 break;
291 } 320 }
292 321
293 --max_distance; 322 --max_distance;
294 } 323 }
295 324
… …
306 if (map->tile_path[2]) 335 if (map->tile_path[2])
307 flags |= 4; 336 flags |= 4;
308 if (map->tile_path[3]) 337 if (map->tile_path[3])
309 flags |= 8; 338 flags |= 8;
310 339
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
312 } 341 }
313 else 342 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 344 }
316 else 345 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 347
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 348 pl->ns->send_packet (bigbuf);
320} 349}
321 350
322/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
323void 352void
324SetUp (char *buf, int len, NewSocket * ns) 353SetUp (char *buf, int len, client * ns)
325{ 354{
326 int s, slen; 355 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
328 357
329 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
331 * 360 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 361 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
333 * The client then must sort this out 362 * The client then must sort this out
334 */ 363 */
335 364
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
337 strcpy (cmdback, "setup"); 367 strcpy (cmdback, "setup");
338 for (s = 0; s < len;) 368 for (s = 0; s < len; )
339 { 369 {
340
341 cmd = &buf[s]; 370 cmd = &buf[s];
342 371
343 /* find the next space, and put a null there */ 372 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++); 373 for (; buf[s] && buf[s] != ' '; s++)
374 ;
375
345 buf[s++] = 0; 376 buf[s++] = 0;
377
346 while (buf[s] == ' ') 378 while (buf[s] == ' ')
347 s++; 379 s++;
348 380
349 if (s >= len) 381 if (s >= len)
350 break; 382 break;
351 383
352 param = &buf[s]; 384 param = &buf[s];
353 385
354 for (; buf[s] && buf[s] != ' '; s++); 386 for (; buf[s] && buf[s] != ' '; s++)
387 ;
388
355 buf[s++] = 0; 389 buf[s++] = 0;
390
356 while (buf[s] == ' ') 391 while (buf[s] == ' ')
357 s++; 392 s++;
358 393
359 slen = strlen (cmdback); 394 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
365 { 400 {
366 ns->sound = atoi (param); 401 ns->sound = atoi (param);
367 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
368 } 403 }
369 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
370 {
371 ns->exp64 = atoi (param);
372 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
373 }
374 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
375 { 407 {
376 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
377 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
378 } 410 }
… …
521 * report a failure to the client. 553 * report a failure to the client.
522 */ 554 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 555 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 } 556 }
525 } /* for processing all the setup commands */ 557 } /* for processing all the setup commands */
558
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 559 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 560 ns->send_packet (cmdback);
528} 561}
529 562
530/** 563/**
531 * The client has requested to be added to the game. 564 * The client has requested to be added to the game.
532 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
533 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
534 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
535 */ 568 */
536void 569void
537AddMeCmd (char *buf, int len, NewSocket * ns) 570AddMeCmd (char *buf, int len, client * ns)
538{ 571{
539 Settings oldsettings; 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
540
541 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns))
543 {
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else
547 {
548 /* Basically, the add_player copies the socket structure into
549 * the player structure, so this one (which is from init_sockets)
550 * is not needed anymore. The write below should still work, as the
551 * stuff in ns is still relevant.
552 */
553 Write_String_To_Socket (ns, "addme_success", 13);
554 socket_info.nconns--;
555 ns->status = Ns_Avail;
556 }
557 settings = oldsettings;
558} 573}
559 574
560/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
561void 576void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
563{ 578{
564 char cmdback[MAX_BUF]; 579 char cmdback[MAX_BUF];
565 char command[50]; 580 char command[50];
566 int info, nextinfo; 581 int info, nextinfo;
567 582
… …
605 { 620 {
606 strcat (cmdback, " "); 621 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 622 strcat (cmdback, "smoothing");
608 } 623 }
609 624
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 625 ns->send_packet (cmdback);
611} 626}
612 627
613/* 628/*
614#define MSG_TYPE_BOOK 1 629#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 630#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 633#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 634#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 635
621/** Reply to ExtendedInfos command */ 636/** Reply to ExtendedInfos command */
622void 637void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 638ToggleExtendedText (char *buf, int len, client * ns)
624{ 639{
625 char cmdback[MAX_BUF]; 640 char cmdback[MAX_BUF];
626 char temp[10]; 641 char temp[10];
627 char command[50]; 642 char command[50];
628 int info, nextinfo, i, flag; 643 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 683 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 684 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 685 strcat (cmdback, temp);
671 } 686 }
672 687
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 688 ns->send_packet (cmdback);
674} 689}
675 690
676/** 691/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 692 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
678 * Basically, it makes no sense to wait for the client to request a 693 * Basically, it makes no sense to wait for the client to request a
679 * a piece of data from us that we know the client wants. So 694 * a piece of data from us that we know the client wants. So
680 * if we know the client wants it, might as well push it to the 695 * if we know the client wants it, might as well push it to the
681 * client. 696 * client.
682 */ 697 */
683static void 698static void
684SendSmooth (NewSocket * ns, uint16 face) 699SendSmooth (client *ns, uint16 face)
685{ 700{
686 uint16 smoothface; 701 uint16 smoothface;
687 702
688 /* If we can't find a face, return and set it so we won't try to send this 703 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 704 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 715 esrv_send_face (ns, smoothface, 0);
701 716
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 718
704 SockList sl (MAXSOCKBUF); 719 packet sl ("smooth");
705 720
706 sl << "smooth "
707 << uint16 (face) 721 sl << uint16 (face)
708 << uint16 (smoothface); 722 << uint16 (smoothface);
709 723
710 Send_With_Handling (ns, &sl); 724 ns->send_packet (sl);
711 sl.free ();
712} 725}
713 726
714 /** 727 /**
715 * Tells client the picture it has to use 728 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 729 * to smooth a picture number given as argument.
717 */ 730 */
718void 731void
719AskSmooth (char *buf, int len, NewSocket * ns) 732AskSmooth (char *buf, int len, client *ns)
720{ 733{
721 uint16 facenbr; 734 SendSmooth (ns, atoi (buf));
722
723 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr);
725} 735}
726 736
727/** 737/**
728 * This handles the general commands from the client (ie, north, fire, cast, 738 * This handles the general commands from the client (ie, north, fire, cast,
729 * etc.) 739 * etc.)
730 */ 740 */
731void 741void
732PlayerCmd (char *buf, int len, player *pl) 742PlayerCmd (char *buf, int len, player *pl)
733{ 743{
734
735 /* The following should never happen with a proper or honest client.
736 * Therefore, the error message doesn't have to be too clear - if
737 * someone is playing with a hacked/non working client, this gives them
738 * an idea of the problem, but they deserve what they get
739 */
740 if (pl->state != ST_PLAYING)
741 {
742 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
743 return;
744 }
745 /* Check if there is a count. In theory, a zero count could also be 744 /* Check if there is a count. In theory, a zero count could also be
746 * sent, so check for that also. 745 * sent, so check for that also.
747 */ 746 */
748 if (atoi (buf) || buf[0] == '0') 747 if (atoi (buf) || buf[0] == '0')
749 { 748 {
750 pl->count = atoi ((char *) buf); 749 pl->count = atoi ((char *) buf);
750
751 buf = strchr (buf, ' '); /* advance beyond the numbers */ 751 buf = strchr (buf, ' '); /* advance beyond the numbers */
752 if (!buf) 752 if (!buf)
753 {
754#ifdef ESRV_DEBUG
755 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
756#endif
757 return; 753 return;
758 } 754
759 buf++; 755 buf++;
760 } 756 }
761 /* This should not happen anymore. */ 757
762 if (pl->ob->speed_left < -1.0)
763 {
764 LOG (llevError, "Player has negative time - shouldn't do command.\n");
765 }
766 /* In c_new.c */
767 execute_newserver_command (pl->ob, (char *) buf); 758 execute_newserver_command (pl->ob, (char *) buf);
759
768 /* Perhaps something better should be done with a left over count. 760 /* Perhaps something better should be done with a left over count.
769 * Cleaning up the input should probably be done first - all actions 761 * Cleaning up the input should probably be done first - all actions
770 * for the command that issued the count should be done before any other 762 * for the command that issued the count should be done before any other
771 * commands. 763 * commands.
772 */ 764 */
773
774 pl->count = 0; 765 pl->count = 0;
775
776} 766}
777 767
778 768
779/** 769/**
780 * This handles the general commands from the client (ie, north, fire, cast, 770 * This handles the general commands from the client (ie, north, fire, cast,
781 * etc.). It is a lot like PlayerCmd above, but is called with the 771 * etc.). It is a lot like PlayerCmd above, but is called with the
782 * 'ncom' method which gives more information back to the client so it 772 * 'ncom' method which gives more information back to the client so it
783 * can throttle. 773 * can throttle.
784 */ 774 */
785void 775void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 776NewPlayerCmd (char *buf, int len, player *pl)
787{ 777{
788 int time, repeat;
789 char command[MAX_BUF];
790 short packet;
791
792 if (len < 7) 778 if (len <= 6)
793 { 779 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 780 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return; 781 return;
796 } 782 }
797 783
798 packet = net_uint16 (buf); 784 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 repeat = net_uint32 (buf + 2); 785 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
800 786
801 /* -1 is special - no repeat, but don't update */ 787 /* -1 is special - no repeat, but don't update */
802 if (repeat != -1) 788 if (repeat != -1)
803 pl->count = repeat; 789 pl->count = repeat;
804 790
805 if ((len - 4) >= MAX_BUF) 791 buf += 6; //len -= 6;
806 len = MAX_BUF - 5;
807 792
808 strncpy ((char *) command, (char *) buf + 6, len - 4);
809 command[len - 4] = '\0';
810
811 /* The following should never happen with a proper or honest client.
812 * Therefore, the error message doesn't have to be too clear - if
813 * someone is playing with a hacked/non working client, this gives them
814 * an idea of the problem, but they deserve what they get
815 */
816 if (pl->state != ST_PLAYING)
817 {
818 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
819 return;
820 }
821
822 /* This should not happen anymore. */
823 if (pl->ob->speed_left < -1.0)
824 LOG (llevError, "Player has negative time - shouldn't do command.\n");
825
826 /* In c_new.c */
827 execute_newserver_command (pl->ob, (char *) command); 793 execute_newserver_command (pl->ob, buf);
794
828 /* Perhaps something better should be done with a left over count. 795 /* Perhaps something better should be done with a left over count.
829 * Cleaning up the input should probably be done first - all actions 796 * Cleaning up the input should probably be done first - all actions
830 * for the command that issued the count should be done before any other 797 * for the command that issued the count should be done before any other
831 * commands. 798 * commands.
832 */ 799 */
833 pl->count = 0; 800 pl->count = 0;
834 801
835 if (FABS (pl->ob->speed) < 0.001) 802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = fabs (pl->ob->speed) < 0.001
836 time = MAX_TIME * 100; 804 ? time = MAX_TIME * 100
837 else
838 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
839 806
840 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
841 808 packet sl ("comc");
842 SockList sl (MAXSOCKBUF);
843 sl << "comc " << uint16 (packet) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
844 Send_With_Handling (&pl->socket, &sl); 810 pl->ns->send_packet (sl);
845 sl.free ();
846} 811}
847
848 812
849/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
850void 814void
851ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
852{ 816{
817 if (ns->state == ST_CUSTOM)
818 {
819 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
820 return;
821 }
822
823 if (!ns->pl)
824 return; //TODO: depends on the exact reply we are after
825 //TODO: but right now, we always have a ns->pl
826
827 player *pl = ns->pl;
828
853 /* This is to synthesize how the data would be stored if it 829 /* This is to synthesize how the data would be stored if it
854 * was normally entered. A bit of a hack, and should be cleaned up 830 * was normally entered. A bit of a hack, and should be cleaned up
855 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
856 * 832 *
857 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
858 * think it was the carriage return that was entered, and the 834 * think it was the carriage return that was entered, and the
859 * function then does not try to do additional input. 835 * function then does not try to do additional input.
860 */ 836 */
861 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
862 838
863 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
864 840
865 switch (pl->state) 841 switch (ns->state)
866 { 842 {
867 case ST_PLAYING: 843 case ST_PLAYING:
868 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
869 break; 845 break;
870 846
871 case ST_PLAY_AGAIN:
872 /* We can check this for return value (2==quit). Maybe we
873 * should, and do something appropriate?
874 */
875 receive_play_again (pl->ob, buf[0]);
876 break;
877
878 case ST_ROLL_STAT:
879 key_roll_stat (pl->ob, buf[0]);
880 break;
881
882 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
883
884 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
885 break; 849 break;
886 850
887 case ST_CONFIRM_QUIT:
888 key_confirm_quit (pl->ob, buf[0]);
889 break;
890
891 case ST_CONFIGURE:
892 LOG (llevError, "In client input handling, but into configure state\n");
893 pl->state = ST_PLAYING;
894 break;
895
896 case ST_GET_NAME:
897 receive_player_name (pl->ob, 13);
898 break;
899
900 case ST_GET_PASSWORD:
901 case ST_CONFIRM_PASSWORD:
902 receive_player_password (pl->ob, 13);
903 break;
904
905 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
906 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
907 break; 853 break;
908 854
909 default: 855 default:
910 LOG (llevError, "Unknown input state: %d\n", pl->state); 856 LOG (llevError, "Unknown input state: %d\n", ns->state);
911 } 857 }
912} 858}
913 859
914/** 860/**
915 * Client tells its version. If there is a mismatch, we close the 861 * Client tells its version. If there is a mismatch, we close the
… …
917 * something older than the server. If we assume the client will be 863 * something older than the server. If we assume the client will be
918 * backwards compatible, having it be a later version should not be a 864 * backwards compatible, having it be a later version should not be a
919 * problem. 865 * problem.
920 */ 866 */
921void 867void
922VersionCmd (char *buf, int len, NewSocket * ns) 868VersionCmd (char *buf, int len, client * ns)
923{ 869{
924 char *cp;
925 char version_warning[256];
926
927 if (!buf) 870 if (!buf)
928 { 871 {
929 LOG (llevError, "CS: received corrupted version command\n"); 872 LOG (llevError, "CS: received corrupted version command\n");
930 return; 873 return;
931 } 874 }
932 875
933 ns->cs_version = atoi (buf); 876 ns->cs_version = atoi (buf);
934 ns->sc_version = ns->cs_version; 877 ns->sc_version = ns->cs_version;
878
879 LOG (llevDebug, "connection from client <%s>\n", buf);
880
881
882 //TODO: should log here just for statistics
883
935 if (VERSION_CS != ns->cs_version) 884 //if (VERSION_CS != ns->cs_version)
936 { 885 // unchecked;
937#ifdef ESRV_DEBUG 886
938 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
939#endif
940 }
941 cp = strchr (buf + 1, ' '); 887 char *cp = strchr (buf + 1, ' ');
942 if (!cp) 888 if (!cp)
943 return; 889 return;
890
944 ns->sc_version = atoi (cp); 891 ns->sc_version = atoi (cp);
892
945 if (VERSION_SC != ns->sc_version) 893 //if (VERSION_SC != ns->sc_version)
946 { 894 // unchecked;
947#ifdef ESRV_DEBUG 895
948 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
949#endif
950 }
951 cp = strchr (cp + 1, ' '); 896 cp = strchr (cp + 1, ' ');
897
952 if (cp) 898 if (cp)
953 { 899 {
954 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 900 assign (ns->version, cp + 1);
955 901
956 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
957
958 /* This is first implementation - i skip all beta DX clients with it
959 * Add later stuff here for other clients
960 */
961
962 /* these are old dxclients */
963 /* Version 1024 added support for singular + plural name values -
964 * requiing this minimal value reduces complexity of that code, and it
965 * has been around for a long time.
966 */
967 if (ns->sc_version < 1026) 902 if (ns->sc_version < 1026)
968 { 903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
969 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
970 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
971 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
972 }
973
974 } 905 }
975} 906}
976 907
977/** sound related functions. */ 908/** sound related functions. */
978
979void 909void
980SetSound (char *buf, int len, NewSocket * ns) 910SetSound (char *buf, int len, client * ns)
981{ 911{
982 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
983} 913}
984 914
985/** client wants the map resent */ 915/** client wants the map resent */
986
987void 916void
988MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
989{ 918{
990
991/* This function is currently disabled; just clearing the map state results in 919/* This function is currently disabled; just clearing the map state results in
992 * display errors. It should clear the cache and send a newmap command. 920 * display errors. It should clear the cache and send a newmap command.
993 * Unfortunately this solution does not work because some client versions send 921 * Unfortunately this solution does not work because some client versions send
994 * a mapredraw command after receiving a newmap command. 922 * a mapredraw command after receiving a newmap command.
995 */ 923 */
996#if 0
997 /* Okay, this is MAJOR UGLY. but the only way I know how to
998 * clear the "cache"
999 */
1000 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1001 draw_client_map (pl->ob);
1002#endif
1003} 924}
1004 925
1005/** 926/**
1006 * Moves an object (typically, container to inventory). 927 * Moves an object (typically, container to inventory).
1007 * syntax is: move (to) (tag) (nrof) 928 * syntax is: move (to) (tag) (nrof)
… …
1010MoveCmd (char *buf, int len, player *pl) 931MoveCmd (char *buf, int len, player *pl)
1011{ 932{
1012 int vals[3], i; 933 int vals[3], i;
1013 934
1014 /* A little funky here. We only cycle for 2 records, because 935 /* A little funky here. We only cycle for 2 records, because
1015 * we obviously am not going to find a space after the third 936 * we obviously are not going to find a space after the third
1016 * record. Perhaps we should just replace this with a 937 * record. Perhaps we should just replace this with a
1017 * sscanf? 938 * sscanf?
1018 */ 939 */
1019 for (i = 0; i < 2; i++) 940 for (i = 0; i < 2; i++)
1020 { 941 {
1021 vals[i] = atoi (buf); 942 vals[i] = atoi (buf);
943
1022 if (!(buf = strchr (buf, ' '))) 944 if (!(buf = strchr (buf, ' ')))
1023 { 945 {
1024 LOG (llevError, "Incomplete move command: %s\n", buf); 946 LOG (llevError, "Incomplete move command: %s\n", buf);
1025 return; 947 return;
1026 } 948 }
949
1027 buf++; 950 buf++;
1028 } 951 }
952
1029 vals[2] = atoi (buf); 953 vals[2] = atoi (buf);
1030 954
1031/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 955/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1032 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 956 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1033} 957}
1034
1035
1036 958
1037/****************************************************************************** 959/******************************************************************************
1038 * 960 *
1039 * Start of commands the server sends to the client. 961 * Start of commands the server sends to the client.
1040 * 962 *
… …
1043/** 965/**
1044 * Asks the client to query the user. This way, the client knows 966 * Asks the client to query the user. This way, the client knows
1045 * it needs to send something back (vs just printing out a message) 967 * it needs to send something back (vs just printing out a message)
1046 */ 968 */
1047void 969void
1048send_query (NewSocket * ns, uint8 flags, char *text) 970send_query (client *ns, uint8 flags, char *text)
1049{ 971{
1050 char buf[MAX_BUF];
1051
1052 sprintf (buf, "query %d %s", flags, text ? text : ""); 972 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1053 Write_String_To_Socket (ns, buf, strlen (buf));
1054} 973}
1055 974
1056#define AddIfInt64(Old,New,Type) if (Old != New) {\ 975#define AddIfInt64(Old,New,Type) if (Old != New) {\
1057 Old = New; \ 976 Old = New; \
1058 sl << uint8 (Type) << uint64 (New); \ 977 sl << uint8 (Type) << uint64 (New); \
… …
1088esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1089{ 1008{
1090 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1091 uint16 flags; 1010 uint16 flags;
1092 1011
1093 SockList sl (MAXSOCKBUF); 1012 client *ns = pl->ns;
1094 sl << "stats "; 1013 if (!ns)
1014 return;
1095 1015
1096 if (pl->ob != NULL) 1016 object *ob = pl->ob;
1097 { 1017 if (!ob)
1018 return;
1019
1020 packet sl ("stats");
1021
1098 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1099 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1100 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1101 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1102 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1103 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1104 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1105 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1106 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1107 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1108 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1109 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1110 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1111 }
1112 1035
1113 if (pl->socket.exp64)
1114 {
1115 uint8 s;
1116
1117 for (s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1118 { 1037 if (object *skill = pl->last_skill_ob[s])
1119 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1038 if (skill->stats.exp != ns->last_skill_exp [s])
1120 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1041
1121 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1122 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1123 */ 1044 */
1124 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1125 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (skill->level)
1126 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1127
1128 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1129 } 1048 }
1130 }
1131 }
1132 1049
1133 if (pl->socket.exp64)
1134 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1135 else
1136 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1137
1138 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1139 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1140 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1141 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1142 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1143 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1144 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1057 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1145 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1058 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1059
1146 flags = 0; 1060 flags = 0;
1147 1061
1148 if (pl->fire_on) 1062 if (pl->fire_on)
1149 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1150 1064
1151 if (pl->run_on) 1065 if (pl->run_on)
1152 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1153 1067
1154 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1155 1069
1156 if (pl->socket.sc_version < 1025) 1070 if (ns->sc_version < 1025)
1157 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1158 else 1072 else
1159 {
1160 int i;
1161
1162 for (i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1163 { 1074 {
1164 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1165 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1166 continue; 1077 continue;
1167 1078
1168 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1169 } 1080 }
1170 }
1171 1081
1172 if (pl->socket.monitor_spells) 1082 if (pl->ns->monitor_spells)
1173 { 1083 {
1174 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1175 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1176 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1177 } 1087 }
1178 1088
1179 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1180 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1181 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1182 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1183 1093
1184 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1185 if (sl.len > 6) 1095 if (sl.length () > 6)
1186 { 1096 ns->send_packet (sl);
1187#ifdef ESRV_DEBUG
1188 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1189#endif
1190 Send_With_Handling (&pl->socket, &sl);
1191 }
1192
1193 sl.free ();
1194} 1097}
1195 1098
1196/** 1099/**
1197 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1198 */ 1101 */
1199void 1102void
1200esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1201{ 1104{
1202 pl->last_weight = weight; 1105 packet sl ("player");
1203
1204 SockList sl (MAXSOCKBUF);
1205 sl << "player ";
1206 1106
1207 sl << uint32 (pl->ob->count) 1107 sl << uint32 (pl->ob->count)
1208 << uint32 (weight) 1108 << uint32 (weight)
1209 << uint32 (pl->ob->face->number) 1109 << uint32 (pl->ob->face->number)
1210 << data8 (pl->ob->name); 1110 << data8 (pl->ob->name);
1211 1111
1212 Send_With_Handling (&pl->socket, &sl); 1112 pl->ns->last_weight = weight;
1213 sl.free (); 1113 pl->ns->send_packet (sl);
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 1115}
1216 1116
1217/** 1117/**
1218 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
… …
1220 * sent them the face yet (this can become quite costly in terms of 1120 * sent them the face yet (this can become quite costly in terms of
1221 * how much we are sending - on the other hand, this should only happen 1121 * how much we are sending - on the other hand, this should only happen
1222 * when the player logs in and picks stuff up. 1122 * when the player logs in and picks stuff up.
1223 */ 1123 */
1224void 1124void
1225esrv_send_animation (NewSocket * ns, short anim_num) 1125esrv_send_animation (client * ns, short anim_num)
1226{ 1126{
1227 int i;
1228
1229 /* Do some checking on the anim_num we got. Note that the animations 1127 /* Do some checking on the anim_num we got. Note that the animations
1230 * are added in contigous order, so if the number is in the valid 1128 * are added in contigous order, so if the number is in the valid
1231 * range, it must be a valid animation. 1129 * range, it must be a valid animation.
1232 */ 1130 */
1233 if (anim_num < 0 || anim_num > num_animations) 1131 if (anim_num < 0 || anim_num > num_animations)
1234 { 1132 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return; 1134 return;
1237 } 1135 }
1238 1136
1239 SockList sl (MAXSOCKBUF); 1137 packet sl ("anim");
1240 1138
1241 sl << "anim "
1242 << uint16 (anim_num) 1139 sl << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */ 1140 << uint16 (0); /* flags - not used right now */
1244 1141
1245 /* Build up the list of faces. Also, send any information (ie, the 1142 /* Build up the list of faces. Also, send any information (ie, the
1246 * the face itself) down to the client. 1143 * the face itself) down to the client.
1247 */ 1144 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++) 1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1249 { 1146 {
1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 } 1151 }
1254 1152
1255 Send_With_Handling (ns, &sl); 1153 ns->send_packet (sl);
1256 sl.free ();
1257 1154
1258 ns->anims_sent[anim_num] = 1; 1155 ns->anims_sent[anim_num] = 1;
1259} 1156}
1260 1157
1261 1158
… …
1268/** 1165/**
1269 * This adds face_num to a map cell at x,y. If the client doesn't have 1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1270 * the face yet, we will also send it. 1167 * the face yet, we will also send it.
1271 */ 1168 */
1272static void 1169static void
1273esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1274{ 1171{
1275 if (newmap->cells[x][y].count >= MAP_LAYERS) 1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1276 { 1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1277 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1278 return; 1176 return;
1279 abort (); 1177 abort ();
1280 } 1178 }
1281 1179
… …
1283 newmap->cells[x][y].count++; 1181 newmap->cells[x][y].count++;
1284 1182
1285 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1286 esrv_send_face (ns, face_num, 0); 1184 esrv_send_face (ns, face_num, 0);
1287} 1185}
1288
1289struct LayerCell
1290{
1291 uint16 xy;
1292 short face;
1293};
1294
1295struct MapLayer
1296{
1297 int count;
1298 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1299};
1300
1301/** Checkes if map cells have changed */
1302static int
1303mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1304{
1305 int k;
1306
1307 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1308 return 1;
1309 for (k = 0; k < newmap->cells[i][j].count; k++)
1310 {
1311 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1312 {
1313 return 1;
1314 }
1315 }
1316 return 0;
1317}
1318
1319/**
1320 * Basically, what this does is pack the data into layers.
1321 * cnum is the client number, cur is the the buffer we put all of
1322 * this data into. we return the end of the data. layers is
1323 * how many layers of data we should back.
1324 */
1325static uint8 *
1326compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1327{
1328 int x, y, k;
1329 int face;
1330 unsigned char *fcur;
1331 struct MapLayer layers[MAP_LAYERS];
1332
1333 for (k = 0; k < MAP_LAYERS; k++)
1334 layers[k].count = 0;
1335 fcur = cur;
1336 for (x = 0; x < ns->mapx; x++)
1337 {
1338 for (y = 0; y < ns->mapy; y++)
1339 {
1340 if (!mapcellchanged (ns, x, y, newmap))
1341 continue;
1342 if (newmap->cells[x][y].count == 0)
1343 {
1344 *cur = x * ns->mapy + y; /* mark empty space */
1345 cur++;
1346 continue;
1347 }
1348 for (k = 0; k < newmap->cells[x][y].count; k++)
1349 {
1350 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1351 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1352 layers[k].count++;
1353 }
1354 }
1355 }
1356 /* If no data, return now. */
1357 if (fcur == cur && layers[0].count == 0)
1358 return cur;
1359 *cur = 255; /* mark end of explicitly cleared cells */
1360 cur++;
1361 /* First pack by layers. */
1362 for (k = 0; k < numlayers; k++)
1363 {
1364 if (layers[k].count == 0)
1365 break; /* once a layer is entirely empty, no layer below it can
1366 have anything in it either */
1367 /* Pack by entries in thie layer */
1368 for (x = 0; x < layers[k].count;)
1369 {
1370 fcur = cur;
1371 *cur = layers[k].lcells[x].face >> 8;
1372 cur++;
1373 *cur = layers[k].lcells[x].face & 0xFF;
1374 cur++;
1375 face = layers[k].lcells[x].face;
1376 /* Now, we back the redundant data into 1 byte xy pairings */
1377 for (y = x; y < layers[k].count; y++)
1378 {
1379 if (layers[k].lcells[y].face == face)
1380 {
1381 *cur = (uint8) layers[k].lcells[y].xy;
1382 cur++;
1383 layers[k].lcells[y].face = -1;
1384 }
1385 }
1386 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1387 /* forward over the now redundant data */
1388 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1389 x++;
1390 }
1391 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1392 }
1393 return cur;
1394}
1395
1396static void
1397esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1398{
1399 static long frames, bytes, tbytes, tframes;
1400 char *cur;
1401
1402 SockList sl (MAXSOCKBUF);
1403 sl << "map ";
1404
1405 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1406 sl.len = cur - (char *) sl.buf;
1407
1408/* LOG(llevDebug, "Sending map command.\n");*/
1409
1410 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1411 {
1412 /* All of this is just accounting stuff */
1413 if (tframes > 100)
1414 tframes = tbytes = 0;
1415
1416 tframes++;
1417 frames++;
1418 tbytes += sl.len;
1419 bytes += sl.len;
1420 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1421 Send_With_Handling (ns, &sl);
1422 ns->sent_scroll = 0;
1423 }
1424
1425 sl.free ();
1426}
1427
1428 1186
1429/** Clears a map cell */ 1187/** Clears a map cell */
1430static void 1188static void
1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1432{ 1190{
… …
1443#define MAX_LAYERS 3 1201#define MAX_LAYERS 3
1444 1202
1445/* Using a global really isn't a good approach, but saves the over head of 1203/* Using a global really isn't a good approach, but saves the over head of
1446 * allocating and deallocating such a block of data each time run through, 1204 * allocating and deallocating such a block of data each time run through,
1447 * and saves the space of allocating this in the socket object when we only 1205 * and saves the space of allocating this in the socket object when we only
1448 * need it for this cycle. If the serve is ever threaded, this needs to be 1206 * need it for this cycle. If the server is ever threaded, this needs to be
1449 * re-examined. 1207 * re-examined.
1450 */ 1208 */
1451
1452static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1453 1210
1454/** 1211/**
1455 * Returns true if any of the heads for this 1212 * Returns true if any of the heads for this
1456 * space is set. Returns false if all are blank - this is used 1213 * space is set. Returns false if all are blank - this is used
1457 * for empty space checking. 1214 * for empty space checking.
1458 */ 1215 */
1459static inline int 1216static inline int
1460have_head (int ax, int ay) 1217have_head (int ax, int ay)
1461{ 1218{
1462
1463 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1464 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1465 return 1; 1221 return 1;
1222
1466 return 0; 1223 return 0;
1467} 1224}
1468 1225
1469/** 1226/**
1470 * check_head is a bit simplistic version of update_space below. 1227 * check_head is a bit simplistic version of update_space below.
1471 * basically, it only checks the that the head on space ax,ay at layer 1228 * basically, it only checks the that the head on space ax,ay at layer
1472 * needs to get sent - if so, it adds the data, sending the head 1229 * needs to get sent - if so, it adds the data, sending the head
1473 * if needed, and returning 1. If this no data needs to get 1230 * if needed, and returning 1. If this no data needs to get
1474 * sent, it returns zero. 1231 * sent, it returns zero.
1475 */ 1232 */
1476static int 1233static int
1477check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1478{ 1235{
1479 short face_num; 1236 short face_num;
1480 1237
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1514 * numbers the spaces differently - I think this was a leftover from 1271 * numbers the spaces differently - I think this was a leftover from
1515 * the map command, where the faces stack up. Sinces that is no longer 1272 * the map command, where the faces stack up. Sinces that is no longer
1516 * the case, it seems to make more sense to have these layer values 1273 * the case, it seems to make more sense to have these layer values
1517 * actually match. 1274 * actually match.
1518 */ 1275 */
1519
1520static int 1276static int
1521update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1522{ 1278{
1523 object *ob, *head; 1279 object *ob, *head;
1524 uint16 face_num; 1280 uint16 face_num;
1525 int bx, by, i; 1281 int bx, by, i;
1526 1282
… …
1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1740 * take. 1496 * take.
1741 */ 1497 */
1742 1498
1743static inline int 1499static inline int
1744update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1745{ 1501{
1746 object *ob; 1502 object *ob;
1747 int smoothlevel; /* old face_num; */ 1503 int smoothlevel; /* old face_num; */
1748 1504
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1750 1506
1751 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1752 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1753 */ 1509 */
1754 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1755 smoothlevel = 0; 1511 smoothlevel = 0;
1756 else 1512 else
1757 { 1513 {
1758 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1759 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1783 * Returns the size of a data for a map square as returned by 1539 * Returns the size of a data for a map square as returned by
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1540 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 1541 * available.
1786 */ 1542 */
1787int 1543int
1788getExtendedMapInfoSize (NewSocket * ns) 1544getExtendedMapInfoSize (client * ns)
1789{ 1545{
1790 int result = 0; 1546 int result = 0;
1791 1547
1792 if (ns->ext_mapinfos) 1548 if (ns->ext_mapinfos)
1793 { 1549 {
1794 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1795 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1796 } 1552 }
1553
1797 return result; 1554 return result;
1555}
1556
1557// prefetch (and touch) all maps within a specific distancd
1558static void
1559prefetch_surrounding_maps (maptile *map, int distance)
1560{
1561 map->last_access = runtime;
1562
1563 if (--distance)
1564 for (int dir = 4; --dir; )
1565 if (const shstr &path = map->tile_path [dir])
1566 if (maptile *&neigh = map->tile_map [dir])
1567 prefetch_surrounding_maps (neigh, distance);
1568 else
1569 neigh = maptile::find_async (path, map);
1570}
1571
1572// prefetch a generous area around the player
1573static void
1574prefetch_surrounding_maps (object *op)
1575{
1576 prefetch_surrounding_maps (op->map, 3);
1798} 1577}
1799 1578
1800/** 1579/**
1801 * This function uses the new map1 protocol command to send the map 1580 * This function uses the new map1 protocol command to send the map
1802 * to the client. It is necessary because the old map command supports 1581 * to the client. It is necessary because the old map command supports
… …
1808 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1587 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1809 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1588 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1810 * and use the other 4 bits for other informatiion. For full documentation 1589 * and use the other 4 bits for other informatiion. For full documentation
1811 * of what we send, see the doc/Protocol file. 1590 * of what we send, see the doc/Protocol file.
1812 * I will describe internally what we do: 1591 * I will describe internally what we do:
1813 * the socket->lastmap shows how the map last looked when sent to the client. 1592 * the ns->lastmap shows how the map last looked when sent to the client.
1814 * in the lastmap structure, there is a cells array, which is set to the 1593 * in the lastmap structure, there is a cells array, which is set to the
1815 * maximum viewable size (As set in config.h). 1594 * maximum viewable size (As set in config.h).
1816 * in the cells, there are faces and a count value. 1595 * in the cells, there are faces and a count value.
1817 * we use the count value to hold the darkness value. If -1, then this space 1596 * we use the count value to hold the darkness value. If -1, then this space
1818 * is not viewable. 1597 * is not viewable.
… …
1829 uint8 eentrysize; 1608 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1609 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1610 uint8 extendedinfos;
1832 maptile *m; 1611 maptile *m;
1833 1612
1834 NewSocket &socket = pl->contr->socket; 1613 client &socket = *pl->contr->ns;
1614
1615 if (!pl->active)
1616 return;
1835 1617
1836 check_map_change (pl->contr); 1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1837 1620
1838 SockList sl (MAXSOCKBUF);
1839 SockList esl (MAXSOCKBUF);
1840
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl;
1623
1842 startlen = sl.len; 1624 startlen = sl.length ();
1843 1625
1844 /*Extendedmapinfo structure initialisation */ 1626 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1627 if (socket.ext_mapinfos)
1846 { 1628 {
1847 extendedinfos = EMI_NOREDRAW; 1629 extendedinfos = EMI_NOREDRAW;
1848 1630
1849 if (socket.EMI_smooth) 1631 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1632 extendedinfos |= EMI_SMOOTH;
1851 1633
1852 ewhatstart = esl.len; 1634 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1635 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1636 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1637 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1638 esl << "mapextended "
1857 << uint8 (extendedinfos) 1639 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1640 << uint8 (eentrysize);
1641
1859 estartlen = esl.len; 1642 estartlen = esl.length ();
1860 } 1643 }
1861 else 1644 else
1862 { 1645 {
1863 /* suppress compiler warnings */ 1646 /* suppress compiler warnings */
1864 ewhatstart = 0; 1647 ewhatstart = 0;
… …
1889 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1672 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1890 { 1673 {
1891 ax = 0; 1674 ax = 0;
1892 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1675 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1893 { 1676 {
1894
1895 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1896 1678
1897 /* If this space is out of the normal viewable area, we only check 1679 /* If this space is out of the normal viewable area, we only check
1898 * the heads value ax or ay will only be greater than what 1680 * the heads value ax or ay will only be greater than what
1899 * the client wants if using the map1a command - this is because 1681 * the client wants if using the map1a command - this is because
… …
1902 */ 1684 */
1903 if (ax >= socket.mapx || ay >= socket.mapy) 1685 if (ax >= socket.mapx || ay >= socket.mapy)
1904 { 1686 {
1905 int i, got_one; 1687 int i, got_one;
1906 1688
1907 oldlen = sl.len; 1689 oldlen = sl.length ();
1908 1690
1909 sl << uint16 (mask); 1691 sl << uint16 (mask);
1910 1692
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1693 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1694 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1916 * actually need to send that - just the coordinates 1698 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the 1699 * with no faces tells the client to blank out the
1918 * space. 1700 * space.
1919 */ 1701 */
1920 got_one = 0; 1702 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++) 1703 for (i = oldlen + 2; i < sl.length (); i++)
1922 if (sl.buf[i]) 1704 if (sl[i])
1923 got_one = 1; 1705 got_one = 1;
1924 1706
1925 if (got_one && (mask & 0xf)) 1707 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff; 1708 sl[oldlen + 1] = mask & 0xff;
1927 else 1709 else
1928 { /*either all faces blank, either no face at all */ 1710 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1711 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2; 1712 sl.reset (oldlen + 2);
1931 else 1713 else
1932 sl.len = oldlen; 1714 sl.reset (oldlen);
1933 } 1715 }
1934 1716
1935 /*What concerns extendinfos, nothing to be done for now 1717 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later) 1718 * (perhaps effects layer later)
1937 */ 1719 */
… …
1961 map_clearcell (&lastcell, 0, 0, 0, -1); 1743 map_clearcell (&lastcell, 0, 0, 0, -1);
1962 } 1744 }
1963 } 1745 }
1964 else if (d > 3) 1746 else if (d > 3)
1965 { 1747 {
1748 m->touch ();
1749
1966 int need_send = 0, count; 1750 int need_send = 0, count;
1967 1751
1968 /* This block deals with spaces that are not visible for whatever 1752 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1753 * reason. Still may need to send the head for this space.
1970 */ 1754 */
1971 1755
1972 oldlen = sl.len; 1756 oldlen = sl.length ();
1973 1757
1974 sl << uint16 (mask); 1758 sl << uint16 (mask);
1975 1759
1976 if (lastcell.count != -1) 1760 if (lastcell.count != -1)
1977 need_send = 1; 1761 need_send = 1;
… …
1997 1781
1998 map_clearcell (&lastcell, 0, 0, 0, count); 1782 map_clearcell (&lastcell, 0, 0, 0, count);
1999 } 1783 }
2000 1784
2001 if ((mask & 0xf) || need_send) 1785 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff; 1786 sl[oldlen + 1] = mask & 0xff;
2003 else 1787 else
2004 sl.len = oldlen; 1788 sl.reset (oldlen);
2005 } 1789 }
2006 else 1790 else
2007 { 1791 {
1792 m->touch ();
1793
2008 /* In this block, the space is visible or there are head objects 1794 /* In this block, the space is visible or there are head objects
2009 * we need to send. 1795 * we need to send.
2010 */ 1796 */
2011 1797
2012 /* Rather than try to figure out what everything that we might 1798 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1799 * need to send is, then form the packet after that,
2014 * we presume that we will in fact form a packet, and update 1800 * we presume that we will in fact form a packet, and update
2015 * the bits by what we do actually send. If we send nothing, 1801 * the bits by what we do actually send. If we send nothing,
2016 * we just back out sl.len to the old value, and no harm 1802 * we just back out sl.length () to the old value, and no harm
2017 * is done. 1803 * is done.
2018 * I think this is simpler than doing a bunch of checks to see 1804 * I think this is simpler than doing a bunch of checks to see
2019 * what if anything we need to send, setting the bits, then 1805 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1806 * doing those checks again to add the real data.
2021 */ 1807 */
2022 oldlen = sl.len; 1808 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1809 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1810 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1811 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2026 sl << uint16 (mask); 1812 sl << uint16 (mask);
2027 1813
2028 if (socket.ext_mapinfos) 1814 if (socket.ext_mapinfos)
2029 esl << uint16 (emask); 1815 esl << uint16 (emask);
… …
2037 mask |= 0x8; 1823 mask |= 0x8;
2038 1824
2039 if (socket.extmap) 1825 if (socket.extmap)
2040 { 1826 {
2041 *last_ext |= 0x80; 1827 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 1828 last_ext = &sl[sl.length ()];
2043 sl << uint8 (d); 1829 sl << uint8 (d);
2044 } 1830 }
2045 else 1831 else
2046 sl << uint8 (255 - 64 * d); 1832 sl << uint8 (255 - 64 * d);
2047 } 1833 }
… …
2081 { 1867 {
2082 lastcell.stat_hp = stat_hp; 1868 lastcell.stat_hp = stat_hp;
2083 1869
2084 mask |= 0x8; 1870 mask |= 0x8;
2085 *last_ext |= 0x80; 1871 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1872 last_ext = &sl[sl.length ()];
2087 1873
2088 sl << uint8 (5) << uint8 (stat_hp); 1874 sl << uint8 (5) << uint8 (stat_hp);
2089 1875
2090 if (stat_width > 1) 1876 if (stat_width > 1)
2091 { 1877 {
2092 *last_ext |= 0x80; 1878 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1879 last_ext = &sl[sl.length ()];
2094 1880
2095 sl << uint8 (6) << uint8 (stat_width); 1881 sl << uint8 (6) << uint8 (stat_width);
2096 } 1882 }
2097 } 1883 }
2098 1884
… …
2100 { 1886 {
2101 lastcell.player = player; 1887 lastcell.player = player;
2102 1888
2103 mask |= 0x8; 1889 mask |= 0x8;
2104 *last_ext |= 0x80; 1890 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 1891 last_ext = &sl[sl.length ()];
2106 1892
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1893 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 1894 }
2109 1895
2110 if (lastcell.flags != flags) 1896 if (lastcell.flags != flags)
2111 { 1897 {
2112 lastcell.flags = flags; 1898 lastcell.flags = flags;
2113 1899
2114 mask |= 0x8; 1900 mask |= 0x8;
2115 *last_ext |= 0x80; 1901 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 1902 last_ext = &sl[sl.length ()];
2117 1903
2118 sl << uint8 (8) << uint8 (flags); 1904 sl << uint8 (8) << uint8 (flags);
2119 } 1905 }
2120 } 1906 }
2121 1907
… …
2163 * space by checking the mask. If so, update the mask. 1949 * space by checking the mask. If so, update the mask.
2164 * if not, reset the len to that from before adding the mask 1950 * if not, reset the len to that from before adding the mask
2165 * value, so we don't send those bits. 1951 * value, so we don't send those bits.
2166 */ 1952 */
2167 if (mask & 0xf) 1953 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 1954 sl[oldlen + 1] = mask & 0xff;
2169 else 1955 else
2170 sl.len = oldlen; 1956 sl.reset (oldlen);
2171 1957
2172 if (emask & 0xf) 1958 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 1959 esl[eoldlen + 1] = emask & 0xff;
2174 else 1960 else
2175 esl.len = eoldlen; 1961 esl.reset (eoldlen);
2176 } /* else this is a viewable space */ 1962 } /* else this is a viewable space */
2177 } /* for x loop */ 1963 } /* for x loop */
2178 } /* for y loop */ 1964 } /* for y loop */
2179 1965
2180 /* Verify that we in fact do need to send this */ 1966 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 1967 if (socket.ext_mapinfos)
2182 { 1968 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 1969 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 1970 {
2185 /* No map data will follow, so don't say the client 1971 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 1972 * it doesn't need draw!
2187 */ 1973 */
2188 ewhatflag &= (~EMI_NOREDRAW); 1974 ewhatflag &= (~EMI_NOREDRAW);
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1975 esl[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 1976 }
2191 1977
2192 if (esl.len > estartlen) 1978 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 1979 socket.send_packet (esl);
2194 } 1980 }
2195 1981
2196 if (sl.len > startlen || socket.sent_scroll) 1982 if (sl.length () > startlen || socket.sent_scroll)
2197 { 1983 {
2198 Send_With_Handling (&socket, &sl); 1984 socket.send_packet (sl);
2199 socket.sent_scroll = 0; 1985 socket.sent_scroll = 0;
2200 } 1986 }
2201
2202 sl.free ();
2203 esl.free ();
2204} 1987}
2205 1988
2206/** 1989/**
2207 * Draws client map. 1990 * Draws client map.
2208 */ 1991 */
2209void 1992void
2210draw_client_map (object *pl) 1993draw_client_map (object *pl)
2211{ 1994{
2212 int i, j; 1995 int i, j;
2213 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2214 New_Face *face, *floor; 1997 facetile *face, *floor;
2215 New_Face *floor2; 1998 facetile *floor2;
2216 int d, mflags; 1999 int d, mflags;
2217 struct Map newmap; 2000 struct Map newmap;
2218 maptile *m, *pm; 2001 maptile *m, *pm;
2219 2002
2220 if (pl->type != PLAYER) 2003 if (pl->type != PLAYER)
… …
2232 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2233 return; 2016 return;
2234 2017
2235 memset (&newmap, 0, sizeof (struct Map)); 2018 memset (&newmap, 0, sizeof (struct Map));
2236 2019
2237 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2020 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2238 {
2239 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2021 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2240 { 2022 {
2241 ax = i; 2023 ax = i;
2242 ay = j; 2024 ay = j;
2243 m = pm; 2025 m = pm;
2244 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2026 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2027
2245 if (mflags & P_OUT_OF_MAP) 2028 if (mflags & P_OUT_OF_MAP)
2246 continue; 2029 continue;
2247 if (mflags & P_NEED_UPDATE) 2030
2248 update_position (m, ax, ay);
2249 /* If a map is visible to the player, we don't want to swap it out 2031 /* If a map is visible to the player, we don't want to swap it out
2250 * just to reload it. This should really call something like 2032 * just to reload it. This should really call something like
2251 * swap_map, but this is much more efficient and 'good enough' 2033 * swap_map, but this is much more efficient and 'good enough'
2252 */ 2034 */
2253 if (mflags & P_NEW_MAP) 2035 if (mflags & P_NEW_MAP)
2254 m->timeout = 50; 2036 m->timeout = 50;
2255 } 2037 }
2256 } 2038
2257 /* do LOS after calls to update_position */ 2039 /* do LOS after calls to update_position */
2258 if (pl->contr->do_los) 2040 if (pl->contr->do_los)
2259 { 2041 {
2260 update_los (pl); 2042 update_los (pl);
2261 pl->contr->do_los = 0; 2043 pl->contr->do_los = 0;
2262 } 2044 }
2263 2045
2264 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2265 {
2266 /* Big maps need a different drawing mechanism to work */ 2046 /* Big maps need a different drawing mechanism to work */
2267 draw_client_map1 (pl); 2047 draw_client_map1 (pl);
2268 return;
2269 }
2270
2271 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2272 {
2273 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2274 }
2275
2276 /* j and i are the y and x coordinates of the real map (which is
2277 * basically some number of spaces around the player)
2278 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2279 * left corner) and are thus disconnected from the map values.
2280 * Subtract 1 from the max values so that we properly handle cases where
2281 * player has specified an even map. Otherwise, we try to send them too
2282 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2283 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2284 * odd, this still works fine.
2285 */
2286 ay = 0;
2287 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2288 {
2289 ax = 0;
2290 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2291 {
2292
2293 d = pl->contr->blocked_los[ax][ay];
2294 /* note the out_of_map and d>3 checks are both within the same
2295 * negation check.
2296 */
2297 nx = i;
2298 ny = j;
2299 m = get_map_from_coord (pm, &nx, &ny);
2300 if (m && d < 4)
2301 {
2302 face = GET_MAP_FACE (m, nx, ny, 0);
2303 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2304 floor = GET_MAP_FACE (m, nx, ny, 2);
2305
2306 /* If all is blank, send a blank face. */
2307 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2308 {
2309 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2310 }
2311 else
2312 { /* actually have something interesting */
2313 /* send the darkness mask, if any. */
2314 if (d && pl->contr->socket.darkness)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2316
2317 if (face && face != blank_face)
2318 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2319 if (floor2 && floor2 != blank_face)
2320 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2321 if (floor && floor != blank_face)
2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2323 }
2324 } /* Is a valid space */
2325 }
2326 }
2327
2328 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2329
2330 check_map_change (pl->contr);
2331} 2048}
2332 2049
2333 2050
2334/*****************************************************************************/ 2051/*****************************************************************************/
2335 2052
… …
2341 2058
2342/*****************************************************************************/ 2059/*****************************************************************************/
2343void 2060void
2344send_plugin_custom_message (object *pl, char *buf) 2061send_plugin_custom_message (object *pl, char *buf)
2345{ 2062{
2346 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2063 pl->contr->ns->send_packet (buf);
2347} 2064}
2348 2065
2349/** 2066/**
2350 * This sends the skill number to name mapping. We ignore 2067 * This sends the skill number to name mapping. We ignore
2351 * the params - we always send the same info no matter what. 2068 * the params - we always send the same info no matter what.
2352 */ 2069 */
2353void 2070void
2354send_skill_info (NewSocket *ns, char *params) 2071send_skill_info (client *ns, char *params)
2355{ 2072{
2356 SockList sl (MAXSOCKBUF); 2073 packet sl;
2357 sl << "replyinfo skill_info\n"; 2074 sl << "replyinfo skill_info\n";
2358 2075
2359 for (int i = 1; i < NUM_SKILLS; i++) 2076 for (int i = 1; i < NUM_SKILLS; i++)
2360 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2077 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2361 2078
2362 if (sl.len >= MAXSOCKBUF) 2079 if (sl.length () >= MAXSOCKBUF)
2363 { 2080 {
2364 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2081 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2365 fatal (0); 2082 fatal (0);
2366 } 2083 }
2367 2084
2368 Send_With_Handling (ns, &sl); 2085 ns->send_packet (sl);
2369 sl.free ();
2370} 2086}
2371 2087
2372/** 2088/**
2373 * This sends the spell path to name mapping. We ignore 2089 * This sends the spell path to name mapping. We ignore
2374 * the params - we always send the same info no matter what. 2090 * the params - we always send the same info no matter what.
2375 */ 2091 */
2376void 2092void
2377send_spell_paths (NewSocket * ns, char *params) 2093send_spell_paths (client * ns, char *params)
2378{ 2094{
2379 SockList sl (MAXSOCKBUF); 2095 packet sl;
2380 2096
2381 sl << "replyinfo spell_paths\n"; 2097 sl << "replyinfo spell_paths\n";
2382 2098
2383 for (int i = 0; i < NRSPELLPATHS; i++) 2099 for (int i = 0; i < NRSPELLPATHS; i++)
2384 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2100 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2385 2101
2386 if (sl.len >= MAXSOCKBUF) 2102 if (sl.length () >= MAXSOCKBUF)
2387 { 2103 {
2388 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2104 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2389 fatal (0); 2105 fatal (0);
2390 } 2106 }
2391 2107
2392 Send_With_Handling (ns, &sl); 2108 ns->send_packet (sl);
2393 sl.free ();
2394} 2109}
2395 2110
2396/** 2111/**
2397 * This looks for any spells the player may have that have changed their stats. 2112 * This looks for any spells the player may have that have changed their stats.
2398 * it then sends an updspell packet for each spell that has changed in this way 2113 * it then sends an updspell packet for each spell that has changed in this way
2399 */ 2114 */
2400void 2115void
2401esrv_update_spells (player *pl) 2116esrv_update_spells (player *pl)
2402{ 2117{
2118 if (!pl->ns)
2119 return;
2120
2403 if (!pl->socket.monitor_spells) 2121 if (!pl->ns->monitor_spells)
2404 return; 2122 return;
2405 2123
2406 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2124 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2407 { 2125 {
2408 if (spell->type == SPELL) 2126 if (spell->type == SPELL)
… …
2428 flags |= UPD_SP_DAMAGE; 2146 flags |= UPD_SP_DAMAGE;
2429 } 2147 }
2430 2148
2431 if (flags) 2149 if (flags)
2432 { 2150 {
2433 SockList sl (MAXSOCKBUF); 2151 packet sl;
2434 2152
2435 sl << "updspell " 2153 sl << "updspell "
2436 << uint8 (flags) 2154 << uint8 (flags)
2437 << uint32 (spell->count); 2155 << uint32 (spell->count);
2438 2156
2439 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2157 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2440 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2158 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2441 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2159 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2442 2160
2443 Send_With_Handling (&pl->socket, &sl); 2161 pl->ns->send_packet (sl);
2444 sl.free ();
2445 } 2162 }
2446 } 2163 }
2447 } 2164 }
2448} 2165}
2449 2166
2450void 2167void
2451esrv_remove_spell (player *pl, object *spell) 2168esrv_remove_spell (player *pl, object *spell)
2452{ 2169{
2453 if (!pl->socket.monitor_spells) 2170 if (!pl->ns->monitor_spells)
2454 return; 2171 return;
2455 2172
2456 if (!pl || !spell || spell->env != pl->ob) 2173 if (!pl || !spell || spell->env != pl->ob)
2457 { 2174 {
2458 LOG (llevError, "Invalid call to esrv_remove_spell"); 2175 LOG (llevError, "Invalid call to esrv_remove_spell");
2459 return; 2176 return;
2460 } 2177 }
2461 2178
2462 SockList sl (MAXSOCKBUF); 2179 packet sl ("delspell");
2463 2180
2464 sl << "delspell "
2465 << uint32 (spell->count); 2181 sl << uint32 (spell->count);
2466 2182
2467 Send_With_Handling (&pl->socket, &sl); 2183 pl->ns->send_packet (sl);
2468 sl.free ();
2469} 2184}
2470 2185
2471/* appends the spell *spell to the Socklist we will send the data to. */ 2186/* appends the spell *spell to the Socklist we will send the data to. */
2472static void 2187static void
2473append_spell (player *pl, SockList &sl, object *spell) 2188append_spell (player *pl, packet &sl, object *spell)
2474{ 2189{
2475 int len, i, skill = 0; 2190 int len, i, skill = 0;
2476 2191
2477 if (!(spell->name)) 2192 if (!(spell->name))
2478 { 2193 {
… …
2521 { 2236 {
2522 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2523 return; 2238 return;
2524 } 2239 }
2525 2240
2526 if (!pl->socket.monitor_spells) 2241 if (!pl->ns->monitor_spells)
2527 return; 2242 return;
2528 2243
2529 SockList sl (MAXSOCKBUF); 2244 packet sl ("addspell");
2530
2531 sl << "addspell ";
2532 2245
2533 if (!spell) 2246 if (!spell)
2534 { 2247 {
2535 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2536 { 2249 {
… …
2548 * like it will fix this 2261 * like it will fix this
2549 */ 2262 */
2550 if (spell->type != SPELL) 2263 if (spell->type != SPELL)
2551 continue; 2264 continue;
2552 2265
2553 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2266 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2554 { 2267 {
2555 Send_With_Handling (&pl->socket, &sl); 2268 pl->ns->send_packet (sl);
2556 strcpy ((char *) sl.buf, "addspell "); 2269
2557 sl.len = strlen ((char *) sl.buf); 2270 sl.reset ();
2271 sl << "addspell ";
2558 } 2272 }
2559 2273
2560 append_spell (pl, sl, spell); 2274 append_spell (pl, sl, spell);
2561 } 2275 }
2562 } 2276 }
… …
2573 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2287 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2574 fatal (0); 2288 fatal (0);
2575 } 2289 }
2576 2290
2577 /* finally, we can send the packet */ 2291 /* finally, we can send the packet */
2578 Send_With_Handling (&pl->socket, &sl); 2292 pl->ns->send_packet (sl);
2579
2580 sl.free ();
2581} 2293}
2582 2294

Diff Legend

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