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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.16 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

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

Diff Legend

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