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.66 by root, Thu Feb 15 04:04:23 2007 UTC

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

Diff Legend

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