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.42 by root, Sat Dec 16 03:08:26 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.
… …
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 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
50 * operations 44 * operations
51 * 45 *
52 * esrv_map_doneredraw finishes the map update, and ships across the
53 * map updates.
54 *
55 */ 46 */
56 47
57#include <global.h> 48#include <global.h>
58#include <sproto.h> 49#include <sproto.h>
59 50
60#include <newclient.h>
61#include <newserver.h>
62#include <living.h> 51#include <living.h>
63#include <commands.h> 52#include <commands.h>
64 53
65/* This block is basically taken from socket.c - I assume if it works there, 54/* This block is basically taken from socket.c - I assume if it works there,
66 * it should work here. 55 * it should work here.
67 */ 56 */
68#ifndef WIN32 /* ---win32 exclude unix headers */
69# include <sys/types.h> 57#include <sys/types.h>
70# include <sys/time.h> 58#include <sys/time.h>
71# include <sys/socket.h> 59#include <sys/socket.h>
72# include <netinet/in.h> 60#include <netinet/in.h>
73# include <netdb.h> 61#include <netdb.h>
74#endif /* win32 */
75 62
76#ifdef HAVE_UNISTD_H
77# include <unistd.h> 63#include <unistd.h>
78#endif
79
80#ifdef HAVE_SYS_TIME_H
81# include <sys/time.h> 64#include <sys/time.h>
82#endif
83 65
84#include "sounds.h" 66#include "sounds.h"
85 67
86/** 68/**
87 * This table translates the attack numbers as used within the 69 * This table translates the attack numbers as used within the
… …
104 -1, /* life stealing */ 86 -1, /* life stealing */
105 -1 /* Disease - not fully done yet */ 87 -1 /* Disease - not fully done yet */
106}; 88};
107 89
108static void 90static void
109socket_map_scroll (NewSocket * ns, int dx, int dy) 91socket_map_scroll (client * ns, int dx, int dy)
110{ 92{
111 struct Map newmap; 93 struct Map newmap;
112 int x, y, mx, my; 94 int x, y, mx, my;
113 95
114 {
115 char buf[MAXSOCKBUF];
116
117 sprintf (buf, "map_scroll %d %d", dx, dy); 96 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
118 Write_String_To_Socket (ns, buf, strlen (buf));
119 }
120 97
121 /* If we are using the Map1aCmd, we may in fact send 98 /* If we are using the Map1aCmd, we may in fact send
122 * head information that is outside the viewable map. 99 * head information that is outside the viewable map.
123 * So set the mx,my to the max value we want to 100 * So set the mx,my to the max value we want to
124 * look for. Removed code to do so - it caused extra 101 * look for. Removed code to do so - it caused extra
… …
143 for (x = 0; x < mx; x++) 120 for (x = 0; x < mx; x++)
144 { 121 {
145 for (y = 0; y < my; y++) 122 for (y = 0; y < my; y++)
146 { 123 {
147 if (x >= ns->mapx || y >= ns->mapy) 124 if (x >= ns->mapx || y >= ns->mapy)
148 {
149 /* clear cells outside the viewable area */ 125 /* clear cells outside the viewable area */
150 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 126 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) 127 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 */ 128 /* clear newly visible tiles within the viewable area */
155 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 129 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
156 }
157 else 130 else
158 {
159 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 131 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
160 }
161 } 132 }
162 } 133 }
163 134
164 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
165 136
… …
170} 141}
171 142
172static void 143static void
173clear_map (player *pl) 144clear_map (player *pl)
174{ 145{
175 NewSocket & socket = pl->socket; 146 client &socket = *pl->socket;
176 147
177 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 148 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
178 149
179 if (socket.newmapcmd == 1) 150 if (socket.newmapcmd == 1)
180 Write_String_To_Socket (&socket, "newmap", 6); 151 socket.send_packet ("newmap");
181 152
182 socket.update_look = 1; 153 socket.update_look = 1;
183 socket.look_position = 0; 154 socket.look_position = 0;
184} 155}
185 156
186/** check for map change and send new map data */ 157/** check for map change and send new map data */
187static void 158static void
188check_map_change (player *pl) 159check_map_change (player *pl)
189{ 160{
190 NewSocket & socket = pl->socket; 161 client &socket = *pl->socket;
191 object *ob = pl->ob; 162 object *ob = pl->ob;
192 char buf[MAX_BUF]; /* eauugggh */ 163 char buf[MAX_BUF]; /* eauugggh */
193 164
194 if (socket.current_map != ob->map) 165 if (socket.current_map != ob->map)
195 { 166 {
… …
216 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 187 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
217 } 188 }
218 else 189 else
219 snprintf (buf, MAX_BUF, "mapinfo current"); 190 snprintf (buf, MAX_BUF, "mapinfo current");
220 191
221 Write_String_To_Socket (&socket, buf, strlen (buf)); 192 socket.send_packet (buf);
222 } 193 }
223 } 194 }
224 else if (socket.current_x != ob->x || socket.current_y != ob->y) 195 else if (socket.current_x != ob->x || socket.current_y != ob->y)
225 { 196 {
226 int dx = ob->x - socket.current_x; 197 int dx = ob->x - socket.current_x;
… …
236 } 207 }
237 } 208 }
238 209
239 socket.current_x = ob->x; 210 socket.current_x = ob->x;
240 socket.current_y = ob->y; 211 socket.current_y = ob->y;
212}
213
214/**
215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide
217 * that information.
218 */
219void
220RequestInfo (char *buf, int len, client * ns)
221{
222 char *params = NULL, *cp;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234
235 /* find the first space, make it null, and update the
236 * params pointer.
237 */
238 for (cp = buf; *cp != '\0'; cp++)
239 if (*cp == ' ')
240 {
241 *cp = '\0';
242 params = cp + 1;
243 break;
244 }
245
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params);
254 else
255 ns->send_packet (bigbuf, len);
241} 256}
242 257
243void 258void
244ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
245{ 260{
… …
264 if (!strncmp (buf, "spatial ", 8)) 279 if (!strncmp (buf, "spatial ", 8))
265 { 280 {
266 buf += 8; 281 buf += 8;
267 282
268 // initial map and its origin 283 // initial map and its origin
269 mapstruct *map = pl->ob->map; 284 maptile *map = pl->ob->map;
270 sint16 dx, dy; 285 sint16 dx, dy;
271 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->socket->mapx / 2 - pl->ob->x;
272 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->socket->mapy / 2 - pl->ob->y;
273 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
274 289
275 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
276 { 291 {
277 int dir = *buf++; 292 int dir = *buf++;
… …
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
329 } 344 }
330 else 345 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
332 347
333 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 348 pl->socket->send_packet (bigbuf);
334} 349}
335 350
336/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
337void 352void
338SetUp (char *buf, int len, NewSocket * ns) 353SetUp (char *buf, int len, client * ns)
339{ 354{
340 int s, slen; 355 int s, slen;
341 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
342 357
343 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
345 * 360 *
346 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 361 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
347 * The client then must sort this out 362 * The client then must sort this out
348 */ 363 */
349 364
350 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
351 strcpy (cmdback, "setup"); 367 strcpy (cmdback, "setup");
352 for (s = 0; s < len;) 368 for (s = 0; s < len; )
353 { 369 {
354
355 cmd = &buf[s]; 370 cmd = &buf[s];
356 371
357 /* find the next space, and put a null there */ 372 /* find the next space, and put a null there */
358 for (; buf[s] && buf[s] != ' '; s++); 373 for (; buf[s] && buf[s] != ' '; s++)
374 ;
375
359 buf[s++] = 0; 376 buf[s++] = 0;
377
360 while (buf[s] == ' ') 378 while (buf[s] == ' ')
361 s++; 379 s++;
362 380
363 if (s >= len) 381 if (s >= len)
364 break; 382 break;
365 383
366 param = &buf[s]; 384 param = &buf[s];
367 385
368 for (; buf[s] && buf[s] != ' '; s++); 386 for (; buf[s] && buf[s] != ' '; s++)
387 ;
388
369 buf[s++] = 0; 389 buf[s++] = 0;
390
370 while (buf[s] == ' ') 391 while (buf[s] == ' ')
371 s++; 392 s++;
372 393
373 slen = strlen (cmdback); 394 slen = strlen (cmdback);
374 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
535 * report a failure to the client. 556 * report a failure to the client.
536 */ 557 */
537 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 558 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
538 } 559 }
539 } /* for processing all the setup commands */ 560 } /* for processing all the setup commands */
561
540 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 562 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
541 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 563 ns->send_packet (cmdback);
542} 564}
543 565
544/** 566/**
545 * The client has requested to be added to the game. 567 * 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. 568 * 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, 569 * 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. 570 * it either has to be here or init_sockets needs to be exported.
549 */ 571 */
550void 572void
551AddMeCmd (char *buf, int len, NewSocket * ns) 573AddMeCmd (char *buf, int len, client * ns)
552{ 574{
553 Settings oldsettings; 575 Settings oldsettings;
554 576
555 oldsettings = settings; 577 oldsettings = settings;
556 if (ns->status != Ns_Add || add_player (ns)) 578 if (ns->status != Ns_Add || add_player (ns))
557 { 579 ns->send_packet ("addme_failed");
558 Write_String_To_Socket (ns, "addme_failed", 12);
559 }
560 else 580 else
561 { 581 ns->send_packet ("addme_success");
562 /* Basically, the add_player copies the socket structure into 582
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; 583 settings = oldsettings;
572} 584}
573 585
574/** Reply to ExtendedInfos command */ 586/** Reply to ExtendedInfos command */
575void 587void
576ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 588ToggleExtendedInfos (char *buf, int len, client * ns)
577{ 589{
578 char cmdback[MAX_BUF]; 590 char cmdback[MAX_BUF];
579 char command[50]; 591 char command[50];
580 int info, nextinfo; 592 int info, nextinfo;
581 593
… …
619 { 631 {
620 strcat (cmdback, " "); 632 strcat (cmdback, " ");
621 strcat (cmdback, "smoothing"); 633 strcat (cmdback, "smoothing");
622 } 634 }
623 635
624 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 636 ns->send_packet (cmdback);
625} 637}
626 638
627/* 639/*
628#define MSG_TYPE_BOOK 1 640#define MSG_TYPE_BOOK 1
629#define MSG_TYPE_CARD 2 641#define MSG_TYPE_CARD 2
… …
632#define MSG_TYPE_MONUMENT 5 644#define MSG_TYPE_MONUMENT 5
633#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 645#define MSG_TYPE_SCRIPTED_DIALOG 6*/
634 646
635/** Reply to ExtendedInfos command */ 647/** Reply to ExtendedInfos command */
636void 648void
637ToggleExtendedText (char *buf, int len, NewSocket * ns) 649ToggleExtendedText (char *buf, int len, client * ns)
638{ 650{
639 char cmdback[MAX_BUF]; 651 char cmdback[MAX_BUF];
640 char temp[10]; 652 char temp[10];
641 char command[50]; 653 char command[50];
642 int info, nextinfo, i, flag; 654 int info, nextinfo, i, flag;
… …
682 strcat (cmdback, " "); 694 strcat (cmdback, " ");
683 snprintf (temp, sizeof (temp), "%d", i); 695 snprintf (temp, sizeof (temp), "%d", i);
684 strcat (cmdback, temp); 696 strcat (cmdback, temp);
685 } 697 }
686 698
687 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 699 ns->send_packet (cmdback);
688} 700}
689 701
690/** 702/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 703 * 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 704 * 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 705 * 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 706 * if we know the client wants it, might as well push it to the
695 * client. 707 * client.
696 */ 708 */
697static void 709static void
698SendSmooth (NewSocket * ns, uint16 face) 710SendSmooth (client * ns, uint16 face)
699{ 711{
700 uint16 smoothface; 712 uint16 smoothface;
701 unsigned char reply[MAX_BUF];
702 SockList sl;
703 713
704 /* If we can't find a face, return and set it so we won't try to send this 714 /* If we can't find a face, return and set it so we won't try to send this
705 * again. 715 * again.
706 */ 716 */
707 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 717 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
715 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
716 esrv_send_face (ns, smoothface, 0); 726 esrv_send_face (ns, smoothface, 0);
717 727
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 729
720 sl.buf = reply; 730 packet sl;
721 strcpy ((char *) sl.buf, "smooth "); 731
722 sl.len = strlen ((char *) sl.buf); 732 sl << "smooth "
723 SockList_AddShort (&sl, face); 733 << uint16 (face)
724 SockList_AddShort (&sl, smoothface); 734 << uint16 (smoothface);
725 Send_With_Handling (ns, &sl); 735
736 ns->send_packet (sl);
726} 737}
727 738
728 /** 739 /**
729 * Tells client the picture it has to use 740 * Tells client the picture it has to use
730 * to smooth a picture number given as argument. 741 * to smooth a picture number given as argument.
731 */ 742 */
732void 743void
733AskSmooth (char *buf, int len, NewSocket * ns) 744AskSmooth (char *buf, int len, client * ns)
734{ 745{
735 uint16 facenbr; 746 uint16 facenbr;
736 747
737 facenbr = atoi (buf); 748 facenbr = atoi (buf);
738 SendSmooth (ns, facenbr); 749 SendSmooth (ns, facenbr);
739} 750}
740
741
742
743
744 751
745/** 752/**
746 * This handles the general commands from the client (ie, north, fire, cast, 753 * This handles the general commands from the client (ie, north, fire, cast,
747 * etc.) 754 * etc.)
748 */ 755 */
… …
799 * etc.). It is a lot like PlayerCmd above, but is called with the 806 * 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 807 * 'ncom' method which gives more information back to the client so it
801 * can throttle. 808 * can throttle.
802 */ 809 */
803void 810void
804NewPlayerCmd (uint8 * buf, int len, player *pl) 811NewPlayerCmd (char *buf, int len, player *pl)
805{ 812{
806 int time, repeat; 813 int time, repeat;
807 short packet;
808 unsigned char command[MAX_BUF]; 814 char command[MAX_BUF];
809 SockList sl; 815 int pktlen;
810 816
811 if (len < 7) 817 if (len < 7)
812 { 818 {
813 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 819 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
814 return; 820 return;
815 } 821 }
816 822
817 packet = GetShort_String (buf); 823 pktlen = net_uint16 ((uint8 *)buf);
818 repeat = GetInt_String (buf + 2); 824 repeat = net_uint32 ((uint8 *)buf + 2);
825
819 /* -1 is special - no repeat, but don't update */ 826 /* -1 is special - no repeat, but don't update */
820 if (repeat != -1) 827 if (repeat != -1)
821 {
822 pl->count = repeat; 828 pl->count = repeat;
823 } 829
824 if ((len - 4) >= MAX_BUF) 830 if ((len - 4) >= MAX_BUF)
825 len = MAX_BUF - 5; 831 len = MAX_BUF - 5;
826 832
827 strncpy ((char *) command, (char *) buf + 6, len - 4); 833 strncpy ((char *) command, (char *) buf + 6, len - 4);
828 command[len - 4] = '\0'; 834 command[len - 4] = 0;
829
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 835
841 /* This should not happen anymore. */ 836 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0) 837 if (pl->ob->speed_left < -1.0)
843 {
844 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
845 } 839
846 /* In c_new.c */ 840 /* In c_new.c */
847 execute_newserver_command (pl->ob, (char *) command); 841 execute_newserver_command (pl->ob, (char *) command);
848 /* Perhaps something better should be done with a left over count. 842 /* Perhaps something better should be done with a left over count.
849 * Cleaning up the input should probably be done first - all actions 843 * 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 844 * for the command that issued the count should be done before any other
851 * commands. 845 * commands.
852 */ 846 */
853 pl->count = 0; 847 pl->count = 0;
854 848
855 /* Send confirmation of command execution now */
856 sl.buf = command;
857 strcpy ((char *) sl.buf, "comc ");
858 sl.len = 5;
859 SockList_AddShort (&sl, packet);
860 if (FABS (pl->ob->speed) < 0.001) 849 if (FABS (pl->ob->speed) < 0.001)
861 time = MAX_TIME * 100; 850 time = MAX_TIME * 100;
862 else 851 else
863 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 852 time = (int) (MAX_TIME / FABS (pl->ob->speed));
864 SockList_AddInt (&sl, time); 853
865 Send_With_Handling (&pl->socket, &sl); 854 /* Send confirmation of command execution now */
855
856 packet sl;
857 sl << "comc " << uint16 (pktlen) << uint32 (time);
858 pl->socket->send_packet (sl);
866} 859}
867 860
868 861
869/** This is a reply to a previous query. */ 862/** This is a reply to a previous query. */
870void 863void
… …
937 * something older than the server. If we assume the client will be 930 * 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 931 * backwards compatible, having it be a later version should not be a
939 * problem. 932 * problem.
940 */ 933 */
941void 934void
942VersionCmd (char *buf, int len, NewSocket * ns) 935VersionCmd (char *buf, int len, client * ns)
943{ 936{
944 char *cp; 937 char *cp;
945 char version_warning[256]; 938 char version_warning[256];
946 939
947 if (!buf) 940 if (!buf)
… …
971 cp = strchr (cp + 1, ' '); 964 cp = strchr (cp + 1, ' ');
972 if (cp) 965 if (cp)
973 { 966 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
975 968
976 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 969 assign (ns->version, cp + 1);
977 970
978 /* This is first implementation - i skip all beta DX clients with it 971 if (ns->sc_version < 1026)
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 { 972 {
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 975 ns->send_packet (version_warning);
992 } 976 }
993 977
994 } 978 }
995} 979}
996 980
997/** sound related functions. */ 981/** sound related functions. */
998
999void 982void
1000SetSound (char *buf, int len, NewSocket * ns) 983SetSound (char *buf, int len, client * ns)
1001{ 984{
1002 ns->sound = atoi (buf); 985 ns->sound = atoi (buf);
1003} 986}
1004 987
1005/** client wants the map resent */ 988/** client wants the map resent */
… …
1015 */ 998 */
1016#if 0 999#if 0
1017 /* Okay, this is MAJOR UGLY. but the only way I know how to 1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
1018 * clear the "cache" 1001 * clear the "cache"
1019 */ 1002 */
1020 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021 draw_client_map (pl->ob); 1004 draw_client_map (pl->ob);
1022#endif 1005#endif
1023} 1006}
1024 1007
1025/** 1008/**
… …
1063/** 1046/**
1064 * Asks the client to query the user. This way, the client knows 1047 * 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) 1048 * it needs to send something back (vs just printing out a message)
1066 */ 1049 */
1067void 1050void
1068send_query (NewSocket * ns, uint8 flags, char *text) 1051send_query (client * ns, uint8 flags, char *text)
1069{ 1052{
1070 char buf[MAX_BUF]; 1053 char buf[MAX_BUF];
1071 1054
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 1055 sprintf (buf, "query %d %s", flags, text ? text : "");
1073 Write_String_To_Socket (ns, buf, strlen (buf)); 1056 ns->send_packet (buf);
1074} 1057}
1075 1058
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1059#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1060 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1061 sl << uint8 (Type) << uint64 (New); \
1079 SockList_AddInt64(&sl, New); \
1080 } 1062 }
1081 1063
1082#define AddIfInt(Old,New,Type) if (Old != New) {\ 1064#define AddIfInt(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1065 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1066 sl << uint8 (Type) << uint32 (New); \
1085 SockList_AddInt(&sl, New); \
1086 } 1067 }
1087 1068
1088#define AddIfShort(Old,New,Type) if (Old != New) {\ 1069#define AddIfShort(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1070 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1071 sl << uint8 (Type) << uint16 (New); \
1091 SockList_AddShort(&sl, New); \
1092 } 1072 }
1093 1073
1094#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1074#define AddIfFloat(Old,New,Type) if (Old != New) {\
1095 Old = New; \ 1075 Old = New; \
1096 SockList_AddChar(&sl, Type); \ 1076 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1097 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1098 } 1077 }
1099 1078
1100#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1079#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1101 if (Old) free(Old);\
1102 Old = strdup_local(New);\ 1080 free(Old); Old = strdup (New);\
1103 SockList_AddChar(&sl, Type); \ 1081 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 } 1082 }
1108 1083
1109/** 1084/**
1110 * Sends a statistics update. We look at the old values, 1085 * Sends a statistics update. We look at the old values,
1111 * and only send what has changed. Stat mapping values are in newclient.h 1086 * and only send what has changed. Stat mapping values are in newclient.h
… …
1113 * commands for now. 1088 * commands for now.
1114 */ 1089 */
1115void 1090void
1116esrv_update_stats (player *pl) 1091esrv_update_stats (player *pl)
1117{ 1092{
1118 SockList sl;
1119 char buf[MAX_BUF]; 1093 char buf[MAX_BUF];
1120 uint16 flags; 1094 uint16 flags;
1121 1095
1122 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1096 packet sl;
1123 strcpy ((char *) sl.buf, "stats "); 1097 sl << "stats ";
1124 sl.len = strlen ((char *) sl.buf);
1125 1098
1126 if (pl->ob != NULL) 1099 if (pl->ob != NULL)
1127 { 1100 {
1128 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1101 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); 1102 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1137 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1110 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); 1111 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); 1112 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); 1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1141 } 1114 }
1115
1142 if (pl->socket.exp64) 1116 if (pl->socket->exp64)
1143 { 1117 {
1144 uint8 s; 1118 uint8 s;
1145 1119
1146 for (s = 0; s < NUM_SKILLS; s++) 1120 for (s = 0; s < NUM_SKILLS; s++)
1147 { 1121 {
1148 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1122 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1149 { 1123 {
1150
1151 /* Always send along the level if exp changes. This is only 1124 /* Always send along the level if exp changes. This is only
1152 * 1 extra byte, but keeps processing simpler. 1125 * 1 extra byte, but keeps processing simpler.
1153 */ 1126 */
1154 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1127 sl << uint8 (s + CS_STAT_SKILLINFO)
1155 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1128 << uint8 (pl->last_skill_ob[s]->level)
1156 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1129 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130
1157 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1158 } 1132 }
1159 } 1133 }
1160 } 1134 }
1135
1161 if (pl->socket.exp64) 1136 if (pl->socket->exp64)
1162 {
1163 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1164 }
1165 else 1138 else
1166 {
1167 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1168 } 1140
1169 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1170 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1142 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); 1143 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); 1144 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1173 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1145 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1174 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1146 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); 1147 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); 1148 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1177 flags = 0; 1149 flags = 0;
1150
1178 if (pl->fire_on) 1151 if (pl->fire_on)
1179 flags |= SF_FIREON; 1152 flags |= SF_FIREON;
1153
1180 if (pl->run_on) 1154 if (pl->run_on)
1181 flags |= SF_RUNON; 1155 flags |= SF_RUNON;
1182 1156
1183 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158
1184 if (pl->socket.sc_version < 1025) 1159 if (pl->socket->sc_version < 1025)
1185 {
1186 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1187 }
1188 else 1161 else
1189 { 1162 {
1190 int i; 1163 int i;
1191 1164
1192 for (i = 0; i < NROFATTACKS; i++) 1165 for (i = 0; i < NROFATTACKS; i++)
1193 { 1166 {
1194 /* Skip ones we won't send */ 1167 /* Skip ones we won't send */
1195 if (atnr_cs_stat[i] == -1) 1168 if (atnr_cs_stat[i] == -1)
1196 continue; 1169 continue;
1170
1197 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1198 } 1172 }
1199 } 1173 }
1174
1200 if (pl->socket.monitor_spells) 1175 if (pl->socket->monitor_spells)
1201 { 1176 {
1202 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1177 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); 1178 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); 1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1205 } 1180 }
1181
1206 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1182 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); 1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1208 set_title (pl->ob, buf); 1184 set_title (pl->ob, buf);
1209 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1210 1186
1211 /* Only send it away if we have some actual data */ 1187 /* Only send it away if we have some actual data */
1212 if (sl.len > 6) 1188 if (sl.length () > 6)
1213 { 1189 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} 1190}
1221
1222 1191
1223/** 1192/**
1224 * Tells the client that here is a player it should start using. 1193 * Tells the client that here is a player it should start using.
1225 */ 1194 */
1226void 1195void
1227esrv_new_player (player *pl, uint32 weight) 1196esrv_new_player (player *pl, uint32 weight)
1228{ 1197{
1229 SockList sl;
1230
1231 pl->last_weight = weight; 1198 pl->last_weight = weight;
1232 1199
1233 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1200 packet sl;
1201 sl << "player ";
1234 1202
1235 strcpy ((char *) sl.buf, "player "); 1203 sl << uint32 (pl->ob->count)
1236 sl.len = strlen ((char *) sl.buf); 1204 << uint32 (weight)
1237 SockList_AddInt (&sl, pl->ob->count); 1205 << uint32 (pl->ob->face->number)
1238 SockList_AddInt (&sl, weight); 1206 << data8 (pl->ob->name);
1239 SockList_AddInt (&sl, pl->ob->face->number);
1240 1207
1241 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1208 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); 1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1248} 1210}
1249
1250 1211
1251/** 1212/**
1252 * Need to send an animation sequence to the client. 1213 * Need to send an animation sequence to the client.
1253 * We will send appropriate face commands to the client if we haven't 1214 * 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 1215 * 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 1216 * how much we are sending - on the other hand, this should only happen
1256 * when the player logs in and picks stuff up. 1217 * when the player logs in and picks stuff up.
1257 */ 1218 */
1258void 1219void
1259esrv_send_animation (NewSocket * ns, short anim_num) 1220esrv_send_animation (client * ns, short anim_num)
1260{ 1221{
1261 SockList sl;
1262 int i; 1222 int i;
1263 1223
1264 /* Do some checking on the anim_num we got. Note that the animations 1224 /* 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 1225 * are added in contigous order, so if the number is in the valid
1266 * range, it must be a valid animation. 1226 * range, it must be a valid animation.
… …
1269 { 1229 {
1270 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1271 return; 1231 return;
1272 } 1232 }
1273 1233
1274 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1234 packet sl;
1275 strcpy ((char *) sl.buf, "anim "); 1235
1276 sl.len = 5; 1236 sl << "anim "
1277 SockList_AddShort (&sl, anim_num); 1237 << uint16 (anim_num)
1278 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1238 << uint16 (0); /* flags - not used right now */
1239
1279 /* Build up the list of faces. Also, send any information (ie, the 1240 /* Build up the list of faces. Also, send any information (ie, the
1280 * the face itself) down to the client. 1241 * the face itself) down to the client.
1281 */ 1242 */
1282 for (i = 0; i < animations[anim_num].num_animations; i++) 1243 for (i = 0; i < animations[anim_num].num_animations; i++)
1283 { 1244 {
1284 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1246 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1286 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1287 } 1248 }
1288 Send_With_Handling (ns, &sl); 1249
1289 free (sl.buf); 1250 ns->send_packet (sl);
1251
1290 ns->anims_sent[anim_num] = 1; 1252 ns->anims_sent[anim_num] = 1;
1291} 1253}
1292 1254
1293 1255
1294/****************************************************************************** 1256/******************************************************************************
… …
1300/** 1262/**
1301 * This adds face_num to a map cell at x,y. If the client doesn't have 1263 * 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. 1264 * the face yet, we will also send it.
1303 */ 1265 */
1304static void 1266static void
1305esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1306{ 1268{
1307 if (newmap->cells[x][y].count >= MAP_LAYERS) 1269 if (newmap->cells[x][y].count >= MAP_LAYERS)
1308 { 1270 {
1309 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1310 return; 1272 return;
1311 abort (); 1273 abort ();
1312 } 1274 }
1275
1313 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1276 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1314 newmap->cells[x][y].count++; 1277 newmap->cells[x][y].count++;
1278
1315 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1316 esrv_send_face (ns, face_num, 0); 1280 esrv_send_face (ns, face_num, 0);
1317} 1281}
1318 1282
1319struct LayerCell 1283struct LayerCell
… …
1328 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1329}; 1293};
1330 1294
1331/** Checkes if map cells have changed */ 1295/** Checkes if map cells have changed */
1332static int 1296static int
1333mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1334{ 1298{
1335 int k; 1299 int k;
1336 1300
1337 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1338 return 1; 1302 return 1;
… …
1351 * cnum is the client number, cur is the the buffer we put all of 1315 * 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 1316 * this data into. we return the end of the data. layers is
1353 * how many layers of data we should back. 1317 * how many layers of data we should back.
1354 */ 1318 */
1355static uint8 * 1319static uint8 *
1356compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1357{ 1321{
1358 int x, y, k; 1322 int x, y, k;
1359 int face; 1323 int face;
1360 unsigned char *fcur; 1324 unsigned char *fcur;
1361 struct MapLayer layers[MAP_LAYERS]; 1325 struct MapLayer layers[MAP_LAYERS];
… …
1421 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1422 } 1386 }
1423 return cur; 1387 return cur;
1424} 1388}
1425 1389
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
1462/** Clears a map cell */ 1390/** Clears a map cell */
1463static void 1391static void
1464map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1465{ 1393{
1466 cell->faces[0] = face0; 1394 cell->faces[0] = face0;
1467 cell->faces[1] = face1; 1395 cell->faces[1] = face1;
1468 cell->faces[2] = face2; 1396 cell->faces[2] = face2;
1469 cell->count = count; 1397 cell->count = count;
1470 cell->stat_hp = 0; 1398 cell->stat_hp = 0;
1399 cell->flags = 0;
1471 cell->player = 0; 1400 cell->player = 0;
1472} 1401}
1473 1402
1474#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1403#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1475#define MAX_LAYERS 3 1404#define MAX_LAYERS 3
1476 1405
… …
1504 * needs to get sent - if so, it adds the data, sending the head 1433 * 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 1434 * if needed, and returning 1. If this no data needs to get
1506 * sent, it returns zero. 1435 * sent, it returns zero.
1507 */ 1436 */
1508static int 1437static int
1509check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1438check_head (packet &sl, client &ns, int ax, int ay, int layer)
1510{ 1439{
1511 short face_num; 1440 short face_num;
1512 1441
1513 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1442 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1514 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1443 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1515 else 1444 else
1516 face_num = 0; 1445 face_num = 0;
1517 1446
1518 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1447 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1519 { 1448 {
1520 SockList_AddShort (&sl, face_num); 1449 sl << uint16 (face_num);
1521 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1450 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1522 esrv_send_face (&ns, face_num, 0); 1451 esrv_send_face (&ns, face_num, 0);
1452
1523 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1453 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1524 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1454 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1525 return 1; 1455 return 1;
1526 } 1456 }
1527 1457
… …
1547 * the case, it seems to make more sense to have these layer values 1477 * the case, it seems to make more sense to have these layer values
1548 * actually match. 1478 * actually match.
1549 */ 1479 */
1550 1480
1551static int 1481static int
1552update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1553{ 1483{
1554 object *ob, *head; 1484 object *ob, *head;
1555 uint16 face_num; 1485 uint16 face_num;
1556 int bx, by, i; 1486 int bx, by, i;
1557 1487
1558 /* If there is a multipart object stored away, treat that as more important. 1488 /* If there is a multipart object stored away, treat that as more important.
1559 * If not, then do the normal processing. 1489 * If not, then do the normal processing.
1560 */ 1490 */
1561
1562 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1491 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1563 1492
1564 /* Check to see if this head is part of the set of objects 1493 /* Check to see if this head is part of the set of objects
1565 * we would normally send for this space. If so, then 1494 * we would normally send for this space. If so, then
1566 * don't use the head value. We need to do the check 1495 * don't use the head value. We need to do the check
… …
1731 1660
1732 /* Another hack - because of heads and whatnot, this face may match one 1661 /* 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 1662 * we already sent for a lower layer. In that case, don't send
1734 * this one. 1663 * this one.
1735 */ 1664 */
1736 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1665 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1737 {
1738 face_num = 0; 1666 face_num = 0;
1739 }
1740 1667
1741 /* We've gotten what face we want to use for the object. Now see if 1668 /* 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. 1669 * if it has changed since we last sent it to the client.
1743 */ 1670 */
1744 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1671 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1745 { 1672 {
1746 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1673 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1747 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1674 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1748 esrv_send_face (ns, face_num, 0); 1675 esrv_send_face (&ns, face_num, 0);
1749 SockList_AddShort (sl, face_num); 1676
1677 sl << uint16 (face_num);
1750 return 1; 1678 return 1;
1751 } 1679 }
1680
1752 /* Nothing changed */ 1681 /* Nothing changed */
1753 return 0; 1682 return 0;
1754} 1683}
1755 1684
1756/** 1685/**
… …
1771 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1700 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1772 * take. 1701 * take.
1773 */ 1702 */
1774 1703
1775static inline int 1704static inline int
1776update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1705update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1777{ 1706{
1778 object *ob; 1707 object *ob;
1779 int smoothlevel; /* old face_num; */ 1708 int smoothlevel; /* old face_num; */
1780 1709
1781 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1786 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1715 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1787 smoothlevel = 0; 1716 smoothlevel = 0;
1788 else 1717 else
1789 { 1718 {
1790 smoothlevel = ob->smoothlevel; 1719 smoothlevel = ob->smoothlevel;
1791 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1720 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1792 SendSmooth (ns, ob->face->number); 1721 SendSmooth (&ns, ob->face->number);
1793 } /* else not already head object or blank face */ 1722 } /* else not already head object or blank face */
1794 1723
1795 /* We've gotten what face we want to use for the object. Now see if 1724 /* 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. 1725 * if it has changed since we last sent it to the client.
1797 */ 1726 */
1798 if (smoothlevel > 255) 1727 if (smoothlevel > 255)
1799 smoothlevel = 255; 1728 smoothlevel = 255;
1800 else if (smoothlevel < 0) 1729 else if (smoothlevel < 0)
1801 smoothlevel = 0; 1730 smoothlevel = 0;
1731
1802 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1732 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1803 { 1733 {
1804 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1734 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1805 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1735 sl << uint8 (smoothlevel);
1806 return 1; 1736 return 1;
1807 } 1737 }
1738
1808 /* Nothing changed */ 1739 /* Nothing changed */
1809 return 0; 1740 return 0;
1810} 1741}
1811 1742
1812/** 1743/**
1813 * Returns the size of a data for a map square as returned by 1744 * Returns the size of a data for a map square as returned by
1814 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1745 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1815 * available. 1746 * available.
1816 */ 1747 */
1817int 1748int
1818getExtendedMapInfoSize (NewSocket * ns) 1749getExtendedMapInfoSize (client * ns)
1819{ 1750{
1820 int result = 0; 1751 int result = 0;
1821 1752
1822 if (ns->ext_mapinfos) 1753 if (ns->ext_mapinfos)
1823 { 1754 {
… …
1853draw_client_map1 (object *pl) 1784draw_client_map1 (object *pl)
1854{ 1785{
1855 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1786 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1856 sint16 nx, ny; 1787 sint16 nx, ny;
1857 int estartlen, eoldlen; 1788 int estartlen, eoldlen;
1858 SockList sl;
1859 SockList esl; /*For extended Map info */
1860 uint16 mask, emask; 1789 uint16 mask, emask;
1861 uint8 eentrysize; 1790 uint8 eentrysize;
1862 uint16 ewhatstart, ewhatflag; 1791 uint16 ewhatstart, ewhatflag;
1863 uint8 extendedinfos; 1792 uint8 extendedinfos;
1864 mapstruct *m; 1793 maptile *m;
1865 1794
1866 NewSocket & socket = pl->contr->socket; 1795 client &socket = *pl->contr->socket;
1867 1796
1868 check_map_change (pl->contr); 1797 check_map_change (pl->contr);
1869 1798
1870 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1799 packet sl;
1871 if (socket.mapmode == Map1Cmd) 1800 packet esl;
1872 strcpy ((char *) sl.buf, "map1 "); 1801
1873 else 1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1874 strcpy ((char *) sl.buf, "map1a ");
1875 sl.len = strlen ((char *) sl.buf);
1876 startlen = sl.len; 1803 startlen = sl.length ();
1804
1877 /*Extendedmapinfo structure initialisation */ 1805 /*Extendedmapinfo structure initialisation */
1878 if (socket.ext_mapinfos) 1806 if (socket.ext_mapinfos)
1879 { 1807 {
1880 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1881 strcpy ((char *) esl.buf, "mapextended ");
1882 esl.len = strlen ((char *) esl.buf);
1883 extendedinfos = EMI_NOREDRAW; 1808 extendedinfos = EMI_NOREDRAW;
1809
1884 if (socket.EMI_smooth) 1810 if (socket.EMI_smooth)
1885 extendedinfos |= EMI_SMOOTH; 1811 extendedinfos |= EMI_SMOOTH;
1812
1886 ewhatstart = esl.len; 1813 ewhatstart = esl.length ();
1887 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1814 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1888 could need to be taken away */ 1815 could need to be taken away */
1889 SockList_AddChar (&esl, extendedinfos);
1890 eentrysize = getExtendedMapInfoSize (&socket); 1816 eentrysize = getExtendedMapInfoSize (&socket);
1891 SockList_AddChar (&esl, eentrysize); 1817 esl << "mapextended "
1818 << uint8 (extendedinfos)
1819 << uint8 (eentrysize);
1820
1892 estartlen = esl.len; 1821 estartlen = esl.length ();
1893 } 1822 }
1894 else 1823 else
1895 { 1824 {
1896 /* suppress compiler warnings */ 1825 /* suppress compiler warnings */
1897 ewhatstart = 0; 1826 ewhatstart = 0;
1898 ewhatflag = 0; 1827 ewhatflag = 0;
1899 estartlen = 0; 1828 estartlen = 0;
1900 } 1829 }
1830
1901 /* Init data to zero */ 1831 /* Init data to zero */
1902 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1832 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1903 1833
1904 /* x,y are the real map locations. ax, ay are viewport relative 1834 /* x,y are the real map locations. ax, ay are viewport relative
1905 * locations. 1835 * locations.
… …
1909 /* We could do this logic as conditionals in the if statement, 1839 /* We could do this logic as conditionals in the if statement,
1910 * but that started to get a bit messy to look at. 1840 * but that started to get a bit messy to look at.
1911 */ 1841 */
1912 max_x = pl->x + (socket.mapx + 1) / 2; 1842 max_x = pl->x + (socket.mapx + 1) / 2;
1913 max_y = pl->y + (socket.mapy + 1) / 2; 1843 max_y = pl->y + (socket.mapy + 1) / 2;
1844
1914 if (socket.mapmode == Map1aCmd) 1845 if (socket.mapmode == Map1aCmd)
1915 { 1846 {
1916 max_x += MAX_HEAD_OFFSET; 1847 max_x += MAX_HEAD_OFFSET;
1917 max_y += MAX_HEAD_OFFSET; 1848 max_y += MAX_HEAD_OFFSET;
1918 } 1849 }
… …
1933 */ 1864 */
1934 if (ax >= socket.mapx || ay >= socket.mapy) 1865 if (ax >= socket.mapx || ay >= socket.mapy)
1935 { 1866 {
1936 int i, got_one; 1867 int i, got_one;
1937 1868
1938 oldlen = sl.len; 1869 oldlen = sl.length ();
1939 1870
1940 SockList_AddShort (&sl, mask); 1871 sl << uint16 (mask);
1941 1872
1942 if (check_head (sl, socket, ax, ay, 2)) 1873 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1943 mask |= 0x4;
1944 if (check_head (sl, socket, ax, ay, 1)) 1874 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1945 mask |= 0x2;
1946 if (check_head (sl, socket, ax, ay, 0)) 1875 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1947 mask |= 0x1;
1948 1876
1949 /* If all we are doing is sending 0 (blank) faces, we don't 1877 /* If all we are doing is sending 0 (blank) faces, we don't
1950 * actually need to send that - just the coordinates 1878 * actually need to send that - just the coordinates
1951 * with no faces tells the client to blank out the 1879 * with no faces tells the client to blank out the
1952 * space. 1880 * space.
1953 */ 1881 */
1954 got_one = 0; 1882 got_one = 0;
1955 for (i = oldlen + 2; i < sl.len; i++) 1883 for (i = oldlen + 2; i < sl.length (); i++)
1956 {
1957 if (sl.buf[i]) 1884 if (sl[i])
1958 got_one = 1; 1885 got_one = 1;
1959 }
1960 1886
1961 if (got_one && (mask & 0xf)) 1887 if (got_one && (mask & 0xf))
1962 {
1963 sl.buf[oldlen + 1] = mask & 0xff; 1888 sl[oldlen + 1] = mask & 0xff;
1964 }
1965 else 1889 else
1966 { /*either all faces blank, either no face at all */ 1890 { /*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 */ 1891 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1968 sl.len = oldlen + 2; 1892 sl.reset (oldlen + 2);
1969 else 1893 else
1970 sl.len = oldlen; 1894 sl.reset (oldlen);
1971 } 1895 }
1896
1972 /*What concerns extendinfos, nothing to be done for now 1897 /*What concerns extendinfos, nothing to be done for now
1973 * (perhaps effects layer later) 1898 * (perhaps effects layer later)
1974 */ 1899 */
1975 continue; /* don't do processing below */ 1900 continue; /* don't do processing below */
1976 } 1901 }
1977 1902
1978 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1903 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1979 1904
1980 d = pl->contr->blocked_los[ax][ay]; 1905 d = pl->contr->blocked_los[ax][ay];
1981 1906
1982 /* If the coordinates are not valid, or it is too dark to see, 1907 /* If the coordinates are not valid, or it is too dark to see,
1983 * we tell the client as such 1908 * we tell the client as such
1984 */ 1909 */
1985 nx = x; 1910 nx = x;
1986 ny = y; 1911 ny = y;
1987 m = get_map_from_coord (pl->map, &nx, &ny); 1912 m = get_map_from_coord (pl->map, &nx, &ny);
1913
1988 if (!m) 1914 if (!m)
1989 { 1915 {
1990 /* space is out of map. Update space and clear values 1916 /* space is out of map. Update space and clear values
1991 * if this hasn't already been done. If the space is out 1917 * if this hasn't already been done. If the space is out
1992 * of the map, it shouldn't have a head 1918 * of the map, it shouldn't have a head
1993 */ 1919 */
1994 if (lastcell.count != -1) 1920 if (lastcell.count != -1)
1995 { 1921 {
1996 SockList_AddShort (&sl, mask); 1922 sl << uint16 (mask);
1997 map_clearcell (&lastcell, 0, 0, 0, -1); 1923 map_clearcell (&lastcell, 0, 0, 0, -1);
1998 } 1924 }
1999 } 1925 }
2000 else if (d > 3) 1926 else if (d > 3)
2001 { 1927 {
… …
2003 1929
2004 /* This block deals with spaces that are not visible for whatever 1930 /* This block deals with spaces that are not visible for whatever
2005 * reason. Still may need to send the head for this space. 1931 * reason. Still may need to send the head for this space.
2006 */ 1932 */
2007 1933
2008 oldlen = sl.len; 1934 oldlen = sl.length ();
2009 1935
2010 SockList_AddShort (&sl, mask); 1936 sl << uint16 (mask);
1937
2011 if (lastcell.count != -1) 1938 if (lastcell.count != -1)
2012 need_send = 1; 1939 need_send = 1;
1940
2013 count = -1; 1941 count = -1;
2014 1942
2015 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1943 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2016 { 1944 {
2017 /* Now check to see if any heads need to be sent */ 1945 /* Now check to see if any heads need to be sent */
2018 1946
2019 if (check_head (sl, socket, ax, ay, 2)) 1947 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2020 mask |= 0x4;
2021 if (check_head (sl, socket, ax, ay, 1)) 1948 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2022 mask |= 0x2;
2023 if (check_head (sl, socket, ax, ay, 0)) 1949 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2024 mask |= 0x1;
2025 1950
2026 lastcell.count = count; 1951 lastcell.count = count;
2027
2028 } 1952 }
2029 else 1953 else
2030 { 1954 {
2031 struct MapCell *cell = &lastcell;
2032
2033 /* properly clear a previously sent big face */ 1955 /* properly clear a previously sent big face */
2034 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1956 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1957 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2035 need_send = 1; 1958 need_send = 1;
1959
2036 map_clearcell (&lastcell, 0, 0, 0, count); 1960 map_clearcell (&lastcell, 0, 0, 0, count);
2037 } 1961 }
2038 1962
2039 if ((mask & 0xf) || need_send) 1963 if ((mask & 0xf) || need_send)
2040 {
2041 sl.buf[oldlen + 1] = mask & 0xff; 1964 sl[oldlen + 1] = mask & 0xff;
2042 }
2043 else 1965 else
2044 {
2045 sl.len = oldlen; 1966 sl.reset (oldlen);
2046 }
2047 } 1967 }
2048 else 1968 else
2049 { 1969 {
2050 /* In this block, the space is visible or there are head objects 1970 /* In this block, the space is visible or there are head objects
2051 * we need to send. 1971 * we need to send.
… …
2053 1973
2054 /* Rather than try to figure out what everything that we might 1974 /* Rather than try to figure out what everything that we might
2055 * need to send is, then form the packet after that, 1975 * need to send is, then form the packet after that,
2056 * we presume that we will in fact form a packet, and update 1976 * 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, 1977 * 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 1978 * we just back out sl.length () to the old value, and no harm
2059 * is done. 1979 * is done.
2060 * I think this is simpler than doing a bunch of checks to see 1980 * 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 1981 * what if anything we need to send, setting the bits, then
2062 * doing those checks again to add the real data. 1982 * doing those checks again to add the real data.
2063 */ 1983 */
2064 oldlen = sl.len; 1984 oldlen = sl.length ();
2065 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2066 eoldlen = esl.len; 1986 eoldlen = esl.length ();
2067 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1987 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 SockList_AddShort (&sl, mask); 1988 sl << uint16 (mask);
2069 1989
2070 if (socket.ext_mapinfos) 1990 if (socket.ext_mapinfos)
2071 SockList_AddShort (&esl, emask); 1991 esl << uint16 (emask);
2072 1992
2073 unsigned char dummy; 1993 unsigned char dummy;
2074 unsigned char *last_ext = &dummy; 1994 unsigned char *last_ext = &dummy;
2075 1995
2076 /* Darkness changed */ 1996 /* Darkness changed */
… …
2079 mask |= 0x8; 1999 mask |= 0x8;
2080 2000
2081 if (socket.extmap) 2001 if (socket.extmap)
2082 { 2002 {
2083 *last_ext |= 0x80; 2003 *last_ext |= 0x80;
2084 last_ext = sl.buf + sl.len; 2004 last_ext = &sl[sl.length ()];
2085 SockList_AddChar (&sl, d); 2005 sl << uint8 (d);
2086 } 2006 }
2087 else 2007 else
2088 SockList_AddChar (&sl, 255 - 64 * d); 2008 sl << uint8 (255 - 64 * d);
2089 } 2009 }
2090 2010
2091 lastcell.count = d; 2011 lastcell.count = d;
2092 2012
2093 if (socket.extmap) 2013 if (socket.extmap)
2094 { 2014 {
2095 uint8 stat_hp = 0; 2015 uint8 stat_hp = 0;
2096 uint8 stat_width = 0; 2016 uint8 stat_width = 0;
2017 uint8 flags = 0;
2097 tag_t player = 0; 2018 UUID player = 0;
2098 2019
2099 // send hp information, if applicable 2020 // send hp information, if applicable
2100 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2021 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2101 { 2022 {
2102 if (op->head || op->invisible) 2023 if (op->head || op->invisible)
… …
2109 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2030 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2110 stat_width = op->arch->tail_x; 2031 stat_width = op->arch->tail_x;
2111 } 2032 }
2112 } 2033 }
2113 2034
2035 if (op->msg && op->msg[0] == '@')
2036 flags |= 1;
2037
2114 if (op->type == PLAYER && op != pl) 2038 if (op->type == PLAYER && op != pl)
2115 player = op->count; 2039 player = op->count;
2116 } 2040 }
2117 2041
2118 if (lastcell.stat_hp != stat_hp) 2042 if (lastcell.stat_hp != stat_hp)
2119 { 2043 {
2120 lastcell.stat_hp = stat_hp; 2044 lastcell.stat_hp = stat_hp;
2121 2045
2122 mask |= 0x8; 2046 mask |= 0x8;
2123 *last_ext |= 0x80; 2047 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 2048 last_ext = &sl[sl.length ()];
2125 SockList_AddChar (&sl, 5); 2049
2126 SockList_AddChar (&sl, stat_hp); 2050 sl << uint8 (5) << uint8 (stat_hp);
2127 2051
2128 if (stat_width > 1) 2052 if (stat_width > 1)
2129 { 2053 {
2130 *last_ext |= 0x80; 2054 *last_ext |= 0x80;
2131 last_ext = sl.buf + sl.len; 2055 last_ext = &sl[sl.length ()];
2132 SockList_AddChar (&sl, 6); 2056
2133 SockList_AddChar (&sl, stat_width); 2057 sl << uint8 (6) << uint8 (stat_width);
2134 } 2058 }
2135 } 2059 }
2136 2060
2137 if (lastcell.player !=player) 2061 if (lastcell.player != player)
2138 { 2062 {
2139 lastcell.player = player; 2063 lastcell.player = player;
2140 2064
2141 mask |= 0x8; 2065 mask |= 0x8;
2142 *last_ext |= 0x80; 2066 *last_ext |= 0x80;
2143 last_ext = sl.buf + sl.len; 2067 last_ext = &sl[sl.length ()];
2144 SockList_AddChar (&sl, 0x47); 2068
2145 SockList_AddChar (&sl, 4); 2069 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2146 SockList_AddInt (&sl, player); 2070 }
2071
2072 if (lastcell.flags != flags)
2073 {
2074 lastcell.flags = flags;
2075
2076 mask |= 0x8;
2077 *last_ext |= 0x80;
2078 last_ext = &sl[sl.length ()];
2079
2080 sl << uint8 (8) << uint8 (flags);
2147 } 2081 }
2148 } 2082 }
2149 2083
2150 /* Floor face */ 2084 /* Floor face */
2151 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2085 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2152 mask |= 0x4; 2086 mask |= 0x4;
2153 2087
2154 if (socket.EMI_smooth) 2088 if (socket.EMI_smooth)
2155 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2089 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2156 emask |= 0x4; 2090 emask |= 0x4;
2157 2091
2158 /* Middle face */ 2092 /* Middle face */
2159 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2093 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2160 mask |= 0x2; 2094 mask |= 0x2;
2161 2095
2162 if (socket.EMI_smooth) 2096 if (socket.EMI_smooth)
2163 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2097 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2164 emask |= 0x2; 2098 emask |= 0x2;
2165 2099
2166 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2100 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2167 { 2101 {
2168 if (lastcell.faces[0] != pl->face->number) 2102 if (lastcell.faces[0] != pl->face->number)
2169 { 2103 {
2170 lastcell.faces[0] = pl->face->number; 2104 lastcell.faces[0] = pl->face->number;
2171 mask |= 0x1; 2105 mask |= 0x1;
2106
2172 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2107 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2173 esrv_send_face (&socket, pl->face->number, 0); 2108 esrv_send_face (&socket, pl->face->number, 0);
2174 SockList_AddShort (&sl, pl->face->number); 2109
2110 sl << uint16 (pl->face->number);
2175 } 2111 }
2176 } 2112 }
2177 /* Top face */
2178 else 2113 else
2179 { 2114 {
2115 /* Top face */
2180 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2116 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2181 mask |= 0x1; 2117 mask |= 0x1;
2118
2182 if (socket.EMI_smooth) 2119 if (socket.EMI_smooth)
2183 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2120 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2184 {
2185 emask |= 0x1; 2121 emask |= 0x1;
2186 }
2187 } 2122 }
2123
2188 /* Check to see if we are in fact sending anything for this 2124 /* Check to see if we are in fact sending anything for this
2189 * space by checking the mask. If so, update the mask. 2125 * space by checking the mask. If so, update the mask.
2190 * if not, reset the len to that from before adding the mask 2126 * if not, reset the len to that from before adding the mask
2191 * value, so we don't send those bits. 2127 * value, so we don't send those bits.
2192 */ 2128 */
2193 if (mask & 0xf) 2129 if (mask & 0xf)
2194 {
2195 sl.buf[oldlen + 1] = mask & 0xff; 2130 sl[oldlen + 1] = mask & 0xff;
2196 }
2197 else 2131 else
2198 {
2199 sl.len = oldlen; 2132 sl.reset (oldlen);
2200 } 2133
2201 if (emask & 0xf) 2134 if (emask & 0xf)
2202 {
2203 esl.buf[eoldlen + 1] = emask & 0xff; 2135 esl[eoldlen + 1] = emask & 0xff;
2204 }
2205 else 2136 else
2206 {
2207 esl.len = eoldlen; 2137 esl.reset (eoldlen);
2208 }
2209 } /* else this is a viewable space */ 2138 } /* else this is a viewable space */
2210 } /* for x loop */ 2139 } /* for x loop */
2211 } /* for y loop */ 2140 } /* for y loop */
2212 2141
2213 /* Verify that we in fact do need to send this */ 2142 /* Verify that we in fact do need to send this */
2214 if (socket.ext_mapinfos) 2143 if (socket.ext_mapinfos)
2215 { 2144 {
2216 if (!(sl.len > startlen || socket.sent_scroll)) 2145 if (!(sl.length () > startlen || socket.sent_scroll))
2217 { 2146 {
2218 /* No map data will follow, so don't say the client 2147 /* No map data will follow, so don't say the client
2219 * it doesn't need draw! 2148 * it doesn't need draw!
2220 */ 2149 */
2221 ewhatflag &= (~EMI_NOREDRAW); 2150 ewhatflag &= (~EMI_NOREDRAW);
2222 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2151 esl[ewhatstart + 1] = ewhatflag & 0xff;
2223 } 2152 }
2224 2153
2225 if (esl.len > estartlen) 2154 if (esl.length () > estartlen)
2226 Send_With_Handling (&socket, &esl); 2155 socket.send_packet (esl);
2227
2228 free (esl.buf);
2229 } 2156 }
2230 2157
2231 if (sl.len > startlen || socket.sent_scroll) 2158 if (sl.length () > startlen || socket.sent_scroll)
2232 { 2159 {
2233 Send_With_Handling (&socket, &sl); 2160 socket.send_packet (sl);
2234 socket.sent_scroll = 0; 2161 socket.sent_scroll = 0;
2235 } 2162 }
2236
2237 free (sl.buf);
2238} 2163}
2239 2164
2240/** 2165/**
2241 * Draws client map. 2166 * Draws client map.
2242 */ 2167 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2172 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2173 New_Face *face, *floor;
2249 New_Face *floor2; 2174 New_Face *floor2;
2250 int d, mflags; 2175 int d, mflags;
2251 struct Map newmap; 2176 struct Map newmap;
2252 mapstruct *m, *pm; 2177 maptile *m, *pm;
2253 2178
2254 if (pl->type != PLAYER) 2179 if (pl->type != PLAYER)
2255 { 2180 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2181 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2182 return;
… …
2266 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2267 return; 2192 return;
2268 2193
2269 memset (&newmap, 0, sizeof (struct Map)); 2194 memset (&newmap, 0, sizeof (struct Map));
2270 2195
2271 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2272 { 2197 {
2273 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2274 { 2199 {
2275 ax = i; 2200 ax = i;
2276 ay = j; 2201 ay = j;
2277 m = pm; 2202 m = pm;
2278 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2293 { 2218 {
2294 update_los (pl); 2219 update_los (pl);
2295 pl->contr->do_los = 0; 2220 pl->contr->do_los = 0;
2296 } 2221 }
2297 2222
2298 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2299 {
2300 /* Big maps need a different drawing mechanism to work */ 2223 /* Big maps need a different drawing mechanism to work */
2301 draw_client_map1 (pl); 2224 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} 2225}
2365 2226
2366 2227
2367/*****************************************************************************/ 2228/*****************************************************************************/
2368 2229
… …
2374 2235
2375/*****************************************************************************/ 2236/*****************************************************************************/
2376void 2237void
2377send_plugin_custom_message (object *pl, char *buf) 2238send_plugin_custom_message (object *pl, char *buf)
2378{ 2239{
2379 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2240 pl->contr->socket->send_packet (buf);
2380} 2241}
2381 2242
2382/** 2243/**
2383 * This sends the skill number to name mapping. We ignore 2244 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2245 * the params - we always send the same info no matter what.
2385 */ 2246 */
2386void 2247void
2387send_skill_info (NewSocket * ns, char *params) 2248send_skill_info (client *ns, char *params)
2388{ 2249{
2389 SockList sl; 2250 packet sl;
2390 int i; 2251 sl << "replyinfo skill_info\n";
2391 2252
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2253 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2254 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]); 2255
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2256 if (sl.length () >= MAXSOCKBUF)
2400 { 2257 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2258 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2259 fatal (0);
2403 } 2260 }
2404 Send_With_Handling (ns, &sl); 2261
2405 free (sl.buf); 2262 ns->send_packet (sl);
2406} 2263}
2407 2264
2408/** 2265/**
2409 * This sends the spell path to name mapping. We ignore 2266 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2267 * the params - we always send the same info no matter what.
2411 */ 2268 */
2412void 2269void
2413send_spell_paths (NewSocket * ns, char *params) 2270send_spell_paths (client * ns, char *params)
2414{ 2271{
2415 SockList sl; 2272 packet sl;
2416 int i;
2417 2273
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2274 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2275
2420 for (i = 0; i < NRSPELLPATHS; i++) 2276 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2277 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2278
2423 if (sl.len >= MAXSOCKBUF) 2279 if (sl.length () >= MAXSOCKBUF)
2424 { 2280 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2281 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2282 fatal (0);
2427 } 2283 }
2428 Send_With_Handling (ns, &sl); 2284
2429 free (sl.buf); 2285 ns->send_packet (sl);
2430} 2286}
2431 2287
2432/** 2288/**
2433 * This looks for any spells the player may have that have changed their stats. 2289 * 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 2290 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2291 */
2436void 2292void
2437esrv_update_spells (player *pl) 2293esrv_update_spells (player *pl)
2438{ 2294{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2295 if (!pl->socket->monitor_spells)
2444 return; 2296 return;
2297
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2298 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2299 {
2447 if (spell->type == SPELL) 2300 if (spell->type == SPELL)
2448 { 2301 {
2302 int flags = 0;
2303
2449 /* check if we need to update it */ 2304 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2305 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2306 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2307 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2308 flags |= UPD_SP_MANA;
2454 } 2309 }
2310
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2311 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2312 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2313 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2314 flags |= UPD_SP_GRACE;
2459 } 2315 }
2316
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2317 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2318 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2319 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2320 flags |= UPD_SP_DAMAGE;
2464 } 2321 }
2322
2465 if (flags != 0) 2323 if (flags)
2466 { 2324 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2325 packet sl;
2468 strcpy ((char *) sl.buf, "updspell "); 2326
2469 sl.len = strlen ((char *) sl.buf); 2327 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2328 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2329 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2330
2473 SockList_AddShort (&sl, spell->last_sp); 2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2334
2477 SockList_AddShort (&sl, spell->last_eat); 2335 pl->socket->send_packet (sl);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf);
2481 } 2336 }
2482 } 2337 }
2483 } 2338 }
2484} 2339}
2485 2340
2486void 2341void
2487esrv_remove_spell (player *pl, object *spell) 2342esrv_remove_spell (player *pl, object *spell)
2488{ 2343{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2344 if (!pl->socket->monitor_spells)
2492 return; 2345 return;
2346
2493 if (!pl || !spell || spell->env != pl->ob) 2347 if (!pl || !spell || spell->env != pl->ob)
2494 { 2348 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2349 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2350 return;
2497 } 2351 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2352
2499 strcpy ((char *) sl.buf, "delspell "); 2353 packet sl;
2500 sl.len = strlen ((char *) sl.buf); 2354
2501 SockList_AddInt (&sl, spell->count); 2355 sl << "delspell "
2502 Send_With_Handling (&pl->socket, &sl); 2356 << uint32 (spell->count);
2503 free (sl.buf); 2357
2358 pl->socket->send_packet (sl);
2504} 2359}
2505 2360
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2361/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2362static void
2508append_spell (player *pl, SockList * sl, object *spell) 2363append_spell (player *pl, packet &sl, object *spell)
2509{ 2364{
2510 int len, i, skill = 0; 2365 int len, i, skill = 0;
2511 2366
2512 if (!(spell->name)) 2367 if (!(spell->name))
2513 { 2368 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2369 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2370 return;
2516 } 2371 }
2517 SockList_AddInt (sl, spell->count); 2372
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 */ 2373 /* 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); 2374 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); 2375 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); 2376 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 2377
2529 /* figure out which skill it uses, if it uses one */ 2378 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2379 if (spell->skill)
2531 { 2380 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2381 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2383 {
2535 skill = i + CS_STAT_SKILLINFO; 2384 skill = i + CS_STAT_SKILLINFO;
2536 break; 2385 break;
2537 } 2386 }
2538 } 2387 }
2539 SockList_AddChar (sl, skill);
2540 2388
2541 SockList_AddInt (sl, spell->path_attuned); 2389 /* send the current values */
2390 sl << uint32 (spell->count)
2391 << uint16 (spell->level)
2392 << uint16 (spell->casting_time)
2393 << uint16 (spell->last_sp)
2394 << uint16 (spell->last_grace)
2395 << uint16 (spell->last_eat)
2396 << uint8 (skill)
2397 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2398 << uint32 (spell->face ? spell->face->number : 0)
2543 2399 << data8 (spell->name)
2544 len = strlen (spell->name); 2400 << 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} 2401}
2561 2402
2562/** 2403/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2404 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2405 * all spells in the player's inventory.
2565 */ 2406 */
2566void 2407void
2567esrv_add_spells (player *pl, object *spell) 2408esrv_add_spells (player *pl, object *spell)
2568{ 2409{
2569 SockList sl;
2570
2571 if (!pl) 2410 if (!pl)
2572 { 2411 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2413 return;
2575 } 2414 }
2415
2576 if (!pl->socket.monitor_spells) 2416 if (!pl->socket->monitor_spells)
2577 return; 2417 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2418
2579 strcpy ((char *) sl.buf, "addspell "); 2419 packet sl;
2580 sl.len = strlen ((char *) sl.buf); 2420
2421 sl << "addspell ";
2422
2581 if (!spell) 2423 if (!spell)
2582 { 2424 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2426 {
2585 /* were we to simply keep appending data here, we could exceed 2427 /* 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 2437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2438 * like it will fix this
2597 */ 2439 */
2598 if (spell->type != SPELL) 2440 if (spell->type != SPELL)
2599 continue; 2441 continue;
2442
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2444 {
2602 Send_With_Handling (&pl->socket, &sl); 2445 pl->socket->send_packet (sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2446
2604 sl.len = strlen ((char *) sl.buf); 2447 sl.reset ();
2448 sl << "addspell ";
2605 } 2449 }
2450
2606 append_spell (pl, &sl, spell); 2451 append_spell (pl, sl, spell);
2607 } 2452 }
2608 } 2453 }
2609 else if (spell->type != SPELL) 2454 else if (spell->type != SPELL)
2610 { 2455 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2456 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2457 return;
2613 } 2458 }
2614 else 2459 else
2615 append_spell (pl, &sl, spell); 2460 append_spell (pl, sl, spell);
2461
2616 if (sl.len >= MAXSOCKBUF) 2462 if (sl.length () >= MAXSOCKBUF)
2617 { 2463 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2465 fatal (0);
2620 } 2466 }
2467
2621 /* finally, we can send the packet */ 2468 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2469 pl->socket->send_packet (sl);
2623 free (sl.buf);
2624} 2470}
2471

Diff Legend

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