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

Diff Legend

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