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.32 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.47 by root, Wed Dec 20 01:19:11 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 SockList sl (MAXSOCKBUF);
108
109 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl);
111 sl.free ();
112 }
113 94
114 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
115 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
116 * 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
117 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
157} 138}
158 139
159static void 140static void
160clear_map (player *pl) 141clear_map (player *pl)
161{ 142{
162 NewSocket & socket = pl->socket;
163
164 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
165 144
166 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
167 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
168 147
169 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
170 socket.look_position = 0;
171} 149}
172 150
173/** check for map change and send new map data */ 151/** check for map change and send new map data */
174static void 152static void
175check_map_change (player *pl) 153check_map_change (player *pl)
176{ 154{
177 NewSocket & socket = pl->socket; 155 client &socket = *pl->socket;
178 object *ob = pl->ob; 156 object *ob = pl->ob;
179 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
180 158
181 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
182 { 160 {
… …
216 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
217 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
218 else 196 else
219 { 197 {
220 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
221 socket.update_look = 1; 199 socket.floorbox_reset ();
222 socket.look_position = 0;
223 } 200 }
224 } 201 }
225 202
226 socket.current_x = ob->x; 203 socket.current_x = ob->x;
227 socket.current_y = ob->y; 204 socket.current_y = ob->y;
228} 205}
229 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
230void 251void
231ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
232{ 253{
233 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
234} 261}
235 262
236void 263void
237MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
238{ 265{
… …
253 buf += 8; 280 buf += 8;
254 281
255 // initial map and its origin 282 // initial map and its origin
256 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
257 sint16 dx, dy; 284 sint16 dx, dy;
258 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->socket->mapx / 2 - pl->ob->x;
259 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->socket->mapy / 2 - pl->ob->y;
260 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
261 288
262 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
263 { 290 {
264 int dir = *buf++; 291 int dir = *buf++;
… …
315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316 } 343 }
317 else 344 else
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319 346
320 pl->socket.send_packet (bigbuf); 347 pl->socket->send_packet (bigbuf);
321} 348}
322 349
323/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
324void 351void
325SetUp (char *buf, int len, NewSocket * ns) 352SetUp (char *buf, int len, client * ns)
326{ 353{
327 int s, slen; 354 int s, slen;
328 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
329 356
330 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
540 * This is what takes care of it. We tell the client how things worked out. 567 * This is what takes care of it. We tell the client how things worked out.
541 * I am not sure if this file is the best place for this function. however, 568 * I am not sure if this file is the best place for this function. however,
542 * it either has to be here or init_sockets needs to be exported. 569 * it either has to be here or init_sockets needs to be exported.
543 */ 570 */
544void 571void
545AddMeCmd (char *buf, int len, NewSocket * ns) 572AddMeCmd (char *buf, int len, client * ns)
546{ 573{
547 Settings oldsettings;
548
549 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 574 if (ns->status != Ns_Add || add_player (ns))
551 ns->send_packet ("addme_failed"); 575 ns->send_packet ("addme_failed");
552 else 576 else
553 {
554 /* Basically, the add_player copies the socket structure into
555 * the player structure, so this one (which is from init_sockets)
556 * is not needed anymore. The write below should still work, as the
557 * stuff in ns is still relevant.
558 */
559 ns->send_packet ("addme_success"); 577 ns->send_packet ("addme_success");
560 socket_info.nconns--;
561 ns->status = Ns_Avail;
562 }
563
564 settings = oldsettings;
565} 578}
566 579
567/** Reply to ExtendedInfos command */ 580/** Reply to ExtendedInfos command */
568void 581void
569ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 582ToggleExtendedInfos (char *buf, int len, client * ns)
570{ 583{
571 char cmdback[MAX_BUF]; 584 char cmdback[MAX_BUF];
572 char command[50]; 585 char command[50];
573 int info, nextinfo; 586 int info, nextinfo;
574 587
… …
625#define MSG_TYPE_MONUMENT 5 638#define MSG_TYPE_MONUMENT 5
626#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 639#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627 640
628/** Reply to ExtendedInfos command */ 641/** Reply to ExtendedInfos command */
629void 642void
630ToggleExtendedText (char *buf, int len, NewSocket * ns) 643ToggleExtendedText (char *buf, int len, client * ns)
631{ 644{
632 char cmdback[MAX_BUF]; 645 char cmdback[MAX_BUF];
633 char temp[10]; 646 char temp[10];
634 char command[50]; 647 char command[50];
635 int info, nextinfo, i, flag; 648 int info, nextinfo, i, flag;
… …
686 * a piece of data from us that we know the client wants. So 699 * a piece of data from us that we know the client wants. So
687 * if we know the client wants it, might as well push it to the 700 * if we know the client wants it, might as well push it to the
688 * client. 701 * client.
689 */ 702 */
690static void 703static void
691SendSmooth (NewSocket * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
692{ 705{
693 uint16 smoothface; 706 uint16 smoothface;
694 707
695 /* If we can't find a face, return and set it so we won't try to send this 708 /* If we can't find a face, return and set it so we won't try to send this
696 * again. 709 * again.
… …
706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707 esrv_send_face (ns, smoothface, 0); 720 esrv_send_face (ns, smoothface, 0);
708 721
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 723
711 SockList sl (MAXSOCKBUF); 724 packet sl ("smooth");
712 725
713 sl << "smooth "
714 << uint16 (face) 726 sl << uint16 (face)
715 << uint16 (smoothface); 727 << uint16 (smoothface);
716 728
717 Send_With_Handling (ns, &sl); 729 ns->send_packet (sl);
718 sl.free ();
719} 730}
720 731
721 /** 732 /**
722 * Tells client the picture it has to use 733 * Tells client the picture it has to use
723 * to smooth a picture number given as argument. 734 * to smooth a picture number given as argument.
724 */ 735 */
725void 736void
726AskSmooth (char *buf, int len, NewSocket * ns) 737AskSmooth (char *buf, int len, client *ns)
727{ 738{
728 uint16 facenbr; 739 SendSmooth (ns, atoi (buf));
729
730 facenbr = atoi (buf);
731 SendSmooth (ns, facenbr);
732} 740}
733 741
734/** 742/**
735 * This handles the general commands from the client (ie, north, fire, cast, 743 * This handles the general commands from the client (ie, north, fire, cast,
736 * etc.) 744 * etc.)
737 */ 745 */
738void 746void
739PlayerCmd (char *buf, int len, player *pl) 747PlayerCmd (char *buf, int len, player *pl)
740{ 748{
741
742 /* The following should never happen with a proper or honest client.
743 * Therefore, the error message doesn't have to be too clear - if
744 * someone is playing with a hacked/non working client, this gives them
745 * an idea of the problem, but they deserve what they get
746 */
747 if (pl->state != ST_PLAYING)
748 {
749 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
750 return;
751 }
752 /* Check if there is a count. In theory, a zero count could also be 749 /* Check if there is a count. In theory, a zero count could also be
753 * sent, so check for that also. 750 * sent, so check for that also.
754 */ 751 */
755 if (atoi (buf) || buf[0] == '0') 752 if (atoi (buf) || buf[0] == '0')
756 { 753 {
757 pl->count = atoi ((char *) buf); 754 pl->count = atoi ((char *) buf);
755
758 buf = strchr (buf, ' '); /* advance beyond the numbers */ 756 buf = strchr (buf, ' '); /* advance beyond the numbers */
759 if (!buf) 757 if (!buf)
760 {
761#ifdef ESRV_DEBUG
762 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
763#endif
764 return; 758 return;
765 } 759
766 buf++; 760 buf++;
767 } 761 }
768 /* This should not happen anymore. */ 762
769 if (pl->ob->speed_left < -1.0)
770 {
771 LOG (llevError, "Player has negative time - shouldn't do command.\n");
772 }
773 /* In c_new.c */
774 execute_newserver_command (pl->ob, (char *) buf); 763 execute_newserver_command (pl->ob, (char *) buf);
764
775 /* Perhaps something better should be done with a left over count. 765 /* Perhaps something better should be done with a left over count.
776 * Cleaning up the input should probably be done first - all actions 766 * Cleaning up the input should probably be done first - all actions
777 * for the command that issued the count should be done before any other 767 * for the command that issued the count should be done before any other
778 * commands. 768 * commands.
779 */ 769 */
780
781 pl->count = 0; 770 pl->count = 0;
782
783} 771}
784 772
785 773
786/** 774/**
787 * This handles the general commands from the client (ie, north, fire, cast, 775 * This handles the general commands from the client (ie, north, fire, cast,
788 * etc.). It is a lot like PlayerCmd above, but is called with the 776 * etc.). It is a lot like PlayerCmd above, but is called with the
789 * 'ncom' method which gives more information back to the client so it 777 * 'ncom' method which gives more information back to the client so it
790 * can throttle. 778 * can throttle.
791 */ 779 */
792void 780void
793NewPlayerCmd (uint8 * buf, int len, player *pl) 781NewPlayerCmd (char *buf, int len, player *pl)
794{ 782{
795 int time, repeat;
796 char command[MAX_BUF];
797 short packet;
798
799 if (len < 7) 783 if (len <= 6)
800 { 784 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 785 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 786 return;
803 } 787 }
804 788
805 packet = net_uint16 (buf); 789 uint16 cmdid = net_uint16 ((uint8 *)buf);
806 repeat = net_uint32 (buf + 2); 790 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
807 791
808 /* -1 is special - no repeat, but don't update */ 792 /* -1 is special - no repeat, but don't update */
809 if (repeat != -1) 793 if (repeat != -1)
810 pl->count = repeat; 794 pl->count = repeat;
811 795
812 if ((len - 4) >= MAX_BUF) 796 buf += 6; //len -= 6;
813 len = MAX_BUF - 5;
814 797
815 strncpy ((char *) command, (char *) buf + 6, len - 4);
816 command[len - 4] = '\0';
817
818 /* The following should never happen with a proper or honest client.
819 * Therefore, the error message doesn't have to be too clear - if
820 * someone is playing with a hacked/non working client, this gives them
821 * an idea of the problem, but they deserve what they get
822 */
823 if (pl->state != ST_PLAYING)
824 {
825 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
826 return;
827 }
828
829 /* This should not happen anymore. */
830 if (pl->ob->speed_left < -1.0)
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); 798 execute_newserver_command (pl->ob, buf);
799
835 /* Perhaps something better should be done with a left over count. 800 /* Perhaps something better should be done with a left over count.
836 * Cleaning up the input should probably be done first - all actions 801 * 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 802 * for the command that issued the count should be done before any other
838 * commands. 803 * commands.
839 */ 804 */
840 pl->count = 0; 805 pl->count = 0;
841 806
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
842 if (FABS (pl->ob->speed) < 0.001) 808 int time = FABS (pl->ob->speed) < 0.001
843 time = MAX_TIME * 100; 809 ? time = MAX_TIME * 100
844 else
845 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 810 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
846 811
847 /* Send confirmation of command execution now */ 812 /* Send confirmation of command execution now */
848 813 packet sl ("comc");
849 SockList sl (MAXSOCKBUF);
850 sl << "comc " << uint16 (packet) << uint32 (time); 814 sl << uint16 (cmdid) << uint32 (time);
851 Send_With_Handling (&pl->socket, &sl); 815 pl->socket->send_packet (sl);
852 sl.free ();
853} 816}
854 817
855 818
856/** This is a reply to a previous query. */ 819/** This is a reply to a previous query. */
857void 820void
858ReplyCmd (char *buf, int len, player *pl) 821ReplyCmd (char *buf, int len, player *pl)
859{ 822{
860 /* This is to synthesize how the data would be stored if it 823 /* This is to synthesize how the data would be stored if it
861 * was normally entered. A bit of a hack, and should be cleaned up 824 * was normally entered. A bit of a hack, and should be cleaned up
862 * once all the X11 code is removed from the server. 825 * once all the X11 code is removed from the server.
863 * 826 *
864 * We pass 13 to many of the functions because this way they 827 * We pass 13 to many of the functions because this way they
865 * think it was the carriage return that was entered, and the 828 * think it was the carriage return that was entered, and the
866 * function then does not try to do additional input. 829 * function then does not try to do additional input.
… …
869 832
870 /* this avoids any hacking here */ 833 /* this avoids any hacking here */
871 834
872 switch (pl->state) 835 switch (pl->state)
873 { 836 {
874 case ST_PLAYING: 837 case ST_PLAYING:
875 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 838 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
876 break; 839 break;
877 840
878 case ST_PLAY_AGAIN: 841 case ST_PLAY_AGAIN:
879 /* We can check this for return value (2==quit). Maybe we 842 /* We can check this for return value (2==quit). Maybe we
880 * should, and do something appropriate? 843 * should, and do something appropriate?
881 */ 844 */
882 receive_play_again (pl->ob, buf[0]); 845 receive_play_again (pl->ob, buf[0]);
883 break; 846 break;
884 847
885 case ST_ROLL_STAT: 848 case ST_ROLL_STAT:
886 key_roll_stat (pl->ob, buf[0]); 849 key_roll_stat (pl->ob, buf[0]);
887 break; 850 break;
888 851
889 case ST_CHANGE_CLASS: 852 case ST_CHANGE_CLASS:
890 853
891 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
892 break; 855 break;
893 856
894 case ST_CONFIRM_QUIT: 857 case ST_CONFIRM_QUIT:
895 key_confirm_quit (pl->ob, buf[0]); 858 key_confirm_quit (pl->ob, buf[0]);
896 break; 859 break;
897 860
898 case ST_CONFIGURE: 861 case ST_CONFIGURE:
899 LOG (llevError, "In client input handling, but into configure state\n"); 862 LOG (llevError, "In client input handling, but into configure state\n");
900 pl->state = ST_PLAYING; 863 pl->state = ST_PLAYING;
901 break; 864 break;
902 865
903 case ST_GET_NAME: 866 case ST_GET_NAME:
904 receive_player_name (pl->ob, 13); 867 receive_player_name (pl->ob, 13);
905 break; 868 break;
906 869
907 case ST_GET_PASSWORD: 870 case ST_GET_PASSWORD:
908 case ST_CONFIRM_PASSWORD: 871 case ST_CONFIRM_PASSWORD:
909 receive_player_password (pl->ob, 13); 872 receive_player_password (pl->ob, 13);
910 break; 873 break;
911 874
912 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 875 case ST_GET_PARTY_PASSWORD: /* Get password for party */
913 receive_party_password (pl->ob, 13); 876 receive_party_password (pl->ob, 13);
914 break; 877 break;
915 878
916 default: 879 default:
917 LOG (llevError, "Unknown input state: %d\n", pl->state); 880 LOG (llevError, "Unknown input state: %d\n", pl->state);
918 } 881 }
919} 882}
920 883
921/** 884/**
922 * Client tells its version. If there is a mismatch, we close the 885 * Client tells its version. If there is a mismatch, we close the
… …
924 * something older than the server. If we assume the client will be 887 * something older than the server. If we assume the client will be
925 * backwards compatible, having it be a later version should not be a 888 * backwards compatible, having it be a later version should not be a
926 * problem. 889 * problem.
927 */ 890 */
928void 891void
929VersionCmd (char *buf, int len, NewSocket * ns) 892VersionCmd (char *buf, int len, client * ns)
930{ 893{
931 char *cp;
932 char version_warning[256];
933
934 if (!buf) 894 if (!buf)
935 { 895 {
936 LOG (llevError, "CS: received corrupted version command\n"); 896 LOG (llevError, "CS: received corrupted version command\n");
937 return; 897 return;
938 } 898 }
939 899
940 ns->cs_version = atoi (buf); 900 ns->cs_version = atoi (buf);
941 ns->sc_version = ns->cs_version; 901 ns->sc_version = ns->cs_version;
902
903 LOG (llevDebug, "connection from client <%s>\n", buf);
904
905
906 //TODO: should log here just for statistics
907
942 if (VERSION_CS != ns->cs_version) 908 //if (VERSION_CS != ns->cs_version)
943 { 909 // unchecked;
944#ifdef ESRV_DEBUG 910
945 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
946#endif
947 }
948 cp = strchr (buf + 1, ' '); 911 char *cp = strchr (buf + 1, ' ');
949 if (!cp) 912 if (!cp)
950 return; 913 return;
914
951 ns->sc_version = atoi (cp); 915 ns->sc_version = atoi (cp);
916
952 if (VERSION_SC != ns->sc_version) 917 //if (VERSION_SC != ns->sc_version)
953 { 918 // unchecked;
954#ifdef ESRV_DEBUG 919
955 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
956#endif
957 }
958 cp = strchr (cp + 1, ' '); 920 cp = strchr (cp + 1, ' ');
921
959 if (cp) 922 if (cp)
960 { 923 {
961 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 924 assign (ns->version, cp + 1);
962 925
963 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
964
965 /* This is first implementation - i skip all beta DX clients with it
966 * Add later stuff here for other clients
967 */
968
969 /* these are old dxclients */
970 /* Version 1024 added support for singular + plural name values -
971 * requiing this minimal value reduces complexity of that code, and it
972 * has been around for a long time.
973 */
974 if (ns->sc_version < 1026) 926 if (ns->sc_version < 1026)
975 { 927 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
976 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
977 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
978 ns->send_packet (version_warning);
979 }
980
981 } 929 }
982} 930}
983 931
984/** sound related functions. */ 932/** sound related functions. */
985
986void 933void
987SetSound (char *buf, int len, NewSocket * ns) 934SetSound (char *buf, int len, client * ns)
988{ 935{
989 ns->sound = atoi (buf); 936 ns->sound = atoi (buf);
990} 937}
991 938
992/** client wants the map resent */ 939/** client wants the map resent */
993 940
994void 941void
995MapRedrawCmd (char *buf, int len, player *pl) 942MapRedrawCmd (char *buf, int len, player *pl)
996{ 943{
997
998/* This function is currently disabled; just clearing the map state results in 944/* This function is currently disabled; just clearing the map state results in
999 * display errors. It should clear the cache and send a newmap command. 945 * display errors. It should clear the cache and send a newmap command.
1000 * Unfortunately this solution does not work because some client versions send 946 * Unfortunately this solution does not work because some client versions send
1001 * a mapredraw command after receiving a newmap command. 947 * a mapredraw command after receiving a newmap command.
1002 */ 948 */
1003#if 0
1004 /* Okay, this is MAJOR UGLY. but the only way I know how to
1005 * clear the "cache"
1006 */
1007 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1008 draw_client_map (pl->ob);
1009#endif
1010} 949}
1011 950
1012/** 951/**
1013 * Moves an object (typically, container to inventory). 952 * Moves an object (typically, container to inventory).
1014 * syntax is: move (to) (tag) (nrof) 953 * syntax is: move (to) (tag) (nrof)
… …
1017MoveCmd (char *buf, int len, player *pl) 956MoveCmd (char *buf, int len, player *pl)
1018{ 957{
1019 int vals[3], i; 958 int vals[3], i;
1020 959
1021 /* A little funky here. We only cycle for 2 records, because 960 /* A little funky here. We only cycle for 2 records, because
1022 * we obviously am not going to find a space after the third 961 * we obviously are not going to find a space after the third
1023 * record. Perhaps we should just replace this with a 962 * record. Perhaps we should just replace this with a
1024 * sscanf? 963 * sscanf?
1025 */ 964 */
1026 for (i = 0; i < 2; i++) 965 for (i = 0; i < 2; i++)
1027 { 966 {
1028 vals[i] = atoi (buf); 967 vals[i] = atoi (buf);
968
1029 if (!(buf = strchr (buf, ' '))) 969 if (!(buf = strchr (buf, ' ')))
1030 { 970 {
1031 LOG (llevError, "Incomplete move command: %s\n", buf); 971 LOG (llevError, "Incomplete move command: %s\n", buf);
1032 return; 972 return;
1033 } 973 }
974
1034 buf++; 975 buf++;
1035 } 976 }
977
1036 vals[2] = atoi (buf); 978 vals[2] = atoi (buf);
1037 979
1038/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 980/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1039 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1040} 982}
1041
1042
1043 983
1044/****************************************************************************** 984/******************************************************************************
1045 * 985 *
1046 * Start of commands the server sends to the client. 986 * Start of commands the server sends to the client.
1047 * 987 *
… …
1050/** 990/**
1051 * Asks the client to query the user. This way, the client knows 991 * Asks the client to query the user. This way, the client knows
1052 * it needs to send something back (vs just printing out a message) 992 * it needs to send something back (vs just printing out a message)
1053 */ 993 */
1054void 994void
1055send_query (NewSocket * ns, uint8 flags, char *text) 995send_query (client *ns, uint8 flags, char *text)
1056{ 996{
1057 char buf[MAX_BUF];
1058
1059 sprintf (buf, "query %d %s", flags, text ? text : ""); 997 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1060 ns->send_packet (buf);
1061} 998}
1062 999
1063#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1000#define AddIfInt64(Old,New,Type) if (Old != New) {\
1064 Old = New; \ 1001 Old = New; \
1065 sl << uint8 (Type) << uint64 (New); \ 1002 sl << uint8 (Type) << uint64 (New); \
… …
1095esrv_update_stats (player *pl) 1032esrv_update_stats (player *pl)
1096{ 1033{
1097 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1098 uint16 flags; 1035 uint16 flags;
1099 1036
1100 SockList sl (MAXSOCKBUF); 1037 packet sl ("stats");
1101 sl << "stats ";
1102 1038
1103 if (pl->ob != NULL) 1039 if (pl->ob)
1104 { 1040 {
1105 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);
1106 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);
1107 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);
1108 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);
… …
1115 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);
1116 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);
1117 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);
1118 } 1054 }
1119 1055
1120 if (pl->socket.exp64) 1056 if (pl->socket->exp64)
1121 {
1122 uint8 s;
1123
1124 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1125 {
1126 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)
1127 { 1059 {
1128 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1129 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1130 */ 1062 */
1131 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1132 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1133 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1134 1066
1135 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;
1136 } 1068 }
1137 }
1138 }
1139 1069
1140 if (pl->socket.exp64) 1070 if (pl->socket->exp64)
1141 { 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) }
1142 else 1072 else
1143 { 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) }
1144 1074
1145 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1158 if (pl->run_on) 1088 if (pl->run_on)
1159 flags |= SF_RUNON; 1089 flags |= SF_RUNON;
1160 1090
1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162 1092
1163 if (pl->socket.sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1164 { 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) }
1165 else 1095 else
1166 {
1167 int i;
1168
1169 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1170 { 1097 {
1171 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1172 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1173 continue; 1100 continue;
1174 1101
1175 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]);
1176 } 1103 }
1177 }
1178 1104
1179 if (pl->socket.monitor_spells) 1105 if (pl->socket->monitor_spells)
1180 { 1106 {
1181 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);
1182 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);
1183 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);
1184 } 1110 }
1185 1111
1186 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 */
1187 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1188 set_title (pl->ob, buf); 1114 set_title (pl->ob, buf);
1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1190 1116
1191 /* Only send it away if we have some actual data */ 1117 /* Only send it away if we have some actual data */
1192 if (sl.len > 6) 1118 if (sl.length () > 6)
1193 { 1119 pl->socket->send_packet (sl);
1194#ifdef ESRV_DEBUG
1195 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1196#endif
1197 Send_With_Handling (&pl->socket, &sl);
1198 }
1199
1200 sl.free ();
1201} 1120}
1202 1121
1203/** 1122/**
1204 * 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.
1205 */ 1124 */
1206void 1125void
1207esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1208{ 1127{
1209 pl->last_weight = weight; 1128 pl->last_weight = weight;
1210 1129
1211 SockList sl (MAXSOCKBUF); 1130 packet sl ("player");
1212 sl << "player ";
1213 1131
1214 sl << uint32 (pl->ob->count) 1132 sl << uint32 (pl->ob->count)
1215 << uint32 (weight) 1133 << uint32 (weight)
1216 << uint32 (pl->ob->face->number) 1134 << uint32 (pl->ob->face->number)
1217 << data8 (pl->ob->name); 1135 << data8 (pl->ob->name);
1218 1136
1219 Send_With_Handling (&pl->socket, &sl); 1137 pl->socket->send_packet (sl);
1220 sl.free ();
1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1138 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222} 1139}
1223 1140
1224/** 1141/**
1225 * Need to send an animation sequence to the client. 1142 * Need to send an animation sequence to the client.
… …
1227 * sent them the face yet (this can become quite costly in terms of 1144 * sent them the face yet (this can become quite costly in terms of
1228 * how much we are sending - on the other hand, this should only happen 1145 * how much we are sending - on the other hand, this should only happen
1229 * when the player logs in and picks stuff up. 1146 * when the player logs in and picks stuff up.
1230 */ 1147 */
1231void 1148void
1232esrv_send_animation (NewSocket * ns, short anim_num) 1149esrv_send_animation (client * ns, short anim_num)
1233{ 1150{
1234 int i;
1235
1236 /* Do some checking on the anim_num we got. Note that the animations 1151 /* Do some checking on the anim_num we got. Note that the animations
1237 * are added in contigous order, so if the number is in the valid 1152 * are added in contigous order, so if the number is in the valid
1238 * range, it must be a valid animation. 1153 * range, it must be a valid animation.
1239 */ 1154 */
1240 if (anim_num < 0 || anim_num > num_animations) 1155 if (anim_num < 0 || anim_num > num_animations)
1241 { 1156 {
1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1157 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1243 return; 1158 return;
1244 } 1159 }
1245 1160
1246 SockList sl (MAXSOCKBUF); 1161 packet sl ("anim");
1247 1162
1248 sl << "anim "
1249 << uint16 (anim_num) 1163 sl << uint16 (anim_num)
1250 << uint16 (0); /* flags - not used right now */ 1164 << uint16 (0); /* flags - not used right now */
1251 1165
1252 /* Build up the list of faces. Also, send any information (ie, the 1166 /* Build up the list of faces. Also, send any information (ie, the
1253 * the face itself) down to the client. 1167 * the face itself) down to the client.
1254 */ 1168 */
1255 for (i = 0; i < animations[anim_num].num_animations; i++) 1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1256 { 1170 {
1257 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1171 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1258 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1174 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1260 } 1175 }
1261 1176
1262 Send_With_Handling (ns, &sl); 1177 ns->send_packet (sl);
1263 sl.free ();
1264 1178
1265 ns->anims_sent[anim_num] = 1; 1179 ns->anims_sent[anim_num] = 1;
1266} 1180}
1267 1181
1268 1182
… …
1275/** 1189/**
1276 * This adds face_num to a map cell at x,y. If the client doesn't have 1190 * This adds face_num to a map cell at x,y. If the client doesn't have
1277 * the face yet, we will also send it. 1191 * the face yet, we will also send it.
1278 */ 1192 */
1279static void 1193static void
1280esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1194esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1281{ 1195{
1282 if (newmap->cells[x][y].count >= MAP_LAYERS) 1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1283 { 1197 {
1198 //TODO: one or the other, can't both have abort and return, verify and act
1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1199 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1285 return; 1200 return;
1286 abort (); 1201 abort ();
1287 } 1202 }
1288 1203
… …
1290 newmap->cells[x][y].count++; 1205 newmap->cells[x][y].count++;
1291 1206
1292 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1293 esrv_send_face (ns, face_num, 0); 1208 esrv_send_face (ns, face_num, 0);
1294} 1209}
1295
1296struct LayerCell
1297{
1298 uint16 xy;
1299 short face;
1300};
1301
1302struct MapLayer
1303{
1304 int count;
1305 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1306};
1307
1308/** Checkes if map cells have changed */
1309static int
1310mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1311{
1312 int k;
1313
1314 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1315 return 1;
1316 for (k = 0; k < newmap->cells[i][j].count; k++)
1317 {
1318 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1319 {
1320 return 1;
1321 }
1322 }
1323 return 0;
1324}
1325
1326/**
1327 * Basically, what this does is pack the data into layers.
1328 * cnum is the client number, cur is the the buffer we put all of
1329 * this data into. we return the end of the data. layers is
1330 * how many layers of data we should back.
1331 */
1332static uint8 *
1333compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1334{
1335 int x, y, k;
1336 int face;
1337 unsigned char *fcur;
1338 struct MapLayer layers[MAP_LAYERS];
1339
1340 for (k = 0; k < MAP_LAYERS; k++)
1341 layers[k].count = 0;
1342 fcur = cur;
1343 for (x = 0; x < ns->mapx; x++)
1344 {
1345 for (y = 0; y < ns->mapy; y++)
1346 {
1347 if (!mapcellchanged (ns, x, y, newmap))
1348 continue;
1349 if (newmap->cells[x][y].count == 0)
1350 {
1351 *cur = x * ns->mapy + y; /* mark empty space */
1352 cur++;
1353 continue;
1354 }
1355 for (k = 0; k < newmap->cells[x][y].count; k++)
1356 {
1357 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1358 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1359 layers[k].count++;
1360 }
1361 }
1362 }
1363 /* If no data, return now. */
1364 if (fcur == cur && layers[0].count == 0)
1365 return cur;
1366 *cur = 255; /* mark end of explicitly cleared cells */
1367 cur++;
1368 /* First pack by layers. */
1369 for (k = 0; k < numlayers; k++)
1370 {
1371 if (layers[k].count == 0)
1372 break; /* once a layer is entirely empty, no layer below it can
1373 have anything in it either */
1374 /* Pack by entries in thie layer */
1375 for (x = 0; x < layers[k].count;)
1376 {
1377 fcur = cur;
1378 *cur = layers[k].lcells[x].face >> 8;
1379 cur++;
1380 *cur = layers[k].lcells[x].face & 0xFF;
1381 cur++;
1382 face = layers[k].lcells[x].face;
1383 /* Now, we back the redundant data into 1 byte xy pairings */
1384 for (y = x; y < layers[k].count; y++)
1385 {
1386 if (layers[k].lcells[y].face == face)
1387 {
1388 *cur = (uint8) layers[k].lcells[y].xy;
1389 cur++;
1390 layers[k].lcells[y].face = -1;
1391 }
1392 }
1393 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1394 /* forward over the now redundant data */
1395 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1396 x++;
1397 }
1398 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1399 }
1400 return cur;
1401}
1402
1403static void
1404esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1405{
1406 static long frames, bytes, tbytes, tframes;
1407 char *cur;
1408
1409 SockList sl (MAXSOCKBUF);
1410 sl << "map ";
1411
1412 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1413 sl.len = cur - (char *) sl.buf;
1414
1415/* LOG(llevDebug, "Sending map command.\n");*/
1416
1417 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1418 {
1419 /* All of this is just accounting stuff */
1420 if (tframes > 100)
1421 tframes = tbytes = 0;
1422
1423 tframes++;
1424 frames++;
1425 tbytes += sl.len;
1426 bytes += sl.len;
1427 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1428 Send_With_Handling (ns, &sl);
1429 ns->sent_scroll = 0;
1430 }
1431
1432 sl.free ();
1433}
1434
1435 1210
1436/** Clears a map cell */ 1211/** Clears a map cell */
1437static void 1212static void
1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1213map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1439{ 1214{
… …
1450#define MAX_LAYERS 3 1225#define MAX_LAYERS 3
1451 1226
1452/* Using a global really isn't a good approach, but saves the over head of 1227/* Using a global really isn't a good approach, but saves the over head of
1453 * allocating and deallocating such a block of data each time run through, 1228 * allocating and deallocating such a block of data each time run through,
1454 * and saves the space of allocating this in the socket object when we only 1229 * and saves the space of allocating this in the socket object when we only
1455 * need it for this cycle. If the serve is ever threaded, this needs to be 1230 * need it for this cycle. If the server is ever threaded, this needs to be
1456 * re-examined. 1231 * re-examined.
1457 */ 1232 */
1458
1459static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1460 1234
1461/** 1235/**
1462 * Returns true if any of the heads for this 1236 * Returns true if any of the heads for this
1463 * space is set. Returns false if all are blank - this is used 1237 * space is set. Returns false if all are blank - this is used
1464 * for empty space checking. 1238 * for empty space checking.
1465 */ 1239 */
1466static inline int 1240static inline int
1467have_head (int ax, int ay) 1241have_head (int ax, int ay)
1468{ 1242{
1469
1470 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1243 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1471 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1244 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1472 return 1; 1245 return 1;
1246
1473 return 0; 1247 return 0;
1474} 1248}
1475 1249
1476/** 1250/**
1477 * check_head is a bit simplistic version of update_space below. 1251 * check_head is a bit simplistic version of update_space below.
1478 * basically, it only checks the that the head on space ax,ay at layer 1252 * basically, it only checks the that the head on space ax,ay at layer
1479 * needs to get sent - if so, it adds the data, sending the head 1253 * needs to get sent - if so, it adds the data, sending the head
1480 * if needed, and returning 1. If this no data needs to get 1254 * if needed, and returning 1. If this no data needs to get
1481 * sent, it returns zero. 1255 * sent, it returns zero.
1482 */ 1256 */
1483static int 1257static int
1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1485{ 1259{
1486 short face_num; 1260 short face_num;
1487 1261
1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1262 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1263 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1521 * numbers the spaces differently - I think this was a leftover from 1295 * numbers the spaces differently - I think this was a leftover from
1522 * the map command, where the faces stack up. Sinces that is no longer 1296 * the map command, where the faces stack up. Sinces that is no longer
1523 * the case, it seems to make more sense to have these layer values 1297 * the case, it seems to make more sense to have these layer values
1524 * actually match. 1298 * actually match.
1525 */ 1299 */
1526
1527static int 1300static int
1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1301update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529{ 1302{
1530 object *ob, *head; 1303 object *ob, *head;
1531 uint16 face_num; 1304 uint16 face_num;
1532 int bx, by, i; 1305 int bx, by, i;
1533 1306
… …
1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1519 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1747 * take. 1520 * take.
1748 */ 1521 */
1749 1522
1750static inline int 1523static inline int
1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1524update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1752{ 1525{
1753 object *ob; 1526 object *ob;
1754 int smoothlevel; /* old face_num; */ 1527 int smoothlevel; /* old face_num; */
1755 1528
1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1790 * Returns the size of a data for a map square as returned by 1563 * Returns the size of a data for a map square as returned by
1791 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1564 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792 * available. 1565 * available.
1793 */ 1566 */
1794int 1567int
1795getExtendedMapInfoSize (NewSocket * ns) 1568getExtendedMapInfoSize (client * ns)
1796{ 1569{
1797 int result = 0; 1570 int result = 0;
1798 1571
1799 if (ns->ext_mapinfos) 1572 if (ns->ext_mapinfos)
1800 { 1573 {
1801 if (ns->EMI_smooth) 1574 if (ns->EMI_smooth)
1802 result += 1; /*One byte for smoothlevel */ 1575 result += 1; /*One byte for smoothlevel */
1803 } 1576 }
1577
1804 return result; 1578 return result;
1805} 1579}
1806 1580
1807/** 1581/**
1808 * This function uses the new map1 protocol command to send the map 1582 * This function uses the new map1 protocol command to send the map
… …
1836 uint8 eentrysize; 1610 uint8 eentrysize;
1837 uint16 ewhatstart, ewhatflag; 1611 uint16 ewhatstart, ewhatflag;
1838 uint8 extendedinfos; 1612 uint8 extendedinfos;
1839 maptile *m; 1613 maptile *m;
1840 1614
1841 NewSocket &socket = pl->contr->socket; 1615 client &socket = *pl->contr->socket;
1842 1616
1843 check_map_change (pl->contr); 1617 check_map_change (pl->contr);
1844 1618
1845 SockList sl (MAXSOCKBUF);
1846 SockList esl (MAXSOCKBUF);
1847
1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620 packet esl;
1621
1849 startlen = sl.len; 1622 startlen = sl.length ();
1850 1623
1851 /*Extendedmapinfo structure initialisation */ 1624 /*Extendedmapinfo structure initialisation */
1852 if (socket.ext_mapinfos) 1625 if (socket.ext_mapinfos)
1853 { 1626 {
1854 extendedinfos = EMI_NOREDRAW; 1627 extendedinfos = EMI_NOREDRAW;
1855 1628
1856 if (socket.EMI_smooth) 1629 if (socket.EMI_smooth)
1857 extendedinfos |= EMI_SMOOTH; 1630 extendedinfos |= EMI_SMOOTH;
1858 1631
1859 ewhatstart = esl.len; 1632 ewhatstart = esl.length ();
1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1633 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861 could need to be taken away */ 1634 could need to be taken away */
1862 eentrysize = getExtendedMapInfoSize (&socket); 1635 eentrysize = getExtendedMapInfoSize (&socket);
1863 esl << "mapextended " 1636 esl << "mapextended "
1864 << uint8 (extendedinfos) 1637 << uint8 (extendedinfos)
1865 << uint8 (eentrysize); 1638 << uint8 (eentrysize);
1639
1866 estartlen = esl.len; 1640 estartlen = esl.length ();
1867 } 1641 }
1868 else 1642 else
1869 { 1643 {
1870 /* suppress compiler warnings */ 1644 /* suppress compiler warnings */
1871 ewhatstart = 0; 1645 ewhatstart = 0;
… …
1909 */ 1683 */
1910 if (ax >= socket.mapx || ay >= socket.mapy) 1684 if (ax >= socket.mapx || ay >= socket.mapy)
1911 { 1685 {
1912 int i, got_one; 1686 int i, got_one;
1913 1687
1914 oldlen = sl.len; 1688 oldlen = sl.length ();
1915 1689
1916 sl << uint16 (mask); 1690 sl << uint16 (mask);
1917 1691
1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1692 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1693 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1923 * actually need to send that - just the coordinates 1697 * actually need to send that - just the coordinates
1924 * with no faces tells the client to blank out the 1698 * with no faces tells the client to blank out the
1925 * space. 1699 * space.
1926 */ 1700 */
1927 got_one = 0; 1701 got_one = 0;
1928 for (i = oldlen + 2; i < sl.len; i++) 1702 for (i = oldlen + 2; i < sl.length (); i++)
1929 if (sl.buf[i]) 1703 if (sl[i])
1930 got_one = 1; 1704 got_one = 1;
1931 1705
1932 if (got_one && (mask & 0xf)) 1706 if (got_one && (mask & 0xf))
1933 sl.buf[oldlen + 1] = mask & 0xff; 1707 sl[oldlen + 1] = mask & 0xff;
1934 else 1708 else
1935 { /*either all faces blank, either no face at all */ 1709 { /*either all faces blank, either no face at all */
1936 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1710 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937 sl.len = oldlen + 2; 1711 sl.reset (oldlen + 2);
1938 else 1712 else
1939 sl.len = oldlen; 1713 sl.reset (oldlen);
1940 } 1714 }
1941 1715
1942 /*What concerns extendinfos, nothing to be done for now 1716 /*What concerns extendinfos, nothing to be done for now
1943 * (perhaps effects layer later) 1717 * (perhaps effects layer later)
1944 */ 1718 */
… …
1974 1748
1975 /* This block deals with spaces that are not visible for whatever 1749 /* This block deals with spaces that are not visible for whatever
1976 * reason. Still may need to send the head for this space. 1750 * reason. Still may need to send the head for this space.
1977 */ 1751 */
1978 1752
1979 oldlen = sl.len; 1753 oldlen = sl.length ();
1980 1754
1981 sl << uint16 (mask); 1755 sl << uint16 (mask);
1982 1756
1983 if (lastcell.count != -1) 1757 if (lastcell.count != -1)
1984 need_send = 1; 1758 need_send = 1;
… …
2004 1778
2005 map_clearcell (&lastcell, 0, 0, 0, count); 1779 map_clearcell (&lastcell, 0, 0, 0, count);
2006 } 1780 }
2007 1781
2008 if ((mask & 0xf) || need_send) 1782 if ((mask & 0xf) || need_send)
2009 sl.buf[oldlen + 1] = mask & 0xff; 1783 sl[oldlen + 1] = mask & 0xff;
2010 else 1784 else
2011 sl.len = oldlen; 1785 sl.reset (oldlen);
2012 } 1786 }
2013 else 1787 else
2014 { 1788 {
2015 /* In this block, the space is visible or there are head objects 1789 /* In this block, the space is visible or there are head objects
2016 * we need to send. 1790 * we need to send.
… …
2018 1792
2019 /* Rather than try to figure out what everything that we might 1793 /* Rather than try to figure out what everything that we might
2020 * need to send is, then form the packet after that, 1794 * need to send is, then form the packet after that,
2021 * we presume that we will in fact form a packet, and update 1795 * we presume that we will in fact form a packet, and update
2022 * the bits by what we do actually send. If we send nothing, 1796 * the bits by what we do actually send. If we send nothing,
2023 * we just back out sl.len to the old value, and no harm 1797 * we just back out sl.length () to the old value, and no harm
2024 * is done. 1798 * is done.
2025 * I think this is simpler than doing a bunch of checks to see 1799 * I think this is simpler than doing a bunch of checks to see
2026 * what if anything we need to send, setting the bits, then 1800 * what if anything we need to send, setting the bits, then
2027 * doing those checks again to add the real data. 1801 * doing those checks again to add the real data.
2028 */ 1802 */
2029 oldlen = sl.len; 1803 oldlen = sl.length ();
2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1804 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031 eoldlen = esl.len; 1805 eoldlen = esl.length ();
2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1806 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033 sl << uint16 (mask); 1807 sl << uint16 (mask);
2034 1808
2035 if (socket.ext_mapinfos) 1809 if (socket.ext_mapinfos)
2036 esl << uint16 (emask); 1810 esl << uint16 (emask);
… …
2044 mask |= 0x8; 1818 mask |= 0x8;
2045 1819
2046 if (socket.extmap) 1820 if (socket.extmap)
2047 { 1821 {
2048 *last_ext |= 0x80; 1822 *last_ext |= 0x80;
2049 last_ext = sl.buf + sl.len; 1823 last_ext = &sl[sl.length ()];
2050 sl << uint8 (d); 1824 sl << uint8 (d);
2051 } 1825 }
2052 else 1826 else
2053 sl << uint8 (255 - 64 * d); 1827 sl << uint8 (255 - 64 * d);
2054 } 1828 }
… …
2088 { 1862 {
2089 lastcell.stat_hp = stat_hp; 1863 lastcell.stat_hp = stat_hp;
2090 1864
2091 mask |= 0x8; 1865 mask |= 0x8;
2092 *last_ext |= 0x80; 1866 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1867 last_ext = &sl[sl.length ()];
2094 1868
2095 sl << uint8 (5) << uint8 (stat_hp); 1869 sl << uint8 (5) << uint8 (stat_hp);
2096 1870
2097 if (stat_width > 1) 1871 if (stat_width > 1)
2098 { 1872 {
2099 *last_ext |= 0x80; 1873 *last_ext |= 0x80;
2100 last_ext = sl.buf + sl.len; 1874 last_ext = &sl[sl.length ()];
2101 1875
2102 sl << uint8 (6) << uint8 (stat_width); 1876 sl << uint8 (6) << uint8 (stat_width);
2103 } 1877 }
2104 } 1878 }
2105 1879
… …
2107 { 1881 {
2108 lastcell.player = player; 1882 lastcell.player = player;
2109 1883
2110 mask |= 0x8; 1884 mask |= 0x8;
2111 *last_ext |= 0x80; 1885 *last_ext |= 0x80;
2112 last_ext = sl.buf + sl.len; 1886 last_ext = &sl[sl.length ()];
2113 1887
2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1888 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115 } 1889 }
2116 1890
2117 if (lastcell.flags != flags) 1891 if (lastcell.flags != flags)
2118 { 1892 {
2119 lastcell.flags = flags; 1893 lastcell.flags = flags;
2120 1894
2121 mask |= 0x8; 1895 mask |= 0x8;
2122 *last_ext |= 0x80; 1896 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len; 1897 last_ext = &sl[sl.length ()];
2124 1898
2125 sl << uint8 (8) << uint8 (flags); 1899 sl << uint8 (8) << uint8 (flags);
2126 } 1900 }
2127 } 1901 }
2128 1902
… …
2170 * space by checking the mask. If so, update the mask. 1944 * space by checking the mask. If so, update the mask.
2171 * if not, reset the len to that from before adding the mask 1945 * if not, reset the len to that from before adding the mask
2172 * value, so we don't send those bits. 1946 * value, so we don't send those bits.
2173 */ 1947 */
2174 if (mask & 0xf) 1948 if (mask & 0xf)
2175 sl.buf[oldlen + 1] = mask & 0xff; 1949 sl[oldlen + 1] = mask & 0xff;
2176 else 1950 else
2177 sl.len = oldlen; 1951 sl.reset (oldlen);
2178 1952
2179 if (emask & 0xf) 1953 if (emask & 0xf)
2180 esl.buf[eoldlen + 1] = emask & 0xff; 1954 esl[eoldlen + 1] = emask & 0xff;
2181 else 1955 else
2182 esl.len = eoldlen; 1956 esl.reset (eoldlen);
2183 } /* else this is a viewable space */ 1957 } /* else this is a viewable space */
2184 } /* for x loop */ 1958 } /* for x loop */
2185 } /* for y loop */ 1959 } /* for y loop */
2186 1960
2187 /* Verify that we in fact do need to send this */ 1961 /* Verify that we in fact do need to send this */
2188 if (socket.ext_mapinfos) 1962 if (socket.ext_mapinfos)
2189 { 1963 {
2190 if (!(sl.len > startlen || socket.sent_scroll)) 1964 if (!(sl.length () > startlen || socket.sent_scroll))
2191 { 1965 {
2192 /* No map data will follow, so don't say the client 1966 /* No map data will follow, so don't say the client
2193 * it doesn't need draw! 1967 * it doesn't need draw!
2194 */ 1968 */
2195 ewhatflag &= (~EMI_NOREDRAW); 1969 ewhatflag &= (~EMI_NOREDRAW);
2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1970 esl[ewhatstart + 1] = ewhatflag & 0xff;
2197 } 1971 }
2198 1972
2199 if (esl.len > estartlen) 1973 if (esl.length () > estartlen)
2200 Send_With_Handling (&socket, &esl); 1974 socket.send_packet (esl);
2201 } 1975 }
2202 1976
2203 if (sl.len > startlen || socket.sent_scroll) 1977 if (sl.length () > startlen || socket.sent_scroll)
2204 { 1978 {
2205 Send_With_Handling (&socket, &sl); 1979 socket.send_packet (sl);
2206 socket.sent_scroll = 0; 1980 socket.sent_scroll = 0;
2207 } 1981 }
2208
2209 sl.free ();
2210 esl.free ();
2211} 1982}
2212 1983
2213/** 1984/**
2214 * Draws client map. 1985 * Draws client map.
2215 */ 1986 */
… …
2239 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2010 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240 return; 2011 return;
2241 2012
2242 memset (&newmap, 0, sizeof (struct Map)); 2013 memset (&newmap, 0, sizeof (struct Map));
2243 2014
2244 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2015 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2245 { 2016 {
2246 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2017 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2247 { 2018 {
2248 ax = i; 2019 ax = i;
2249 ay = j; 2020 ay = j;
2250 m = pm; 2021 m = pm;
2251 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2022 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023
2252 if (mflags & P_OUT_OF_MAP) 2024 if (mflags & P_OUT_OF_MAP)
2253 continue; 2025 continue;
2026
2254 if (mflags & P_NEED_UPDATE) 2027 if (mflags & P_NEED_UPDATE)
2255 update_position (m, ax, ay); 2028 update_position (m, ax, ay);
2029
2256 /* If a map is visible to the player, we don't want to swap it out 2030 /* If a map is visible to the player, we don't want to swap it out
2257 * just to reload it. This should really call something like 2031 * just to reload it. This should really call something like
2258 * swap_map, but this is much more efficient and 'good enough' 2032 * swap_map, but this is much more efficient and 'good enough'
2259 */ 2033 */
2260 if (mflags & P_NEW_MAP) 2034 if (mflags & P_NEW_MAP)
… …
2266 { 2040 {
2267 update_los (pl); 2041 update_los (pl);
2268 pl->contr->do_los = 0; 2042 pl->contr->do_los = 0;
2269 } 2043 }
2270 2044
2271 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272 {
2273 /* Big maps need a different drawing mechanism to work */ 2045 /* Big maps need a different drawing mechanism to work */
2274 draw_client_map1 (pl); 2046 draw_client_map1 (pl);
2275 return;
2276 }
2277
2278 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2279 {
2280 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2281 }
2282
2283 /* j and i are the y and x coordinates of the real map (which is
2284 * basically some number of spaces around the player)
2285 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2286 * left corner) and are thus disconnected from the map values.
2287 * Subtract 1 from the max values so that we properly handle cases where
2288 * player has specified an even map. Otherwise, we try to send them too
2289 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2290 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2291 * odd, this still works fine.
2292 */
2293 ay = 0;
2294 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2295 {
2296 ax = 0;
2297 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2298 {
2299
2300 d = pl->contr->blocked_los[ax][ay];
2301 /* note the out_of_map and d>3 checks are both within the same
2302 * negation check.
2303 */
2304 nx = i;
2305 ny = j;
2306 m = get_map_from_coord (pm, &nx, &ny);
2307 if (m && d < 4)
2308 {
2309 face = GET_MAP_FACE (m, nx, ny, 0);
2310 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2311 floor = GET_MAP_FACE (m, nx, ny, 2);
2312
2313 /* If all is blank, send a blank face. */
2314 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2315 {
2316 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2317 }
2318 else
2319 { /* actually have something interesting */
2320 /* send the darkness mask, if any. */
2321 if (d && pl->contr->socket.darkness)
2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2323
2324 if (face && face != blank_face)
2325 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2326 if (floor2 && floor2 != blank_face)
2327 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2328 if (floor && floor != blank_face)
2329 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2330 }
2331 } /* Is a valid space */
2332 }
2333 }
2334
2335 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2336
2337 check_map_change (pl->contr);
2338} 2047}
2339 2048
2340 2049
2341/*****************************************************************************/ 2050/*****************************************************************************/
2342 2051
… …
2348 2057
2349/*****************************************************************************/ 2058/*****************************************************************************/
2350void 2059void
2351send_plugin_custom_message (object *pl, char *buf) 2060send_plugin_custom_message (object *pl, char *buf)
2352{ 2061{
2353 pl->contr->socket.send_packet (buf); 2062 pl->contr->socket->send_packet (buf);
2354} 2063}
2355 2064
2356/** 2065/**
2357 * This sends the skill number to name mapping. We ignore 2066 * This sends the skill number to name mapping. We ignore
2358 * the params - we always send the same info no matter what. 2067 * the params - we always send the same info no matter what.
2359 */ 2068 */
2360void 2069void
2361send_skill_info (NewSocket *ns, char *params) 2070send_skill_info (client *ns, char *params)
2362{ 2071{
2363 SockList sl (MAXSOCKBUF); 2072 packet sl;
2364 sl << "replyinfo skill_info\n"; 2073 sl << "replyinfo skill_info\n";
2365 2074
2366 for (int i = 1; i < NUM_SKILLS; i++) 2075 for (int i = 1; i < NUM_SKILLS; i++)
2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2076 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368 2077
2369 if (sl.len >= MAXSOCKBUF) 2078 if (sl.length () >= MAXSOCKBUF)
2370 { 2079 {
2371 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2080 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372 fatal (0); 2081 fatal (0);
2373 } 2082 }
2374 2083
2375 Send_With_Handling (ns, &sl); 2084 ns->send_packet (sl);
2376 sl.free ();
2377} 2085}
2378 2086
2379/** 2087/**
2380 * This sends the spell path to name mapping. We ignore 2088 * This sends the spell path to name mapping. We ignore
2381 * the params - we always send the same info no matter what. 2089 * the params - we always send the same info no matter what.
2382 */ 2090 */
2383void 2091void
2384send_spell_paths (NewSocket * ns, char *params) 2092send_spell_paths (client * ns, char *params)
2385{ 2093{
2386 SockList sl (MAXSOCKBUF); 2094 packet sl;
2387 2095
2388 sl << "replyinfo spell_paths\n"; 2096 sl << "replyinfo spell_paths\n";
2389 2097
2390 for (int i = 0; i < NRSPELLPATHS; i++) 2098 for (int i = 0; i < NRSPELLPATHS; i++)
2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2099 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392 2100
2393 if (sl.len >= MAXSOCKBUF) 2101 if (sl.length () >= MAXSOCKBUF)
2394 { 2102 {
2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2103 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396 fatal (0); 2104 fatal (0);
2397 } 2105 }
2398 2106
2399 Send_With_Handling (ns, &sl); 2107 ns->send_packet (sl);
2400 sl.free ();
2401} 2108}
2402 2109
2403/** 2110/**
2404 * This looks for any spells the player may have that have changed their stats. 2111 * This looks for any spells the player may have that have changed their stats.
2405 * it then sends an updspell packet for each spell that has changed in this way 2112 * it then sends an updspell packet for each spell that has changed in this way
2406 */ 2113 */
2407void 2114void
2408esrv_update_spells (player *pl) 2115esrv_update_spells (player *pl)
2409{ 2116{
2410 if (!pl->socket.monitor_spells) 2117 if (!pl->socket->monitor_spells)
2411 return; 2118 return;
2412 2119
2413 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2120 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414 { 2121 {
2415 if (spell->type == SPELL) 2122 if (spell->type == SPELL)
… …
2435 flags |= UPD_SP_DAMAGE; 2142 flags |= UPD_SP_DAMAGE;
2436 } 2143 }
2437 2144
2438 if (flags) 2145 if (flags)
2439 { 2146 {
2440 SockList sl (MAXSOCKBUF); 2147 packet sl;
2441 2148
2442 sl << "updspell " 2149 sl << "updspell "
2443 << uint8 (flags) 2150 << uint8 (flags)
2444 << uint32 (spell->count); 2151 << uint32 (spell->count);
2445 2152
2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2153 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2154 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2155 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449 2156
2450 Send_With_Handling (&pl->socket, &sl); 2157 pl->socket->send_packet (sl);
2451 sl.free ();
2452 } 2158 }
2453 } 2159 }
2454 } 2160 }
2455} 2161}
2456 2162
2457void 2163void
2458esrv_remove_spell (player *pl, object *spell) 2164esrv_remove_spell (player *pl, object *spell)
2459{ 2165{
2460 if (!pl->socket.monitor_spells) 2166 if (!pl->socket->monitor_spells)
2461 return; 2167 return;
2462 2168
2463 if (!pl || !spell || spell->env != pl->ob) 2169 if (!pl || !spell || spell->env != pl->ob)
2464 { 2170 {
2465 LOG (llevError, "Invalid call to esrv_remove_spell"); 2171 LOG (llevError, "Invalid call to esrv_remove_spell");
2466 return; 2172 return;
2467 } 2173 }
2468 2174
2469 SockList sl (MAXSOCKBUF); 2175 packet sl ("delspell");
2470 2176
2471 sl << "delspell "
2472 << uint32 (spell->count); 2177 sl << uint32 (spell->count);
2473 2178
2474 Send_With_Handling (&pl->socket, &sl); 2179 pl->socket->send_packet (sl);
2475 sl.free ();
2476} 2180}
2477 2181
2478/* appends the spell *spell to the Socklist we will send the data to. */ 2182/* appends the spell *spell to the Socklist we will send the data to. */
2479static void 2183static void
2480append_spell (player *pl, SockList &sl, object *spell) 2184append_spell (player *pl, packet &sl, object *spell)
2481{ 2185{
2482 int len, i, skill = 0; 2186 int len, i, skill = 0;
2483 2187
2484 if (!(spell->name)) 2188 if (!(spell->name))
2485 { 2189 {
… …
2528 { 2232 {
2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2233 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2530 return; 2234 return;
2531 } 2235 }
2532 2236
2533 if (!pl->socket.monitor_spells) 2237 if (!pl->socket->monitor_spells)
2534 return; 2238 return;
2535 2239
2536 SockList sl (MAXSOCKBUF); 2240 packet sl ("addspell");
2537
2538 sl << "addspell ";
2539 2241
2540 if (!spell) 2242 if (!spell)
2541 { 2243 {
2542 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2244 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2543 { 2245 {
… …
2555 * like it will fix this 2257 * like it will fix this
2556 */ 2258 */
2557 if (spell->type != SPELL) 2259 if (spell->type != SPELL)
2558 continue; 2260 continue;
2559 2261
2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2262 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2561 { 2263 {
2562 Send_With_Handling (&pl->socket, &sl); 2264 pl->socket->send_packet (sl);
2563 strcpy ((char *) sl.buf, "addspell "); 2265
2564 sl.len = strlen ((char *) sl.buf); 2266 sl.reset ();
2267 sl << "addspell ";
2565 } 2268 }
2566 2269
2567 append_spell (pl, sl, spell); 2270 append_spell (pl, sl, spell);
2568 } 2271 }
2569 } 2272 }
… …
2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2283 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581 fatal (0); 2284 fatal (0);
2582 } 2285 }
2583 2286
2584 /* finally, we can send the packet */ 2287 /* finally, we can send the packet */
2585 Send_With_Handling (&pl->socket, &sl); 2288 pl->socket->send_packet (sl);
2586
2587 sl.free ();
2588} 2289}
2589 2290

Diff Legend

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