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

Diff Legend

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