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.26 by pippijn, Mon Dec 11 19:46:47 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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