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.36 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 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 */ 43 */
47 44
48#include <global.h> 45#include <global.h>
49#include <sproto.h> 46#include <sproto.h>
50 47
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* 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,
57 * it should work here. 52 * it should work here.
… …
60#include <sys/time.h> 55#include <sys/time.h>
61#include <sys/socket.h> 56#include <sys/socket.h>
62#include <netinet/in.h> 57#include <netinet/in.h>
63#include <netdb.h> 58#include <netdb.h>
64 59
65#ifdef HAVE_UNISTD_H
66# include <unistd.h> 60#include <unistd.h>
67#endif
68
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h> 61#include <sys/time.h>
71#endif
72 62
73#include "sounds.h" 63#include "sounds.h"
74 64
75/** 65/**
76 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
93 -1, /* life stealing */ 83 -1, /* life stealing */
94 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
95}; 85};
96 86
97static void 87static void
98socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
99{ 89{
100 struct Map newmap; 90 struct Map newmap;
101 int x, y, mx, my; 91 int x, y, mx, my;
102 92
103 {
104 packet sl;
105
106 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107 ns->send_packet (sl);
108 }
109 94
110 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
111 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
112 * 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
113 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
153} 138}
154 139
155static void 140static void
156clear_map (player *pl) 141clear_map (player *pl)
157{ 142{
158 client_socket &socket = *pl->socket; 143 client &socket = *pl->socket;
159 144
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 145 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
161 146
162 if (socket.newmapcmd == 1) 147 if (socket.newmapcmd == 1)
163 socket.send_packet ("newmap"); 148 socket.send_packet ("newmap");
… …
168 153
169/** check for map change and send new map data */ 154/** check for map change and send new map data */
170static void 155static void
171check_map_change (player *pl) 156check_map_change (player *pl)
172{ 157{
173 client_socket &socket = *pl->socket; 158 client &socket = *pl->socket;
174 object *ob = pl->ob; 159 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 160 char buf[MAX_BUF]; /* eauugggh */
176 161
177 if (socket.current_map != ob->map) 162 if (socket.current_map != ob->map)
178 { 163 {
… …
221 206
222 socket.current_x = ob->x; 207 socket.current_x = ob->x;
223 socket.current_y = ob->y; 208 socket.current_y = ob->y;
224} 209}
225 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);
253}
254
226void 255void
227ExtCmd (char *buf, int len, player *pl) 256ExtCmd (char *buf, int len, player *pl)
228{ 257{
229 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 258 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
259}
260
261void
262ExtiCmd (char *buf, int len, client *ns)
263{
264 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230} 265}
231 266
232void 267void
233MapInfoCmd (char *buf, int len, player *pl) 268MapInfoCmd (char *buf, int len, player *pl)
234{ 269{
… …
316 pl->socket->send_packet (bigbuf); 351 pl->socket->send_packet (bigbuf);
317} 352}
318 353
319/** This is the Setup cmd - easy first implementation */ 354/** This is the Setup cmd - easy first implementation */
320void 355void
321SetUp (char *buf, int len, client_socket * ns) 356SetUp (char *buf, int len, client * ns)
322{ 357{
323 int s, slen; 358 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 359 char *cmd, *param, cmdback[HUGE_BUF];
325 360
326 /* run through the cmds of setup 361 /* run through the cmds of setup
… …
536 * This is what takes care of it. We tell the client how things worked out. 571 * This is what takes care of it. We tell the client how things worked out.
537 * I am not sure if this file is the best place for this function. however, 572 * I am not sure if this file is the best place for this function. however,
538 * it either has to be here or init_sockets needs to be exported. 573 * it either has to be here or init_sockets needs to be exported.
539 */ 574 */
540void 575void
541AddMeCmd (char *buf, int len, client_socket * ns) 576AddMeCmd (char *buf, int len, client * ns)
542{ 577{
543 Settings oldsettings;
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns)) 578 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed"); 579 ns->send_packet ("addme_failed");
548 else 580 else
549 ns->send_packet ("addme_success"); 581 ns->send_packet ("addme_success");
550
551 settings = oldsettings;
552} 582}
553 583
554/** Reply to ExtendedInfos command */ 584/** Reply to ExtendedInfos command */
555void 585void
556ToggleExtendedInfos (char *buf, int len, client_socket * ns) 586ToggleExtendedInfos (char *buf, int len, client * ns)
557{ 587{
558 char cmdback[MAX_BUF]; 588 char cmdback[MAX_BUF];
559 char command[50]; 589 char command[50];
560 int info, nextinfo; 590 int info, nextinfo;
561 591
… …
612#define MSG_TYPE_MONUMENT 5 642#define MSG_TYPE_MONUMENT 5
613#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 643#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614 644
615/** Reply to ExtendedInfos command */ 645/** Reply to ExtendedInfos command */
616void 646void
617ToggleExtendedText (char *buf, int len, client_socket * ns) 647ToggleExtendedText (char *buf, int len, client * ns)
618{ 648{
619 char cmdback[MAX_BUF]; 649 char cmdback[MAX_BUF];
620 char temp[10]; 650 char temp[10];
621 char command[50]; 651 char command[50];
622 int info, nextinfo, i, flag; 652 int info, nextinfo, i, flag;
… …
673 * a piece of data from us that we know the client wants. So 703 * a piece of data from us that we know the client wants. So
674 * if we know the client wants it, might as well push it to the 704 * if we know the client wants it, might as well push it to the
675 * client. 705 * client.
676 */ 706 */
677static void 707static void
678SendSmooth (client_socket * ns, uint16 face) 708SendSmooth (client *ns, uint16 face)
679{ 709{
680 uint16 smoothface; 710 uint16 smoothface;
681 711
682 /* If we can't find a face, return and set it so we won't try to send this 712 /* If we can't find a face, return and set it so we won't try to send this
683 * again. 713 * again.
… …
699 729
700 sl << "smooth " 730 sl << "smooth "
701 << uint16 (face) 731 << uint16 (face)
702 << uint16 (smoothface); 732 << uint16 (smoothface);
703 733
704 Send_With_Handling (ns, &sl); 734 ns->send_packet (sl);
705} 735}
706 736
707 /** 737 /**
708 * Tells client the picture it has to use 738 * Tells client the picture it has to use
709 * to smooth a picture number given as argument. 739 * to smooth a picture number given as argument.
710 */ 740 */
711void 741void
712AskSmooth (char *buf, int len, client_socket * ns) 742AskSmooth (char *buf, int len, client *ns)
713{ 743{
714 uint16 facenbr; 744 SendSmooth (ns, atoi (buf));
715
716 facenbr = atoi (buf);
717 SendSmooth (ns, facenbr);
718} 745}
719 746
720/** 747/**
721 * This handles the general commands from the client (ie, north, fire, cast, 748 * This handles the general commands from the client (ie, north, fire, cast,
722 * etc.) 749 * etc.)
723 */ 750 */
724void 751void
725PlayerCmd (char *buf, int len, player *pl) 752PlayerCmd (char *buf, int len, player *pl)
726{ 753{
727
728 /* The following should never happen with a proper or honest client.
729 * Therefore, the error message doesn't have to be too clear - if
730 * someone is playing with a hacked/non working client, this gives them
731 * an idea of the problem, but they deserve what they get
732 */
733 if (pl->state != ST_PLAYING)
734 {
735 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
736 return;
737 }
738 /* Check if there is a count. In theory, a zero count could also be 754 /* Check if there is a count. In theory, a zero count could also be
739 * sent, so check for that also. 755 * sent, so check for that also.
740 */ 756 */
741 if (atoi (buf) || buf[0] == '0') 757 if (atoi (buf) || buf[0] == '0')
742 { 758 {
743 pl->count = atoi ((char *) buf); 759 pl->count = atoi ((char *) buf);
760
744 buf = strchr (buf, ' '); /* advance beyond the numbers */ 761 buf = strchr (buf, ' '); /* advance beyond the numbers */
745 if (!buf) 762 if (!buf)
746 {
747#ifdef ESRV_DEBUG
748 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749#endif
750 return; 763 return;
751 } 764
752 buf++; 765 buf++;
753 } 766 }
754 /* This should not happen anymore. */ 767
755 if (pl->ob->speed_left < -1.0)
756 {
757 LOG (llevError, "Player has negative time - shouldn't do command.\n");
758 }
759 /* In c_new.c */
760 execute_newserver_command (pl->ob, (char *) buf); 768 execute_newserver_command (pl->ob, (char *) buf);
769
761 /* Perhaps something better should be done with a left over count. 770 /* Perhaps something better should be done with a left over count.
762 * Cleaning up the input should probably be done first - all actions 771 * Cleaning up the input should probably be done first - all actions
763 * for the command that issued the count should be done before any other 772 * for the command that issued the count should be done before any other
764 * commands. 773 * commands.
765 */ 774 */
766
767 pl->count = 0; 775 pl->count = 0;
768
769} 776}
770 777
771 778
772/** 779/**
773 * This handles the general commands from the client (ie, north, fire, cast, 780 * This handles the general commands from the client (ie, north, fire, cast,
774 * etc.). It is a lot like PlayerCmd above, but is called with the 781 * etc.). It is a lot like PlayerCmd above, but is called with the
775 * 'ncom' method which gives more information back to the client so it 782 * 'ncom' method which gives more information back to the client so it
776 * can throttle. 783 * can throttle.
777 */ 784 */
778void 785void
779NewPlayerCmd (uint8 * buf, int len, player *pl) 786NewPlayerCmd (char *buf, int len, player *pl)
780{ 787{
781 int time, repeat;
782 char command[MAX_BUF];
783 int pktlen;
784
785 if (len < 7) 788 if (len <= 6)
786 { 789 {
787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 790 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
788 return; 791 return;
789 } 792 }
790 793
791 pktlen = net_uint16 (buf); 794 uint16 cmdid = net_uint16 ((uint8 *)buf);
792 repeat = net_uint32 (buf + 2); 795 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793 796
794 /* -1 is special - no repeat, but don't update */ 797 /* -1 is special - no repeat, but don't update */
795 if (repeat != -1) 798 if (repeat != -1)
796 pl->count = repeat; 799 pl->count = repeat;
797 800
798 if ((len - 4) >= MAX_BUF) 801 buf += 6; //len -= 6;
799 len = MAX_BUF - 5;
800 802
801 strncpy ((char *) command, (char *) buf + 6, len - 4);
802 command[len - 4] = '\0';
803
804 /* The following should never happen with a proper or honest client.
805 * Therefore, the error message doesn't have to be too clear - if
806 * someone is playing with a hacked/non working client, this gives them
807 * an idea of the problem, but they deserve what they get
808 */
809 if (pl->state != ST_PLAYING)
810 {
811 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
812 return;
813 }
814
815 /* This should not happen anymore. */
816 if (pl->ob->speed_left < -1.0)
817 LOG (llevError, "Player has negative time - shouldn't do command.\n");
818
819 /* In c_new.c */
820 execute_newserver_command (pl->ob, (char *) command); 803 execute_newserver_command (pl->ob, buf);
804
821 /* Perhaps something better should be done with a left over count. 805 /* Perhaps something better should be done with a left over count.
822 * Cleaning up the input should probably be done first - all actions 806 * Cleaning up the input should probably be done first - all actions
823 * for the command that issued the count should be done before any other 807 * for the command that issued the count should be done before any other
824 * commands. 808 * commands.
825 */ 809 */
826 pl->count = 0; 810 pl->count = 0;
827 811
812 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
828 if (FABS (pl->ob->speed) < 0.001) 813 int time = FABS (pl->ob->speed) < 0.001
829 time = MAX_TIME * 100; 814 ? time = MAX_TIME * 100
830 else
831 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 815 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
832 816
833 /* Send confirmation of command execution now */ 817 /* Send confirmation of command execution now */
834
835 packet sl; 818 packet sl;
836 sl << "comc " << uint16 (pktlen) << uint32 (time); 819 sl << "comc " << uint16 (cmdid) << uint32 (time);
837 Send_With_Handling (pl->socket, &sl); 820 pl->socket->send_packet (sl);
838} 821}
839 822
840 823
841/** This is a reply to a previous query. */ 824/** This is a reply to a previous query. */
842void 825void
843ReplyCmd (char *buf, int len, player *pl) 826ReplyCmd (char *buf, int len, player *pl)
844{ 827{
845 /* This is to synthesize how the data would be stored if it 828 /* This is to synthesize how the data would be stored if it
846 * was normally entered. A bit of a hack, and should be cleaned up 829 * was normally entered. A bit of a hack, and should be cleaned up
847 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
848 * 831 *
849 * We pass 13 to many of the functions because this way they 832 * We pass 13 to many of the functions because this way they
850 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
851 * function then does not try to do additional input. 834 * function then does not try to do additional input.
… …
854 837
855 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
856 839
857 switch (pl->state) 840 switch (pl->state)
858 { 841 {
859 case ST_PLAYING: 842 case ST_PLAYING:
860 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861 break; 844 break;
862 845
863 case ST_PLAY_AGAIN: 846 case ST_PLAY_AGAIN:
864 /* We can check this for return value (2==quit). Maybe we 847 /* We can check this for return value (2==quit). Maybe we
865 * should, and do something appropriate? 848 * should, and do something appropriate?
866 */ 849 */
867 receive_play_again (pl->ob, buf[0]); 850 receive_play_again (pl->ob, buf[0]);
868 break; 851 break;
869 852
870 case ST_ROLL_STAT: 853 case ST_ROLL_STAT:
871 key_roll_stat (pl->ob, buf[0]); 854 key_roll_stat (pl->ob, buf[0]);
872 break; 855 break;
873 856
874 case ST_CHANGE_CLASS: 857 case ST_CHANGE_CLASS:
875 858
876 key_change_class (pl->ob, buf[0]); 859 key_change_class (pl->ob, buf[0]);
877 break; 860 break;
878 861
879 case ST_CONFIRM_QUIT: 862 case ST_CONFIRM_QUIT:
880 key_confirm_quit (pl->ob, buf[0]); 863 key_confirm_quit (pl->ob, buf[0]);
881 break; 864 break;
882 865
883 case ST_CONFIGURE: 866 case ST_CONFIGURE:
884 LOG (llevError, "In client input handling, but into configure state\n"); 867 LOG (llevError, "In client input handling, but into configure state\n");
885 pl->state = ST_PLAYING; 868 pl->state = ST_PLAYING;
886 break; 869 break;
887 870
888 case ST_GET_NAME: 871 case ST_GET_NAME:
889 receive_player_name (pl->ob, 13); 872 receive_player_name (pl->ob, 13);
890 break; 873 break;
891 874
892 case ST_GET_PASSWORD: 875 case ST_GET_PASSWORD:
893 case ST_CONFIRM_PASSWORD: 876 case ST_CONFIRM_PASSWORD:
894 receive_player_password (pl->ob, 13); 877 receive_player_password (pl->ob, 13);
895 break; 878 break;
896 879
897 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 880 case ST_GET_PARTY_PASSWORD: /* Get password for party */
898 receive_party_password (pl->ob, 13); 881 receive_party_password (pl->ob, 13);
899 break; 882 break;
900 883
901 default: 884 default:
902 LOG (llevError, "Unknown input state: %d\n", pl->state); 885 LOG (llevError, "Unknown input state: %d\n", pl->state);
903 } 886 }
904} 887}
905 888
906/** 889/**
907 * Client tells its version. If there is a mismatch, we close the 890 * Client tells its version. If there is a mismatch, we close the
… …
909 * something older than the server. If we assume the client will be 892 * something older than the server. If we assume the client will be
910 * backwards compatible, having it be a later version should not be a 893 * backwards compatible, having it be a later version should not be a
911 * problem. 894 * problem.
912 */ 895 */
913void 896void
914VersionCmd (char *buf, int len, client_socket * ns) 897VersionCmd (char *buf, int len, client * ns)
915{ 898{
916 char *cp;
917 char version_warning[256];
918
919 if (!buf) 899 if (!buf)
920 { 900 {
921 LOG (llevError, "CS: received corrupted version command\n"); 901 LOG (llevError, "CS: received corrupted version command\n");
922 return; 902 return;
923 } 903 }
924 904
925 ns->cs_version = atoi (buf); 905 ns->cs_version = atoi (buf);
926 ns->sc_version = ns->cs_version; 906 ns->sc_version = ns->cs_version;
907
908 LOG (llevDebug, "connection from client <%s>\n", buf);
909
910
911 //TODO: should log here just for statistics
912
927 if (VERSION_CS != ns->cs_version) 913 //if (VERSION_CS != ns->cs_version)
928 { 914 // unchecked;
929#ifdef ESRV_DEBUG 915
930 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931#endif
932 }
933 cp = strchr (buf + 1, ' '); 916 char *cp = strchr (buf + 1, ' ');
934 if (!cp) 917 if (!cp)
935 return; 918 return;
919
936 ns->sc_version = atoi (cp); 920 ns->sc_version = atoi (cp);
921
937 if (VERSION_SC != ns->sc_version) 922 //if (VERSION_SC != ns->sc_version)
938 { 923 // unchecked;
939#ifdef ESRV_DEBUG 924
940 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941#endif
942 }
943 cp = strchr (cp + 1, ' '); 925 cp = strchr (cp + 1, ' ');
926
944 if (cp) 927 if (cp)
945 { 928 {
946 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 929 assign (ns->version, cp + 1);
947 930
948 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
949
950 /* This is first implementation - i skip all beta DX clients with it
951 * Add later stuff here for other clients
952 */
953
954 /* these are old dxclients */
955 /* Version 1024 added support for singular + plural name values -
956 * requiing this minimal value reduces complexity of that code, and it
957 * has been around for a long time.
958 */
959 if (ns->sc_version < 1026) 931 if (ns->sc_version < 1026)
960 { 932 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
961 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
962 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 933 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
963 ns->send_packet (version_warning);
964 }
965
966 } 934 }
967} 935}
968 936
969/** sound related functions. */ 937/** sound related functions. */
970
971void 938void
972SetSound (char *buf, int len, client_socket * ns) 939SetSound (char *buf, int len, client * ns)
973{ 940{
974 ns->sound = atoi (buf); 941 ns->sound = atoi (buf);
975} 942}
976 943
977/** client wants the map resent */ 944/** client wants the map resent */
978 945
979void 946void
980MapRedrawCmd (char *buf, int len, player *pl) 947MapRedrawCmd (char *buf, int len, player *pl)
981{ 948{
982
983/* This function is currently disabled; just clearing the map state results in 949/* This function is currently disabled; just clearing the map state results in
984 * display errors. It should clear the cache and send a newmap command. 950 * display errors. It should clear the cache and send a newmap command.
985 * Unfortunately this solution does not work because some client versions send 951 * Unfortunately this solution does not work because some client versions send
986 * a mapredraw command after receiving a newmap command. 952 * a mapredraw command after receiving a newmap command.
987 */ 953 */
988#if 0
989 /* Okay, this is MAJOR UGLY. but the only way I know how to
990 * clear the "cache"
991 */
992 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
993 draw_client_map (pl->ob);
994#endif
995} 954}
996 955
997/** 956/**
998 * Moves an object (typically, container to inventory). 957 * Moves an object (typically, container to inventory).
999 * syntax is: move (to) (tag) (nrof) 958 * syntax is: move (to) (tag) (nrof)
… …
1002MoveCmd (char *buf, int len, player *pl) 961MoveCmd (char *buf, int len, player *pl)
1003{ 962{
1004 int vals[3], i; 963 int vals[3], i;
1005 964
1006 /* A little funky here. We only cycle for 2 records, because 965 /* A little funky here. We only cycle for 2 records, because
1007 * we obviously am not going to find a space after the third 966 * we obviously are not going to find a space after the third
1008 * record. Perhaps we should just replace this with a 967 * record. Perhaps we should just replace this with a
1009 * sscanf? 968 * sscanf?
1010 */ 969 */
1011 for (i = 0; i < 2; i++) 970 for (i = 0; i < 2; i++)
1012 { 971 {
1013 vals[i] = atoi (buf); 972 vals[i] = atoi (buf);
973
1014 if (!(buf = strchr (buf, ' '))) 974 if (!(buf = strchr (buf, ' ')))
1015 { 975 {
1016 LOG (llevError, "Incomplete move command: %s\n", buf); 976 LOG (llevError, "Incomplete move command: %s\n", buf);
1017 return; 977 return;
1018 } 978 }
979
1019 buf++; 980 buf++;
1020 } 981 }
982
1021 vals[2] = atoi (buf); 983 vals[2] = atoi (buf);
1022 984
1023/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 985/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1024 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 986 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025} 987}
1026
1027
1028 988
1029/****************************************************************************** 989/******************************************************************************
1030 * 990 *
1031 * Start of commands the server sends to the client. 991 * Start of commands the server sends to the client.
1032 * 992 *
… …
1035/** 995/**
1036 * Asks the client to query the user. This way, the client knows 996 * Asks the client to query the user. This way, the client knows
1037 * it needs to send something back (vs just printing out a message) 997 * it needs to send something back (vs just printing out a message)
1038 */ 998 */
1039void 999void
1040send_query (client_socket * ns, uint8 flags, char *text) 1000send_query (client *ns, uint8 flags, char *text)
1041{ 1001{
1042 char buf[MAX_BUF];
1043
1044 sprintf (buf, "query %d %s", flags, text ? text : ""); 1002 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045 ns->send_packet (buf);
1046} 1003}
1047 1004
1048#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1005#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049 Old = New; \ 1006 Old = New; \
1050 sl << uint8 (Type) << uint64 (New); \ 1007 sl << uint8 (Type) << uint64 (New); \
… …
1083 uint16 flags; 1040 uint16 flags;
1084 1041
1085 packet sl; 1042 packet sl;
1086 sl << "stats "; 1043 sl << "stats ";
1087 1044
1088 if (pl->ob != NULL) 1045 if (pl->ob)
1089 { 1046 {
1090 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1047 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1091 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1048 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1092 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1049 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1093 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1050 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1101 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1058 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1102 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1059 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1103 } 1060 }
1104 1061
1105 if (pl->socket->exp64) 1062 if (pl->socket->exp64)
1106 {
1107 uint8 s;
1108
1109 for (s = 0; s < NUM_SKILLS; s++) 1063 for (int s = 0; s < NUM_SKILLS; s++)
1110 {
1111 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1064 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1112 { 1065 {
1113 /* Always send along the level if exp changes. This is only 1066 /* Always send along the level if exp changes. This is only
1114 * 1 extra byte, but keeps processing simpler. 1067 * 1 extra byte, but keeps processing simpler.
1115 */ 1068 */
1116 sl << uint8 (s + CS_STAT_SKILLINFO) 1069 sl << uint8 (s + CS_STAT_SKILLINFO)
1117 << uint8 (pl->last_skill_ob[s]->level) 1070 << uint8 (pl->last_skill_ob[s]->level)
1118 << uint64 (pl->last_skill_ob[s]->stats.exp); 1071 << uint64 (pl->last_skill_ob[s]->stats.exp);
1119 1072
1120 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1073 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1121 } 1074 }
1122 }
1123 }
1124 1075
1125 if (pl->socket->exp64) 1076 if (pl->socket->exp64)
1126 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1077 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1127 else 1078 else
1128 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1079 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
… …
1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1097 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1147 1098
1148 if (pl->socket->sc_version < 1025) 1099 if (pl->socket->sc_version < 1025)
1149 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1100 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1150 else 1101 else
1151 {
1152 int i;
1153
1154 for (i = 0; i < NROFATTACKS; i++) 1102 for (int i = 0; i < NROFATTACKS; i++)
1155 { 1103 {
1156 /* Skip ones we won't send */ 1104 /* Skip ones we won't send */
1157 if (atnr_cs_stat[i] == -1) 1105 if (atnr_cs_stat[i] == -1)
1158 continue; 1106 continue;
1159 1107
1160 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1108 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1161 } 1109 }
1162 }
1163 1110
1164 if (pl->socket->monitor_spells) 1111 if (pl->socket->monitor_spells)
1165 { 1112 {
1166 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1113 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1167 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1114 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
1173 set_title (pl->ob, buf); 1120 set_title (pl->ob, buf);
1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1121 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1175 1122
1176 /* Only send it away if we have some actual data */ 1123 /* Only send it away if we have some actual data */
1177 if (sl.length () > 6) 1124 if (sl.length () > 6)
1178 Send_With_Handling (pl->socket, &sl); 1125 pl->socket->send_packet (sl);
1179} 1126}
1180 1127
1181/** 1128/**
1182 * Tells the client that here is a player it should start using. 1129 * Tells the client that here is a player it should start using.
1183 */ 1130 */
… …
1192 sl << uint32 (pl->ob->count) 1139 sl << uint32 (pl->ob->count)
1193 << uint32 (weight) 1140 << uint32 (weight)
1194 << uint32 (pl->ob->face->number) 1141 << uint32 (pl->ob->face->number)
1195 << data8 (pl->ob->name); 1142 << data8 (pl->ob->name);
1196 1143
1197 Send_With_Handling (pl->socket, &sl); 1144 pl->socket->send_packet (sl);
1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1199} 1146}
1200 1147
1201/** 1148/**
1202 * Need to send an animation sequence to the client. 1149 * Need to send an animation sequence to the client.
… …
1204 * sent them the face yet (this can become quite costly in terms of 1151 * sent them the face yet (this can become quite costly in terms of
1205 * how much we are sending - on the other hand, this should only happen 1152 * how much we are sending - on the other hand, this should only happen
1206 * when the player logs in and picks stuff up. 1153 * when the player logs in and picks stuff up.
1207 */ 1154 */
1208void 1155void
1209esrv_send_animation (client_socket * ns, short anim_num) 1156esrv_send_animation (client * ns, short anim_num)
1210{ 1157{
1211 int i;
1212
1213 /* Do some checking on the anim_num we got. Note that the animations 1158 /* Do some checking on the anim_num we got. Note that the animations
1214 * are added in contigous order, so if the number is in the valid 1159 * are added in contigous order, so if the number is in the valid
1215 * range, it must be a valid animation. 1160 * range, it must be a valid animation.
1216 */ 1161 */
1217 if (anim_num < 0 || anim_num > num_animations) 1162 if (anim_num < 0 || anim_num > num_animations)
… …
1227 << uint16 (0); /* flags - not used right now */ 1172 << uint16 (0); /* flags - not used right now */
1228 1173
1229 /* Build up the list of faces. Also, send any information (ie, the 1174 /* Build up the list of faces. Also, send any information (ie, the
1230 * the face itself) down to the client. 1175 * the face itself) down to the client.
1231 */ 1176 */
1232 for (i = 0; i < animations[anim_num].num_animations; i++) 1177 for (int i = 0; i < animations[anim_num].num_animations; i++)
1233 { 1178 {
1234 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1179 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1235 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1180 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1181
1236 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1182 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1237 } 1183 }
1238 1184
1239 Send_With_Handling (ns, &sl); 1185 ns->send_packet (sl);
1240 1186
1241 ns->anims_sent[anim_num] = 1; 1187 ns->anims_sent[anim_num] = 1;
1242} 1188}
1243 1189
1244 1190
… …
1251/** 1197/**
1252 * This adds face_num to a map cell at x,y. If the client doesn't have 1198 * This adds face_num to a map cell at x,y. If the client doesn't have
1253 * the face yet, we will also send it. 1199 * the face yet, we will also send it.
1254 */ 1200 */
1255static void 1201static void
1256esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1202esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1257{ 1203{
1258 if (newmap->cells[x][y].count >= MAP_LAYERS) 1204 if (newmap->cells[x][y].count >= MAP_LAYERS)
1259 { 1205 {
1206 //TODO: one or the other, can't both have abort and return, verify and act
1260 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1207 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261 return; 1208 return;
1262 abort (); 1209 abort ();
1263 } 1210 }
1264 1211
1265 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1212 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266 newmap->cells[x][y].count++; 1213 newmap->cells[x][y].count++;
1267 1214
1268 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1215 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269 esrv_send_face (ns, face_num, 0); 1216 esrv_send_face (ns, face_num, 0);
1270}
1271
1272struct LayerCell
1273{
1274 uint16 xy;
1275 short face;
1276};
1277
1278struct MapLayer
1279{
1280 int count;
1281 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1282};
1283
1284/** Checkes if map cells have changed */
1285static int
1286mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1287{
1288 int k;
1289
1290 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1291 return 1;
1292 for (k = 0; k < newmap->cells[i][j].count; k++)
1293 {
1294 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1295 {
1296 return 1;
1297 }
1298 }
1299 return 0;
1300}
1301
1302/**
1303 * Basically, what this does is pack the data into layers.
1304 * cnum is the client number, cur is the the buffer we put all of
1305 * this data into. we return the end of the data. layers is
1306 * how many layers of data we should back.
1307 */
1308static uint8 *
1309compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1310{
1311 int x, y, k;
1312 int face;
1313 unsigned char *fcur;
1314 struct MapLayer layers[MAP_LAYERS];
1315
1316 for (k = 0; k < MAP_LAYERS; k++)
1317 layers[k].count = 0;
1318 fcur = cur;
1319 for (x = 0; x < ns->mapx; x++)
1320 {
1321 for (y = 0; y < ns->mapy; y++)
1322 {
1323 if (!mapcellchanged (ns, x, y, newmap))
1324 continue;
1325 if (newmap->cells[x][y].count == 0)
1326 {
1327 *cur = x * ns->mapy + y; /* mark empty space */
1328 cur++;
1329 continue;
1330 }
1331 for (k = 0; k < newmap->cells[x][y].count; k++)
1332 {
1333 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1334 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1335 layers[k].count++;
1336 }
1337 }
1338 }
1339 /* If no data, return now. */
1340 if (fcur == cur && layers[0].count == 0)
1341 return cur;
1342 *cur = 255; /* mark end of explicitly cleared cells */
1343 cur++;
1344 /* First pack by layers. */
1345 for (k = 0; k < numlayers; k++)
1346 {
1347 if (layers[k].count == 0)
1348 break; /* once a layer is entirely empty, no layer below it can
1349 have anything in it either */
1350 /* Pack by entries in thie layer */
1351 for (x = 0; x < layers[k].count;)
1352 {
1353 fcur = cur;
1354 *cur = layers[k].lcells[x].face >> 8;
1355 cur++;
1356 *cur = layers[k].lcells[x].face & 0xFF;
1357 cur++;
1358 face = layers[k].lcells[x].face;
1359 /* Now, we back the redundant data into 1 byte xy pairings */
1360 for (y = x; y < layers[k].count; y++)
1361 {
1362 if (layers[k].lcells[y].face == face)
1363 {
1364 *cur = (uint8) layers[k].lcells[y].xy;
1365 cur++;
1366 layers[k].lcells[y].face = -1;
1367 }
1368 }
1369 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1370 /* forward over the now redundant data */
1371 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1372 x++;
1373 }
1374 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1375 }
1376 return cur;
1377} 1217}
1378 1218
1379/** Clears a map cell */ 1219/** Clears a map cell */
1380static void 1220static void
1381map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1221map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1393#define MAX_LAYERS 3 1233#define MAX_LAYERS 3
1394 1234
1395/* Using a global really isn't a good approach, but saves the over head of 1235/* Using a global really isn't a good approach, but saves the over head of
1396 * allocating and deallocating such a block of data each time run through, 1236 * allocating and deallocating such a block of data each time run through,
1397 * and saves the space of allocating this in the socket object when we only 1237 * and saves the space of allocating this in the socket object when we only
1398 * need it for this cycle. If the serve is ever threaded, this needs to be 1238 * need it for this cycle. If the server is ever threaded, this needs to be
1399 * re-examined. 1239 * re-examined.
1400 */ 1240 */
1401
1402static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1241static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1403 1242
1404/** 1243/**
1405 * Returns true if any of the heads for this 1244 * Returns true if any of the heads for this
1406 * space is set. Returns false if all are blank - this is used 1245 * space is set. Returns false if all are blank - this is used
1407 * for empty space checking. 1246 * for empty space checking.
1408 */ 1247 */
1409static inline int 1248static inline int
1410have_head (int ax, int ay) 1249have_head (int ax, int ay)
1411{ 1250{
1412
1413 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1251 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1414 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1252 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415 return 1; 1253 return 1;
1254
1416 return 0; 1255 return 0;
1417} 1256}
1418 1257
1419/** 1258/**
1420 * check_head is a bit simplistic version of update_space below. 1259 * check_head is a bit simplistic version of update_space below.
1421 * basically, it only checks the that the head on space ax,ay at layer 1260 * basically, it only checks the that the head on space ax,ay at layer
1422 * needs to get sent - if so, it adds the data, sending the head 1261 * needs to get sent - if so, it adds the data, sending the head
1423 * if needed, and returning 1. If this no data needs to get 1262 * if needed, and returning 1. If this no data needs to get
1424 * sent, it returns zero. 1263 * sent, it returns zero.
1425 */ 1264 */
1426static int 1265static int
1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1266check_head (packet &sl, client &ns, int ax, int ay, int layer)
1428{ 1267{
1429 short face_num; 1268 short face_num;
1430 1269
1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1270 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1271 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1464 * numbers the spaces differently - I think this was a leftover from 1303 * numbers the spaces differently - I think this was a leftover from
1465 * the map command, where the faces stack up. Sinces that is no longer 1304 * the map command, where the faces stack up. Sinces that is no longer
1466 * the case, it seems to make more sense to have these layer values 1305 * the case, it seems to make more sense to have these layer values
1467 * actually match. 1306 * actually match.
1468 */ 1307 */
1469
1470static int 1308static int
1471update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1309update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1472{ 1310{
1473 object *ob, *head; 1311 object *ob, *head;
1474 uint16 face_num; 1312 uint16 face_num;
1475 int bx, by, i; 1313 int bx, by, i;
1476 1314
… …
1689 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1527 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1690 * take. 1528 * take.
1691 */ 1529 */
1692 1530
1693static inline int 1531static inline int
1694update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1532update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1695{ 1533{
1696 object *ob; 1534 object *ob;
1697 int smoothlevel; /* old face_num; */ 1535 int smoothlevel; /* old face_num; */
1698 1536
1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1537 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1733 * Returns the size of a data for a map square as returned by 1571 * Returns the size of a data for a map square as returned by
1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1572 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1735 * available. 1573 * available.
1736 */ 1574 */
1737int 1575int
1738getExtendedMapInfoSize (client_socket * ns) 1576getExtendedMapInfoSize (client * ns)
1739{ 1577{
1740 int result = 0; 1578 int result = 0;
1741 1579
1742 if (ns->ext_mapinfos) 1580 if (ns->ext_mapinfos)
1743 { 1581 {
1744 if (ns->EMI_smooth) 1582 if (ns->EMI_smooth)
1745 result += 1; /*One byte for smoothlevel */ 1583 result += 1; /*One byte for smoothlevel */
1746 } 1584 }
1585
1747 return result; 1586 return result;
1748} 1587}
1749 1588
1750/** 1589/**
1751 * This function uses the new map1 protocol command to send the map 1590 * This function uses the new map1 protocol command to send the map
… …
1779 uint8 eentrysize; 1618 uint8 eentrysize;
1780 uint16 ewhatstart, ewhatflag; 1619 uint16 ewhatstart, ewhatflag;
1781 uint8 extendedinfos; 1620 uint8 extendedinfos;
1782 maptile *m; 1621 maptile *m;
1783 1622
1784 client_socket &socket = *pl->contr->socket; 1623 client &socket = *pl->contr->socket;
1785 1624
1786 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1787 1626
1788 packet sl; 1627 packet sl;
1789 packet esl; 1628 packet esl;
… …
1868 * with no faces tells the client to blank out the 1707 * with no faces tells the client to blank out the
1869 * space. 1708 * space.
1870 */ 1709 */
1871 got_one = 0; 1710 got_one = 0;
1872 for (i = oldlen + 2; i < sl.length (); i++) 1711 for (i = oldlen + 2; i < sl.length (); i++)
1873 if (sl.buf[i]) 1712 if (sl[i])
1874 got_one = 1; 1713 got_one = 1;
1875 1714
1876 if (got_one && (mask & 0xf)) 1715 if (got_one && (mask & 0xf))
1877 sl.buf[oldlen + 1] = mask & 0xff; 1716 sl[oldlen + 1] = mask & 0xff;
1878 else 1717 else
1879 { /*either all faces blank, either no face at all */ 1718 { /*either all faces blank, either no face at all */
1880 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1719 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1881 sl.reset (oldlen + 2); 1720 sl.reset (oldlen + 2);
1882 else 1721 else
… …
1948 1787
1949 map_clearcell (&lastcell, 0, 0, 0, count); 1788 map_clearcell (&lastcell, 0, 0, 0, count);
1950 } 1789 }
1951 1790
1952 if ((mask & 0xf) || need_send) 1791 if ((mask & 0xf) || need_send)
1953 sl.buf[oldlen + 1] = mask & 0xff; 1792 sl[oldlen + 1] = mask & 0xff;
1954 else 1793 else
1955 sl.reset (oldlen); 1794 sl.reset (oldlen);
1956 } 1795 }
1957 else 1796 else
1958 { 1797 {
… …
1988 mask |= 0x8; 1827 mask |= 0x8;
1989 1828
1990 if (socket.extmap) 1829 if (socket.extmap)
1991 { 1830 {
1992 *last_ext |= 0x80; 1831 *last_ext |= 0x80;
1993 last_ext = sl.buf + sl.length (); 1832 last_ext = &sl[sl.length ()];
1994 sl << uint8 (d); 1833 sl << uint8 (d);
1995 } 1834 }
1996 else 1835 else
1997 sl << uint8 (255 - 64 * d); 1836 sl << uint8 (255 - 64 * d);
1998 } 1837 }
… …
2032 { 1871 {
2033 lastcell.stat_hp = stat_hp; 1872 lastcell.stat_hp = stat_hp;
2034 1873
2035 mask |= 0x8; 1874 mask |= 0x8;
2036 *last_ext |= 0x80; 1875 *last_ext |= 0x80;
2037 last_ext = sl.buf + sl.length (); 1876 last_ext = &sl[sl.length ()];
2038 1877
2039 sl << uint8 (5) << uint8 (stat_hp); 1878 sl << uint8 (5) << uint8 (stat_hp);
2040 1879
2041 if (stat_width > 1) 1880 if (stat_width > 1)
2042 { 1881 {
2043 *last_ext |= 0x80; 1882 *last_ext |= 0x80;
2044 last_ext = sl.buf + sl.length (); 1883 last_ext = &sl[sl.length ()];
2045 1884
2046 sl << uint8 (6) << uint8 (stat_width); 1885 sl << uint8 (6) << uint8 (stat_width);
2047 } 1886 }
2048 } 1887 }
2049 1888
… …
2051 { 1890 {
2052 lastcell.player = player; 1891 lastcell.player = player;
2053 1892
2054 mask |= 0x8; 1893 mask |= 0x8;
2055 *last_ext |= 0x80; 1894 *last_ext |= 0x80;
2056 last_ext = sl.buf + sl.length (); 1895 last_ext = &sl[sl.length ()];
2057 1896
2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1897 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2059 } 1898 }
2060 1899
2061 if (lastcell.flags != flags) 1900 if (lastcell.flags != flags)
2062 { 1901 {
2063 lastcell.flags = flags; 1902 lastcell.flags = flags;
2064 1903
2065 mask |= 0x8; 1904 mask |= 0x8;
2066 *last_ext |= 0x80; 1905 *last_ext |= 0x80;
2067 last_ext = sl.buf + sl.length (); 1906 last_ext = &sl[sl.length ()];
2068 1907
2069 sl << uint8 (8) << uint8 (flags); 1908 sl << uint8 (8) << uint8 (flags);
2070 } 1909 }
2071 } 1910 }
2072 1911
… …
2114 * space by checking the mask. If so, update the mask. 1953 * space by checking the mask. If so, update the mask.
2115 * if not, reset the len to that from before adding the mask 1954 * if not, reset the len to that from before adding the mask
2116 * value, so we don't send those bits. 1955 * value, so we don't send those bits.
2117 */ 1956 */
2118 if (mask & 0xf) 1957 if (mask & 0xf)
2119 sl.buf[oldlen + 1] = mask & 0xff; 1958 sl[oldlen + 1] = mask & 0xff;
2120 else 1959 else
2121 sl.reset (oldlen); 1960 sl.reset (oldlen);
2122 1961
2123 if (emask & 0xf) 1962 if (emask & 0xf)
2124 esl.buf[eoldlen + 1] = emask & 0xff; 1963 esl[eoldlen + 1] = emask & 0xff;
2125 else 1964 else
2126 esl.reset (eoldlen); 1965 esl.reset (eoldlen);
2127 } /* else this is a viewable space */ 1966 } /* else this is a viewable space */
2128 } /* for x loop */ 1967 } /* for x loop */
2129 } /* for y loop */ 1968 } /* for y loop */
… …
2135 { 1974 {
2136 /* No map data will follow, so don't say the client 1975 /* No map data will follow, so don't say the client
2137 * it doesn't need draw! 1976 * it doesn't need draw!
2138 */ 1977 */
2139 ewhatflag &= (~EMI_NOREDRAW); 1978 ewhatflag &= (~EMI_NOREDRAW);
2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1979 esl[ewhatstart + 1] = ewhatflag & 0xff;
2141 } 1980 }
2142 1981
2143 if (esl.length () > estartlen) 1982 if (esl.length () > estartlen)
2144 Send_With_Handling (&socket, &esl); 1983 socket.send_packet (esl);
2145 } 1984 }
2146 1985
2147 if (sl.length () > startlen || socket.sent_scroll) 1986 if (sl.length () > startlen || socket.sent_scroll)
2148 { 1987 {
2149 Send_With_Handling (&socket, &sl); 1988 socket.send_packet (sl);
2150 socket.sent_scroll = 0; 1989 socket.sent_scroll = 0;
2151 } 1990 }
2152} 1991}
2153 1992
2154/** 1993/**
… …
2188 { 2027 {
2189 ax = i; 2028 ax = i;
2190 ay = j; 2029 ay = j;
2191 m = pm; 2030 m = pm;
2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2031 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2032
2193 if (mflags & P_OUT_OF_MAP) 2033 if (mflags & P_OUT_OF_MAP)
2194 continue; 2034 continue;
2035
2195 if (mflags & P_NEED_UPDATE) 2036 if (mflags & P_NEED_UPDATE)
2196 update_position (m, ax, ay); 2037 update_position (m, ax, ay);
2038
2197 /* If a map is visible to the player, we don't want to swap it out 2039 /* If a map is visible to the player, we don't want to swap it out
2198 * just to reload it. This should really call something like 2040 * just to reload it. This should really call something like
2199 * swap_map, but this is much more efficient and 'good enough' 2041 * swap_map, but this is much more efficient and 'good enough'
2200 */ 2042 */
2201 if (mflags & P_NEW_MAP) 2043 if (mflags & P_NEW_MAP)
… …
2232/** 2074/**
2233 * This sends the skill number to name mapping. We ignore 2075 * This sends the skill number to name mapping. We ignore
2234 * the params - we always send the same info no matter what. 2076 * the params - we always send the same info no matter what.
2235 */ 2077 */
2236void 2078void
2237send_skill_info (client_socket *ns, char *params) 2079send_skill_info (client *ns, char *params)
2238{ 2080{
2239 packet sl; 2081 packet sl;
2240 sl << "replyinfo skill_info\n"; 2082 sl << "replyinfo skill_info\n";
2241 2083
2242 for (int i = 1; i < NUM_SKILLS; i++) 2084 for (int i = 1; i < NUM_SKILLS; i++)
… …
2246 { 2088 {
2247 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2089 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2248 fatal (0); 2090 fatal (0);
2249 } 2091 }
2250 2092
2251 Send_With_Handling (ns, &sl); 2093 ns->send_packet (sl);
2252} 2094}
2253 2095
2254/** 2096/**
2255 * This sends the spell path to name mapping. We ignore 2097 * This sends the spell path to name mapping. We ignore
2256 * the params - we always send the same info no matter what. 2098 * the params - we always send the same info no matter what.
2257 */ 2099 */
2258void 2100void
2259send_spell_paths (client_socket * ns, char *params) 2101send_spell_paths (client * ns, char *params)
2260{ 2102{
2261 packet sl; 2103 packet sl;
2262 2104
2263 sl << "replyinfo spell_paths\n"; 2105 sl << "replyinfo spell_paths\n";
2264 2106
… …
2269 { 2111 {
2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2112 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2271 fatal (0); 2113 fatal (0);
2272 } 2114 }
2273 2115
2274 Send_With_Handling (ns, &sl); 2116 ns->send_packet (sl);
2275} 2117}
2276 2118
2277/** 2119/**
2278 * This looks for any spells the player may have that have changed their stats. 2120 * This looks for any spells the player may have that have changed their stats.
2279 * it then sends an updspell packet for each spell that has changed in this way 2121 * it then sends an updspell packet for each spell that has changed in this way
… …
2319 2161
2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2162 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2163 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2164 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2323 2165
2324 Send_With_Handling (pl->socket, &sl); 2166 pl->socket->send_packet (sl);
2325 } 2167 }
2326 } 2168 }
2327 } 2169 }
2328} 2170}
2329 2171
… …
2342 packet sl; 2184 packet sl;
2343 2185
2344 sl << "delspell " 2186 sl << "delspell "
2345 << uint32 (spell->count); 2187 << uint32 (spell->count);
2346 2188
2347 Send_With_Handling (pl->socket, &sl); 2189 pl->socket->send_packet (sl);
2348} 2190}
2349 2191
2350/* appends the spell *spell to the Socklist we will send the data to. */ 2192/* appends the spell *spell to the Socklist we will send the data to. */
2351static void 2193static void
2352append_spell (player *pl, packet &sl, object *spell) 2194append_spell (player *pl, packet &sl, object *spell)
… …
2404 2246
2405 if (!pl->socket->monitor_spells) 2247 if (!pl->socket->monitor_spells)
2406 return; 2248 return;
2407 2249
2408 packet sl; 2250 packet sl;
2409
2410 sl << "addspell "; 2251 sl << "addspell ";
2411 2252
2412 if (!spell) 2253 if (!spell)
2413 { 2254 {
2414 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
… …
2429 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2430 continue; 2271 continue;
2431 2272
2432 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2433 { 2274 {
2434 Send_With_Handling (pl->socket, &sl); 2275 pl->socket->send_packet (sl);
2435 2276
2436 sl.reset (); 2277 sl.reset ();
2437 sl << "addspell "; 2278 sl << "addspell ";
2438 } 2279 }
2439 2280
… …
2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2454 fatal (0); 2295 fatal (0);
2455 } 2296 }
2456 2297
2457 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2458 Send_With_Handling (pl->socket, &sl); 2299 pl->socket->send_packet (sl);
2459} 2300}
2460 2301

Diff Legend

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