ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.31 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.68 by root, Sun Mar 4 19:36:12 2007 UTC

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

Diff Legend

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