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.21 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.68 by root, Sun Mar 4 19:36:12 2007 UTC

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

Diff Legend

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