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

Diff Legend

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