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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC

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

Diff Legend

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