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.27 by root, Wed Dec 13 18:08:02 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 ");
708 sl.len = strlen ((char *) sl.buf);
709 723
710 sl << uint16 (face) << uint16 (smoothface); 724 sl << "smooth "
725 << uint16 (face)
726 << uint16 (smoothface);
711 727
712 Send_With_Handling (ns, &sl); 728 ns->send_packet (sl);
713} 729}
714 730
715 /** 731 /**
716 * Tells client the picture it has to use 732 * Tells client the picture it has to use
717 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
718 */ 734 */
719void 735void
720AskSmooth (char *buf, int len, NewSocket * ns) 736AskSmooth (char *buf, int len, client *ns)
721{ 737{
722 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
723
724 facenbr = atoi (buf);
725 SendSmooth (ns, facenbr);
726} 739}
727
728
729
730
731 740
732/** 741/**
733 * 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,
734 * etc.) 743 * etc.)
735 */ 744 */
736void 745void
737PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
738{ 747{
739
740 /* The following should never happen with a proper or honest client.
741 * Therefore, the error message doesn't have to be too clear - if
742 * someone is playing with a hacked/non working client, this gives them
743 * an idea of the problem, but they deserve what they get
744 */
745 if (pl->state != ST_PLAYING)
746 {
747 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
748 return;
749 }
750 /* 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
751 * sent, so check for that also. 749 * sent, so check for that also.
752 */ 750 */
753 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
754 { 752 {
755 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
756 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
757 if (!buf) 756 if (!buf)
758 {
759#ifdef ESRV_DEBUG
760 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
761#endif
762 return; 757 return;
763 } 758
764 buf++; 759 buf++;
765 } 760 }
766 /* This should not happen anymore. */ 761
767 if (pl->ob->speed_left < -1.0)
768 {
769 LOG (llevError, "Player has negative time - shouldn't do command.\n");
770 }
771 /* In c_new.c */
772 execute_newserver_command (pl->ob, (char *) buf); 762 execute_newserver_command (pl->ob, (char *) buf);
763
773 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
774 * Cleaning up the input should probably be done first - all actions 765 * Cleaning up the input should probably be done first - all actions
775 * 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
776 * commands. 767 * commands.
777 */ 768 */
778
779 pl->count = 0; 769 pl->count = 0;
780
781} 770}
782 771
783 772
784/** 773/**
785 * 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,
786 * 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
787 * '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
788 * can throttle. 777 * can throttle.
789 */ 778 */
790void 779void
791NewPlayerCmd (uint8 * buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
792{ 781{
793 int time, repeat;
794 short packet;
795 unsigned char command[MAX_BUF];
796 SockList sl;
797
798 if (len < 7) 782 if (len <= 6)
799 { 783 {
800 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);
801 return; 785 return;
802 } 786 }
803 787
804 packet = GetShort_String (buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
805 repeat = GetInt_String (buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
790
806 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
807 if (repeat != -1) 792 if (repeat != -1)
808 {
809 pl->count = repeat; 793 pl->count = repeat;
810 }
811 if ((len - 4) >= MAX_BUF)
812 len = MAX_BUF - 5;
813 794
814 strncpy ((char *) command, (char *) buf + 6, len - 4); 795 buf += 6; //len -= 6;
815 command[len - 4] = '\0';
816 796
817 /* The following should never happen with a proper or honest client.
818 * Therefore, the error message doesn't have to be too clear - if
819 * someone is playing with a hacked/non working client, this gives them
820 * an idea of the problem, but they deserve what they get
821 */
822 if (pl->state != ST_PLAYING)
823 {
824 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
825 return;
826 }
827
828 /* This should not happen anymore. */
829 if (pl->ob->speed_left < -1.0)
830 {
831 LOG (llevError, "Player has negative time - shouldn't do command.\n");
832 }
833 /* In c_new.c */
834 execute_newserver_command (pl->ob, (char *) command); 797 execute_newserver_command (pl->ob, buf);
798
835 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
836 * Cleaning up the input should probably be done first - all actions 800 * Cleaning up the input should probably be done first - all actions
837 * 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
838 * commands. 802 * commands.
839 */ 803 */
840 pl->count = 0; 804 pl->count = 0;
841 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
842 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
843 sl.buf = command; 812 packet sl;
844 strcpy ((char *) sl.buf, "comc ");
845 sl.len = 5;
846
847 if (FABS (pl->ob->speed) < 0.001)
848 time = MAX_TIME * 100;
849 else
850 time = (int) (MAX_TIME / FABS (pl->ob->speed));
851
852 sl << uint16 (packet) << uint32 (time); 813 sl << "comc " << uint16 (cmdid) << uint32 (time);
853 814 pl->socket->send_packet (sl);
854 Send_With_Handling (&pl->socket, &sl);
855} 815}
856 816
857 817
858/** This is a reply to a previous query. */ 818/** This is a reply to a previous query. */
859void 819void
860ReplyCmd (char *buf, int len, player *pl) 820ReplyCmd (char *buf, int len, player *pl)
861{ 821{
862 /* 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
863 * 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
864 * once all the X11 code is removed from the server. 824 * once all the X11 code is removed from the server.
865 * 825 *
866 * 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
867 * think it was the carriage return that was entered, and the 827 * think it was the carriage return that was entered, and the
868 * function then does not try to do additional input. 828 * function then does not try to do additional input.
… …
871 831
872 /* this avoids any hacking here */ 832 /* this avoids any hacking here */
873 833
874 switch (pl->state) 834 switch (pl->state)
875 { 835 {
876 case ST_PLAYING: 836 case ST_PLAYING:
877 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 837 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
878 break; 838 break;
879 839
880 case ST_PLAY_AGAIN: 840 case ST_PLAY_AGAIN:
881 /* We can check this for return value (2==quit). Maybe we 841 /* We can check this for return value (2==quit). Maybe we
882 * should, and do something appropriate? 842 * should, and do something appropriate?
883 */ 843 */
884 receive_play_again (pl->ob, buf[0]); 844 receive_play_again (pl->ob, buf[0]);
885 break; 845 break;
886 846
887 case ST_ROLL_STAT: 847 case ST_ROLL_STAT:
888 key_roll_stat (pl->ob, buf[0]); 848 key_roll_stat (pl->ob, buf[0]);
889 break; 849 break;
890 850
891 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
892 852
893 key_change_class (pl->ob, buf[0]); 853 key_change_class (pl->ob, buf[0]);
894 break; 854 break;
895 855
896 case ST_CONFIRM_QUIT: 856 case ST_CONFIRM_QUIT:
897 key_confirm_quit (pl->ob, buf[0]); 857 key_confirm_quit (pl->ob, buf[0]);
898 break; 858 break;
899 859
900 case ST_CONFIGURE: 860 case ST_CONFIGURE:
901 LOG (llevError, "In client input handling, but into configure state\n"); 861 LOG (llevError, "In client input handling, but into configure state\n");
902 pl->state = ST_PLAYING; 862 pl->state = ST_PLAYING;
903 break; 863 break;
904 864
905 case ST_GET_NAME: 865 case ST_GET_NAME:
906 receive_player_name (pl->ob, 13); 866 receive_player_name (pl->ob, 13);
907 break; 867 break;
908 868
909 case ST_GET_PASSWORD: 869 case ST_GET_PASSWORD:
910 case ST_CONFIRM_PASSWORD: 870 case ST_CONFIRM_PASSWORD:
911 receive_player_password (pl->ob, 13); 871 receive_player_password (pl->ob, 13);
912 break; 872 break;
913 873
914 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 874 case ST_GET_PARTY_PASSWORD: /* Get password for party */
915 receive_party_password (pl->ob, 13); 875 receive_party_password (pl->ob, 13);
916 break; 876 break;
917 877
918 default: 878 default:
919 LOG (llevError, "Unknown input state: %d\n", pl->state); 879 LOG (llevError, "Unknown input state: %d\n", pl->state);
920 } 880 }
921} 881}
922 882
923/** 883/**
924 * 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
… …
926 * 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
927 * 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
928 * problem. 888 * problem.
929 */ 889 */
930void 890void
931VersionCmd (char *buf, int len, NewSocket * ns) 891VersionCmd (char *buf, int len, client * ns)
932{ 892{
933 char *cp;
934 char version_warning[256];
935
936 if (!buf) 893 if (!buf)
937 { 894 {
938 LOG (llevError, "CS: received corrupted version command\n"); 895 LOG (llevError, "CS: received corrupted version command\n");
939 return; 896 return;
940 } 897 }
941 898
942 ns->cs_version = atoi (buf); 899 ns->cs_version = atoi (buf);
943 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
944 if (VERSION_CS != ns->cs_version) 907 //if (VERSION_CS != ns->cs_version)
945 { 908 // unchecked;
946#ifdef ESRV_DEBUG 909
947 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
948#endif
949 }
950 cp = strchr (buf + 1, ' '); 910 char *cp = strchr (buf + 1, ' ');
951 if (!cp) 911 if (!cp)
952 return; 912 return;
913
953 ns->sc_version = atoi (cp); 914 ns->sc_version = atoi (cp);
915
954 if (VERSION_SC != ns->sc_version) 916 //if (VERSION_SC != ns->sc_version)
955 { 917 // unchecked;
956#ifdef ESRV_DEBUG 918
957 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
958#endif
959 }
960 cp = strchr (cp + 1, ' '); 919 cp = strchr (cp + 1, ' ');
920
961 if (cp) 921 if (cp)
962 { 922 {
963 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 923 assign (ns->version, cp + 1);
964 924
965 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 925 if (ns->sc_version < 1026)
966 926 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
967 /* This is first implementation - i skip all beta DX clients with it
968 * Add later stuff here for other clients
969 */
970
971 /* these are old dxclients */
972 /* Version 1024 added support for singular + plural name values -
973 * requiing this minimal value reduces complexity of that code, and it
974 * has been around for a long time.
975 */
976 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
977 {
978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 927 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
980 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
981 }
982
983 } 928 }
984} 929}
985 930
986/** sound related functions. */ 931/** sound related functions. */
987
988void 932void
989SetSound (char *buf, int len, NewSocket * ns) 933SetSound (char *buf, int len, client * ns)
990{ 934{
991 ns->sound = atoi (buf); 935 ns->sound = atoi (buf);
992} 936}
993 937
994/** client wants the map resent */ 938/** client wants the map resent */
995 939
996void 940void
997MapRedrawCmd (char *buf, int len, player *pl) 941MapRedrawCmd (char *buf, int len, player *pl)
998{ 942{
999
1000/* 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
1001 * 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.
1002 * Unfortunately this solution does not work because some client versions send 945 * Unfortunately this solution does not work because some client versions send
1003 * a mapredraw command after receiving a newmap command. 946 * a mapredraw command after receiving a newmap command.
1004 */ 947 */
1005#if 0
1006 /* Okay, this is MAJOR UGLY. but the only way I know how to
1007 * clear the "cache"
1008 */
1009 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1010 draw_client_map (pl->ob);
1011#endif
1012} 948}
1013 949
1014/** 950/**
1015 * Moves an object (typically, container to inventory). 951 * Moves an object (typically, container to inventory).
1016 * syntax is: move (to) (tag) (nrof) 952 * syntax is: move (to) (tag) (nrof)
… …
1019MoveCmd (char *buf, int len, player *pl) 955MoveCmd (char *buf, int len, player *pl)
1020{ 956{
1021 int vals[3], i; 957 int vals[3], i;
1022 958
1023 /* A little funky here. We only cycle for 2 records, because 959 /* A little funky here. We only cycle for 2 records, because
1024 * 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
1025 * record. Perhaps we should just replace this with a 961 * record. Perhaps we should just replace this with a
1026 * sscanf? 962 * sscanf?
1027 */ 963 */
1028 for (i = 0; i < 2; i++) 964 for (i = 0; i < 2; i++)
1029 { 965 {
1030 vals[i] = atoi (buf); 966 vals[i] = atoi (buf);
967
1031 if (!(buf = strchr (buf, ' '))) 968 if (!(buf = strchr (buf, ' ')))
1032 { 969 {
1033 LOG (llevError, "Incomplete move command: %s\n", buf); 970 LOG (llevError, "Incomplete move command: %s\n", buf);
1034 return; 971 return;
1035 } 972 }
973
1036 buf++; 974 buf++;
1037 } 975 }
976
1038 vals[2] = atoi (buf); 977 vals[2] = atoi (buf);
1039 978
1040/* 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]);*/
1041 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 980 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1042} 981}
1043
1044
1045 982
1046/****************************************************************************** 983/******************************************************************************
1047 * 984 *
1048 * Start of commands the server sends to the client. 985 * Start of commands the server sends to the client.
1049 * 986 *
… …
1052/** 989/**
1053 * 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
1054 * 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)
1055 */ 992 */
1056void 993void
1057send_query (NewSocket * ns, uint8 flags, char *text) 994send_query (client *ns, uint8 flags, char *text)
1058{ 995{
1059 char buf[MAX_BUF];
1060
1061 sprintf (buf, "query %d %s", flags, text ? text : ""); 996 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1062 Write_String_To_Socket (ns, buf, strlen (buf));
1063} 997}
1064 998
1065#define AddIfInt64(Old,New,Type) if (Old != New) {\ 999#define AddIfInt64(Old,New,Type) if (Old != New) {\
1066 Old = New; \ 1000 Old = New; \
1067 SockList_AddChar(&sl, Type); \ 1001 sl << uint8 (Type) << uint64 (New); \
1068 SockList_AddInt64(&sl, New); \
1069 } 1002 }
1070 1003
1071#define AddIfInt(Old,New,Type) if (Old != New) {\ 1004#define AddIfInt(Old,New,Type) if (Old != New) {\
1072 Old = New; \ 1005 Old = New; \
1073 SockList_AddChar(&sl, Type); \ 1006 sl << uint8 (Type) << uint32 (New); \
1074 SockList_AddInt(&sl, New); \
1075 } 1007 }
1076 1008
1077#define AddIfShort(Old,New,Type) if (Old != New) {\ 1009#define AddIfShort(Old,New,Type) if (Old != New) {\
1078 Old = New; \ 1010 Old = New; \
1079 SockList_AddChar(&sl, Type); \ 1011 sl << uint8 (Type) << uint16 (New); \
1080 SockList_AddShort(&sl, New); \
1081 } 1012 }
1082 1013
1083#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1014#define AddIfFloat(Old,New,Type) if (Old != New) {\
1084 Old = New; \ 1015 Old = New; \
1085 SockList_AddChar(&sl, Type); \ 1016 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1086 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1087 } 1017 }
1088 1018
1089#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1019#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1090 if (Old) free(Old);\
1091 Old = strdup_local(New);\ 1020 free(Old); Old = strdup (New);\
1092 SockList_AddChar(&sl, Type); \ 1021 sl << uint8 (Type) << data8 (New); \
1093 SockList_AddChar(&sl, ( char )strlen(New)); \
1094 strcpy((char*)sl.buf + sl.len, New); \
1095 sl.len += strlen(New); \
1096 } 1022 }
1097 1023
1098/** 1024/**
1099 * Sends a statistics update. We look at the old values, 1025 * Sends a statistics update. We look at the old values,
1100 * 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
… …
1102 * commands for now. 1028 * commands for now.
1103 */ 1029 */
1104void 1030void
1105esrv_update_stats (player *pl) 1031esrv_update_stats (player *pl)
1106{ 1032{
1107 SockList sl;
1108 char buf[MAX_BUF]; 1033 char buf[MAX_BUF];
1109 uint16 flags; 1034 uint16 flags;
1110 1035
1111 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1036 packet sl;
1112 strcpy ((char *) sl.buf, "stats "); 1037 sl << "stats ";
1113 sl.len = strlen ((char *) sl.buf);
1114 1038
1115 if (pl->ob != NULL) 1039 if (pl->ob)
1116 { 1040 {
1117 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);
1118 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);
1119 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);
1120 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);
… …
1127 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);
1128 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);
1129 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);
1130 } 1054 }
1131 1055
1132 if (pl->socket.exp64) 1056 if (pl->socket->exp64)
1133 {
1134 uint8 s;
1135
1136 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1137 {
1138 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)
1139 { 1059 {
1140
1141 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1143 */ 1062 */
1144 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1064 << uint8 (pl->last_skill_ob[s]->level)
1146 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1066
1147 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;
1148 } 1068 }
1149 }
1150 }
1151 1069
1152 if (pl->socket.exp64) 1070 if (pl->socket->exp64)
1153 { 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) }
1154 else 1072 else
1155 { 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) }
1156 1074
1157 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1170 if (pl->run_on) 1088 if (pl->run_on)
1171 flags |= SF_RUNON; 1089 flags |= SF_RUNON;
1172 1090
1173 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1174 1092
1175 if (pl->socket.sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1176 { 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) }
1177 else 1095 else
1178 {
1179 int i;
1180
1181 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1182 { 1097 {
1183 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1184 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1185 continue; 1100 continue;
1186 1101
1187 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]);
1188 } 1103 }
1189 }
1190 1104
1191 if (pl->socket.monitor_spells) 1105 if (pl->socket->monitor_spells)
1192 { 1106 {
1193 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);
1194 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);
1195 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);
1196 } 1110 }
1197 1111
1198 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 */
1199 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1200 set_title (pl->ob, buf); 1114 set_title (pl->ob, buf);
1201 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1202 1116
1203 /* Only send it away if we have some actual data */ 1117 /* Only send it away if we have some actual data */
1204 if (sl.len > 6) 1118 if (sl.length () > 6)
1205 { 1119 pl->socket->send_packet (sl);
1206#ifdef ESRV_DEBUG
1207 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1208#endif
1209 Send_With_Handling (&pl->socket, &sl);
1210 }
1211
1212 free (sl.buf);
1213} 1120}
1214 1121
1215/** 1122/**
1216 * 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.
1217 */ 1124 */
1218void 1125void
1219esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1220{ 1127{
1221 SockList sl;
1222
1223 pl->last_weight = weight; 1128 pl->last_weight = weight;
1224 1129
1225 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1130 packet sl;
1131 sl << "player ";
1226 1132
1227 strcpy ((char *) sl.buf, "player "); 1133 sl << uint32 (pl->ob->count)
1228 sl.len = strlen ((char *) sl.buf); 1134 << uint32 (weight)
1229 SockList_AddInt (&sl, pl->ob->count); 1135 << uint32 (pl->ob->face->number)
1230 SockList_AddInt (&sl, weight); 1136 << data8 (pl->ob->name);
1231 SockList_AddInt (&sl, pl->ob->face->number);
1232 1137
1233 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1138 pl->socket->send_packet (sl);
1234 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1235 sl.len += strlen (pl->ob->name);
1236
1237 Send_With_Handling (&pl->socket, &sl);
1238 free (sl.buf);
1239 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1240} 1140}
1241 1141
1242/** 1142/**
1243 * Need to send an animation sequence to the client. 1143 * Need to send an animation sequence to the client.
… …
1245 * 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
1246 * 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
1247 * when the player logs in and picks stuff up. 1147 * when the player logs in and picks stuff up.
1248 */ 1148 */
1249void 1149void
1250esrv_send_animation (NewSocket * ns, short anim_num) 1150esrv_send_animation (client * ns, short anim_num)
1251{ 1151{
1252 SockList sl;
1253 int i;
1254
1255 /* 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
1256 * 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
1257 * range, it must be a valid animation. 1154 * range, it must be a valid animation.
1258 */ 1155 */
1259 if (anim_num < 0 || anim_num > num_animations) 1156 if (anim_num < 0 || anim_num > num_animations)
1260 { 1157 {
1261 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);
1262 return; 1159 return;
1263 } 1160 }
1264 1161
1265 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1162 packet sl;
1266 strcpy ((char *) sl.buf, "anim "); 1163
1267 sl.len = 5; 1164 sl << "anim "
1268 SockList_AddShort (&sl, anim_num); 1165 << uint16 (anim_num)
1269 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1166 << uint16 (0); /* flags - not used right now */
1167
1270 /* 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
1271 * the face itself) down to the client. 1169 * the face itself) down to the client.
1272 */ 1170 */
1273 for (i = 0; i < animations[anim_num].num_animations; i++) 1171 for (int i = 0; i < animations[anim_num].num_animations; i++)
1274 { 1172 {
1275 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))
1276 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1174 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1175
1277 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 */
1278 } 1177 }
1279 Send_With_Handling (ns, &sl); 1178
1280 free (sl.buf); 1179 ns->send_packet (sl);
1180
1281 ns->anims_sent[anim_num] = 1; 1181 ns->anims_sent[anim_num] = 1;
1282} 1182}
1283 1183
1284 1184
1285/****************************************************************************** 1185/******************************************************************************
… …
1291/** 1191/**
1292 * 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
1293 * the face yet, we will also send it. 1193 * the face yet, we will also send it.
1294 */ 1194 */
1295static void 1195static void
1296esrv_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)
1297{ 1197{
1298 if (newmap->cells[x][y].count >= MAP_LAYERS) 1198 if (newmap->cells[x][y].count >= MAP_LAYERS)
1299 { 1199 {
1200 //TODO: one or the other, can't both have abort and return, verify and act
1300 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);
1301 return; 1202 return;
1302 abort (); 1203 abort ();
1303 } 1204 }
1205
1304 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;
1305 newmap->cells[x][y].count++; 1207 newmap->cells[x][y].count++;
1208
1306 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1209 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1307 esrv_send_face (ns, face_num, 0); 1210 esrv_send_face (ns, face_num, 0);
1308} 1211}
1309
1310struct LayerCell
1311{
1312 uint16 xy;
1313 short face;
1314};
1315
1316struct MapLayer
1317{
1318 int count;
1319 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1320};
1321
1322/** Checkes if map cells have changed */
1323static int
1324mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1325{
1326 int k;
1327
1328 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1329 return 1;
1330 for (k = 0; k < newmap->cells[i][j].count; k++)
1331 {
1332 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1333 {
1334 return 1;
1335 }
1336 }
1337 return 0;
1338}
1339
1340/**
1341 * Basically, what this does is pack the data into layers.
1342 * cnum is the client number, cur is the the buffer we put all of
1343 * this data into. we return the end of the data. layers is
1344 * how many layers of data we should back.
1345 */
1346static uint8 *
1347compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1348{
1349 int x, y, k;
1350 int face;
1351 unsigned char *fcur;
1352 struct MapLayer layers[MAP_LAYERS];
1353
1354 for (k = 0; k < MAP_LAYERS; k++)
1355 layers[k].count = 0;
1356 fcur = cur;
1357 for (x = 0; x < ns->mapx; x++)
1358 {
1359 for (y = 0; y < ns->mapy; y++)
1360 {
1361 if (!mapcellchanged (ns, x, y, newmap))
1362 continue;
1363 if (newmap->cells[x][y].count == 0)
1364 {
1365 *cur = x * ns->mapy + y; /* mark empty space */
1366 cur++;
1367 continue;
1368 }
1369 for (k = 0; k < newmap->cells[x][y].count; k++)
1370 {
1371 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1372 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1373 layers[k].count++;
1374 }
1375 }
1376 }
1377 /* If no data, return now. */
1378 if (fcur == cur && layers[0].count == 0)
1379 return cur;
1380 *cur = 255; /* mark end of explicitly cleared cells */
1381 cur++;
1382 /* First pack by layers. */
1383 for (k = 0; k < numlayers; k++)
1384 {
1385 if (layers[k].count == 0)
1386 break; /* once a layer is entirely empty, no layer below it can
1387 have anything in it either */
1388 /* Pack by entries in thie layer */
1389 for (x = 0; x < layers[k].count;)
1390 {
1391 fcur = cur;
1392 *cur = layers[k].lcells[x].face >> 8;
1393 cur++;
1394 *cur = layers[k].lcells[x].face & 0xFF;
1395 cur++;
1396 face = layers[k].lcells[x].face;
1397 /* Now, we back the redundant data into 1 byte xy pairings */
1398 for (y = x; y < layers[k].count; y++)
1399 {
1400 if (layers[k].lcells[y].face == face)
1401 {
1402 *cur = (uint8) layers[k].lcells[y].xy;
1403 cur++;
1404 layers[k].lcells[y].face = -1;
1405 }
1406 }
1407 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1408 /* forward over the now redundant data */
1409 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1410 x++;
1411 }
1412 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1413 }
1414 return cur;
1415}
1416
1417static void
1418esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1419{
1420 static long frames, bytes, tbytes, tframes;
1421 char *cur;
1422 SockList sl;
1423
1424
1425 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1426 strcpy ((char *) sl.buf, "map ");
1427 sl.len = strlen ((char *) sl.buf);
1428
1429 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1430 sl.len = cur - (char *) sl.buf;
1431
1432/* LOG(llevDebug, "Sending map command.\n");*/
1433
1434 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1435 {
1436 /* All of this is just accounting stuff */
1437 if (tframes > 100)
1438 tframes = tbytes = 0;
1439
1440 tframes++;
1441 frames++;
1442 tbytes += sl.len;
1443 bytes += sl.len;
1444 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1445 Send_With_Handling (ns, &sl);
1446 ns->sent_scroll = 0;
1447 }
1448
1449 free (sl.buf);
1450}
1451
1452 1212
1453/** Clears a map cell */ 1213/** Clears a map cell */
1454static void 1214static void
1455map_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)
1456{ 1216{
… …
1467#define MAX_LAYERS 3 1227#define MAX_LAYERS 3
1468 1228
1469/* 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
1470 * 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,
1471 * 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
1472 * 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
1473 * re-examined. 1233 * re-examined.
1474 */ 1234 */
1475
1476static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1235static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1477 1236
1478/** 1237/**
1479 * Returns true if any of the heads for this 1238 * Returns true if any of the heads for this
1480 * 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
1481 * for empty space checking. 1240 * for empty space checking.
1482 */ 1241 */
1483static inline int 1242static inline int
1484have_head (int ax, int ay) 1243have_head (int ax, int ay)
1485{ 1244{
1486
1487 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1488 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])
1489 return 1; 1247 return 1;
1248
1490 return 0; 1249 return 0;
1491} 1250}
1492 1251
1493/** 1252/**
1494 * check_head is a bit simplistic version of update_space below. 1253 * check_head is a bit simplistic version of update_space below.
1495 * 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
1496 * 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
1497 * 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
1498 * sent, it returns zero. 1257 * sent, it returns zero.
1499 */ 1258 */
1500static int 1259static int
1501check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1260check_head (packet &sl, client &ns, int ax, int ay, int layer)
1502{ 1261{
1503 short face_num; 1262 short face_num;
1504 1263
1505 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1264 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1506 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;
1507 else 1266 else
1508 face_num = 0; 1267 face_num = 0;
1509 1268
1510 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1269 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1511 { 1270 {
1512 SockList_AddShort (&sl, face_num); 1271 sl << uint16 (face_num);
1513 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1272 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1514 esrv_send_face (&ns, face_num, 0); 1273 esrv_send_face (&ns, face_num, 0);
1274
1515 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1275 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1516 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1276 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1517 return 1; 1277 return 1;
1518 } 1278 }
1519 1279
… …
1537 * numbers the spaces differently - I think this was a leftover from 1297 * numbers the spaces differently - I think this was a leftover from
1538 * 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
1539 * 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
1540 * actually match. 1300 * actually match.
1541 */ 1301 */
1542
1543static int 1302static int
1544update_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)
1545{ 1304{
1546 object *ob, *head; 1305 object *ob, *head;
1547 uint16 face_num; 1306 uint16 face_num;
1548 int bx, by, i; 1307 int bx, by, i;
1549 1308
1550 /* 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.
1551 * If not, then do the normal processing. 1310 * If not, then do the normal processing.
1552 */ 1311 */
1553
1554 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1312 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1555 1313
1556 /* 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
1557 * we would normally send for this space. If so, then 1315 * we would normally send for this space. If so, then
1558 * 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
… …
1723 1481
1724 /* 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
1725 * 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
1726 * this one. 1484 * this one.
1727 */ 1485 */
1728 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)
1729 {
1730 face_num = 0; 1487 face_num = 0;
1731 }
1732 1488
1733 /* 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
1734 * 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.
1735 */ 1491 */
1736 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1492 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1737 { 1493 {
1738 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1494 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1739 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1495 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1740 esrv_send_face (ns, face_num, 0); 1496 esrv_send_face (&ns, face_num, 0);
1741 SockList_AddShort (sl, face_num); 1497
1498 sl << uint16 (face_num);
1742 return 1; 1499 return 1;
1743 } 1500 }
1501
1744 /* Nothing changed */ 1502 /* Nothing changed */
1745 return 0; 1503 return 0;
1746} 1504}
1747 1505
1748/** 1506/**
… …
1763 * 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
1764 * take. 1522 * take.
1765 */ 1523 */
1766 1524
1767static inline int 1525static inline int
1768update_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)
1769{ 1527{
1770 object *ob; 1528 object *ob;
1771 int smoothlevel; /* old face_num; */ 1529 int smoothlevel; /* old face_num; */
1772 1530
1773 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1778 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1536 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1779 smoothlevel = 0; 1537 smoothlevel = 0;
1780 else 1538 else
1781 { 1539 {
1782 smoothlevel = ob->smoothlevel; 1540 smoothlevel = ob->smoothlevel;
1783 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1541 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1784 SendSmooth (ns, ob->face->number); 1542 SendSmooth (&ns, ob->face->number);
1785 } /* else not already head object or blank face */ 1543 } /* else not already head object or blank face */
1786 1544
1787 /* 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
1788 * 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.
1789 */ 1547 */
1790 if (smoothlevel > 255) 1548 if (smoothlevel > 255)
1791 smoothlevel = 255; 1549 smoothlevel = 255;
1792 else if (smoothlevel < 0) 1550 else if (smoothlevel < 0)
1793 smoothlevel = 0; 1551 smoothlevel = 0;
1552
1794 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1553 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1795 { 1554 {
1796 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1555 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1797 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1556 sl << uint8 (smoothlevel);
1798 return 1; 1557 return 1;
1799 } 1558 }
1559
1800 /* Nothing changed */ 1560 /* Nothing changed */
1801 return 0; 1561 return 0;
1802} 1562}
1803 1563
1804/** 1564/**
1805 * 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
1806 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1566 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1807 * available. 1567 * available.
1808 */ 1568 */
1809int 1569int
1810getExtendedMapInfoSize (NewSocket * ns) 1570getExtendedMapInfoSize (client * ns)
1811{ 1571{
1812 int result = 0; 1572 int result = 0;
1813 1573
1814 if (ns->ext_mapinfos) 1574 if (ns->ext_mapinfos)
1815 { 1575 {
1816 if (ns->EMI_smooth) 1576 if (ns->EMI_smooth)
1817 result += 1; /*One byte for smoothlevel */ 1577 result += 1; /*One byte for smoothlevel */
1818 } 1578 }
1579
1819 return result; 1580 return result;
1820} 1581}
1821 1582
1822/** 1583/**
1823 * 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
… …
1845draw_client_map1 (object *pl) 1606draw_client_map1 (object *pl)
1846{ 1607{
1847 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;
1848 sint16 nx, ny; 1609 sint16 nx, ny;
1849 int estartlen, eoldlen; 1610 int estartlen, eoldlen;
1850 SockList sl;
1851 SockList esl; /*For extended Map info */
1852 uint16 mask, emask; 1611 uint16 mask, emask;
1853 uint8 eentrysize; 1612 uint8 eentrysize;
1854 uint16 ewhatstart, ewhatflag; 1613 uint16 ewhatstart, ewhatflag;
1855 uint8 extendedinfos; 1614 uint8 extendedinfos;
1856 maptile *m; 1615 maptile *m;
1857 1616
1858 NewSocket & socket = pl->contr->socket; 1617 client &socket = *pl->contr->socket;
1859 1618
1860 check_map_change (pl->contr); 1619 check_map_change (pl->contr);
1861 1620
1862 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1621 packet sl;
1863 if (socket.mapmode == Map1Cmd) 1622 packet esl;
1864 strcpy ((char *) sl.buf, "map1 "); 1623
1865 else 1624 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1866 strcpy ((char *) sl.buf, "map1a ");
1867 sl.len = strlen ((char *) sl.buf);
1868 startlen = sl.len; 1625 startlen = sl.length ();
1869 1626
1870 /*Extendedmapinfo structure initialisation */ 1627 /*Extendedmapinfo structure initialisation */
1871 if (socket.ext_mapinfos) 1628 if (socket.ext_mapinfos)
1872 { 1629 {
1873 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1874 strcpy ((char *) esl.buf, "mapextended ");
1875 esl.len = strlen ((char *) esl.buf);
1876 extendedinfos = EMI_NOREDRAW; 1630 extendedinfos = EMI_NOREDRAW;
1877 1631
1878 if (socket.EMI_smooth) 1632 if (socket.EMI_smooth)
1879 extendedinfos |= EMI_SMOOTH; 1633 extendedinfos |= EMI_SMOOTH;
1880 1634
1881 ewhatstart = esl.len; 1635 ewhatstart = esl.length ();
1882 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1636 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1883 could need to be taken away */ 1637 could need to be taken away */
1884 SockList_AddChar (&esl, extendedinfos);
1885 eentrysize = getExtendedMapInfoSize (&socket); 1638 eentrysize = getExtendedMapInfoSize (&socket);
1886 SockList_AddChar (&esl, eentrysize); 1639 esl << "mapextended "
1640 << uint8 (extendedinfos)
1641 << uint8 (eentrysize);
1642
1887 estartlen = esl.len; 1643 estartlen = esl.length ();
1888 } 1644 }
1889 else 1645 else
1890 { 1646 {
1891 /* suppress compiler warnings */ 1647 /* suppress compiler warnings */
1892 ewhatstart = 0; 1648 ewhatstart = 0;
… …
1930 */ 1686 */
1931 if (ax >= socket.mapx || ay >= socket.mapy) 1687 if (ax >= socket.mapx || ay >= socket.mapy)
1932 { 1688 {
1933 int i, got_one; 1689 int i, got_one;
1934 1690
1935 oldlen = sl.len; 1691 oldlen = sl.length ();
1936 1692
1937 SockList_AddShort (&sl, mask); 1693 sl << uint16 (mask);
1938 1694
1939 if (check_head (sl, socket, ax, ay, 2)) 1695 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1940 mask |= 0x4;
1941 if (check_head (sl, socket, ax, ay, 1)) 1696 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1942 mask |= 0x2;
1943 if (check_head (sl, socket, ax, ay, 0)) 1697 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1944 mask |= 0x1;
1945 1698
1946 /* 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
1947 * actually need to send that - just the coordinates 1700 * actually need to send that - just the coordinates
1948 * with no faces tells the client to blank out the 1701 * with no faces tells the client to blank out the
1949 * space. 1702 * space.
1950 */ 1703 */
1951 got_one = 0; 1704 got_one = 0;
1952 for (i = oldlen + 2; i < sl.len; i++) 1705 for (i = oldlen + 2; i < sl.length (); i++)
1953 if (sl.buf[i]) 1706 if (sl[i])
1954 got_one = 1; 1707 got_one = 1;
1955 1708
1956 if (got_one && (mask & 0xf)) 1709 if (got_one && (mask & 0xf))
1957 sl.buf[oldlen + 1] = mask & 0xff; 1710 sl[oldlen + 1] = mask & 0xff;
1958 else 1711 else
1959 { /*either all faces blank, either no face at all */ 1712 { /*either all faces blank, either no face at all */
1960 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 */
1961 sl.len = oldlen + 2; 1714 sl.reset (oldlen + 2);
1962 else 1715 else
1963 sl.len = oldlen; 1716 sl.reset (oldlen);
1964 } 1717 }
1965 1718
1966 /*What concerns extendinfos, nothing to be done for now 1719 /*What concerns extendinfos, nothing to be done for now
1967 * (perhaps effects layer later) 1720 * (perhaps effects layer later)
1968 */ 1721 */
… …
1986 * 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
1987 * of the map, it shouldn't have a head 1740 * of the map, it shouldn't have a head
1988 */ 1741 */
1989 if (lastcell.count != -1) 1742 if (lastcell.count != -1)
1990 { 1743 {
1991 SockList_AddShort (&sl, mask); 1744 sl << uint16 (mask);
1992 map_clearcell (&lastcell, 0, 0, 0, -1); 1745 map_clearcell (&lastcell, 0, 0, 0, -1);
1993 } 1746 }
1994 } 1747 }
1995 else if (d > 3) 1748 else if (d > 3)
1996 { 1749 {
… …
1998 1751
1999 /* This block deals with spaces that are not visible for whatever 1752 /* This block deals with spaces that are not visible for whatever
2000 * reason. Still may need to send the head for this space. 1753 * reason. Still may need to send the head for this space.
2001 */ 1754 */
2002 1755
2003 oldlen = sl.len; 1756 oldlen = sl.length ();
2004 1757
2005 SockList_AddShort (&sl, mask); 1758 sl << uint16 (mask);
2006 1759
2007 if (lastcell.count != -1) 1760 if (lastcell.count != -1)
2008 need_send = 1; 1761 need_send = 1;
2009 1762
2010 count = -1; 1763 count = -1;
2011 1764
2012 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1765 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2013 { 1766 {
2014 /* Now check to see if any heads need to be sent */ 1767 /* Now check to see if any heads need to be sent */
2015 1768
2016 if (check_head (sl, socket, ax, ay, 2)) 1769 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2017 mask |= 0x4;
2018 if (check_head (sl, socket, ax, ay, 1)) 1770 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2019 mask |= 0x2;
2020 if (check_head (sl, socket, ax, ay, 0)) 1771 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2021 mask |= 0x1;
2022 1772
2023 lastcell.count = count; 1773 lastcell.count = count;
2024 } 1774 }
2025 else 1775 else
2026 { 1776 {
… …
2031 1781
2032 map_clearcell (&lastcell, 0, 0, 0, count); 1782 map_clearcell (&lastcell, 0, 0, 0, count);
2033 } 1783 }
2034 1784
2035 if ((mask & 0xf) || need_send) 1785 if ((mask & 0xf) || need_send)
2036 sl.buf[oldlen + 1] = mask & 0xff; 1786 sl[oldlen + 1] = mask & 0xff;
2037 else 1787 else
2038 sl.len = oldlen; 1788 sl.reset (oldlen);
2039 } 1789 }
2040 else 1790 else
2041 { 1791 {
2042 /* 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
2043 * we need to send. 1793 * we need to send.
… …
2045 1795
2046 /* Rather than try to figure out what everything that we might 1796 /* Rather than try to figure out what everything that we might
2047 * need to send is, then form the packet after that, 1797 * need to send is, then form the packet after that,
2048 * 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
2049 * 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,
2050 * 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
2051 * is done. 1801 * is done.
2052 * 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
2053 * what if anything we need to send, setting the bits, then 1803 * what if anything we need to send, setting the bits, then
2054 * doing those checks again to add the real data. 1804 * doing those checks again to add the real data.
2055 */ 1805 */
2056 oldlen = sl.len; 1806 oldlen = sl.length ();
2057 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1807 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2058 eoldlen = esl.len; 1808 eoldlen = esl.length ();
2059 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1809 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2060 SockList_AddShort (&sl, mask); 1810 sl << uint16 (mask);
2061 1811
2062 if (socket.ext_mapinfos) 1812 if (socket.ext_mapinfos)
2063 SockList_AddShort (&esl, emask); 1813 esl << uint16 (emask);
2064 1814
2065 unsigned char dummy; 1815 unsigned char dummy;
2066 unsigned char *last_ext = &dummy; 1816 unsigned char *last_ext = &dummy;
2067 1817
2068 /* Darkness changed */ 1818 /* Darkness changed */
… …
2071 mask |= 0x8; 1821 mask |= 0x8;
2072 1822
2073 if (socket.extmap) 1823 if (socket.extmap)
2074 { 1824 {
2075 *last_ext |= 0x80; 1825 *last_ext |= 0x80;
2076 last_ext = sl.buf + sl.len; 1826 last_ext = &sl[sl.length ()];
2077 SockList_AddChar (&sl, d); 1827 sl << uint8 (d);
2078 } 1828 }
2079 else 1829 else
2080 SockList_AddChar (&sl, 255 - 64 * d); 1830 sl << uint8 (255 - 64 * d);
2081 } 1831 }
2082 1832
2083 lastcell.count = d; 1833 lastcell.count = d;
2084 1834
2085 if (socket.extmap) 1835 if (socket.extmap)
… …
2115 { 1865 {
2116 lastcell.stat_hp = stat_hp; 1866 lastcell.stat_hp = stat_hp;
2117 1867
2118 mask |= 0x8; 1868 mask |= 0x8;
2119 *last_ext |= 0x80; 1869 *last_ext |= 0x80;
2120 last_ext = sl.buf + sl.len; 1870 last_ext = &sl[sl.length ()];
2121 1871
2122 sl << uint8 (5) << uint8 (stat_hp); 1872 sl << uint8 (5) << uint8 (stat_hp);
2123 1873
2124 if (stat_width > 1) 1874 if (stat_width > 1)
2125 { 1875 {
2126 *last_ext |= 0x80; 1876 *last_ext |= 0x80;
2127 last_ext = sl.buf + sl.len; 1877 last_ext = &sl[sl.length ()];
2128 1878
2129 sl << uint8 (6) << uint8 (stat_width); 1879 sl << uint8 (6) << uint8 (stat_width);
2130 } 1880 }
2131 } 1881 }
2132 1882
… …
2134 { 1884 {
2135 lastcell.player = player; 1885 lastcell.player = player;
2136 1886
2137 mask |= 0x8; 1887 mask |= 0x8;
2138 *last_ext |= 0x80; 1888 *last_ext |= 0x80;
2139 last_ext = sl.buf + sl.len; 1889 last_ext = &sl[sl.length ()];
2140 1890
2141 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1891 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2142 } 1892 }
2143 1893
2144 if (lastcell.flags != flags) 1894 if (lastcell.flags != flags)
2145 { 1895 {
2146 lastcell.flags = flags; 1896 lastcell.flags = flags;
2147 1897
2148 mask |= 0x8; 1898 mask |= 0x8;
2149 *last_ext |= 0x80; 1899 *last_ext |= 0x80;
2150 last_ext = sl.buf + sl.len; 1900 last_ext = &sl[sl.length ()];
2151 1901
2152 sl << uint8 (8) << uint8 (flags); 1902 sl << uint8 (8) << uint8 (flags);
2153 } 1903 }
2154 } 1904 }
2155 1905
2156 /* Floor face */ 1906 /* Floor face */
2157 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1907 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2158 mask |= 0x4; 1908 mask |= 0x4;
2159 1909
2160 if (socket.EMI_smooth) 1910 if (socket.EMI_smooth)
2161 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 1911 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2162 emask |= 0x4; 1912 emask |= 0x4;
2163 1913
2164 /* Middle face */ 1914 /* Middle face */
2165 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1915 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2166 mask |= 0x2; 1916 mask |= 0x2;
2167 1917
2168 if (socket.EMI_smooth) 1918 if (socket.EMI_smooth)
2169 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1919 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2170 emask |= 0x2; 1920 emask |= 0x2;
2171 1921
2172 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))
2173 { 1923 {
2174 if (lastcell.faces[0] != pl->face->number) 1924 if (lastcell.faces[0] != pl->face->number)
… …
2183 } 1933 }
2184 } 1934 }
2185 else 1935 else
2186 { 1936 {
2187 /* Top face */ 1937 /* Top face */
2188 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1938 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2189 mask |= 0x1; 1939 mask |= 0x1;
2190 1940
2191 if (socket.EMI_smooth) 1941 if (socket.EMI_smooth)
2192 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 1942 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2193 emask |= 0x1; 1943 emask |= 0x1;
2194 } 1944 }
2195 1945
2196 /* 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
2197 * space by checking the mask. If so, update the mask. 1947 * space by checking the mask. If so, update the mask.
2198 * 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
2199 * value, so we don't send those bits. 1949 * value, so we don't send those bits.
2200 */ 1950 */
2201 if (mask & 0xf) 1951 if (mask & 0xf)
2202 sl.buf[oldlen + 1] = mask & 0xff; 1952 sl[oldlen + 1] = mask & 0xff;
2203 else 1953 else
2204 sl.len = oldlen; 1954 sl.reset (oldlen);
2205 1955
2206 if (emask & 0xf) 1956 if (emask & 0xf)
2207 esl.buf[eoldlen + 1] = emask & 0xff; 1957 esl[eoldlen + 1] = emask & 0xff;
2208 else 1958 else
2209 esl.len = eoldlen; 1959 esl.reset (eoldlen);
2210 } /* else this is a viewable space */ 1960 } /* else this is a viewable space */
2211 } /* for x loop */ 1961 } /* for x loop */
2212 } /* for y loop */ 1962 } /* for y loop */
2213 1963
2214 /* Verify that we in fact do need to send this */ 1964 /* Verify that we in fact do need to send this */
2215 if (socket.ext_mapinfos) 1965 if (socket.ext_mapinfos)
2216 { 1966 {
2217 if (!(sl.len > startlen || socket.sent_scroll)) 1967 if (!(sl.length () > startlen || socket.sent_scroll))
2218 { 1968 {
2219 /* No map data will follow, so don't say the client 1969 /* No map data will follow, so don't say the client
2220 * it doesn't need draw! 1970 * it doesn't need draw!
2221 */ 1971 */
2222 ewhatflag &= (~EMI_NOREDRAW); 1972 ewhatflag &= (~EMI_NOREDRAW);
2223 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1973 esl[ewhatstart + 1] = ewhatflag & 0xff;
2224 } 1974 }
2225 1975
2226 if (esl.len > estartlen) 1976 if (esl.length () > estartlen)
2227 Send_With_Handling (&socket, &esl); 1977 socket.send_packet (esl);
2228
2229 free (esl.buf);
2230 } 1978 }
2231 1979
2232 if (sl.len > startlen || socket.sent_scroll) 1980 if (sl.length () > startlen || socket.sent_scroll)
2233 { 1981 {
2234 Send_With_Handling (&socket, &sl); 1982 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 1983 socket.sent_scroll = 0;
2236 } 1984 }
2237
2238 free (sl.buf);
2239} 1985}
2240 1986
2241/** 1987/**
2242 * Draws client map. 1988 * Draws client map.
2243 */ 1989 */
… …
2267 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2268 return; 2014 return;
2269 2015
2270 memset (&newmap, 0, sizeof (struct Map)); 2016 memset (&newmap, 0, sizeof (struct Map));
2271 2017
2272 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++)
2273 { 2019 {
2274 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++)
2275 { 2021 {
2276 ax = i; 2022 ax = i;
2277 ay = j; 2023 ay = j;
2278 m = pm; 2024 m = pm;
2279 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026
2280 if (mflags & P_OUT_OF_MAP) 2027 if (mflags & P_OUT_OF_MAP)
2281 continue; 2028 continue;
2029
2282 if (mflags & P_NEED_UPDATE) 2030 if (mflags & P_NEED_UPDATE)
2283 update_position (m, ax, ay); 2031 update_position (m, ax, ay);
2032
2284 /* 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
2285 * just to reload it. This should really call something like 2034 * just to reload it. This should really call something like
2286 * swap_map, but this is much more efficient and 'good enough' 2035 * swap_map, but this is much more efficient and 'good enough'
2287 */ 2036 */
2288 if (mflags & P_NEW_MAP) 2037 if (mflags & P_NEW_MAP)
… …
2294 { 2043 {
2295 update_los (pl); 2044 update_los (pl);
2296 pl->contr->do_los = 0; 2045 pl->contr->do_los = 0;
2297 } 2046 }
2298 2047
2299 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2300 {
2301 /* Big maps need a different drawing mechanism to work */ 2048 /* Big maps need a different drawing mechanism to work */
2302 draw_client_map1 (pl); 2049 draw_client_map1 (pl);
2303 return;
2304 }
2305
2306 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2307 {
2308 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2309 }
2310
2311 /* j and i are the y and x coordinates of the real map (which is
2312 * basically some number of spaces around the player)
2313 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2314 * left corner) and are thus disconnected from the map values.
2315 * Subtract 1 from the max values so that we properly handle cases where
2316 * player has specified an even map. Otherwise, we try to send them too
2317 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2318 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2319 * odd, this still works fine.
2320 */
2321 ay = 0;
2322 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2323 {
2324 ax = 0;
2325 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2326 {
2327
2328 d = pl->contr->blocked_los[ax][ay];
2329 /* note the out_of_map and d>3 checks are both within the same
2330 * negation check.
2331 */
2332 nx = i;
2333 ny = j;
2334 m = get_map_from_coord (pm, &nx, &ny);
2335 if (m && d < 4)
2336 {
2337 face = GET_MAP_FACE (m, nx, ny, 0);
2338 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2339 floor = GET_MAP_FACE (m, nx, ny, 2);
2340
2341 /* If all is blank, send a blank face. */
2342 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2343 {
2344 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2345 }
2346 else
2347 { /* actually have something interesting */
2348 /* send the darkness mask, if any. */
2349 if (d && pl->contr->socket.darkness)
2350 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2351
2352 if (face && face != blank_face)
2353 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2354 if (floor2 && floor2 != blank_face)
2355 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2356 if (floor && floor != blank_face)
2357 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2358 }
2359 } /* Is a valid space */
2360 }
2361 }
2362 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2363
2364 check_map_change (pl->contr);
2365} 2050}
2366 2051
2367 2052
2368/*****************************************************************************/ 2053/*****************************************************************************/
2369 2054
… …
2375 2060
2376/*****************************************************************************/ 2061/*****************************************************************************/
2377void 2062void
2378send_plugin_custom_message (object *pl, char *buf) 2063send_plugin_custom_message (object *pl, char *buf)
2379{ 2064{
2380 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2065 pl->contr->socket->send_packet (buf);
2381} 2066}
2382 2067
2383/** 2068/**
2384 * This sends the skill number to name mapping. We ignore 2069 * This sends the skill number to name mapping. We ignore
2385 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2386 */ 2071 */
2387void 2072void
2388send_skill_info (NewSocket * ns, char *params) 2073send_skill_info (client *ns, char *params)
2389{ 2074{
2390 SockList sl; 2075 packet sl;
2391 int i; 2076 sl << "replyinfo skill_info\n";
2392 2077
2393 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2394 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2395 for (i = 1; i < NUM_SKILLS; i++) 2078 for (int i = 1; i < NUM_SKILLS; i++)
2396 { 2079 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2397 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2080
2398 }
2399 sl.len = strlen ((char *) sl.buf);
2400 if (sl.len >= MAXSOCKBUF) 2081 if (sl.length () >= MAXSOCKBUF)
2401 { 2082 {
2402 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2083 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2403 fatal (0); 2084 fatal (0);
2404 } 2085 }
2405 Send_With_Handling (ns, &sl); 2086
2406 free (sl.buf); 2087 ns->send_packet (sl);
2407} 2088}
2408 2089
2409/** 2090/**
2410 * This sends the spell path to name mapping. We ignore 2091 * This sends the spell path to name mapping. We ignore
2411 * the params - we always send the same info no matter what. 2092 * the params - we always send the same info no matter what.
2412 */ 2093 */
2413void 2094void
2414send_spell_paths (NewSocket * ns, char *params) 2095send_spell_paths (client * ns, char *params)
2415{ 2096{
2416 SockList sl; 2097 packet sl;
2417 int i;
2418 2098
2419 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2099 sl << "replyinfo spell_paths\n";
2420 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2100
2421 for (i = 0; i < NRSPELLPATHS; i++) 2101 for (int i = 0; i < NRSPELLPATHS; i++)
2422 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]);
2423 sl.len = strlen ((char *) sl.buf); 2103
2424 if (sl.len >= MAXSOCKBUF) 2104 if (sl.length () >= MAXSOCKBUF)
2425 { 2105 {
2426 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2106 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2427 fatal (0); 2107 fatal (0);
2428 } 2108 }
2429 Send_With_Handling (ns, &sl); 2109
2430 free (sl.buf); 2110 ns->send_packet (sl);
2431} 2111}
2432 2112
2433/** 2113/**
2434 * 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.
2435 * 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
2436 */ 2116 */
2437void 2117void
2438esrv_update_spells (player *pl) 2118esrv_update_spells (player *pl)
2439{ 2119{
2440 SockList sl;
2441 int flags = 0;
2442 object *spell;
2443
2444 if (!pl->socket.monitor_spells) 2120 if (!pl->socket->monitor_spells)
2445 return; 2121 return;
2122
2446 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2123 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2447 { 2124 {
2448 if (spell->type == SPELL) 2125 if (spell->type == SPELL)
2449 { 2126 {
2127 int flags = 0;
2128
2450 /* check if we need to update it */ 2129 /* check if we need to update it */
2451 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))
2452 { 2131 {
2453 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);
2454 flags |= UPD_SP_MANA; 2133 flags |= UPD_SP_MANA;
2455 } 2134 }
2135
2456 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))
2457 { 2137 {
2458 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);
2459 flags |= UPD_SP_GRACE; 2139 flags |= UPD_SP_GRACE;
2460 } 2140 }
2141
2461 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))
2462 { 2143 {
2463 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);
2464 flags |= UPD_SP_DAMAGE; 2145 flags |= UPD_SP_DAMAGE;
2465 } 2146 }
2147
2466 if (flags != 0) 2148 if (flags)
2467 { 2149 {
2468 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2150 packet sl;
2469 strcpy ((char *) sl.buf, "updspell ");
2470 sl.len = strlen ((char *) sl.buf);
2471 2151
2152 sl << "updspell "
2153 << uint8 (flags)
2472 sl << uint8 (flags) << uint32 (spell->count); 2154 << uint32 (spell->count);
2473 2155
2474 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2475 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2476 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2477 2159
2478 flags = 0; 2160 pl->socket->send_packet (sl);
2479 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf);
2481 } 2161 }
2482 } 2162 }
2483 } 2163 }
2484} 2164}
2485 2165
2486void 2166void
2487esrv_remove_spell (player *pl, object *spell) 2167esrv_remove_spell (player *pl, object *spell)
2488{ 2168{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2169 if (!pl->socket->monitor_spells)
2492 return; 2170 return;
2171
2493 if (!pl || !spell || spell->env != pl->ob) 2172 if (!pl || !spell || spell->env != pl->ob)
2494 { 2173 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2174 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2175 return;
2497 } 2176 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2499 strcpy ((char *) sl.buf, "delspell ");
2500 sl.len = strlen ((char *) sl.buf);
2501 2177
2178 packet sl;
2179
2180 sl << "delspell "
2502 sl << uint32 (spell->count); 2181 << uint32 (spell->count);
2503 2182
2504 Send_With_Handling (&pl->socket, &sl); 2183 pl->socket->send_packet (sl);
2505 free (sl.buf);
2506} 2184}
2507 2185
2508/* 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. */
2509static void 2187static void
2510append_spell (player *pl, SockList &sl, object *spell) 2188append_spell (player *pl, packet &sl, object *spell)
2511{ 2189{
2512 int len, i, skill = 0; 2190 int len, i, skill = 0;
2513 2191
2514 if (!(spell->name)) 2192 if (!(spell->name))
2515 { 2193 {
… …
2552 * all spells in the player's inventory. 2230 * all spells in the player's inventory.
2553 */ 2231 */
2554void 2232void
2555esrv_add_spells (player *pl, object *spell) 2233esrv_add_spells (player *pl, object *spell)
2556{ 2234{
2557 SockList sl;
2558
2559 if (!pl) 2235 if (!pl)
2560 { 2236 {
2561 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");
2562 return; 2238 return;
2563 } 2239 }
2240
2564 if (!pl->socket.monitor_spells) 2241 if (!pl->socket->monitor_spells)
2565 return; 2242 return;
2566 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2243
2567 strcpy ((char *) sl.buf, "addspell "); 2244 packet sl;
2568 sl.len = strlen ((char *) sl.buf); 2245 sl << "addspell ";
2246
2569 if (!spell) 2247 if (!spell)
2570 { 2248 {
2571 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2572 { 2250 {
2573 /* were we to simply keep appending data here, we could exceed 2251 /* were we to simply keep appending data here, we could exceed
… …
2584 * like it will fix this 2262 * like it will fix this
2585 */ 2263 */
2586 if (spell->type != SPELL) 2264 if (spell->type != SPELL)
2587 continue; 2265 continue;
2588 2266
2589 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))))
2590 { 2268 {
2591 Send_With_Handling (&pl->socket, &sl); 2269 pl->socket->send_packet (sl);
2592 strcpy ((char *) sl.buf, "addspell "); 2270
2593 sl.len = strlen ((char *) sl.buf); 2271 sl.reset ();
2272 sl << "addspell ";
2594 } 2273 }
2595 2274
2596 append_spell (pl, sl, spell); 2275 append_spell (pl, sl, spell);
2597 } 2276 }
2598 } 2277 }
… …
2602 return; 2281 return;
2603 } 2282 }
2604 else 2283 else
2605 append_spell (pl, sl, spell); 2284 append_spell (pl, sl, spell);
2606 2285
2607 if (sl.len >= MAXSOCKBUF) 2286 if (sl.length () >= MAXSOCKBUF)
2608 { 2287 {
2609 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2610 fatal (0); 2289 fatal (0);
2611 } 2290 }
2612 2291
2613 /* finally, we can send the packet */ 2292 /* finally, we can send the packet */
2614 Send_With_Handling (&pl->socket, &sl); 2293 pl->socket->send_packet (sl);
2615 free (sl.buf);
2616} 2294}
2295

Diff Legend

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