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.17 by root, Tue Sep 12 19:20:09 2006 UTC vs.
Revision 1.63 by root, Fri Jan 19 17:50:11 2007 UTC

1
2/*
3 * static char *rcsid_init_c =
4 * "$Id: request.C,v 1.17 2006/09/12 19:20:09 root Exp $";
5 */
6
7/* 1/*
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
… …
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.
… …
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 * esrv_map_scroll tells the client to scroll the map, and does similarily
56 * for the locally cached copy.
57 */ 44 */
58 45
59#include <global.h> 46#include <global.h>
60#include <sproto.h> 47#include <sproto.h>
61 48
62#include <newclient.h>
63#include <newserver.h>
64#include <living.h> 49#include <living.h>
65#include <commands.h> 50#include <commands.h>
66 51
67/* 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,
68 * it should work here. 53 * it should work here.
69 */ 54 */
70#ifndef WIN32 /* ---win32 exclude unix headers */
71# include <sys/types.h> 55#include <sys/types.h>
72# include <sys/time.h> 56#include <sys/time.h>
73# include <sys/socket.h> 57#include <sys/socket.h>
74# include <netinet/in.h> 58#include <netinet/in.h>
75# include <netdb.h> 59#include <netdb.h>
76#endif /* win32 */
77 60
78#ifdef HAVE_UNISTD_H
79# include <unistd.h> 61#include <unistd.h>
80#endif
81
82#ifdef HAVE_SYS_TIME_H
83# include <sys/time.h> 62#include <sys/time.h>
84#endif
85 63
86#include "sounds.h" 64#include "sounds.h"
87 65
88/** 66/**
89 * This table translates the attack numbers as used within the 67 * This table translates the attack numbers as used within the
… …
106 -1, /* life stealing */ 84 -1, /* life stealing */
107 -1 /* Disease - not fully done yet */ 85 -1 /* Disease - not fully done yet */
108}; 86};
109 87
110static void 88static void
111socket_map_scroll (NewSocket * ns, int dx, int dy) 89socket_map_scroll (client *ns, int dx, int dy)
112{ 90{
113 struct Map newmap; 91 struct Map newmap;
114 int x, y, mx, my; 92 int x, y, mx, my;
115 93
116 {
117 char buf[MAXSOCKBUF];
118
119 sprintf (buf, "map_scroll %d %d", dx, dy); 94 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
120 Write_String_To_Socket (ns, buf, strlen (buf));
121 }
122 95
123 /* If we are using the Map1aCmd, we may in fact send 96 /* If we are using the Map1aCmd, we may in fact send
124 * head information that is outside the viewable map. 97 * head information that is outside the viewable map.
125 * 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
126 * look for. Removed code to do so - it caused extra 99 * look for. Removed code to do so - it caused extra
… …
145 for (x = 0; x < mx; x++) 118 for (x = 0; x < mx; x++)
146 { 119 {
147 for (y = 0; y < my; y++) 120 for (y = 0; y < my; y++)
148 { 121 {
149 if (x >= ns->mapx || y >= ns->mapy) 122 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 123 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 124 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
153 }
154 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)
155 {
156 /* clear newly visible tiles within the viewable area */ 126 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 127 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 128 else
160 {
161 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));
162 }
163 } 130 }
164 } 131 }
165 132
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 133 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 134
… …
172} 139}
173 140
174static void 141static void
175clear_map (player *pl) 142clear_map (player *pl)
176{ 143{
177 NewSocket & socket = pl->socket;
178
179 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
180 145
181 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
182 Write_String_To_Socket (&socket, "newmap", 6); 147 pl->ns->send_packet ("newmap");
183 148
184 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
185 socket.look_position = 0;
186} 150}
187 151
188/** check for map change and send new map data */ 152/** check for map change and send new map data */
189static void 153static void
190check_map_change (player *pl) 154check_map_change (player *pl)
191{ 155{
192 NewSocket & socket = pl->socket; 156 client &socket = *pl->ns;
193 object *ob = pl->ob; 157 object *ob = pl->ob;
194 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
195 159
196 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
197 { 161 {
… …
213 flags |= 4; 177 flags |= 4;
214 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
215 flags |= 8; 179 flags |= 8;
216 180
217 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",
218 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);
219 } 183 }
220 else 184 else
221 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
222 186
223 Write_String_To_Socket (&socket, buf, strlen (buf)); 187 socket.send_packet (buf);
224 } 188 }
225 } 189 }
226 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)
227 { 191 {
228 int dx = ob->x - socket.current_x; 192 int dx = ob->x - socket.current_x;
… …
231 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
232 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
233 else 197 else
234 { 198 {
235 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);
236 socket.update_look = 1; 200 socket.floorbox_reset ();
237 socket.look_position = 0;
238 } 201 }
239 } 202 }
240 203
241 socket.current_x = ob->x; 204 socket.current_x = ob->x;
242 socket.current_y = ob->y; 205 socket.current_y = ob->y;
243} 206}
244 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
245void 252void
246ExtCmd (char *buf, int len, player *pl) 253ExtCmd (char *buf, int len, player *pl)
247{ 254{
248 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));
249} 262}
250 263
251void 264void
252MapInfoCmd (char *buf, int len, player *pl) 265MapInfoCmd (char *buf, int len, player *pl)
253{ 266{
… …
266 if (!strncmp (buf, "spatial ", 8)) 279 if (!strncmp (buf, "spatial ", 8))
267 { 280 {
268 buf += 8; 281 buf += 8;
269 282
270 // initial map and its origin 283 // initial map and its origin
271 mapstruct *map = pl->ob->map; 284 maptile *map = pl->ob->map;
272 sint16 dx, dy; 285 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
276 289
277 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
278 { 291 {
279 int dir = *buf++; 292 int dir = *buf++;
280 293
281 switch (dir) 294 switch (dir)
282 { 295 {
283 case '1': 296 case '1':
284 dx = 0; 297 dx = 0;
285 dy = -1; 298 dy = -1;
286 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
287 map && (mapy -= map->height); 300 map && (mapy -= map->height);
288 break; 301 break;
289 case '2': 302 case '2':
290 mapx += map->width; 303 mapx += map->width;
291 dx = map->width; 304 dx = map->width;
292 dy = 0; 305 dy = 0;
293 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
294 break; 307 break;
295 case '3': 308 case '3':
296 mapy += map->height; 309 mapy += map->height;
297 dx = 0; 310 dx = 0;
298 dy = map->height; 311 dy = map->height;
299 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
300 break; 313 break;
301 case '4': 314 case '4':
302 dx = -1; 315 dx = -1;
303 dy = 0; 316 dy = 0;
304 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
305 map && (mapx -= map->width); 318 map && (mapx -= map->width);
306 break; 319 break;
307 } 320 }
308 321
309 --max_distance; 322 --max_distance;
310 } 323 }
311 324
… …
322 if (map->tile_path[2]) 335 if (map->tile_path[2])
323 flags |= 4; 336 flags |= 4;
324 if (map->tile_path[3]) 337 if (map->tile_path[3])
325 flags |= 8; 338 flags |= 8;
326 339
327 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);
328 } 341 }
329 else 342 else
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 344 }
332 else 345 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 347
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 348 pl->ns->send_packet (bigbuf);
336} 349}
337 350
338/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
339void 352void
340SetUp (char *buf, int len, NewSocket * ns) 353SetUp (char *buf, int len, client * ns)
341{ 354{
342 int s, slen; 355 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
344 357
345 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
347 * 360 *
348 * 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
349 * The client then must sort this out 362 * The client then must sort this out
350 */ 363 */
351 364
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
353 strcpy (cmdback, "setup"); 367 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 368 for (s = 0; s < len; )
355 { 369 {
356
357 cmd = &buf[s]; 370 cmd = &buf[s];
358 371
359 /* find the next space, and put a null there */ 372 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 373 for (; buf[s] && buf[s] != ' '; s++)
374 ;
375
361 buf[s++] = 0; 376 buf[s++] = 0;
377
362 while (buf[s] == ' ') 378 while (buf[s] == ' ')
363 s++; 379 s++;
364 380
365 if (s >= len) 381 if (s >= len)
366 break; 382 break;
367 383
368 param = &buf[s]; 384 param = &buf[s];
369 385
370 for (; buf[s] && buf[s] != ' '; s++); 386 for (; buf[s] && buf[s] != ' '; s++)
387 ;
388
371 buf[s++] = 0; 389 buf[s++] = 0;
390
372 while (buf[s] == ' ') 391 while (buf[s] == ' ')
373 s++; 392 s++;
374 393
375 slen = strlen (cmdback); 394 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
381 { 400 {
382 ns->sound = atoi (param); 401 ns->sound = atoi (param);
383 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
384 } 403 }
385 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
386 {
387 ns->exp64 = atoi (param);
388 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
389 }
390 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
391 { 407 {
392 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
393 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
394 } 410 }
… …
537 * report a failure to the client. 553 * report a failure to the client.
538 */ 554 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 555 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 556 }
541 } /* for processing all the setup commands */ 557 } /* for processing all the setup commands */
558
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 559 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 560 ns->send_packet (cmdback);
544} 561}
545 562
546/** 563/**
547 * The client has requested to be added to the game. 564 * The client has requested to be added to the game.
548 * 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.
549 * 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,
550 * 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.
551 */ 568 */
552void 569void
553AddMeCmd (char *buf, int len, NewSocket * ns) 570AddMeCmd (char *buf, int len, client * ns)
554{ 571{
555 Settings oldsettings; 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
556
557 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns))
559 {
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else
563 {
564 /* Basically, the add_player copies the socket structure into
565 * the player structure, so this one (which is from init_sockets)
566 * is not needed anymore. The write below should still work, as the
567 * stuff in ns is still relevant.
568 */
569 Write_String_To_Socket (ns, "addme_success", 13);
570 socket_info.nconns--;
571 ns->status = Ns_Avail;
572 }
573 settings = oldsettings;
574} 573}
575 574
576/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
577void 576void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
579{ 578{
580 char cmdback[MAX_BUF]; 579 char cmdback[MAX_BUF];
581 char command[50]; 580 char command[50];
582 int info, nextinfo; 581 int info, nextinfo;
583 582
… …
621 { 620 {
622 strcat (cmdback, " "); 621 strcat (cmdback, " ");
623 strcat (cmdback, "smoothing"); 622 strcat (cmdback, "smoothing");
624 } 623 }
625 624
626 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 625 ns->send_packet (cmdback);
627} 626}
628 627
629/* 628/*
630#define MSG_TYPE_BOOK 1 629#define MSG_TYPE_BOOK 1
631#define MSG_TYPE_CARD 2 630#define MSG_TYPE_CARD 2
… …
634#define MSG_TYPE_MONUMENT 5 633#define MSG_TYPE_MONUMENT 5
635#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 634#define MSG_TYPE_SCRIPTED_DIALOG 6*/
636 635
637/** Reply to ExtendedInfos command */ 636/** Reply to ExtendedInfos command */
638void 637void
639ToggleExtendedText (char *buf, int len, NewSocket * ns) 638ToggleExtendedText (char *buf, int len, client * ns)
640{ 639{
641 char cmdback[MAX_BUF]; 640 char cmdback[MAX_BUF];
642 char temp[10]; 641 char temp[10];
643 char command[50]; 642 char command[50];
644 int info, nextinfo, i, flag; 643 int info, nextinfo, i, flag;
… …
684 strcat (cmdback, " "); 683 strcat (cmdback, " ");
685 snprintf (temp, sizeof (temp), "%d", i); 684 snprintf (temp, sizeof (temp), "%d", i);
686 strcat (cmdback, temp); 685 strcat (cmdback, temp);
687 } 686 }
688 687
689 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 688 ns->send_packet (cmdback);
690} 689}
691 690
692/** 691/**
693 * 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).
694 * 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
695 * 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
696 * 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
697 * client. 696 * client.
698 */ 697 */
699static void 698static void
700SendSmooth (NewSocket * ns, uint16 face) 699SendSmooth (client *ns, uint16 face)
701{ 700{
702 uint16 smoothface; 701 uint16 smoothface;
703 unsigned char reply[MAX_BUF];
704 SockList sl;
705 702
706 /* 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
707 * again. 704 * again.
708 */ 705 */
709 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 715 esrv_send_face (ns, smoothface, 0);
719 716
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 718
722 sl.buf = reply; 719 packet sl ("smooth");
723 strcpy ((char *) sl.buf, "smooth "); 720
724 sl.len = strlen ((char *) sl.buf); 721 sl << uint16 (face)
725 SockList_AddShort (&sl, face); 722 << uint16 (smoothface);
726 SockList_AddShort (&sl, smoothface); 723
727 Send_With_Handling (ns, &sl); 724 ns->send_packet (sl);
728} 725}
729 726
730 /** 727 /**
731 * Tells client the picture it has to use 728 * Tells client the picture it has to use
732 * to smooth a picture number given as argument. 729 * to smooth a picture number given as argument.
733 */ 730 */
734void 731void
735AskSmooth (char *buf, int len, NewSocket * ns) 732AskSmooth (char *buf, int len, client *ns)
736{ 733{
737 uint16 facenbr; 734 SendSmooth (ns, atoi (buf));
738
739 facenbr = atoi (buf);
740 SendSmooth (ns, facenbr);
741} 735}
742
743
744
745
746 736
747/** 737/**
748 * 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,
749 * etc.) 739 * etc.)
750 */ 740 */
751void 741void
752PlayerCmd (char *buf, int len, player *pl) 742PlayerCmd (char *buf, int len, player *pl)
753{ 743{
754
755 /* The following should never happen with a proper or honest client.
756 * Therefore, the error message doesn't have to be too clear - if
757 * someone is playing with a hacked/non working client, this gives them
758 * an idea of the problem, but they deserve what they get
759 */
760 if (pl->state != ST_PLAYING)
761 {
762 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
763 return;
764 }
765 /* 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
766 * sent, so check for that also. 745 * sent, so check for that also.
767 */ 746 */
768 if (atoi (buf) || buf[0] == '0') 747 if (atoi (buf) || buf[0] == '0')
769 { 748 {
770 pl->count = atoi ((char *) buf); 749 pl->count = atoi ((char *) buf);
750
771 buf = strchr (buf, ' '); /* advance beyond the numbers */ 751 buf = strchr (buf, ' '); /* advance beyond the numbers */
772 if (!buf) 752 if (!buf)
773 {
774#ifdef ESRV_DEBUG
775 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776#endif
777 return; 753 return;
778 } 754
779 buf++; 755 buf++;
780 } 756 }
781 /* This should not happen anymore. */ 757
782 if (pl->ob->speed_left < -1.0)
783 {
784 LOG (llevError, "Player has negative time - shouldn't do command.\n");
785 }
786 /* In c_new.c */
787 execute_newserver_command (pl->ob, (char *) buf); 758 execute_newserver_command (pl->ob, (char *) buf);
759
788 /* Perhaps something better should be done with a left over count. 760 /* Perhaps something better should be done with a left over count.
789 * Cleaning up the input should probably be done first - all actions 761 * Cleaning up the input should probably be done first - all actions
790 * 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
791 * commands. 763 * commands.
792 */ 764 */
793
794 pl->count = 0; 765 pl->count = 0;
795
796} 766}
797 767
798 768
799/** 769/**
800 * 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,
801 * 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
802 * '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
803 * can throttle. 773 * can throttle.
804 */ 774 */
805void 775void
806NewPlayerCmd (uint8 * buf, int len, player *pl) 776NewPlayerCmd (char *buf, int len, player *pl)
807{ 777{
808 int time, repeat;
809 short packet;
810 unsigned char command[MAX_BUF];
811 SockList sl;
812
813 if (len < 7) 778 if (len <= 6)
814 { 779 {
815 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);
816 return; 781 return;
817 } 782 }
818 783
819 packet = GetShort_String (buf); 784 uint16 cmdid = net_uint16 ((uint8 *)buf);
820 repeat = GetInt_String (buf + 2); 785 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
786
821 /* -1 is special - no repeat, but don't update */ 787 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 788 if (repeat != -1)
823 {
824 pl->count = repeat; 789 pl->count = repeat;
825 }
826 if ((len - 4) >= MAX_BUF)
827 len = MAX_BUF - 5;
828 790
829 strncpy ((char *) command, (char *) buf + 6, len - 4); 791 buf += 6; //len -= 6;
830 command[len - 4] = '\0';
831 792
832 /* The following should never happen with a proper or honest client.
833 * Therefore, the error message doesn't have to be too clear - if
834 * someone is playing with a hacked/non working client, this gives them
835 * an idea of the problem, but they deserve what they get
836 */
837 if (pl->state != ST_PLAYING)
838 {
839 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
840 return;
841 }
842
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 {
846 LOG (llevError, "Player has negative time - shouldn't do command.\n");
847 }
848 /* In c_new.c */
849 execute_newserver_command (pl->ob, (char *) command); 793 execute_newserver_command (pl->ob, buf);
794
850 /* Perhaps something better should be done with a left over count. 795 /* Perhaps something better should be done with a left over count.
851 * Cleaning up the input should probably be done first - all actions 796 * Cleaning up the input should probably be done first - all actions
852 * 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
853 * commands. 798 * commands.
854 */ 799 */
855 pl->count = 0; 800 pl->count = 0;
856 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
857 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
858 sl.buf = command; 808 packet sl ("comc");
859 strcpy ((char *) sl.buf, "comc "); 809 sl << uint16 (cmdid) << uint32 (time);
860 sl.len = 5; 810 pl->ns->send_packet (sl);
861 SockList_AddShort (&sl, packet);
862 if (FABS (pl->ob->speed) < 0.001)
863 time = MAX_TIME * 100;
864 else
865 time = (int) (MAX_TIME / FABS (pl->ob->speed));
866 SockList_AddInt (&sl, time);
867 Send_With_Handling (&pl->socket, &sl);
868} 811}
869
870 812
871/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
872void 814void
873ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
874{ 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
875 /* 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
876 * 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
877 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
878 * 832 *
879 * 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
880 * think it was the carriage return that was entered, and the 834 * think it was the carriage return that was entered, and the
881 * function then does not try to do additional input. 835 * function then does not try to do additional input.
882 */ 836 */
883 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
884 838
885 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
886 840
887 switch (pl->state) 841 switch (ns->state)
888 { 842 {
889 case ST_PLAYING: 843 case ST_PLAYING:
890 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
891 break; 845 break;
892 846
893 case ST_PLAY_AGAIN:
894 /* We can check this for return value (2==quit). Maybe we
895 * should, and do something appropriate?
896 */
897 receive_play_again (pl->ob, buf[0]);
898 break;
899
900 case ST_ROLL_STAT:
901 key_roll_stat (pl->ob, buf[0]);
902 break;
903
904 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
905
906 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
907 break; 849 break;
908 850
909 case ST_CONFIRM_QUIT:
910 key_confirm_quit (pl->ob, buf[0]);
911 break;
912
913 case ST_CONFIGURE:
914 LOG (llevError, "In client input handling, but into configure state\n");
915 pl->state = ST_PLAYING;
916 break;
917
918 case ST_GET_NAME:
919 receive_player_name (pl->ob, 13);
920 break;
921
922 case ST_GET_PASSWORD:
923 case ST_CONFIRM_PASSWORD:
924 receive_player_password (pl->ob, 13);
925 break;
926
927 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
928 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
929 break; 853 break;
930 854
931 default: 855 default:
932 LOG (llevError, "Unknown input state: %d\n", pl->state); 856 LOG (llevError, "Unknown input state: %d\n", ns->state);
933 } 857 }
934} 858}
935 859
936/** 860/**
937 * 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
… …
939 * 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
940 * 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
941 * problem. 865 * problem.
942 */ 866 */
943void 867void
944VersionCmd (char *buf, int len, NewSocket * ns) 868VersionCmd (char *buf, int len, client * ns)
945{ 869{
946 char *cp;
947 char version_warning[256];
948
949 if (!buf) 870 if (!buf)
950 { 871 {
951 LOG (llevError, "CS: received corrupted version command\n"); 872 LOG (llevError, "CS: received corrupted version command\n");
952 return; 873 return;
953 } 874 }
954 875
955 ns->cs_version = atoi (buf); 876 ns->cs_version = atoi (buf);
956 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
957 if (VERSION_CS != ns->cs_version) 884 //if (VERSION_CS != ns->cs_version)
958 { 885 // unchecked;
959#ifdef ESRV_DEBUG 886
960 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
961#endif
962 }
963 cp = strchr (buf + 1, ' '); 887 char *cp = strchr (buf + 1, ' ');
964 if (!cp) 888 if (!cp)
965 return; 889 return;
890
966 ns->sc_version = atoi (cp); 891 ns->sc_version = atoi (cp);
892
967 if (VERSION_SC != ns->sc_version) 893 //if (VERSION_SC != ns->sc_version)
968 { 894 // unchecked;
969#ifdef ESRV_DEBUG 895
970 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
971#endif
972 }
973 cp = strchr (cp + 1, ' '); 896 cp = strchr (cp + 1, ' ');
897
974 if (cp) 898 if (cp)
975 { 899 {
976 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 900 assign (ns->version, cp + 1);
977 901
978 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 902 if (ns->sc_version < 1026)
979 903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
980 /* This is first implementation - i skip all beta DX clients with it
981 * Add later stuff here for other clients
982 */
983
984 /* these are old dxclients */
985 /* Version 1024 added support for singular + plural name values -
986 * requiing this minimal value reduces complexity of that code, and it
987 * has been around for a long time.
988 */
989 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
990 {
991 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
992 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
993 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
994 }
995
996 } 905 }
997} 906}
998 907
999/** sound related functions. */ 908/** sound related functions. */
1000
1001void 909void
1002SetSound (char *buf, int len, NewSocket * ns) 910SetSound (char *buf, int len, client * ns)
1003{ 911{
1004 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
1005} 913}
1006 914
1007/** client wants the map resent */ 915/** client wants the map resent */
1008
1009void 916void
1010MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
1011{ 918{
1012
1013/* 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
1014 * 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.
1015 * Unfortunately this solution does not work because some client versions send 921 * Unfortunately this solution does not work because some client versions send
1016 * a mapredraw command after receiving a newmap command. 922 * a mapredraw command after receiving a newmap command.
1017 */ 923 */
1018#if 0
1019 /* Okay, this is MAJOR UGLY. but the only way I know how to
1020 * clear the "cache"
1021 */
1022 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1023 draw_client_map (pl->ob);
1024#endif
1025} 924}
1026 925
1027/** 926/**
1028 * Moves an object (typically, container to inventory). 927 * Moves an object (typically, container to inventory).
1029 * syntax is: move (to) (tag) (nrof) 928 * syntax is: move (to) (tag) (nrof)
… …
1032MoveCmd (char *buf, int len, player *pl) 931MoveCmd (char *buf, int len, player *pl)
1033{ 932{
1034 int vals[3], i; 933 int vals[3], i;
1035 934
1036 /* A little funky here. We only cycle for 2 records, because 935 /* A little funky here. We only cycle for 2 records, because
1037 * 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
1038 * record. Perhaps we should just replace this with a 937 * record. Perhaps we should just replace this with a
1039 * sscanf? 938 * sscanf?
1040 */ 939 */
1041 for (i = 0; i < 2; i++) 940 for (i = 0; i < 2; i++)
1042 { 941 {
1043 vals[i] = atoi (buf); 942 vals[i] = atoi (buf);
943
1044 if (!(buf = strchr (buf, ' '))) 944 if (!(buf = strchr (buf, ' ')))
1045 { 945 {
1046 LOG (llevError, "Incomplete move command: %s\n", buf); 946 LOG (llevError, "Incomplete move command: %s\n", buf);
1047 return; 947 return;
1048 } 948 }
949
1049 buf++; 950 buf++;
1050 } 951 }
952
1051 vals[2] = atoi (buf); 953 vals[2] = atoi (buf);
1052 954
1053/* 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]);*/
1054 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 956 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1055} 957}
1056
1057
1058 958
1059/****************************************************************************** 959/******************************************************************************
1060 * 960 *
1061 * Start of commands the server sends to the client. 961 * Start of commands the server sends to the client.
1062 * 962 *
… …
1065/** 965/**
1066 * 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
1067 * 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)
1068 */ 968 */
1069void 969void
1070send_query (NewSocket * ns, uint8 flags, char *text) 970send_query (client *ns, uint8 flags, char *text)
1071{ 971{
1072 char buf[MAX_BUF];
1073
1074 sprintf (buf, "query %d %s", flags, text ? text : ""); 972 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1075 Write_String_To_Socket (ns, buf, strlen (buf));
1076} 973}
1077 974
1078#define AddIfInt64(Old,New,Type) if (Old != New) {\ 975#define AddIfInt64(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 976 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 977 sl << uint8 (Type) << uint64 (New); \
1081 SockList_AddInt64(&sl, New); \
1082 } 978 }
1083 979
1084#define AddIfInt(Old,New,Type) if (Old != New) {\ 980#define AddIfInt(Old,New,Type) if (Old != New) {\
1085 Old = New; \ 981 Old = New; \
1086 SockList_AddChar(&sl, Type); \ 982 sl << uint8 (Type) << uint32 (New); \
1087 SockList_AddInt(&sl, New); \
1088 } 983 }
1089 984
1090#define AddIfShort(Old,New,Type) if (Old != New) {\ 985#define AddIfShort(Old,New,Type) if (Old != New) {\
1091 Old = New; \ 986 Old = New; \
1092 SockList_AddChar(&sl, Type); \ 987 sl << uint8 (Type) << uint16 (New); \
1093 SockList_AddShort(&sl, New); \
1094 } 988 }
1095 989
1096#define AddIfFloat(Old,New,Type) if (Old != New) {\ 990#define AddIfFloat(Old,New,Type) if (Old != New) {\
1097 Old = New; \ 991 Old = New; \
1098 SockList_AddChar(&sl, Type); \ 992 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1099 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1100 } 993 }
1101 994
1102#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 995#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1103 if (Old) free(Old);\
1104 Old = strdup_local(New);\ 996 free(Old); Old = strdup (New);\
1105 SockList_AddChar(&sl, Type); \ 997 sl << uint8 (Type) << data8 (New); \
1106 SockList_AddChar(&sl, ( char )strlen(New)); \
1107 strcpy((char*)sl.buf + sl.len, New); \
1108 sl.len += strlen(New); \
1109 } 998 }
1110 999
1111/** 1000/**
1112 * Sends a statistics update. We look at the old values, 1001 * Sends a statistics update. We look at the old values,
1113 * 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
… …
1115 * commands for now. 1004 * commands for now.
1116 */ 1005 */
1117void 1006void
1118esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1119{ 1008{
1120 SockList sl;
1121 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1122 uint16 flags; 1010 uint16 flags;
1123 1011
1124 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1012 client *ns = pl->ns;
1125 strcpy ((char *) sl.buf, "stats "); 1013 if (!ns)
1126 sl.len = strlen ((char *) sl.buf); 1014 return;
1127 1015
1128 if (pl->ob != NULL) 1016 object *ob = pl->ob;
1129 { 1017 if (!ob)
1018 return;
1019
1020 packet sl ("stats");
1021
1130 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1131 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1132 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1133 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1134 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1135 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1136 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1137 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1138 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1139 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1140 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1141 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);
1142 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1143 }
1144 if (pl->socket.exp64)
1145 {
1146 uint8 s;
1147 1035
1148 for (s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1149 { 1037 if (object *skill = pl->last_skill_ob[s])
1150 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])
1151 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1152 1041
1153 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1154 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1155 */ 1044 */
1156 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1157 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1046 << uint8 (skill->level)
1158 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1159 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1160 } 1048 }
1161 } 1049
1162 }
1163 if (pl->socket.exp64)
1164 {
1165 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1166 }
1167 else
1168 {
1169 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP);
1170 }
1171 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1172 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1173 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1174 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1175 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1176 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1177 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);
1178 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
1179 flags = 0; 1060 flags = 0;
1061
1180 if (pl->fire_on) 1062 if (pl->fire_on)
1181 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1064
1182 if (pl->run_on) 1065 if (pl->run_on)
1183 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1184 1067
1185 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069
1186 if (pl->socket.sc_version < 1025) 1070 if (ns->sc_version < 1025)
1187 {
1188 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) }
1189 }
1190 else 1072 else
1191 {
1192 int i;
1193
1194 for (i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1195 { 1074 {
1196 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1197 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1198 continue; 1077 continue;
1078
1199 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]);
1200 } 1080 }
1201 } 1081
1202 if (pl->socket.monitor_spells) 1082 if (pl->ns->monitor_spells)
1203 { 1083 {
1204 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);
1205 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);
1206 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);
1207 } 1087 }
1088
1208 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 */
1209 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1210 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1211 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1212 1093
1213 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1214 if (sl.len > 6) 1095 if (sl.length () > 6)
1215 { 1096 ns->send_packet (sl);
1216#ifdef ESRV_DEBUG
1217 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1218#endif
1219 Send_With_Handling (&pl->socket, &sl);
1220 }
1221 free (sl.buf);
1222} 1097}
1223
1224 1098
1225/** 1099/**
1226 * 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.
1227 */ 1101 */
1228void 1102void
1229esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1230{ 1104{
1231 SockList sl; 1105 packet sl ("player");
1232 1106
1107 sl << uint32 (pl->ob->count)
1108 << uint32 (weight)
1109 << uint32 (pl->ob->face->number)
1110 << data8 (pl->ob->name);
1111
1233 pl->last_weight = weight; 1112 pl->ns->last_weight = weight;
1234 1113 pl->ns->send_packet (sl);
1235 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1236
1237 strcpy ((char *) sl.buf, "player ");
1238 sl.len = strlen ((char *) sl.buf);
1239 SockList_AddInt (&sl, pl->ob->count);
1240 SockList_AddInt (&sl, weight);
1241 SockList_AddInt (&sl, pl->ob->face->number);
1242
1243 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1244 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1245 sl.len += strlen (pl->ob->name);
1246
1247 Send_With_Handling (&pl->socket, &sl);
1248 free (sl.buf);
1249 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1250} 1115}
1251
1252 1116
1253/** 1117/**
1254 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
1255 * 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
1256 * 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
1257 * 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
1258 * when the player logs in and picks stuff up. 1122 * when the player logs in and picks stuff up.
1259 */ 1123 */
1260void 1124void
1261esrv_send_animation (NewSocket * ns, short anim_num) 1125esrv_send_animation (client * ns, short anim_num)
1262{ 1126{
1263 SockList sl;
1264 int i;
1265
1266 /* 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
1267 * 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
1268 * range, it must be a valid animation. 1129 * range, it must be a valid animation.
1269 */ 1130 */
1270 if (anim_num < 0 || anim_num > num_animations) 1131 if (anim_num < 0 || anim_num > num_animations)
1271 { 1132 {
1272 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);
1273 return; 1134 return;
1274 } 1135 }
1275 1136
1276 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1137 packet sl ("anim");
1277 strcpy ((char *) sl.buf, "anim "); 1138
1278 sl.len = 5; 1139 sl << uint16 (anim_num)
1279 SockList_AddShort (&sl, anim_num); 1140 << uint16 (0); /* flags - not used right now */
1280 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1141
1281 /* 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
1282 * the face itself) down to the client. 1143 * the face itself) down to the client.
1283 */ 1144 */
1284 for (i = 0; i < animations[anim_num].num_animations; i++) 1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1285 { 1146 {
1286 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))
1287 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1288 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 */
1289 } 1151 }
1290 Send_With_Handling (ns, &sl); 1152
1291 free (sl.buf); 1153 ns->send_packet (sl);
1154
1292 ns->anims_sent[anim_num] = 1; 1155 ns->anims_sent[anim_num] = 1;
1293} 1156}
1294 1157
1295 1158
1296/****************************************************************************** 1159/******************************************************************************
… …
1302/** 1165/**
1303 * 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
1304 * the face yet, we will also send it. 1167 * the face yet, we will also send it.
1305 */ 1168 */
1306static void 1169static void
1307esrv_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)
1308{ 1171{
1309 if (newmap->cells[x][y].count >= MAP_LAYERS) 1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1310 { 1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1311 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);
1312 return; 1176 return;
1313 abort (); 1177 abort ();
1314 } 1178 }
1179
1315 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;
1316 newmap->cells[x][y].count++; 1181 newmap->cells[x][y].count++;
1182
1317 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1318 esrv_send_face (ns, face_num, 0); 1184 esrv_send_face (ns, face_num, 0);
1319} 1185}
1320
1321struct LayerCell
1322{
1323 uint16 xy;
1324 short face;
1325};
1326
1327struct MapLayer
1328{
1329 int count;
1330 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1331};
1332
1333/** Checkes if map cells have changed */
1334static int
1335mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1336{
1337 int k;
1338
1339 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1340 return 1;
1341 for (k = 0; k < newmap->cells[i][j].count; k++)
1342 {
1343 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1344 {
1345 return 1;
1346 }
1347 }
1348 return 0;
1349}
1350
1351/**
1352 * Basically, what this does is pack the data into layers.
1353 * cnum is the client number, cur is the the buffer we put all of
1354 * this data into. we return the end of the data. layers is
1355 * how many layers of data we should back.
1356 */
1357static uint8 *
1358compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1359{
1360 int x, y, k;
1361 int face;
1362 unsigned char *fcur;
1363 struct MapLayer layers[MAP_LAYERS];
1364
1365 for (k = 0; k < MAP_LAYERS; k++)
1366 layers[k].count = 0;
1367 fcur = cur;
1368 for (x = 0; x < ns->mapx; x++)
1369 {
1370 for (y = 0; y < ns->mapy; y++)
1371 {
1372 if (!mapcellchanged (ns, x, y, newmap))
1373 continue;
1374 if (newmap->cells[x][y].count == 0)
1375 {
1376 *cur = x * ns->mapy + y; /* mark empty space */
1377 cur++;
1378 continue;
1379 }
1380 for (k = 0; k < newmap->cells[x][y].count; k++)
1381 {
1382 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1383 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1384 layers[k].count++;
1385 }
1386 }
1387 }
1388 /* If no data, return now. */
1389 if (fcur == cur && layers[0].count == 0)
1390 return cur;
1391 *cur = 255; /* mark end of explicitly cleared cells */
1392 cur++;
1393 /* First pack by layers. */
1394 for (k = 0; k < numlayers; k++)
1395 {
1396 if (layers[k].count == 0)
1397 break; /* once a layer is entirely empty, no layer below it can
1398 have anything in it either */
1399 /* Pack by entries in thie layer */
1400 for (x = 0; x < layers[k].count;)
1401 {
1402 fcur = cur;
1403 *cur = layers[k].lcells[x].face >> 8;
1404 cur++;
1405 *cur = layers[k].lcells[x].face & 0xFF;
1406 cur++;
1407 face = layers[k].lcells[x].face;
1408 /* Now, we back the redundant data into 1 byte xy pairings */
1409 for (y = x; y < layers[k].count; y++)
1410 {
1411 if (layers[k].lcells[y].face == face)
1412 {
1413 *cur = (uint8) layers[k].lcells[y].xy;
1414 cur++;
1415 layers[k].lcells[y].face = -1;
1416 }
1417 }
1418 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1419 /* forward over the now redundant data */
1420 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1421 x++;
1422 }
1423 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1424 }
1425 return cur;
1426}
1427
1428static void
1429esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1430{
1431 static long frames, bytes, tbytes, tframes;
1432 char *cur;
1433 SockList sl;
1434
1435
1436 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1437 strcpy ((char *) sl.buf, "map ");
1438 sl.len = strlen ((char *) sl.buf);
1439
1440 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1441 sl.len = cur - (char *) sl.buf;
1442
1443/* LOG(llevDebug, "Sending map command.\n");*/
1444
1445 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1446 {
1447 /* All of this is just accounting stuff */
1448 if (tframes > 100)
1449 {
1450 tframes = tbytes = 0;
1451 }
1452 tframes++;
1453 frames++;
1454 tbytes += sl.len;
1455 bytes += sl.len;
1456 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1457 Send_With_Handling (ns, &sl);
1458 ns->sent_scroll = 0;
1459 }
1460 free (sl.buf);
1461}
1462
1463 1186
1464/** Clears a map cell */ 1187/** Clears a map cell */
1465static void 1188static void
1466map_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)
1467{ 1190{
1468 cell->faces[0] = face0; 1191 cell->faces[0] = face0;
1469 cell->faces[1] = face1; 1192 cell->faces[1] = face1;
1470 cell->faces[2] = face2; 1193 cell->faces[2] = face2;
1471 cell->count = count; 1194 cell->count = count;
1472 cell->stat_hp = 0; 1195 cell->stat_hp = 0;
1196 cell->flags = 0;
1473 cell->player = 0; 1197 cell->player = 0;
1474} 1198}
1475 1199
1476#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1477#define MAX_LAYERS 3 1201#define MAX_LAYERS 3
1478 1202
1479/* 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
1480 * 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,
1481 * 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
1482 * 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
1483 * re-examined. 1207 * re-examined.
1484 */ 1208 */
1485
1486static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1487 1210
1488/** 1211/**
1489 * Returns true if any of the heads for this 1212 * Returns true if any of the heads for this
1490 * 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
1491 * for empty space checking. 1214 * for empty space checking.
1492 */ 1215 */
1493static inline int 1216static inline int
1494have_head (int ax, int ay) 1217have_head (int ax, int ay)
1495{ 1218{
1496
1497 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1498 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])
1499 return 1; 1221 return 1;
1222
1500 return 0; 1223 return 0;
1501} 1224}
1502 1225
1503/** 1226/**
1504 * check_head is a bit simplistic version of update_space below. 1227 * check_head is a bit simplistic version of update_space below.
1505 * 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
1506 * 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
1507 * 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
1508 * sent, it returns zero. 1231 * sent, it returns zero.
1509 */ 1232 */
1510static int 1233static int
1511check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1512{ 1235{
1513 short face_num; 1236 short face_num;
1514 1237
1515 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1516 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;
1517 else 1240 else
1518 face_num = 0; 1241 face_num = 0;
1519 1242
1520 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1521 { 1244 {
1522 SockList_AddShort (&sl, face_num); 1245 sl << uint16 (face_num);
1523 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1524 esrv_send_face (&ns, face_num, 0); 1247 esrv_send_face (&ns, face_num, 0);
1248
1525 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1526 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1527 return 1; 1251 return 1;
1528 } 1252 }
1529 1253
… …
1547 * numbers the spaces differently - I think this was a leftover from 1271 * numbers the spaces differently - I think this was a leftover from
1548 * 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
1549 * 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
1550 * actually match. 1274 * actually match.
1551 */ 1275 */
1552
1553static int 1276static int
1554update_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)
1555{ 1278{
1556 object *ob, *head; 1279 object *ob, *head;
1557 uint16 face_num; 1280 uint16 face_num;
1558 int bx, by, i; 1281 int bx, by, i;
1559 1282
1560 /* 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.
1561 * If not, then do the normal processing. 1284 * If not, then do the normal processing.
1562 */ 1285 */
1563
1564 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1565 1287
1566 /* 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
1567 * we would normally send for this space. If so, then 1289 * we would normally send for this space. If so, then
1568 * 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
… …
1733 1455
1734 /* 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
1735 * 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
1736 * this one. 1458 * this one.
1737 */ 1459 */
1738 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)
1739 {
1740 face_num = 0; 1461 face_num = 0;
1741 }
1742 1462
1743 /* 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
1744 * 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.
1745 */ 1465 */
1746 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1747 { 1467 {
1748 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1749 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1750 esrv_send_face (ns, face_num, 0); 1470 esrv_send_face (&ns, face_num, 0);
1751 SockList_AddShort (sl, face_num); 1471
1472 sl << uint16 (face_num);
1752 return 1; 1473 return 1;
1753 } 1474 }
1475
1754 /* Nothing changed */ 1476 /* Nothing changed */
1755 return 0; 1477 return 0;
1756} 1478}
1757 1479
1758/** 1480/**
… …
1773 * 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
1774 * take. 1496 * take.
1775 */ 1497 */
1776 1498
1777static inline int 1499static inline int
1778update_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)
1779{ 1501{
1780 object *ob; 1502 object *ob;
1781 int smoothlevel; /* old face_num; */ 1503 int smoothlevel; /* old face_num; */
1782 1504
1783 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1784 1506
1785 /* 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
1786 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1787 */ 1509 */
1788 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1789 smoothlevel = 0; 1511 smoothlevel = 0;
1790 else 1512 else
1791 { 1513 {
1792 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1793 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1794 SendSmooth (ns, ob->face->number); 1516 SendSmooth (&ns, ob->face->number);
1795 } /* else not already head object or blank face */ 1517 } /* else not already head object or blank face */
1796 1518
1797 /* 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
1798 * 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.
1799 */ 1521 */
1800 if (smoothlevel > 255) 1522 if (smoothlevel > 255)
1801 smoothlevel = 255; 1523 smoothlevel = 255;
1802 else if (smoothlevel < 0) 1524 else if (smoothlevel < 0)
1803 smoothlevel = 0; 1525 smoothlevel = 0;
1526
1804 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1527 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1805 { 1528 {
1806 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1529 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1807 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1530 sl << uint8 (smoothlevel);
1808 return 1; 1531 return 1;
1809 } 1532 }
1533
1810 /* Nothing changed */ 1534 /* Nothing changed */
1811 return 0; 1535 return 0;
1812} 1536}
1813 1537
1814/** 1538/**
1815 * 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
1816 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1540 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1817 * available. 1541 * available.
1818 */ 1542 */
1819int 1543int
1820getExtendedMapInfoSize (NewSocket * ns) 1544getExtendedMapInfoSize (client * ns)
1821{ 1545{
1822 int result = 0; 1546 int result = 0;
1823 1547
1824 if (ns->ext_mapinfos) 1548 if (ns->ext_mapinfos)
1825 { 1549 {
1826 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1827 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1828 } 1552 }
1553
1829 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);
1830} 1577}
1831 1578
1832/** 1579/**
1833 * 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
1834 * 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
… …
1840 * 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
1841 * 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,
1842 * 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
1843 * of what we send, see the doc/Protocol file. 1590 * of what we send, see the doc/Protocol file.
1844 * I will describe internally what we do: 1591 * I will describe internally what we do:
1845 * 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.
1846 * 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
1847 * maximum viewable size (As set in config.h). 1594 * maximum viewable size (As set in config.h).
1848 * in the cells, there are faces and a count value. 1595 * in the cells, there are faces and a count value.
1849 * 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
1850 * is not viewable. 1597 * is not viewable.
… …
1855draw_client_map1 (object *pl) 1602draw_client_map1 (object *pl)
1856{ 1603{
1857 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;
1858 sint16 nx, ny; 1605 sint16 nx, ny;
1859 int estartlen, eoldlen; 1606 int estartlen, eoldlen;
1860 SockList sl;
1861 SockList esl; /*For extended Map info */
1862 uint16 mask, emask; 1607 uint16 mask, emask;
1863 uint8 eentrysize; 1608 uint8 eentrysize;
1864 uint16 ewhatstart, ewhatflag; 1609 uint16 ewhatstart, ewhatflag;
1865 uint8 extendedinfos; 1610 uint8 extendedinfos;
1866 mapstruct *m; 1611 maptile *m;
1867 1612
1868 NewSocket & socket = pl->contr->socket; 1613 client &socket = *pl->contr->ns;
1614
1615 if (!pl->active)
1616 return;
1869 1617
1870 check_map_change (pl->contr); 1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1871 1620
1872 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1873 if (socket.mapmode == Map1Cmd) 1622 packet esl;
1874 strcpy ((char *) sl.buf, "map1 "); 1623
1875 else
1876 strcpy ((char *) sl.buf, "map1a ");
1877 sl.len = strlen ((char *) sl.buf);
1878 startlen = sl.len; 1624 startlen = sl.length ();
1625
1879 /*Extendedmapinfo structure initialisation */ 1626 /*Extendedmapinfo structure initialisation */
1880 if (socket.ext_mapinfos) 1627 if (socket.ext_mapinfos)
1881 { 1628 {
1882 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1883 strcpy ((char *) esl.buf, "mapextended ");
1884 esl.len = strlen ((char *) esl.buf);
1885 extendedinfos = EMI_NOREDRAW; 1629 extendedinfos = EMI_NOREDRAW;
1630
1886 if (socket.EMI_smooth) 1631 if (socket.EMI_smooth)
1887 extendedinfos |= EMI_SMOOTH; 1632 extendedinfos |= EMI_SMOOTH;
1633
1888 ewhatstart = esl.len; 1634 ewhatstart = esl.length ();
1889 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1635 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1890 could need to be taken away */ 1636 could need to be taken away */
1891 SockList_AddChar (&esl, extendedinfos);
1892 eentrysize = getExtendedMapInfoSize (&socket); 1637 eentrysize = getExtendedMapInfoSize (&socket);
1893 SockList_AddChar (&esl, eentrysize); 1638 esl << "mapextended "
1639 << uint8 (extendedinfos)
1640 << uint8 (eentrysize);
1641
1894 estartlen = esl.len; 1642 estartlen = esl.length ();
1895 } 1643 }
1896 else 1644 else
1897 { 1645 {
1898 /* suppress compiler warnings */ 1646 /* suppress compiler warnings */
1899 ewhatstart = 0; 1647 ewhatstart = 0;
1900 ewhatflag = 0; 1648 ewhatflag = 0;
1901 estartlen = 0; 1649 estartlen = 0;
1902 } 1650 }
1651
1903 /* Init data to zero */ 1652 /* Init data to zero */
1904 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);
1905 1654
1906 /* 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
1907 * locations. 1656 * locations.
… …
1911 /* We could do this logic as conditionals in the if statement, 1660 /* We could do this logic as conditionals in the if statement,
1912 * but that started to get a bit messy to look at. 1661 * but that started to get a bit messy to look at.
1913 */ 1662 */
1914 max_x = pl->x + (socket.mapx + 1) / 2; 1663 max_x = pl->x + (socket.mapx + 1) / 2;
1915 max_y = pl->y + (socket.mapy + 1) / 2; 1664 max_y = pl->y + (socket.mapy + 1) / 2;
1665
1916 if (socket.mapmode == Map1aCmd) 1666 if (socket.mapmode == Map1aCmd)
1917 { 1667 {
1918 max_x += MAX_HEAD_OFFSET; 1668 max_x += MAX_HEAD_OFFSET;
1919 max_y += MAX_HEAD_OFFSET; 1669 max_y += MAX_HEAD_OFFSET;
1920 } 1670 }
… …
1922 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++)
1923 { 1673 {
1924 ax = 0; 1674 ax = 0;
1925 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++)
1926 { 1676 {
1927
1928 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1929 1678
1930 /* 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
1931 * 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
1932 * the client wants if using the map1a command - this is because 1681 * the client wants if using the map1a command - this is because
… …
1935 */ 1684 */
1936 if (ax >= socket.mapx || ay >= socket.mapy) 1685 if (ax >= socket.mapx || ay >= socket.mapy)
1937 { 1686 {
1938 int i, got_one; 1687 int i, got_one;
1939 1688
1940 oldlen = sl.len; 1689 oldlen = sl.length ();
1941 1690
1942 SockList_AddShort (&sl, mask); 1691 sl << uint16 (mask);
1943 1692
1944 if (check_head (sl, socket, ax, ay, 2)) 1693 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1945 mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) 1694 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 mask |= 0x2;
1948 if (check_head (sl, socket, ax, ay, 0)) 1695 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1949 mask |= 0x1;
1950 1696
1951 /* 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
1952 * actually need to send that - just the coordinates 1698 * actually need to send that - just the coordinates
1953 * with no faces tells the client to blank out the 1699 * with no faces tells the client to blank out the
1954 * space. 1700 * space.
1955 */ 1701 */
1956 got_one = 0; 1702 got_one = 0;
1957 for (i = oldlen + 2; i < sl.len; i++) 1703 for (i = oldlen + 2; i < sl.length (); i++)
1958 {
1959 if (sl.buf[i]) 1704 if (sl[i])
1960 got_one = 1; 1705 got_one = 1;
1961 }
1962 1706
1963 if (got_one && (mask & 0xf)) 1707 if (got_one && (mask & 0xf))
1964 {
1965 sl.buf[oldlen + 1] = mask & 0xff; 1708 sl[oldlen + 1] = mask & 0xff;
1966 }
1967 else 1709 else
1968 { /*either all faces blank, either no face at all */ 1710 { /*either all faces blank, either no face at all */
1969 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 */
1970 sl.len = oldlen + 2; 1712 sl.reset (oldlen + 2);
1971 else 1713 else
1972 sl.len = oldlen; 1714 sl.reset (oldlen);
1973 } 1715 }
1716
1974 /*What concerns extendinfos, nothing to be done for now 1717 /*What concerns extendinfos, nothing to be done for now
1975 * (perhaps effects layer later) 1718 * (perhaps effects layer later)
1976 */ 1719 */
1977 continue; /* don't do processing below */ 1720 continue; /* don't do processing below */
1978 } 1721 }
1979 1722
1980 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1723 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1981 1724
1982 d = pl->contr->blocked_los[ax][ay]; 1725 d = pl->contr->blocked_los[ax][ay];
1983 1726
1984 /* 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,
1985 * we tell the client as such 1728 * we tell the client as such
1986 */ 1729 */
1987 nx = x; 1730 nx = x;
1988 ny = y; 1731 ny = y;
1989 m = get_map_from_coord (pl->map, &nx, &ny); 1732 m = get_map_from_coord (pl->map, &nx, &ny);
1733
1990 if (!m) 1734 if (!m)
1991 { 1735 {
1992 /* space is out of map. Update space and clear values 1736 /* space is out of map. Update space and clear values
1993 * 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
1994 * of the map, it shouldn't have a head 1738 * of the map, it shouldn't have a head
1995 */ 1739 */
1996 if (lastcell.count != -1) 1740 if (lastcell.count != -1)
1997 { 1741 {
1998 SockList_AddShort (&sl, mask); 1742 sl << uint16 (mask);
1999 map_clearcell (&lastcell, 0, 0, 0, -1); 1743 map_clearcell (&lastcell, 0, 0, 0, -1);
2000 } 1744 }
2001 } 1745 }
2002 else if (d > 3) 1746 else if (d > 3)
2003 { 1747 {
1748 m->touch ();
1749
2004 int need_send = 0, count; 1750 int need_send = 0, count;
2005 1751
2006 /* This block deals with spaces that are not visible for whatever 1752 /* This block deals with spaces that are not visible for whatever
2007 * reason. Still may need to send the head for this space. 1753 * reason. Still may need to send the head for this space.
2008 */ 1754 */
2009 1755
2010 oldlen = sl.len; 1756 oldlen = sl.length ();
2011 1757
2012 SockList_AddShort (&sl, mask); 1758 sl << uint16 (mask);
1759
2013 if (lastcell.count != -1) 1760 if (lastcell.count != -1)
2014 need_send = 1; 1761 need_send = 1;
1762
2015 count = -1; 1763 count = -1;
2016 1764
2017 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1765 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2018 { 1766 {
2019 /* Now check to see if any heads need to be sent */ 1767 /* Now check to see if any heads need to be sent */
2020 1768
2021 if (check_head (sl, socket, ax, ay, 2)) 1769 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2022 mask |= 0x4;
2023 if (check_head (sl, socket, ax, ay, 1)) 1770 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2024 mask |= 0x2;
2025 if (check_head (sl, socket, ax, ay, 0)) 1771 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2026 mask |= 0x1;
2027 1772
2028 lastcell.count = count; 1773 lastcell.count = count;
2029
2030 } 1774 }
2031 else 1775 else
2032 { 1776 {
2033 struct MapCell *cell = &lastcell;
2034
2035 /* properly clear a previously sent big face */ 1777 /* properly clear a previously sent big face */
2036 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)
2037 need_send = 1; 1780 need_send = 1;
1781
2038 map_clearcell (&lastcell, 0, 0, 0, count); 1782 map_clearcell (&lastcell, 0, 0, 0, count);
2039 } 1783 }
2040 1784
2041 if ((mask & 0xf) || need_send) 1785 if ((mask & 0xf) || need_send)
2042 {
2043 sl.buf[oldlen + 1] = mask & 0xff; 1786 sl[oldlen + 1] = mask & 0xff;
2044 }
2045 else 1787 else
2046 {
2047 sl.len = oldlen; 1788 sl.reset (oldlen);
2048 }
2049 } 1789 }
2050 else 1790 else
2051 { 1791 {
1792 m->touch ();
1793
2052 /* 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
2053 * we need to send. 1795 * we need to send.
2054 */ 1796 */
2055 1797
2056 /* Rather than try to figure out what everything that we might 1798 /* Rather than try to figure out what everything that we might
2057 * need to send is, then form the packet after that, 1799 * need to send is, then form the packet after that,
2058 * 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
2059 * 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,
2060 * 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
2061 * is done. 1803 * is done.
2062 * 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
2063 * what if anything we need to send, setting the bits, then 1805 * what if anything we need to send, setting the bits, then
2064 * doing those checks again to add the real data. 1806 * doing those checks again to add the real data.
2065 */ 1807 */
2066 oldlen = sl.len; 1808 oldlen = sl.length ();
2067 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1809 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 eoldlen = esl.len; 1810 eoldlen = esl.length ();
2069 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1811 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2070 SockList_AddShort (&sl, mask); 1812 sl << uint16 (mask);
2071 1813
2072 if (socket.ext_mapinfos) 1814 if (socket.ext_mapinfos)
2073 SockList_AddShort (&esl, emask); 1815 esl << uint16 (emask);
2074 1816
2075 unsigned char dummy; 1817 unsigned char dummy;
2076 unsigned char *last_ext = &dummy; 1818 unsigned char *last_ext = &dummy;
2077 1819
2078 /* Darkness changed */ 1820 /* Darkness changed */
… …
2081 mask |= 0x8; 1823 mask |= 0x8;
2082 1824
2083 if (socket.extmap) 1825 if (socket.extmap)
2084 { 1826 {
2085 *last_ext |= 0x80; 1827 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1828 last_ext = &sl[sl.length ()];
2087 SockList_AddChar (&sl, d); 1829 sl << uint8 (d);
2088 } 1830 }
2089 else 1831 else
2090 SockList_AddChar (&sl, 255 - 64 * d); 1832 sl << uint8 (255 - 64 * d);
2091 } 1833 }
2092 1834
2093 lastcell.count = d; 1835 lastcell.count = d;
2094 1836
2095 if (socket.extmap) 1837 if (socket.extmap)
2096 { 1838 {
2097 uint8 stat_hp = 0; 1839 uint8 stat_hp = 0;
2098 uint8 stat_width = 0; 1840 uint8 stat_width = 0;
1841 uint8 flags = 0;
2099 tag_t player = 0; 1842 UUID player = 0;
2100 1843
2101 // send hp information, if applicable 1844 // send hp information, if applicable
2102 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1845 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2103 { 1846 {
2104 if (op->head || op->invisible) 1847 if (op->head || op->invisible)
… …
2111 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1854 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2112 stat_width = op->arch->tail_x; 1855 stat_width = op->arch->tail_x;
2113 } 1856 }
2114 } 1857 }
2115 1858
1859 if (op->msg && op->msg[0] == '@')
1860 flags |= 1;
1861
2116 if (op->type == PLAYER && op != pl) 1862 if (op->type == PLAYER && op != pl)
2117 player = op->count; 1863 player = op->count;
2118 } 1864 }
2119 1865
2120 if (lastcell.stat_hp != stat_hp) 1866 if (lastcell.stat_hp != stat_hp)
2121 { 1867 {
2122 lastcell.stat_hp = stat_hp; 1868 lastcell.stat_hp = stat_hp;
2123 1869
2124 mask |= 0x8; 1870 mask |= 0x8;
2125 *last_ext |= 0x80; 1871 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 1872 last_ext = &sl[sl.length ()];
2127 SockList_AddChar (&sl, 5); 1873
2128 SockList_AddChar (&sl, stat_hp); 1874 sl << uint8 (5) << uint8 (stat_hp);
2129 1875
2130 if (stat_width > 1) 1876 if (stat_width > 1)
2131 { 1877 {
2132 *last_ext |= 0x80; 1878 *last_ext |= 0x80;
2133 last_ext = sl.buf + sl.len; 1879 last_ext = &sl[sl.length ()];
2134 SockList_AddChar (&sl, 6); 1880
2135 SockList_AddChar (&sl, stat_width); 1881 sl << uint8 (6) << uint8 (stat_width);
2136 } 1882 }
2137 } 1883 }
2138 1884
2139 if (lastcell.player !=player) 1885 if (lastcell.player != player)
2140 { 1886 {
2141 lastcell.player = player; 1887 lastcell.player = player;
2142 1888
2143 mask |= 0x8; 1889 mask |= 0x8;
2144 *last_ext |= 0x80; 1890 *last_ext |= 0x80;
2145 last_ext = sl.buf + sl.len; 1891 last_ext = &sl[sl.length ()];
2146 SockList_AddChar (&sl, 0x47); 1892
2147 SockList_AddChar (&sl, 4); 1893 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2148 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);
2149 } 1905 }
2150 } 1906 }
2151 1907
2152 /* Floor face */ 1908 /* Floor face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1909 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2154 mask |= 0x4; 1910 mask |= 0x4;
2155 1911
2156 if (socket.EMI_smooth) 1912 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 1913 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2158 emask |= 0x4; 1914 emask |= 0x4;
2159 1915
2160 /* Middle face */ 1916 /* Middle face */
2161 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1917 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2162 mask |= 0x2; 1918 mask |= 0x2;
2163 1919
2164 if (socket.EMI_smooth) 1920 if (socket.EMI_smooth)
2165 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2166 emask |= 0x2; 1922 emask |= 0x2;
2167 1923
2168 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))
2169 { 1925 {
2170 if (lastcell.faces[0] != pl->face->number) 1926 if (lastcell.faces[0] != pl->face->number)
2171 { 1927 {
2172 lastcell.faces[0] = pl->face->number; 1928 lastcell.faces[0] = pl->face->number;
2173 mask |= 0x1; 1929 mask |= 0x1;
1930
2174 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1931 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2175 esrv_send_face (&socket, pl->face->number, 0); 1932 esrv_send_face (&socket, pl->face->number, 0);
2176 SockList_AddShort (&sl, pl->face->number); 1933
1934 sl << uint16 (pl->face->number);
2177 } 1935 }
2178 } 1936 }
2179 /* Top face */
2180 else 1937 else
2181 { 1938 {
1939 /* Top face */
2182 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1940 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2183 mask |= 0x1; 1941 mask |= 0x1;
1942
2184 if (socket.EMI_smooth) 1943 if (socket.EMI_smooth)
2185 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 1944 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2186 {
2187 emask |= 0x1; 1945 emask |= 0x1;
2188 }
2189 } 1946 }
1947
2190 /* 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
2191 * space by checking the mask. If so, update the mask. 1949 * space by checking the mask. If so, update the mask.
2192 * 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
2193 * value, so we don't send those bits. 1951 * value, so we don't send those bits.
2194 */ 1952 */
2195 if (mask & 0xf) 1953 if (mask & 0xf)
2196 {
2197 sl.buf[oldlen + 1] = mask & 0xff; 1954 sl[oldlen + 1] = mask & 0xff;
2198 }
2199 else 1955 else
2200 {
2201 sl.len = oldlen; 1956 sl.reset (oldlen);
2202 } 1957
2203 if (emask & 0xf) 1958 if (emask & 0xf)
2204 {
2205 esl.buf[eoldlen + 1] = emask & 0xff; 1959 esl[eoldlen + 1] = emask & 0xff;
2206 }
2207 else 1960 else
2208 {
2209 esl.len = eoldlen; 1961 esl.reset (eoldlen);
2210 }
2211 } /* else this is a viewable space */ 1962 } /* else this is a viewable space */
2212 } /* for x loop */ 1963 } /* for x loop */
2213 } /* for y loop */ 1964 } /* for y loop */
2214 1965
2215 /* Verify that we in fact do need to send this */ 1966 /* Verify that we in fact do need to send this */
2216 if (socket.ext_mapinfos) 1967 if (socket.ext_mapinfos)
2217 { 1968 {
2218 if (!(sl.len > startlen || socket.sent_scroll)) 1969 if (!(sl.length () > startlen || socket.sent_scroll))
2219 { 1970 {
2220 /* No map data will follow, so don't say the client 1971 /* No map data will follow, so don't say the client
2221 * it doesn't need draw! 1972 * it doesn't need draw!
2222 */ 1973 */
2223 ewhatflag &= (~EMI_NOREDRAW); 1974 ewhatflag &= (~EMI_NOREDRAW);
2224 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1975 esl[ewhatstart + 1] = ewhatflag & 0xff;
2225 } 1976 }
1977
2226 if (esl.len > estartlen) 1978 if (esl.length () > estartlen)
2227 { 1979 socket.send_packet (esl);
2228 Send_With_Handling (&socket, &esl);
2229 }
2230 free (esl.buf);
2231 } 1980 }
1981
2232 if (sl.len > startlen || socket.sent_scroll) 1982 if (sl.length () > startlen || socket.sent_scroll)
2233 { 1983 {
2234 Send_With_Handling (&socket, &sl); 1984 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 1985 socket.sent_scroll = 0;
2236 } 1986 }
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