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

Diff Legend

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