ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

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

Diff Legend

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