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

Diff Legend

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