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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.65 by root, Sun Jan 21 21:28:27 2007 UTC

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

Diff Legend

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