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

Diff Legend

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