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.16 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC

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

Diff Legend

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