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.29 by root, Wed Dec 13 21:27:09 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 = GetShort_String (buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 repeat = GetInt_String (buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
790
800 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1) 792 if (repeat != -1)
802 pl->count = repeat; 793 pl->count = repeat;
803 794
804 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
805 len = MAX_BUF - 5;
806 796
807 strncpy ((char *) command, (char *) buf + 6, len - 4);
808 command[len - 4] = '\0';
809
810 /* The following should never happen with a proper or honest client.
811 * Therefore, the error message doesn't have to be too clear - if
812 * someone is playing with a hacked/non working client, this gives them
813 * an idea of the problem, but they deserve what they get
814 */
815 if (pl->state != ST_PLAYING)
816 {
817 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
818 return;
819 }
820
821 /* This should not happen anymore. */
822 if (pl->ob->speed_left < -1.0)
823 LOG (llevError, "Player has negative time - shouldn't do command.\n");
824
825 /* In c_new.c */
826 execute_newserver_command (pl->ob, (char *) command); 797 execute_newserver_command (pl->ob, buf);
798
827 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
828 * Cleaning up the input should probably be done first - all actions 800 * Cleaning up the input should probably be done first - all actions
829 * 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
830 * commands. 802 * commands.
831 */ 803 */
832 pl->count = 0; 804 pl->count = 0;
833 805
834 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
835 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
836 else
837 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
838 810
839 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
840 812 packet sl ("comc");
841 SockList sl (MAXSOCKBUF);
842 sl << "comc " << uint16 (packet) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
843 Send_With_Handling (&pl->socket, &sl); 814 pl->ns->send_packet (sl);
844 sl.free ();
845} 815}
846
847 816
848/** This is a reply to a previous query. */ 817/** This is a reply to a previous query. */
849void 818void
850ReplyCmd (char *buf, int len, player *pl) 819ReplyCmd (char *buf, int len, client *ns)
851{ 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
852 /* 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
853 * 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
854 * once all the X11 code is removed from the server. 835 * once all the X11 code is removed from the server.
855 * 836 *
856 * 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
857 * think it was the carriage return that was entered, and the 838 * think it was the carriage return that was entered, and the
858 * function then does not try to do additional input. 839 * function then does not try to do additional input.
859 */ 840 */
860 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 841 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
861 842
862 /* this avoids any hacking here */ 843 /* this avoids any hacking here */
863 844
864 switch (pl->state) 845 switch (ns->state)
865 { 846 {
866 case ST_PLAYING: 847 case ST_PLAYING:
867 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 848 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
868 break; 849 break;
869 850
870 case ST_PLAY_AGAIN:
871 /* We can check this for return value (2==quit). Maybe we
872 * should, and do something appropriate?
873 */
874 receive_play_again (pl->ob, buf[0]);
875 break;
876
877 case ST_ROLL_STAT:
878 key_roll_stat (pl->ob, buf[0]);
879 break;
880
881 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
882
883 key_change_class (pl->ob, buf[0]); 852 key_change_class (pl->ob, buf[0]);
884 break; 853 break;
885 854
886 case ST_CONFIRM_QUIT:
887 key_confirm_quit (pl->ob, buf[0]);
888 break;
889
890 case ST_CONFIGURE:
891 LOG (llevError, "In client input handling, but into configure state\n");
892 pl->state = ST_PLAYING;
893 break;
894
895 case ST_GET_NAME:
896 receive_player_name (pl->ob, 13);
897 break;
898
899 case ST_GET_PASSWORD:
900 case ST_CONFIRM_PASSWORD:
901 receive_player_password (pl->ob, 13);
902 break;
903
904 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
905 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
906 break; 857 break;
907 858
908 default: 859 default:
909 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
910 } 861 }
911} 862}
912 863
913/** 864/**
914 * 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
… …
916 * 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
917 * 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
918 * problem. 869 * problem.
919 */ 870 */
920void 871void
921VersionCmd (char *buf, int len, NewSocket * ns) 872VersionCmd (char *buf, int len, client * ns)
922{ 873{
923 char *cp;
924 char version_warning[256];
925
926 if (!buf) 874 if (!buf)
927 { 875 {
928 LOG (llevError, "CS: received corrupted version command\n"); 876 LOG (llevError, "CS: received corrupted version command\n");
929 return; 877 return;
930 } 878 }
931 879
932 ns->cs_version = atoi (buf); 880 ns->cs_version = atoi (buf);
933 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
934 if (VERSION_CS != ns->cs_version) 888 //if (VERSION_CS != ns->cs_version)
935 { 889 // unchecked;
936#ifdef ESRV_DEBUG 890
937 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
938#endif
939 }
940 cp = strchr (buf + 1, ' '); 891 char *cp = strchr (buf + 1, ' ');
941 if (!cp) 892 if (!cp)
942 return; 893 return;
894
943 ns->sc_version = atoi (cp); 895 ns->sc_version = atoi (cp);
896
944 if (VERSION_SC != ns->sc_version) 897 //if (VERSION_SC != ns->sc_version)
945 { 898 // unchecked;
946#ifdef ESRV_DEBUG 899
947 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
948#endif
949 }
950 cp = strchr (cp + 1, ' '); 900 cp = strchr (cp + 1, ' ');
901
951 if (cp) 902 if (cp)
952 { 903 {
953 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 904 assign (ns->version, cp + 1);
954 905
955 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
956
957 /* This is first implementation - i skip all beta DX clients with it
958 * Add later stuff here for other clients
959 */
960
961 /* these are old dxclients */
962 /* Version 1024 added support for singular + plural name values -
963 * requiing this minimal value reduces complexity of that code, and it
964 * has been around for a long time.
965 */
966 if (ns->sc_version < 1026) 906 if (ns->sc_version < 1026)
967 { 907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
971 }
972
973 } 909 }
974} 910}
975 911
976/** sound related functions. */ 912/** sound related functions. */
977
978void 913void
979SetSound (char *buf, int len, NewSocket * ns) 914SetSound (char *buf, int len, client * ns)
980{ 915{
981 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
982} 917}
983 918
984/** client wants the map resent */ 919/** client wants the map resent */
985
986void 920void
987MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
988{ 922{
989
990/* 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
991 * 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.
992 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
993 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
994 */ 927 */
995#if 0
996 /* Okay, this is MAJOR UGLY. but the only way I know how to
997 * clear the "cache"
998 */
999 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1000 draw_client_map (pl->ob);
1001#endif
1002} 928}
1003 929
1004/** 930/**
1005 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
1006 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
1009MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
1010{ 936{
1011 int vals[3], i; 937 int vals[3], i;
1012 938
1013 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
1014 * 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
1015 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
1016 * sscanf? 942 * sscanf?
1017 */ 943 */
1018 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
1019 { 945 {
1020 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
1021 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
1022 { 949 {
1023 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1024 return; 951 return;
1025 } 952 }
953
1026 buf++; 954 buf++;
1027 } 955 }
956
1028 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1029 958
1030/* 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]);*/
1031 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1032} 961}
1033
1034
1035 962
1036/****************************************************************************** 963/******************************************************************************
1037 * 964 *
1038 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1039 * 966 *
… …
1042/** 969/**
1043 * 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
1044 * 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)
1045 */ 972 */
1046void 973void
1047send_query (NewSocket * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1048{ 975{
1049 char buf[MAX_BUF];
1050
1051 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1052 Write_String_To_Socket (ns, buf, strlen (buf));
1053} 977}
1054 978
1055#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1056 Old = New; \ 980 Old = New; \
1057 sl << uint8 (Type) << uint64 (New); \ 981 sl << uint8 (Type) << uint64 (New); \
… …
1087esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1088{ 1012{
1089 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1090 uint16 flags; 1014 uint16 flags;
1091 1015
1092 SockList sl (MAXSOCKBUF); 1016 client *ns = pl->ns;
1093 sl << "stats "; 1017 if (!ns)
1018 return;
1094 1019
1095 if (pl->ob != NULL) 1020 object *ob = pl->ob;
1096 { 1021 if (!ob)
1022 return;
1023
1024 packet sl ("stats");
1025
1097 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1098 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1099 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1100 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1101 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1102 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1103 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1104 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1105 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1106 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1107 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1108 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);
1109 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1110 }
1111 1039
1112 if (pl->socket.exp64)
1113 {
1114 uint8 s;
1115
1116 for (s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1117 { 1041 if (object *skill = pl->last_skill_ob[s])
1118 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])
1119 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1120 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1121 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1122 */ 1048 */
1123 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1124 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1125 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1126
1127 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1128 } 1052 }
1129 }
1130 }
1131 1053
1132 if (pl->socket.exp64)
1133 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1134 else
1135 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1136
1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1138 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1139 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1140 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1141 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1142 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1143 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);
1144 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
1145 flags = 0; 1064 flags = 0;
1146 1065
1147 if (pl->fire_on) 1066 if (pl->fire_on)
1148 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1149 1068
1150 if (pl->run_on) 1069 if (pl->run_on)
1151 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1152 1071
1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1154 1073
1155 if (pl->socket.sc_version < 1025) 1074 if (ns->sc_version < 1025)
1156 { 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) }
1157 else 1076 else
1158 {
1159 int i;
1160
1161 for (i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1162 { 1078 {
1163 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1164 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1165 continue; 1081 continue;
1166 1082
1167 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]);
1168 } 1084 }
1169 }
1170 1085
1171 if (pl->socket.monitor_spells) 1086 if (pl->ns->monitor_spells)
1172 { 1087 {
1173 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);
1174 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);
1175 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);
1176 } 1091 }
1177 1092
1178 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 */
1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1180 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1182 1097
1183 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1184 if (sl.len > 6) 1099 if (sl.length () > 6)
1185 { 1100 ns->send_packet (sl);
1186#ifdef ESRV_DEBUG
1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1188#endif
1189 Send_With_Handling (&pl->socket, &sl);
1190 }
1191
1192 sl.free ();
1193} 1101}
1194 1102
1195/** 1103/**
1196 * 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.
1197 */ 1105 */
1198void 1106void
1199esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1200{ 1108{
1201 pl->last_weight = weight; 1109 packet sl ("player");
1202
1203 SockList sl (MAXSOCKBUF);
1204 sl << "player ";
1205 1110
1206 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1207 << uint32 (weight) 1112 << uint32 (weight)
1208 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face->number)
1209 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1210 1115
1211 Send_With_Handling (&pl->socket, &sl); 1116 pl->ns->last_weight = weight;
1212 sl.free (); 1117 pl->ns->send_packet (sl);
1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1214} 1119}
1215 1120
1216/** 1121/**
1217 * Need to send an animation sequence to the client. 1122 * Need to send an animation sequence to the client.
… …
1219 * 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
1220 * 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
1221 * when the player logs in and picks stuff up. 1126 * when the player logs in and picks stuff up.
1222 */ 1127 */
1223void 1128void
1224esrv_send_animation (NewSocket * ns, short anim_num) 1129esrv_send_animation (client * ns, short anim_num)
1225{ 1130{
1226 int i;
1227
1228 /* 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
1229 * 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
1230 * range, it must be a valid animation. 1133 * range, it must be a valid animation.
1231 */ 1134 */
1232 if (anim_num < 0 || anim_num > num_animations) 1135 if (anim_num < 0 || anim_num > num_animations)
1233 { 1136 {
1234 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);
1235 return; 1138 return;
1236 } 1139 }
1237 1140
1238 SockList sl (MAXSOCKBUF); 1141 packet sl ("anim");
1239 1142
1240 sl << "anim "
1241 << uint16 (anim_num) 1143 sl << uint16 (anim_num)
1242 << uint16 (0); /* flags - not used right now */ 1144 << uint16 (0); /* flags - not used right now */
1243 1145
1244 /* 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
1245 * the face itself) down to the client. 1147 * the face itself) down to the client.
1246 */ 1148 */
1247 for (i = 0; i < animations[anim_num].num_animations; i++) 1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1248 { 1150 {
1249 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))
1250 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1251 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 */
1252 } 1155 }
1253 1156
1254 Send_With_Handling (ns, &sl); 1157 ns->send_packet (sl);
1255 sl.free ();
1256 1158
1257 ns->anims_sent[anim_num] = 1; 1159 ns->anims_sent[anim_num] = 1;
1258} 1160}
1259 1161
1260 1162
1261/****************************************************************************** 1163/******************************************************************************
1262 * 1164 *
1263 * Start of map related commands. 1165 * Start of map related commands.
1264 * 1166 *
1265 ******************************************************************************/ 1167 ******************************************************************************/
1266
1267/**
1268 * This adds face_num to a map cell at x,y. If the client doesn't have
1269 * the face yet, we will also send it.
1270 */
1271static void
1272esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1273{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 {
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return;
1278 abort ();
1279 }
1280
1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1282 newmap->cells[x][y].count++;
1283
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0);
1286}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393}
1394
1395static void
1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1397{
1398 static long frames, bytes, tbytes, tframes;
1399 char *cur;
1400
1401 SockList sl (MAXSOCKBUF);
1402 sl << "map ";
1403
1404 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1405 sl.len = cur - (char *) sl.buf;
1406
1407/* LOG(llevDebug, "Sending map command.\n");*/
1408
1409 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1410 {
1411 /* All of this is just accounting stuff */
1412 if (tframes > 100)
1413 tframes = tbytes = 0;
1414
1415 tframes++;
1416 frames++;
1417 tbytes += sl.len;
1418 bytes += sl.len;
1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1420 Send_With_Handling (ns, &sl);
1421 ns->sent_scroll = 0;
1422 }
1423
1424 sl.free ();
1425}
1426
1427 1168
1428/** Clears a map cell */ 1169/** Clears a map cell */
1429static void 1170static void
1430map_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)
1431{ 1172{
… …
1442#define MAX_LAYERS 3 1183#define MAX_LAYERS 3
1443 1184
1444/* 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
1445 * 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,
1446 * 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
1447 * 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
1448 * re-examined. 1189 * re-examined.
1449 */ 1190 */
1450
1451static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1452 1192
1453/** 1193/**
1454 * Returns true if any of the heads for this 1194 * Returns true if any of the heads for this
1455 * 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
1456 * for empty space checking. 1196 * for empty space checking.
1457 */ 1197 */
1458static inline int 1198static inline int
1459have_head (int ax, int ay) 1199have_head (int ax, int ay)
1460{ 1200{
1461
1462 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1201 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1463 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])
1464 return 1; 1203 return 1;
1204
1465 return 0; 1205 return 0;
1466} 1206}
1467 1207
1468/** 1208/**
1469 * check_head is a bit simplistic version of update_space below. 1209 * check_head is a bit simplistic version of update_space below.
1470 * 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
1471 * 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
1472 * 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
1473 * sent, it returns zero. 1213 * sent, it returns zero.
1474 */ 1214 */
1475static int 1215static int
1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1477{ 1217{
1478 short face_num; 1218 short face_num;
1479 1219
1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1481 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;
1482 else 1222 else
1483 face_num = 0; 1223 face_num = 0;
1484 1224
1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1486 { 1226 {
1487 SockList_AddShort (&sl, face_num); 1227 sl << uint16 (face_num);
1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1228 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1489 esrv_send_face (&ns, face_num, 0); 1229 esrv_send_face (&ns, face_num, 0);
1490 1230
1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1231 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1232 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1513 * numbers the spaces differently - I think this was a leftover from 1253 * numbers the spaces differently - I think this was a leftover from
1514 * 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
1515 * 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
1516 * actually match. 1256 * actually match.
1517 */ 1257 */
1518
1519static int 1258static int
1520update_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)
1521{ 1260{
1522 object *ob, *head; 1261 object *ob, *head;
1523 uint16 face_num; 1262 uint16 face_num;
1524 int bx, by, i; 1263 int bx, by, i;
1525 1264
… …
1738 * 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
1739 * take. 1478 * take.
1740 */ 1479 */
1741 1480
1742static inline int 1481static inline int
1743update_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)
1744{ 1483{
1745 object *ob; 1484 object *ob;
1746 int smoothlevel; /* old face_num; */ 1485 int smoothlevel; /* old face_num; */
1747 1486
1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1749 1488
1750 /* 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
1751 * is the blank face, set the smoothlevel to zero. 1490 * is the blank face, set the smoothlevel to zero.
1752 */ 1491 */
1753 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1492 if (!ob || ob->face == blank_face)
1754 smoothlevel = 0; 1493 smoothlevel = 0;
1755 else 1494 else
1756 { 1495 {
1757 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1758 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1782 * 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
1783 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1522 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1784 * available. 1523 * available.
1785 */ 1524 */
1786int 1525int
1787getExtendedMapInfoSize (NewSocket * ns) 1526getExtendedMapInfoSize (client * ns)
1788{ 1527{
1789 int result = 0; 1528 int result = 0;
1790 1529
1791 if (ns->ext_mapinfos) 1530 if (ns->ext_mapinfos)
1792 { 1531 {
1793 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1794 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1795 } 1534 }
1535
1796 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);
1797} 1559}
1798 1560
1799/** 1561/**
1800 * 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
1801 * 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
… …
1807 * 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
1808 * 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,
1809 * 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
1810 * of what we send, see the doc/Protocol file. 1572 * of what we send, see the doc/Protocol file.
1811 * I will describe internally what we do: 1573 * I will describe internally what we do:
1812 * 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.
1813 * 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
1814 * maximum viewable size (As set in config.h). 1576 * maximum viewable size (As set in config.h).
1815 * in the cells, there are faces and a count value. 1577 * in the cells, there are faces and a count value.
1816 * 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
1817 * is not viewable. 1579 * is not viewable.
… …
1828 uint8 eentrysize; 1590 uint8 eentrysize;
1829 uint16 ewhatstart, ewhatflag; 1591 uint16 ewhatstart, ewhatflag;
1830 uint8 extendedinfos; 1592 uint8 extendedinfos;
1831 maptile *m; 1593 maptile *m;
1832 1594
1833 NewSocket &socket = pl->contr->socket; 1595 client &socket = *pl->contr->ns;
1596
1597 if (!pl->active)
1598 return;
1834 1599
1835 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1836 1602
1837 SockList sl (MAXSOCKBUF);
1838 SockList esl (MAXSOCKBUF);
1839
1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1604 packet esl;
1605
1841 startlen = sl.len; 1606 startlen = sl.length ();
1842 1607
1843 /*Extendedmapinfo structure initialisation */ 1608 /*Extendedmapinfo structure initialisation */
1844 if (socket.ext_mapinfos) 1609 if (socket.ext_mapinfos)
1845 { 1610 {
1846 extendedinfos = EMI_NOREDRAW; 1611 extendedinfos = EMI_NOREDRAW;
1847 1612
1848 if (socket.EMI_smooth) 1613 if (socket.EMI_smooth)
1849 extendedinfos |= EMI_SMOOTH; 1614 extendedinfos |= EMI_SMOOTH;
1850 1615
1851 ewhatstart = esl.len; 1616 ewhatstart = esl.length ();
1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1617 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1853 could need to be taken away */ 1618 could need to be taken away */
1854 eentrysize = getExtendedMapInfoSize (&socket); 1619 eentrysize = getExtendedMapInfoSize (&socket);
1855 esl << "mapextended " 1620 esl << "mapextended "
1856 << uint8 (extendedinfos) 1621 << uint8 (extendedinfos)
1857 << uint8 (eentrysize); 1622 << uint8 (eentrysize);
1623
1858 estartlen = esl.len; 1624 estartlen = esl.length ();
1859 } 1625 }
1860 else 1626 else
1861 { 1627 {
1862 /* suppress compiler warnings */ 1628 /* suppress compiler warnings */
1863 ewhatstart = 0; 1629 ewhatstart = 0;
… …
1888 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++)
1889 { 1655 {
1890 ax = 0; 1656 ax = 0;
1891 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++)
1892 { 1658 {
1893
1894 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1895 1660
1896 /* 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
1897 * 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
1898 * the client wants if using the map1a command - this is because 1663 * the client wants if using the map1a command - this is because
… …
1901 */ 1666 */
1902 if (ax >= socket.mapx || ay >= socket.mapy) 1667 if (ax >= socket.mapx || ay >= socket.mapy)
1903 { 1668 {
1904 int i, got_one; 1669 int i, got_one;
1905 1670
1906 oldlen = sl.len; 1671 oldlen = sl.length ();
1907 1672
1908 sl << uint16 (mask); 1673 sl << uint16 (mask);
1909 1674
1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1675 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1676 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1915 * actually need to send that - just the coordinates 1680 * actually need to send that - just the coordinates
1916 * with no faces tells the client to blank out the 1681 * with no faces tells the client to blank out the
1917 * space. 1682 * space.
1918 */ 1683 */
1919 got_one = 0; 1684 got_one = 0;
1920 for (i = oldlen + 2; i < sl.len; i++) 1685 for (i = oldlen + 2; i < sl.length (); i++)
1921 if (sl.buf[i]) 1686 if (sl[i])
1922 got_one = 1; 1687 got_one = 1;
1923 1688
1924 if (got_one && (mask & 0xf)) 1689 if (got_one && (mask & 0xf))
1925 sl.buf[oldlen + 1] = mask & 0xff; 1690 sl[oldlen + 1] = mask & 0xff;
1926 else 1691 else
1927 { /*either all faces blank, either no face at all */ 1692 { /*either all faces blank, either no face at all */
1928 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 */
1929 sl.len = oldlen + 2; 1694 sl.reset (oldlen + 2);
1930 else 1695 else
1931 sl.len = oldlen; 1696 sl.reset (oldlen);
1932 } 1697 }
1933 1698
1934 /*What concerns extendinfos, nothing to be done for now 1699 /*What concerns extendinfos, nothing to be done for now
1935 * (perhaps effects layer later) 1700 * (perhaps effects layer later)
1936 */ 1701 */
… …
1960 map_clearcell (&lastcell, 0, 0, 0, -1); 1725 map_clearcell (&lastcell, 0, 0, 0, -1);
1961 } 1726 }
1962 } 1727 }
1963 else if (d > 3) 1728 else if (d > 3)
1964 { 1729 {
1730 m->touch ();
1731
1965 int need_send = 0, count; 1732 int need_send = 0, count;
1966 1733
1967 /* This block deals with spaces that are not visible for whatever 1734 /* This block deals with spaces that are not visible for whatever
1968 * reason. Still may need to send the head for this space. 1735 * reason. Still may need to send the head for this space.
1969 */ 1736 */
1970 1737
1971 oldlen = sl.len; 1738 oldlen = sl.length ();
1972 1739
1973 sl << uint16 (mask); 1740 sl << uint16 (mask);
1974 1741
1975 if (lastcell.count != -1) 1742 if (lastcell.count != -1)
1976 need_send = 1; 1743 need_send = 1;
… …
1996 1763
1997 map_clearcell (&lastcell, 0, 0, 0, count); 1764 map_clearcell (&lastcell, 0, 0, 0, count);
1998 } 1765 }
1999 1766
2000 if ((mask & 0xf) || need_send) 1767 if ((mask & 0xf) || need_send)
2001 sl.buf[oldlen + 1] = mask & 0xff; 1768 sl[oldlen + 1] = mask & 0xff;
2002 else 1769 else
2003 sl.len = oldlen; 1770 sl.reset (oldlen);
2004 } 1771 }
2005 else 1772 else
2006 { 1773 {
1774 m->touch ();
1775
2007 /* 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
2008 * we need to send. 1777 * we need to send.
2009 */ 1778 */
2010 1779
2011 /* Rather than try to figure out what everything that we might 1780 /* Rather than try to figure out what everything that we might
2012 * need to send is, then form the packet after that, 1781 * need to send is, then form the packet after that,
2013 * 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
2014 * 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,
2015 * 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
2016 * is done. 1785 * is done.
2017 * 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
2018 * what if anything we need to send, setting the bits, then 1787 * what if anything we need to send, setting the bits, then
2019 * doing those checks again to add the real data. 1788 * doing those checks again to add the real data.
2020 */ 1789 */
2021 oldlen = sl.len; 1790 oldlen = sl.length ();
2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1791 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2023 eoldlen = esl.len; 1792 eoldlen = esl.length ();
2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1793 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2025 sl << uint16 (mask); 1794 sl << uint16 (mask);
2026 1795
2027 if (socket.ext_mapinfos) 1796 if (socket.ext_mapinfos)
2028 esl << uint16 (emask); 1797 esl << uint16 (emask);
… …
2036 mask |= 0x8; 1805 mask |= 0x8;
2037 1806
2038 if (socket.extmap) 1807 if (socket.extmap)
2039 { 1808 {
2040 *last_ext |= 0x80; 1809 *last_ext |= 0x80;
2041 last_ext = sl.buf + sl.len; 1810 last_ext = &sl[sl.length ()];
2042 sl << uint8 (d); 1811 sl << uint8 (d);
2043 } 1812 }
2044 else 1813 else
2045 sl << uint8 (255 - 64 * d); 1814 sl << uint8 (255 - 64 * d);
2046 } 1815 }
… …
2080 { 1849 {
2081 lastcell.stat_hp = stat_hp; 1850 lastcell.stat_hp = stat_hp;
2082 1851
2083 mask |= 0x8; 1852 mask |= 0x8;
2084 *last_ext |= 0x80; 1853 *last_ext |= 0x80;
2085 last_ext = sl.buf + sl.len; 1854 last_ext = &sl[sl.length ()];
2086 1855
2087 sl << uint8 (5) << uint8 (stat_hp); 1856 sl << uint8 (5) << uint8 (stat_hp);
2088 1857
2089 if (stat_width > 1) 1858 if (stat_width > 1)
2090 { 1859 {
2091 *last_ext |= 0x80; 1860 *last_ext |= 0x80;
2092 last_ext = sl.buf + sl.len; 1861 last_ext = &sl[sl.length ()];
2093 1862
2094 sl << uint8 (6) << uint8 (stat_width); 1863 sl << uint8 (6) << uint8 (stat_width);
2095 } 1864 }
2096 } 1865 }
2097 1866
… …
2099 { 1868 {
2100 lastcell.player = player; 1869 lastcell.player = player;
2101 1870
2102 mask |= 0x8; 1871 mask |= 0x8;
2103 *last_ext |= 0x80; 1872 *last_ext |= 0x80;
2104 last_ext = sl.buf + sl.len; 1873 last_ext = &sl[sl.length ()];
2105 1874
2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1875 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2107 } 1876 }
2108 1877
2109 if (lastcell.flags != flags) 1878 if (lastcell.flags != flags)
2110 { 1879 {
2111 lastcell.flags = flags; 1880 lastcell.flags = flags;
2112 1881
2113 mask |= 0x8; 1882 mask |= 0x8;
2114 *last_ext |= 0x80; 1883 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 1884 last_ext = &sl[sl.length ()];
2116 1885
2117 sl << uint8 (8) << uint8 (flags); 1886 sl << uint8 (8) << uint8 (flags);
2118 } 1887 }
2119 } 1888 }
2120 1889
… …
2162 * space by checking the mask. If so, update the mask. 1931 * space by checking the mask. If so, update the mask.
2163 * 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
2164 * value, so we don't send those bits. 1933 * value, so we don't send those bits.
2165 */ 1934 */
2166 if (mask & 0xf) 1935 if (mask & 0xf)
2167 sl.buf[oldlen + 1] = mask & 0xff; 1936 sl[oldlen + 1] = mask & 0xff;
2168 else 1937 else
2169 sl.len = oldlen; 1938 sl.reset (oldlen);
2170 1939
2171 if (emask & 0xf) 1940 if (emask & 0xf)
2172 esl.buf[eoldlen + 1] = emask & 0xff; 1941 esl[eoldlen + 1] = emask & 0xff;
2173 else 1942 else
2174 esl.len = eoldlen; 1943 esl.reset (eoldlen);
2175 } /* else this is a viewable space */ 1944 } /* else this is a viewable space */
2176 } /* for x loop */ 1945 } /* for x loop */
2177 } /* for y loop */ 1946 } /* for y loop */
2178 1947
2179 /* Verify that we in fact do need to send this */ 1948 /* Verify that we in fact do need to send this */
2180 if (socket.ext_mapinfos) 1949 if (socket.ext_mapinfos)
2181 { 1950 {
2182 if (!(sl.len > startlen || socket.sent_scroll)) 1951 if (!(sl.length () > startlen || socket.sent_scroll))
2183 { 1952 {
2184 /* No map data will follow, so don't say the client 1953 /* No map data will follow, so don't say the client
2185 * it doesn't need draw! 1954 * it doesn't need draw!
2186 */ 1955 */
2187 ewhatflag &= (~EMI_NOREDRAW); 1956 ewhatflag &= (~EMI_NOREDRAW);
2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1957 esl[ewhatstart + 1] = ewhatflag & 0xff;
2189 } 1958 }
2190 1959
2191 if (esl.len > estartlen) 1960 if (esl.length () > estartlen)
2192 Send_With_Handling (&socket, &esl); 1961 socket.send_packet (esl);
2193 } 1962 }
2194 1963
2195 if (sl.len > startlen || socket.sent_scroll) 1964 if (sl.length () > startlen || socket.sent_scroll)
2196 { 1965 {
2197 Send_With_Handling (&socket, &sl); 1966 socket.send_packet (sl);
2198 socket.sent_scroll = 0; 1967 socket.sent_scroll = 0;
2199 } 1968 }
2200
2201 sl.free ();
2202 esl.free ();
2203} 1969}
2204 1970
2205/** 1971/**
2206 * Draws client map. 1972 * Draws client map.
2207 */ 1973 */
2208void 1974void
2209draw_client_map (object *pl) 1975draw_client_map (object *pl)
2210{ 1976{
2211 int i, j; 1977 int i, j;
2212 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 */
2213 New_Face *face, *floor;
2214 New_Face *floor2;
2215 int d, mflags; 1979 int mflags;
2216 struct Map newmap; 1980 struct Map newmap;
2217 maptile *m, *pm; 1981 maptile *m, *pm;
2218 1982
2219 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
2220 { 1984 {
… …
2231 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1995 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2232 return; 1996 return;
2233 1997
2234 memset (&newmap, 0, sizeof (struct Map)); 1998 memset (&newmap, 0, sizeof (struct Map));
2235 1999
2236 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++)
2237 {
2238 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++)
2239 { 2002 {
2240 ax = i; 2003 ax = i;
2241 ay = j; 2004 ay = j;
2242 m = pm; 2005 m = pm;
2243 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2006 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2007
2244 if (mflags & P_OUT_OF_MAP) 2008 if (mflags & P_OUT_OF_MAP)
2245 continue; 2009 continue;
2246 if (mflags & P_NEED_UPDATE) 2010
2247 update_position (m, ax, ay);
2248 /* 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
2249 * just to reload it. This should really call something like 2012 * just to reload it. This should really call something like
2250 * swap_map, but this is much more efficient and 'good enough' 2013 * swap_map, but this is much more efficient and 'good enough'
2251 */ 2014 */
2252 if (mflags & P_NEW_MAP) 2015 if (mflags & P_NEW_MAP)
2253 m->timeout = 50; 2016 m->timeout = 50;
2254 } 2017 }
2255 } 2018
2256 /* do LOS after calls to update_position */ 2019 /* do LOS after calls to update_position */
2257 if (pl->contr->do_los) 2020 if (pl->contr->do_los)
2258 { 2021 {
2259 update_los (pl); 2022 update_los (pl);
2260 pl->contr->do_los = 0; 2023 pl->contr->do_los = 0;
2261 } 2024 }
2262 2025
2263 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2264 {
2265 /* Big maps need a different drawing mechanism to work */ 2026 /* Big maps need a different drawing mechanism to work */
2266 draw_client_map1 (pl); 2027 draw_client_map1 (pl);
2267 return;
2268 }
2269
2270 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2271 {
2272 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2273 }
2274
2275 /* j and i are the y and x coordinates of the real map (which is
2276 * basically some number of spaces around the player)
2277 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2278 * left corner) and are thus disconnected from the map values.
2279 * Subtract 1 from the max values so that we properly handle cases where
2280 * player has specified an even map. Otherwise, we try to send them too
2281 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2282 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2283 * odd, this still works fine.
2284 */
2285 ay = 0;
2286 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2287 {
2288 ax = 0;
2289 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2290 {
2291
2292 d = pl->contr->blocked_los[ax][ay];
2293 /* note the out_of_map and d>3 checks are both within the same
2294 * negation check.
2295 */
2296 nx = i;
2297 ny = j;
2298 m = get_map_from_coord (pm, &nx, &ny);
2299 if (m && d < 4)
2300 {
2301 face = GET_MAP_FACE (m, nx, ny, 0);
2302 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2303 floor = GET_MAP_FACE (m, nx, ny, 2);
2304
2305 /* If all is blank, send a blank face. */
2306 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2307 {
2308 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2309 }
2310 else
2311 { /* actually have something interesting */
2312 /* send the darkness mask, if any. */
2313 if (d && pl->contr->socket.darkness)
2314 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2315
2316 if (face && face != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2318 if (floor2 && floor2 != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2320 if (floor && floor != blank_face)
2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2322 }
2323 } /* Is a valid space */
2324 }
2325 }
2326
2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2328
2329 check_map_change (pl->contr);
2330} 2028}
2331 2029
2332 2030
2333/*****************************************************************************/ 2031/*****************************************************************************/
2334 2032
… …
2340 2038
2341/*****************************************************************************/ 2039/*****************************************************************************/
2342void 2040void
2343send_plugin_custom_message (object *pl, char *buf) 2041send_plugin_custom_message (object *pl, char *buf)
2344{ 2042{
2345 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2043 pl->contr->ns->send_packet (buf);
2346} 2044}
2347 2045
2348/** 2046/**
2349 * This sends the skill number to name mapping. We ignore 2047 * This sends the skill number to name mapping. We ignore
2350 * the params - we always send the same info no matter what. 2048 * the params - we always send the same info no matter what.
2351 */ 2049 */
2352void 2050void
2353send_skill_info (NewSocket *ns, char *params) 2051send_skill_info (client *ns, char *params)
2354{ 2052{
2355 SockList sl (MAXSOCKBUF); 2053 packet sl;
2356 sl << "replyinfo skill_info\n"; 2054 sl << "replyinfo skill_info\n";
2357 2055
2358 for (int i = 1; i < NUM_SKILLS; i++) 2056 for (int i = 1; i < NUM_SKILLS; i++)
2359 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]);
2360 2058
2361 if (sl.len >= MAXSOCKBUF) 2059 if (sl.length () >= MAXSOCKBUF)
2362 { 2060 {
2363 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2061 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2364 fatal (0); 2062 fatal (0);
2365 } 2063 }
2366 2064
2367 Send_With_Handling (ns, &sl); 2065 ns->send_packet (sl);
2368 sl.free ();
2369} 2066}
2370 2067
2371/** 2068/**
2372 * This sends the spell path to name mapping. We ignore 2069 * This sends the spell path to name mapping. We ignore
2373 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2374 */ 2071 */
2375void 2072void
2376send_spell_paths (NewSocket * ns, char *params) 2073send_spell_paths (client * ns, char *params)
2377{ 2074{
2378 SockList sl (MAXSOCKBUF); 2075 packet sl;
2379 2076
2380 sl << "replyinfo spell_paths\n"; 2077 sl << "replyinfo spell_paths\n";
2381 2078
2382 for (int i = 0; i < NRSPELLPATHS; i++) 2079 for (int i = 0; i < NRSPELLPATHS; i++)
2383 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2080 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2384 2081
2385 if (sl.len >= MAXSOCKBUF) 2082 if (sl.length () >= MAXSOCKBUF)
2386 { 2083 {
2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2084 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2388 fatal (0); 2085 fatal (0);
2389 } 2086 }
2390 2087
2391 Send_With_Handling (ns, &sl); 2088 ns->send_packet (sl);
2392 sl.free ();
2393} 2089}
2394 2090
2395/** 2091/**
2396 * 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.
2397 * 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
2398 */ 2094 */
2399void 2095void
2400esrv_update_spells (player *pl) 2096esrv_update_spells (player *pl)
2401{ 2097{
2098 if (!pl->ns)
2099 return;
2100
2402 if (!pl->socket.monitor_spells) 2101 if (!pl->ns->monitor_spells)
2403 return; 2102 return;
2404 2103
2405 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2104 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2406 { 2105 {
2407 if (spell->type == SPELL) 2106 if (spell->type == SPELL)
… …
2427 flags |= UPD_SP_DAMAGE; 2126 flags |= UPD_SP_DAMAGE;
2428 } 2127 }
2429 2128
2430 if (flags) 2129 if (flags)
2431 { 2130 {
2432 SockList sl (MAXSOCKBUF); 2131 packet sl;
2433 2132
2434 sl << "updspell " 2133 sl << "updspell "
2435 << uint8 (flags) 2134 << uint8 (flags)
2436 << uint32 (spell->count); 2135 << uint32 (spell->count);
2437 2136
2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2137 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2138 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2139 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2441 2140
2442 Send_With_Handling (&pl->socket, &sl); 2141 pl->ns->send_packet (sl);
2443 sl.free ();
2444 } 2142 }
2445 } 2143 }
2446 } 2144 }
2447} 2145}
2448 2146
2449void 2147void
2450esrv_remove_spell (player *pl, object *spell) 2148esrv_remove_spell (player *pl, object *spell)
2451{ 2149{
2452 if (!pl->socket.monitor_spells) 2150 if (!pl->ns->monitor_spells)
2453 return; 2151 return;
2454 2152
2455 if (!pl || !spell || spell->env != pl->ob) 2153 if (!pl || !spell || spell->env != pl->ob)
2456 { 2154 {
2457 LOG (llevError, "Invalid call to esrv_remove_spell"); 2155 LOG (llevError, "Invalid call to esrv_remove_spell");
2458 return; 2156 return;
2459 } 2157 }
2460 2158
2461 SockList sl (MAXSOCKBUF); 2159 packet sl ("delspell");
2462 2160
2463 sl << "delspell "
2464 << uint32 (spell->count); 2161 sl << uint32 (spell->count);
2465 2162
2466 Send_With_Handling (&pl->socket, &sl); 2163 pl->ns->send_packet (sl);
2467 sl.free ();
2468} 2164}
2469 2165
2470/* 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. */
2471static void 2167static void
2472append_spell (player *pl, SockList &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2473{ 2169{
2474 int len, i, skill = 0; 2170 int i, skill = 0;
2475 2171
2476 if (!(spell->name)) 2172 if (!(spell->name))
2477 { 2173 {
2478 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);
2479 return; 2175 return;
… …
2520 { 2216 {
2521 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");
2522 return; 2218 return;
2523 } 2219 }
2524 2220
2525 if (!pl->socket.monitor_spells) 2221 if (!pl->ns->monitor_spells)
2526 return; 2222 return;
2527 2223
2528 SockList sl (MAXSOCKBUF); 2224 packet sl ("addspell");
2529
2530 sl << "addspell ";
2531 2225
2532 if (!spell) 2226 if (!spell)
2533 { 2227 {
2534 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2535 { 2229 {
… …
2547 * like it will fix this 2241 * like it will fix this
2548 */ 2242 */
2549 if (spell->type != SPELL) 2243 if (spell->type != SPELL)
2550 continue; 2244 continue;
2551 2245
2552 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))))
2553 { 2247 {
2554 Send_With_Handling (&pl->socket, &sl); 2248 pl->ns->send_packet (sl);
2555 strcpy ((char *) sl.buf, "addspell "); 2249
2556 sl.len = strlen ((char *) sl.buf); 2250 sl.reset ();
2251 sl << "addspell ";
2557 } 2252 }
2558 2253
2559 append_spell (pl, sl, spell); 2254 append_spell (pl, sl, spell);
2560 } 2255 }
2561 } 2256 }
… …
2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2267 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2573 fatal (0); 2268 fatal (0);
2574 } 2269 }
2575 2270
2576 /* finally, we can send the packet */ 2271 /* finally, we can send the packet */
2577 Send_With_Handling (&pl->socket, &sl); 2272 pl->ns->send_packet (sl);
2578
2579 sl.free ();
2580} 2273}
2581 2274

Diff Legend

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