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.44 by root, Sat Dec 16 21:40:26 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 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 {
… …
219 } 204 }
220 } 205 }
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;
209}
210
211/**
212 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide
214 * that information.
215 */
216void
217RequestInfo (char *buf, int len, client * ns)
218{
219 char *params = NULL, *cp;
220
221 /* No match */
222 char bigbuf[MAX_BUF];
223 int slen;
224
225 /* Set up replyinfo before we modify any of the buffers - this is used
226 * if we don't find a match.
227 */
228 strcpy (bigbuf, "replyinfo ");
229 slen = strlen (bigbuf);
230 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
231
232 /* find the first space, make it null, and update the
233 * params pointer.
234 */
235 for (cp = buf; *cp != '\0'; cp++)
236 if (*cp == ' ')
237 {
238 *cp = '\0';
239 params = cp + 1;
240 break;
241 }
242
243 if (!strcmp (buf, "image_info"))
244 send_image_info (ns, params);
245 else if (!strcmp (buf, "image_sums"))
246 send_image_sums (ns, params);
247 else if (!strcmp (buf, "skill_info"))
248 send_skill_info (ns, params);
249 else if (!strcmp (buf, "spell_paths"))
250 send_spell_paths (ns, params);
251 else
252 ns->send_packet (bigbuf, len);
224} 253}
225 254
226void 255void
227ExtCmd (char *buf, int len, player *pl) 256ExtCmd (char *buf, int len, player *pl)
228{ 257{
… …
316 pl->socket->send_packet (bigbuf); 345 pl->socket->send_packet (bigbuf);
317} 346}
318 347
319/** This is the Setup cmd - easy first implementation */ 348/** This is the Setup cmd - easy first implementation */
320void 349void
321SetUp (char *buf, int len, client_socket * ns) 350SetUp (char *buf, int len, client * ns)
322{ 351{
323 int s, slen; 352 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 353 char *cmd, *param, cmdback[HUGE_BUF];
325 354
326 /* run through the cmds of setup 355 /* run through the cmds of setup
… …
536 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
537 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
538 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
539 */ 568 */
540void 569void
541AddMeCmd (char *buf, int len, client_socket * ns) 570AddMeCmd (char *buf, int len, client * ns)
542{ 571{
543 Settings oldsettings;
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns)) 572 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed"); 573 ns->send_packet ("addme_failed");
548 else 574 else
549 ns->send_packet ("addme_success"); 575 ns->send_packet ("addme_success");
550
551 settings = oldsettings;
552} 576}
553 577
554/** Reply to ExtendedInfos command */ 578/** Reply to ExtendedInfos command */
555void 579void
556ToggleExtendedInfos (char *buf, int len, client_socket * ns) 580ToggleExtendedInfos (char *buf, int len, client * ns)
557{ 581{
558 char cmdback[MAX_BUF]; 582 char cmdback[MAX_BUF];
559 char command[50]; 583 char command[50];
560 int info, nextinfo; 584 int info, nextinfo;
561 585
… …
612#define MSG_TYPE_MONUMENT 5 636#define MSG_TYPE_MONUMENT 5
613#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 637#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614 638
615/** Reply to ExtendedInfos command */ 639/** Reply to ExtendedInfos command */
616void 640void
617ToggleExtendedText (char *buf, int len, client_socket * ns) 641ToggleExtendedText (char *buf, int len, client * ns)
618{ 642{
619 char cmdback[MAX_BUF]; 643 char cmdback[MAX_BUF];
620 char temp[10]; 644 char temp[10];
621 char command[50]; 645 char command[50];
622 int info, nextinfo, i, flag; 646 int info, nextinfo, i, flag;
… …
673 * a piece of data from us that we know the client wants. So 697 * a piece of data from us that we know the client wants. So
674 * if we know the client wants it, might as well push it to the 698 * if we know the client wants it, might as well push it to the
675 * client. 699 * client.
676 */ 700 */
677static void 701static void
678SendSmooth (client_socket * ns, uint16 face) 702SendSmooth (client *ns, uint16 face)
679{ 703{
680 uint16 smoothface; 704 uint16 smoothface;
681 705
682 /* If we can't find a face, return and set it so we won't try to send this 706 /* If we can't find a face, return and set it so we won't try to send this
683 * again. 707 * again.
… …
699 723
700 sl << "smooth " 724 sl << "smooth "
701 << uint16 (face) 725 << uint16 (face)
702 << uint16 (smoothface); 726 << uint16 (smoothface);
703 727
704 Send_With_Handling (ns, &sl); 728 ns->send_packet (sl);
705} 729}
706 730
707 /** 731 /**
708 * Tells client the picture it has to use 732 * Tells client the picture it has to use
709 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
710 */ 734 */
711void 735void
712AskSmooth (char *buf, int len, client_socket * ns) 736AskSmooth (char *buf, int len, client *ns)
713{ 737{
714 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
715
716 facenbr = atoi (buf);
717 SendSmooth (ns, facenbr);
718} 739}
719 740
720/** 741/**
721 * This handles the general commands from the client (ie, north, fire, cast, 742 * This handles the general commands from the client (ie, north, fire, cast,
722 * etc.) 743 * etc.)
723 */ 744 */
724void 745void
725PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
726{ 747{
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 748 /* Check if there is a count. In theory, a zero count could also be
739 * sent, so check for that also. 749 * sent, so check for that also.
740 */ 750 */
741 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
742 { 752 {
743 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
744 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
745 if (!buf) 756 if (!buf)
746 {
747#ifdef ESRV_DEBUG
748 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749#endif
750 return; 757 return;
751 } 758
752 buf++; 759 buf++;
753 } 760 }
754 /* This should not happen anymore. */ 761
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); 762 execute_newserver_command (pl->ob, (char *) buf);
763
761 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
762 * Cleaning up the input should probably be done first - all actions 765 * 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 766 * for the command that issued the count should be done before any other
764 * commands. 767 * commands.
765 */ 768 */
766
767 pl->count = 0; 769 pl->count = 0;
768
769} 770}
770 771
771 772
772/** 773/**
773 * This handles the general commands from the client (ie, north, fire, cast, 774 * This handles the general commands from the client (ie, north, fire, cast,
774 * etc.). It is a lot like PlayerCmd above, but is called with the 775 * etc.). It is a lot like PlayerCmd above, but is called with the
775 * 'ncom' method which gives more information back to the client so it 776 * 'ncom' method which gives more information back to the client so it
776 * can throttle. 777 * can throttle.
777 */ 778 */
778void 779void
779NewPlayerCmd (uint8 * buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
780{ 781{
781 int time, repeat;
782 char command[MAX_BUF];
783 int pktlen;
784
785 if (len < 7) 782 if (len <= 6)
786 { 783 {
787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
788 return; 785 return;
789 } 786 }
790 787
791 pktlen = net_uint16 (buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
792 repeat = net_uint32 (buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793 790
794 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
795 if (repeat != -1) 792 if (repeat != -1)
796 pl->count = repeat; 793 pl->count = repeat;
797 794
798 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
799 len = MAX_BUF - 5;
800 796
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); 797 execute_newserver_command (pl->ob, buf);
798
821 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
822 * Cleaning up the input should probably be done first - all actions 800 * 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 801 * for the command that issued the count should be done before any other
824 * commands. 802 * commands.
825 */ 803 */
826 pl->count = 0; 804 pl->count = 0;
827 805
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
828 if (FABS (pl->ob->speed) < 0.001) 807 int time = FABS (pl->ob->speed) < 0.001
829 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
830 else
831 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
832 810
833 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
834
835 packet sl; 812 packet sl;
836 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << "comc " << uint16 (cmdid) << uint32 (time);
837 Send_With_Handling (pl->socket, &sl); 814 pl->socket->send_packet (sl);
838} 815}
839 816
840 817
841/** This is a reply to a previous query. */ 818/** This is a reply to a previous query. */
842void 819void
843ReplyCmd (char *buf, int len, player *pl) 820ReplyCmd (char *buf, int len, player *pl)
844{ 821{
845 /* This is to synthesize how the data would be stored if it 822 /* This is to synthesize how the data would be stored if it
846 * was normally entered. A bit of a hack, and should be cleaned up 823 * was normally entered. A bit of a hack, and should be cleaned up
847 * once all the X11 code is removed from the server. 824 * once all the X11 code is removed from the server.
848 * 825 *
849 * We pass 13 to many of the functions because this way they 826 * We pass 13 to many of the functions because this way they
850 * think it was the carriage return that was entered, and the 827 * think it was the carriage return that was entered, and the
851 * function then does not try to do additional input. 828 * function then does not try to do additional input.
… …
854 831
855 /* this avoids any hacking here */ 832 /* this avoids any hacking here */
856 833
857 switch (pl->state) 834 switch (pl->state)
858 { 835 {
859 case ST_PLAYING: 836 case ST_PLAYING:
860 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 837 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861 break; 838 break;
862 839
863 case ST_PLAY_AGAIN: 840 case ST_PLAY_AGAIN:
864 /* We can check this for return value (2==quit). Maybe we 841 /* We can check this for return value (2==quit). Maybe we
865 * should, and do something appropriate? 842 * should, and do something appropriate?
866 */ 843 */
867 receive_play_again (pl->ob, buf[0]); 844 receive_play_again (pl->ob, buf[0]);
868 break; 845 break;
869 846
870 case ST_ROLL_STAT: 847 case ST_ROLL_STAT:
871 key_roll_stat (pl->ob, buf[0]); 848 key_roll_stat (pl->ob, buf[0]);
872 break; 849 break;
873 850
874 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
875 852
876 key_change_class (pl->ob, buf[0]); 853 key_change_class (pl->ob, buf[0]);
877 break; 854 break;
878 855
879 case ST_CONFIRM_QUIT: 856 case ST_CONFIRM_QUIT:
880 key_confirm_quit (pl->ob, buf[0]); 857 key_confirm_quit (pl->ob, buf[0]);
881 break; 858 break;
882 859
883 case ST_CONFIGURE: 860 case ST_CONFIGURE:
884 LOG (llevError, "In client input handling, but into configure state\n"); 861 LOG (llevError, "In client input handling, but into configure state\n");
885 pl->state = ST_PLAYING; 862 pl->state = ST_PLAYING;
886 break; 863 break;
887 864
888 case ST_GET_NAME: 865 case ST_GET_NAME:
889 receive_player_name (pl->ob, 13); 866 receive_player_name (pl->ob, 13);
890 break; 867 break;
891 868
892 case ST_GET_PASSWORD: 869 case ST_GET_PASSWORD:
893 case ST_CONFIRM_PASSWORD: 870 case ST_CONFIRM_PASSWORD:
894 receive_player_password (pl->ob, 13); 871 receive_player_password (pl->ob, 13);
895 break; 872 break;
896 873
897 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 874 case ST_GET_PARTY_PASSWORD: /* Get password for party */
898 receive_party_password (pl->ob, 13); 875 receive_party_password (pl->ob, 13);
899 break; 876 break;
900 877
901 default: 878 default:
902 LOG (llevError, "Unknown input state: %d\n", pl->state); 879 LOG (llevError, "Unknown input state: %d\n", pl->state);
903 } 880 }
904} 881}
905 882
906/** 883/**
907 * Client tells its version. If there is a mismatch, we close the 884 * Client tells its version. If there is a mismatch, we close the
… …
909 * something older than the server. If we assume the client will be 886 * something older than the server. If we assume the client will be
910 * backwards compatible, having it be a later version should not be a 887 * backwards compatible, having it be a later version should not be a
911 * problem. 888 * problem.
912 */ 889 */
913void 890void
914VersionCmd (char *buf, int len, client_socket * ns) 891VersionCmd (char *buf, int len, client * ns)
915{ 892{
916 char *cp;
917 char version_warning[256];
918
919 if (!buf) 893 if (!buf)
920 { 894 {
921 LOG (llevError, "CS: received corrupted version command\n"); 895 LOG (llevError, "CS: received corrupted version command\n");
922 return; 896 return;
923 } 897 }
924 898
925 ns->cs_version = atoi (buf); 899 ns->cs_version = atoi (buf);
926 ns->sc_version = ns->cs_version; 900 ns->sc_version = ns->cs_version;
901
902 LOG (llevDebug, "connection from client <%s>\n", buf);
903
904
905 //TODO: should log here just for statistics
906
927 if (VERSION_CS != ns->cs_version) 907 //if (VERSION_CS != ns->cs_version)
928 { 908 // unchecked;
929#ifdef ESRV_DEBUG 909
930 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931#endif
932 }
933 cp = strchr (buf + 1, ' '); 910 char *cp = strchr (buf + 1, ' ');
934 if (!cp) 911 if (!cp)
935 return; 912 return;
913
936 ns->sc_version = atoi (cp); 914 ns->sc_version = atoi (cp);
915
937 if (VERSION_SC != ns->sc_version) 916 //if (VERSION_SC != ns->sc_version)
938 { 917 // unchecked;
939#ifdef ESRV_DEBUG 918
940 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941#endif
942 }
943 cp = strchr (cp + 1, ' '); 919 cp = strchr (cp + 1, ' ');
920
944 if (cp) 921 if (cp)
945 { 922 {
946 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 923 assign (ns->version, cp + 1);
947 924
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) 925 if (ns->sc_version < 1026)
960 { 926 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!! ****"); 927 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
963 ns->send_packet (version_warning);
964 }
965
966 } 928 }
967} 929}
968 930
969/** sound related functions. */ 931/** sound related functions. */
970
971void 932void
972SetSound (char *buf, int len, client_socket * ns) 933SetSound (char *buf, int len, client * ns)
973{ 934{
974 ns->sound = atoi (buf); 935 ns->sound = atoi (buf);
975} 936}
976 937
977/** client wants the map resent */ 938/** client wants the map resent */
978 939
979void 940void
980MapRedrawCmd (char *buf, int len, player *pl) 941MapRedrawCmd (char *buf, int len, player *pl)
981{ 942{
982
983/* This function is currently disabled; just clearing the map state results in 943/* This function is currently disabled; just clearing the map state results in
984 * display errors. It should clear the cache and send a newmap command. 944 * display errors. It should clear the cache and send a newmap command.
985 * Unfortunately this solution does not work because some client versions send 945 * Unfortunately this solution does not work because some client versions send
986 * a mapredraw command after receiving a newmap command. 946 * a mapredraw command after receiving a newmap command.
987 */ 947 */
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} 948}
996 949
997/** 950/**
998 * Moves an object (typically, container to inventory). 951 * Moves an object (typically, container to inventory).
999 * syntax is: move (to) (tag) (nrof) 952 * syntax is: move (to) (tag) (nrof)
… …
1002MoveCmd (char *buf, int len, player *pl) 955MoveCmd (char *buf, int len, player *pl)
1003{ 956{
1004 int vals[3], i; 957 int vals[3], i;
1005 958
1006 /* A little funky here. We only cycle for 2 records, because 959 /* A little funky here. We only cycle for 2 records, because
1007 * we obviously am not going to find a space after the third 960 * we obviously are not going to find a space after the third
1008 * record. Perhaps we should just replace this with a 961 * record. Perhaps we should just replace this with a
1009 * sscanf? 962 * sscanf?
1010 */ 963 */
1011 for (i = 0; i < 2; i++) 964 for (i = 0; i < 2; i++)
1012 { 965 {
1013 vals[i] = atoi (buf); 966 vals[i] = atoi (buf);
967
1014 if (!(buf = strchr (buf, ' '))) 968 if (!(buf = strchr (buf, ' ')))
1015 { 969 {
1016 LOG (llevError, "Incomplete move command: %s\n", buf); 970 LOG (llevError, "Incomplete move command: %s\n", buf);
1017 return; 971 return;
1018 } 972 }
973
1019 buf++; 974 buf++;
1020 } 975 }
976
1021 vals[2] = atoi (buf); 977 vals[2] = atoi (buf);
1022 978
1023/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 979/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1024 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 980 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025} 981}
1026
1027
1028 982
1029/****************************************************************************** 983/******************************************************************************
1030 * 984 *
1031 * Start of commands the server sends to the client. 985 * Start of commands the server sends to the client.
1032 * 986 *
… …
1035/** 989/**
1036 * Asks the client to query the user. This way, the client knows 990 * Asks the client to query the user. This way, the client knows
1037 * it needs to send something back (vs just printing out a message) 991 * it needs to send something back (vs just printing out a message)
1038 */ 992 */
1039void 993void
1040send_query (client_socket * ns, uint8 flags, char *text) 994send_query (client *ns, uint8 flags, char *text)
1041{ 995{
1042 char buf[MAX_BUF];
1043
1044 sprintf (buf, "query %d %s", flags, text ? text : ""); 996 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045 ns->send_packet (buf);
1046} 997}
1047 998
1048#define AddIfInt64(Old,New,Type) if (Old != New) {\ 999#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049 Old = New; \ 1000 Old = New; \
1050 sl << uint8 (Type) << uint64 (New); \ 1001 sl << uint8 (Type) << uint64 (New); \
… …
1083 uint16 flags; 1034 uint16 flags;
1084 1035
1085 packet sl; 1036 packet sl;
1086 sl << "stats "; 1037 sl << "stats ";
1087 1038
1088 if (pl->ob != NULL) 1039 if (pl->ob)
1089 { 1040 {
1090 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);
1091 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);
1092 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);
1093 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);
… …
1101 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);
1102 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);
1103 } 1054 }
1104 1055
1105 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1106 {
1107 uint8 s;
1108
1109 for (s = 0; s < NUM_SKILLS; s++) 1057 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) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1112 { 1059 {
1113 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1114 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1115 */ 1062 */
1116 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1117 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1118 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1119 1066
1120 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;
1121 } 1068 }
1122 }
1123 }
1124 1069
1125 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1126 { 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) }
1127 else 1072 else
1128 { 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) }
… …
1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1147 1092
1148 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1149 { 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) }
1150 else 1095 else
1151 {
1152 int i;
1153
1154 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1155 { 1097 {
1156 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1157 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1158 continue; 1100 continue;
1159 1101
1160 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]);
1161 } 1103 }
1162 }
1163 1104
1164 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1165 { 1106 {
1166 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);
1167 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);
… …
1173 set_title (pl->ob, buf); 1114 set_title (pl->ob, buf);
1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1175 1116
1176 /* Only send it away if we have some actual data */ 1117 /* Only send it away if we have some actual data */
1177 if (sl.length () > 6) 1118 if (sl.length () > 6)
1178 Send_With_Handling (pl->socket, &sl); 1119 pl->socket->send_packet (sl);
1179} 1120}
1180 1121
1181/** 1122/**
1182 * 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.
1183 */ 1124 */
… …
1192 sl << uint32 (pl->ob->count) 1133 sl << uint32 (pl->ob->count)
1193 << uint32 (weight) 1134 << uint32 (weight)
1194 << uint32 (pl->ob->face->number) 1135 << uint32 (pl->ob->face->number)
1195 << data8 (pl->ob->name); 1136 << data8 (pl->ob->name);
1196 1137
1197 Send_With_Handling (pl->socket, &sl); 1138 pl->socket->send_packet (sl);
1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1199} 1140}
1200 1141
1201/** 1142/**
1202 * Need to send an animation sequence to the client. 1143 * Need to send an animation sequence to the client.
… …
1204 * sent them the face yet (this can become quite costly in terms of 1145 * sent them the face yet (this can become quite costly in terms of
1205 * how much we are sending - on the other hand, this should only happen 1146 * how much we are sending - on the other hand, this should only happen
1206 * when the player logs in and picks stuff up. 1147 * when the player logs in and picks stuff up.
1207 */ 1148 */
1208void 1149void
1209esrv_send_animation (client_socket * ns, short anim_num) 1150esrv_send_animation (client * ns, short anim_num)
1210{ 1151{
1211 int i;
1212
1213 /* Do some checking on the anim_num we got. Note that the animations 1152 /* Do some checking on the anim_num we got. Note that the animations
1214 * are added in contigous order, so if the number is in the valid 1153 * are added in contigous order, so if the number is in the valid
1215 * range, it must be a valid animation. 1154 * range, it must be a valid animation.
1216 */ 1155 */
1217 if (anim_num < 0 || anim_num > num_animations) 1156 if (anim_num < 0 || anim_num > num_animations)
… …
1227 << uint16 (0); /* flags - not used right now */ 1166 << uint16 (0); /* flags - not used right now */
1228 1167
1229 /* Build up the list of faces. Also, send any information (ie, the 1168 /* Build up the list of faces. Also, send any information (ie, the
1230 * the face itself) down to the client. 1169 * the face itself) down to the client.
1231 */ 1170 */
1232 for (i = 0; i < animations[anim_num].num_animations; i++) 1171 for (int i = 0; i < animations[anim_num].num_animations; i++)
1233 { 1172 {
1234 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1173 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1235 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1174 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1175
1236 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1176 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1237 } 1177 }
1238 1178
1239 Send_With_Handling (ns, &sl); 1179 ns->send_packet (sl);
1240 1180
1241 ns->anims_sent[anim_num] = 1; 1181 ns->anims_sent[anim_num] = 1;
1242} 1182}
1243 1183
1244 1184
… …
1251/** 1191/**
1252 * This adds face_num to a map cell at x,y. If the client doesn't have 1192 * This adds face_num to a map cell at x,y. If the client doesn't have
1253 * the face yet, we will also send it. 1193 * the face yet, we will also send it.
1254 */ 1194 */
1255static void 1195static void
1256esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1196esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1257{ 1197{
1258 if (newmap->cells[x][y].count >= MAP_LAYERS) 1198 if (newmap->cells[x][y].count >= MAP_LAYERS)
1259 { 1199 {
1200 //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); 1201 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261 return; 1202 return;
1262 abort (); 1203 abort ();
1263 } 1204 }
1264 1205
1265 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1206 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266 newmap->cells[x][y].count++; 1207 newmap->cells[x][y].count++;
1267 1208
1268 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1209 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269 esrv_send_face (ns, face_num, 0); 1210 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} 1211}
1378 1212
1379/** Clears a map cell */ 1213/** Clears a map cell */
1380static void 1214static void
1381map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1215map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1393#define MAX_LAYERS 3 1227#define MAX_LAYERS 3
1394 1228
1395/* Using a global really isn't a good approach, but saves the over head of 1229/* Using a global really isn't a good approach, but saves the over head of
1396 * allocating and deallocating such a block of data each time run through, 1230 * allocating and deallocating such a block of data each time run through,
1397 * and saves the space of allocating this in the socket object when we only 1231 * and saves the space of allocating this in the socket object when we only
1398 * need it for this cycle. If the serve is ever threaded, this needs to be 1232 * need it for this cycle. If the server is ever threaded, this needs to be
1399 * re-examined. 1233 * re-examined.
1400 */ 1234 */
1401
1402static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1235static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1403 1236
1404/** 1237/**
1405 * Returns true if any of the heads for this 1238 * Returns true if any of the heads for this
1406 * space is set. Returns false if all are blank - this is used 1239 * space is set. Returns false if all are blank - this is used
1407 * for empty space checking. 1240 * for empty space checking.
1408 */ 1241 */
1409static inline int 1242static inline int
1410have_head (int ax, int ay) 1243have_head (int ax, int ay)
1411{ 1244{
1412
1413 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1245 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]) 1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415 return 1; 1247 return 1;
1248
1416 return 0; 1249 return 0;
1417} 1250}
1418 1251
1419/** 1252/**
1420 * check_head is a bit simplistic version of update_space below. 1253 * 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 1254 * 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 1255 * 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 1256 * if needed, and returning 1. If this no data needs to get
1424 * sent, it returns zero. 1257 * sent, it returns zero.
1425 */ 1258 */
1426static int 1259static int
1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1260check_head (packet &sl, client &ns, int ax, int ay, int layer)
1428{ 1261{
1429 short face_num; 1262 short face_num;
1430 1263
1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1264 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1265 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1464 * numbers the spaces differently - I think this was a leftover from 1297 * 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 1298 * 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 1299 * the case, it seems to make more sense to have these layer values
1467 * actually match. 1300 * actually match.
1468 */ 1301 */
1469
1470static int 1302static int
1471update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1303update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1472{ 1304{
1473 object *ob, *head; 1305 object *ob, *head;
1474 uint16 face_num; 1306 uint16 face_num;
1475 int bx, by, i; 1307 int bx, by, i;
1476 1308
… …
1689 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1521 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1690 * take. 1522 * take.
1691 */ 1523 */
1692 1524
1693static inline int 1525static inline int
1694update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1526update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1695{ 1527{
1696 object *ob; 1528 object *ob;
1697 int smoothlevel; /* old face_num; */ 1529 int smoothlevel; /* old face_num; */
1698 1530
1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1733 * Returns the size of a data for a map square as returned by 1565 * Returns the size of a data for a map square as returned by
1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1566 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1735 * available. 1567 * available.
1736 */ 1568 */
1737int 1569int
1738getExtendedMapInfoSize (client_socket * ns) 1570getExtendedMapInfoSize (client * ns)
1739{ 1571{
1740 int result = 0; 1572 int result = 0;
1741 1573
1742 if (ns->ext_mapinfos) 1574 if (ns->ext_mapinfos)
1743 { 1575 {
1744 if (ns->EMI_smooth) 1576 if (ns->EMI_smooth)
1745 result += 1; /*One byte for smoothlevel */ 1577 result += 1; /*One byte for smoothlevel */
1746 } 1578 }
1579
1747 return result; 1580 return result;
1748} 1581}
1749 1582
1750/** 1583/**
1751 * This function uses the new map1 protocol command to send the map 1584 * This function uses the new map1 protocol command to send the map
… …
1779 uint8 eentrysize; 1612 uint8 eentrysize;
1780 uint16 ewhatstart, ewhatflag; 1613 uint16 ewhatstart, ewhatflag;
1781 uint8 extendedinfos; 1614 uint8 extendedinfos;
1782 maptile *m; 1615 maptile *m;
1783 1616
1784 client_socket &socket = *pl->contr->socket; 1617 client &socket = *pl->contr->socket;
1785 1618
1786 check_map_change (pl->contr); 1619 check_map_change (pl->contr);
1787 1620
1788 packet sl; 1621 packet sl;
1789 packet esl; 1622 packet esl;
… …
1868 * with no faces tells the client to blank out the 1701 * with no faces tells the client to blank out the
1869 * space. 1702 * space.
1870 */ 1703 */
1871 got_one = 0; 1704 got_one = 0;
1872 for (i = oldlen + 2; i < sl.length (); i++) 1705 for (i = oldlen + 2; i < sl.length (); i++)
1873 if (sl.buf[i]) 1706 if (sl[i])
1874 got_one = 1; 1707 got_one = 1;
1875 1708
1876 if (got_one && (mask & 0xf)) 1709 if (got_one && (mask & 0xf))
1877 sl.buf[oldlen + 1] = mask & 0xff; 1710 sl[oldlen + 1] = mask & 0xff;
1878 else 1711 else
1879 { /*either all faces blank, either no face at all */ 1712 { /*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 */ 1713 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1881 sl.reset (oldlen + 2); 1714 sl.reset (oldlen + 2);
1882 else 1715 else
… …
1948 1781
1949 map_clearcell (&lastcell, 0, 0, 0, count); 1782 map_clearcell (&lastcell, 0, 0, 0, count);
1950 } 1783 }
1951 1784
1952 if ((mask & 0xf) || need_send) 1785 if ((mask & 0xf) || need_send)
1953 sl.buf[oldlen + 1] = mask & 0xff; 1786 sl[oldlen + 1] = mask & 0xff;
1954 else 1787 else
1955 sl.reset (oldlen); 1788 sl.reset (oldlen);
1956 } 1789 }
1957 else 1790 else
1958 { 1791 {
… …
1988 mask |= 0x8; 1821 mask |= 0x8;
1989 1822
1990 if (socket.extmap) 1823 if (socket.extmap)
1991 { 1824 {
1992 *last_ext |= 0x80; 1825 *last_ext |= 0x80;
1993 last_ext = sl.buf + sl.length (); 1826 last_ext = &sl[sl.length ()];
1994 sl << uint8 (d); 1827 sl << uint8 (d);
1995 } 1828 }
1996 else 1829 else
1997 sl << uint8 (255 - 64 * d); 1830 sl << uint8 (255 - 64 * d);
1998 } 1831 }
… …
2032 { 1865 {
2033 lastcell.stat_hp = stat_hp; 1866 lastcell.stat_hp = stat_hp;
2034 1867
2035 mask |= 0x8; 1868 mask |= 0x8;
2036 *last_ext |= 0x80; 1869 *last_ext |= 0x80;
2037 last_ext = sl.buf + sl.length (); 1870 last_ext = &sl[sl.length ()];
2038 1871
2039 sl << uint8 (5) << uint8 (stat_hp); 1872 sl << uint8 (5) << uint8 (stat_hp);
2040 1873
2041 if (stat_width > 1) 1874 if (stat_width > 1)
2042 { 1875 {
2043 *last_ext |= 0x80; 1876 *last_ext |= 0x80;
2044 last_ext = sl.buf + sl.length (); 1877 last_ext = &sl[sl.length ()];
2045 1878
2046 sl << uint8 (6) << uint8 (stat_width); 1879 sl << uint8 (6) << uint8 (stat_width);
2047 } 1880 }
2048 } 1881 }
2049 1882
… …
2051 { 1884 {
2052 lastcell.player = player; 1885 lastcell.player = player;
2053 1886
2054 mask |= 0x8; 1887 mask |= 0x8;
2055 *last_ext |= 0x80; 1888 *last_ext |= 0x80;
2056 last_ext = sl.buf + sl.length (); 1889 last_ext = &sl[sl.length ()];
2057 1890
2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1891 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2059 } 1892 }
2060 1893
2061 if (lastcell.flags != flags) 1894 if (lastcell.flags != flags)
2062 { 1895 {
2063 lastcell.flags = flags; 1896 lastcell.flags = flags;
2064 1897
2065 mask |= 0x8; 1898 mask |= 0x8;
2066 *last_ext |= 0x80; 1899 *last_ext |= 0x80;
2067 last_ext = sl.buf + sl.length (); 1900 last_ext = &sl[sl.length ()];
2068 1901
2069 sl << uint8 (8) << uint8 (flags); 1902 sl << uint8 (8) << uint8 (flags);
2070 } 1903 }
2071 } 1904 }
2072 1905
… …
2114 * space by checking the mask. If so, update the mask. 1947 * space by checking the mask. If so, update the mask.
2115 * if not, reset the len to that from before adding the mask 1948 * if not, reset the len to that from before adding the mask
2116 * value, so we don't send those bits. 1949 * value, so we don't send those bits.
2117 */ 1950 */
2118 if (mask & 0xf) 1951 if (mask & 0xf)
2119 sl.buf[oldlen + 1] = mask & 0xff; 1952 sl[oldlen + 1] = mask & 0xff;
2120 else 1953 else
2121 sl.reset (oldlen); 1954 sl.reset (oldlen);
2122 1955
2123 if (emask & 0xf) 1956 if (emask & 0xf)
2124 esl.buf[eoldlen + 1] = emask & 0xff; 1957 esl[eoldlen + 1] = emask & 0xff;
2125 else 1958 else
2126 esl.reset (eoldlen); 1959 esl.reset (eoldlen);
2127 } /* else this is a viewable space */ 1960 } /* else this is a viewable space */
2128 } /* for x loop */ 1961 } /* for x loop */
2129 } /* for y loop */ 1962 } /* for y loop */
… …
2135 { 1968 {
2136 /* No map data will follow, so don't say the client 1969 /* No map data will follow, so don't say the client
2137 * it doesn't need draw! 1970 * it doesn't need draw!
2138 */ 1971 */
2139 ewhatflag &= (~EMI_NOREDRAW); 1972 ewhatflag &= (~EMI_NOREDRAW);
2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1973 esl[ewhatstart + 1] = ewhatflag & 0xff;
2141 } 1974 }
2142 1975
2143 if (esl.length () > estartlen) 1976 if (esl.length () > estartlen)
2144 Send_With_Handling (&socket, &esl); 1977 socket.send_packet (esl);
2145 } 1978 }
2146 1979
2147 if (sl.length () > startlen || socket.sent_scroll) 1980 if (sl.length () > startlen || socket.sent_scroll)
2148 { 1981 {
2149 Send_With_Handling (&socket, &sl); 1982 socket.send_packet (sl);
2150 socket.sent_scroll = 0; 1983 socket.sent_scroll = 0;
2151 } 1984 }
2152} 1985}
2153 1986
2154/** 1987/**
… …
2188 { 2021 {
2189 ax = i; 2022 ax = i;
2190 ay = j; 2023 ay = j;
2191 m = pm; 2024 m = pm;
2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026
2193 if (mflags & P_OUT_OF_MAP) 2027 if (mflags & P_OUT_OF_MAP)
2194 continue; 2028 continue;
2029
2195 if (mflags & P_NEED_UPDATE) 2030 if (mflags & P_NEED_UPDATE)
2196 update_position (m, ax, ay); 2031 update_position (m, ax, ay);
2032
2197 /* If a map is visible to the player, we don't want to swap it out 2033 /* If a map is visible to the player, we don't want to swap it out
2198 * just to reload it. This should really call something like 2034 * just to reload it. This should really call something like
2199 * swap_map, but this is much more efficient and 'good enough' 2035 * swap_map, but this is much more efficient and 'good enough'
2200 */ 2036 */
2201 if (mflags & P_NEW_MAP) 2037 if (mflags & P_NEW_MAP)
… …
2232/** 2068/**
2233 * This sends the skill number to name mapping. We ignore 2069 * This sends the skill number to name mapping. We ignore
2234 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2235 */ 2071 */
2236void 2072void
2237send_skill_info (client_socket *ns, char *params) 2073send_skill_info (client *ns, char *params)
2238{ 2074{
2239 packet sl; 2075 packet sl;
2240 sl << "replyinfo skill_info\n"; 2076 sl << "replyinfo skill_info\n";
2241 2077
2242 for (int i = 1; i < NUM_SKILLS; i++) 2078 for (int i = 1; i < NUM_SKILLS; i++)
… …
2246 { 2082 {
2247 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2083 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2248 fatal (0); 2084 fatal (0);
2249 } 2085 }
2250 2086
2251 Send_With_Handling (ns, &sl); 2087 ns->send_packet (sl);
2252} 2088}
2253 2089
2254/** 2090/**
2255 * This sends the spell path to name mapping. We ignore 2091 * This sends the spell path to name mapping. We ignore
2256 * the params - we always send the same info no matter what. 2092 * the params - we always send the same info no matter what.
2257 */ 2093 */
2258void 2094void
2259send_spell_paths (client_socket * ns, char *params) 2095send_spell_paths (client * ns, char *params)
2260{ 2096{
2261 packet sl; 2097 packet sl;
2262 2098
2263 sl << "replyinfo spell_paths\n"; 2099 sl << "replyinfo spell_paths\n";
2264 2100
… …
2269 { 2105 {
2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2106 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2271 fatal (0); 2107 fatal (0);
2272 } 2108 }
2273 2109
2274 Send_With_Handling (ns, &sl); 2110 ns->send_packet (sl);
2275} 2111}
2276 2112
2277/** 2113/**
2278 * This looks for any spells the player may have that have changed their stats. 2114 * This looks for any spells the player may have that have changed their stats.
2279 * it then sends an updspell packet for each spell that has changed in this way 2115 * it then sends an updspell packet for each spell that has changed in this way
… …
2319 2155
2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2323 2159
2324 Send_With_Handling (pl->socket, &sl); 2160 pl->socket->send_packet (sl);
2325 } 2161 }
2326 } 2162 }
2327 } 2163 }
2328} 2164}
2329 2165
… …
2342 packet sl; 2178 packet sl;
2343 2179
2344 sl << "delspell " 2180 sl << "delspell "
2345 << uint32 (spell->count); 2181 << uint32 (spell->count);
2346 2182
2347 Send_With_Handling (pl->socket, &sl); 2183 pl->socket->send_packet (sl);
2348} 2184}
2349 2185
2350/* appends the spell *spell to the Socklist we will send the data to. */ 2186/* appends the spell *spell to the Socklist we will send the data to. */
2351static void 2187static void
2352append_spell (player *pl, packet &sl, object *spell) 2188append_spell (player *pl, packet &sl, object *spell)
… …
2404 2240
2405 if (!pl->socket->monitor_spells) 2241 if (!pl->socket->monitor_spells)
2406 return; 2242 return;
2407 2243
2408 packet sl; 2244 packet sl;
2409
2410 sl << "addspell "; 2245 sl << "addspell ";
2411 2246
2412 if (!spell) 2247 if (!spell)
2413 { 2248 {
2414 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
… …
2429 if (spell->type != SPELL) 2264 if (spell->type != SPELL)
2430 continue; 2265 continue;
2431 2266
2432 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2433 { 2268 {
2434 Send_With_Handling (pl->socket, &sl); 2269 pl->socket->send_packet (sl);
2435 2270
2436 sl.reset (); 2271 sl.reset ();
2437 sl << "addspell "; 2272 sl << "addspell ";
2438 } 2273 }
2439 2274
… …
2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2454 fatal (0); 2289 fatal (0);
2455 } 2290 }
2456 2291
2457 /* finally, we can send the packet */ 2292 /* finally, we can send the packet */
2458 Send_With_Handling (pl->socket, &sl); 2293 pl->socket->send_packet (sl);
2459} 2294}
2460 2295

Diff Legend

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