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

Diff Legend

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