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

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

Diff Legend

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