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.40 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 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.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * 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
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
156 144
157 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
158 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
159 147
160 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
161 socket.look_position = 0;
162} 149}
163 150
164/** check for map change and send new map data */ 151/** check for map change and send new map data */
165static void 152static void
166check_map_change (player *pl) 153check_map_change (player *pl)
167{ 154{
168 client_socket &socket = *pl->socket; 155 client &socket = *pl->socket;
169 object *ob = pl->ob; 156 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
171 158
172 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
173 { 160 {
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 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
209 else 196 else
210 { 197 {
211 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);
212 socket.update_look = 1; 199 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 200 }
215 } 201 }
216 202
217 socket.current_x = ob->x; 203 socket.current_x = ob->x;
218 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
222 * RequestInfo is sort of a meta command. There is some specific 208 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 209 * request of information, but we call other functions to provide
224 * that information. 210 * that information.
225 */ 211 */
226void 212void
227RequestInfo (char *buf, int len, client_socket * ns) 213RequestInfo (char *buf, int len, client * ns)
228{ 214{
229 char *params = NULL, *cp; 215 char *params = NULL, *cp;
230 216
231 /* No match */ 217 /* No match */
232 char bigbuf[MAX_BUF]; 218 char bigbuf[MAX_BUF];
… …
264 250
265void 251void
266ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
267{ 253{
268 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));
269} 261}
270 262
271void 263void
272MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
273{ 265{
… …
355 pl->socket->send_packet (bigbuf); 347 pl->socket->send_packet (bigbuf);
356} 348}
357 349
358/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
359void 351void
360SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
361{ 353{
362 int s, slen; 354 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
364 356
365 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
575 * 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.
576 * 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,
577 * 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.
578 */ 570 */
579void 571void
580AddMeCmd (char *buf, int len, client_socket * ns) 572AddMeCmd (char *buf, int len, client * ns)
581{ 573{
582 Settings oldsettings;
583
584 oldsettings = settings;
585 if (ns->status != Ns_Add || add_player (ns)) 574 if (ns->status != Ns_Add || add_player (ns))
586 ns->send_packet ("addme_failed"); 575 ns->send_packet ("addme_failed");
587 else 576 else
588 ns->send_packet ("addme_success"); 577 ns->send_packet ("addme_success");
589
590 settings = oldsettings;
591} 578}
592 579
593/** Reply to ExtendedInfos command */ 580/** Reply to ExtendedInfos command */
594void 581void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 582ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 583{
597 char cmdback[MAX_BUF]; 584 char cmdback[MAX_BUF];
598 char command[50]; 585 char command[50];
599 int info, nextinfo; 586 int info, nextinfo;
600 587
… …
651#define MSG_TYPE_MONUMENT 5 638#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 639#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 640
654/** Reply to ExtendedInfos command */ 641/** Reply to ExtendedInfos command */
655void 642void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 643ToggleExtendedText (char *buf, int len, client * ns)
657{ 644{
658 char cmdback[MAX_BUF]; 645 char cmdback[MAX_BUF];
659 char temp[10]; 646 char temp[10];
660 char command[50]; 647 char command[50];
661 int info, nextinfo, i, flag; 648 int info, nextinfo, i, flag;
… …
712 * 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
713 * 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
714 * client. 701 * client.
715 */ 702 */
716static void 703static void
717SendSmooth (client_socket * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
718{ 705{
719 uint16 smoothface; 706 uint16 smoothface;
720 707
721 /* 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
722 * again. 709 * again.
… …
732 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
733 esrv_send_face (ns, smoothface, 0); 720 esrv_send_face (ns, smoothface, 0);
734 721
735 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
736 723
737 packet sl; 724 packet sl ("smooth");
738 725
739 sl << "smooth "
740 << uint16 (face) 726 sl << uint16 (face)
741 << uint16 (smoothface); 727 << uint16 (smoothface);
742 728
743 ns->send_packet (sl); 729 ns->send_packet (sl);
744} 730}
745 731
746 /** 732 /**
747 * Tells client the picture it has to use 733 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 734 * to smooth a picture number given as argument.
749 */ 735 */
750void 736void
751AskSmooth (char *buf, int len, client_socket * ns) 737AskSmooth (char *buf, int len, client *ns)
752{ 738{
753 uint16 facenbr; 739 SendSmooth (ns, atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 740}
758 741
759/** 742/**
760 * 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,
761 * etc.) 744 * etc.)
762 */ 745 */
763void 746void
764PlayerCmd (char *buf, int len, player *pl) 747PlayerCmd (char *buf, int len, player *pl)
765{ 748{
766
767 /* The following should never happen with a proper or honest client.
768 * Therefore, the error message doesn't have to be too clear - if
769 * someone is playing with a hacked/non working client, this gives them
770 * an idea of the problem, but they deserve what they get
771 */
772 if (pl->state != ST_PLAYING)
773 {
774 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
775 return;
776 }
777 /* 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
778 * sent, so check for that also. 750 * sent, so check for that also.
779 */ 751 */
780 if (atoi (buf) || buf[0] == '0') 752 if (atoi (buf) || buf[0] == '0')
781 { 753 {
782 pl->count = atoi ((char *) buf); 754 pl->count = atoi ((char *) buf);
755
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 756 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 757 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 758 return;
790 } 759
791 buf++; 760 buf++;
792 } 761 }
793 /* This should not happen anymore. */ 762
794 if (pl->ob->speed_left < -1.0)
795 {
796 LOG (llevError, "Player has negative time - shouldn't do command.\n");
797 }
798 /* In c_new.c */
799 execute_newserver_command (pl->ob, (char *) buf); 763 execute_newserver_command (pl->ob, (char *) buf);
764
800 /* Perhaps something better should be done with a left over count. 765 /* Perhaps something better should be done with a left over count.
801 * Cleaning up the input should probably be done first - all actions 766 * Cleaning up the input should probably be done first - all actions
802 * 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
803 * commands. 768 * commands.
804 */ 769 */
805
806 pl->count = 0; 770 pl->count = 0;
807
808} 771}
809 772
810 773
811/** 774/**
812 * 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,
… …
815 * can throttle. 778 * can throttle.
816 */ 779 */
817void 780void
818NewPlayerCmd (char *buf, int len, player *pl) 781NewPlayerCmd (char *buf, int len, player *pl)
819{ 782{
820 int time, repeat;
821 char command[MAX_BUF];
822 int pktlen;
823
824 if (len < 7) 783 if (len <= 6)
825 { 784 {
826 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);
827 return; 786 return;
828 } 787 }
829 788
830 pktlen = net_uint16 ((uint8 *)buf); 789 uint16 cmdid = net_uint16 ((uint8 *)buf);
831 repeat = net_uint32 ((uint8 *)buf + 2); 790 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832 791
833 /* -1 is special - no repeat, but don't update */ 792 /* -1 is special - no repeat, but don't update */
834 if (repeat != -1) 793 if (repeat != -1)
835 pl->count = repeat; 794 pl->count = repeat;
836 795
837 if ((len - 4) >= MAX_BUF) 796 buf += 6; //len -= 6;
838 len = MAX_BUF - 5;
839 797
840 strncpy ((char *) command, (char *) buf + 6, len - 4);
841 command[len - 4] = 0;
842
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 LOG (llevError, "Player has negative time - shouldn't do command.\n");
846
847 /* In c_new.c */
848 execute_newserver_command (pl->ob, (char *) command); 798 execute_newserver_command (pl->ob, buf);
799
849 /* Perhaps something better should be done with a left over count. 800 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 801 * Cleaning up the input should probably be done first - all actions
851 * 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
852 * commands. 803 * commands.
853 */ 804 */
854 pl->count = 0; 805 pl->count = 0;
855 806
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
856 if (FABS (pl->ob->speed) < 0.001) 808 int time = FABS (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 809 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 810 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
860 811
861 /* Send confirmation of command execution now */ 812 /* Send confirmation of command execution now */
862 813 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 814 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 815 pl->socket->send_packet (sl);
866} 816}
867 817
868 818
869/** This is a reply to a previous query. */ 819/** This is a reply to a previous query. */
870void 820void
871ReplyCmd (char *buf, int len, player *pl) 821ReplyCmd (char *buf, int len, player *pl)
872{ 822{
873 /* 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
874 * 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
875 * once all the X11 code is removed from the server. 825 * once all the X11 code is removed from the server.
876 * 826 *
877 * 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
878 * think it was the carriage return that was entered, and the 828 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 829 * function then does not try to do additional input.
… …
882 832
883 /* this avoids any hacking here */ 833 /* this avoids any hacking here */
884 834
885 switch (pl->state) 835 switch (pl->state)
886 { 836 {
887 case ST_PLAYING: 837 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 838 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 839 break;
890 840
891 case ST_PLAY_AGAIN: 841 case ST_PLAY_AGAIN:
892 /* We can check this for return value (2==quit). Maybe we 842 /* We can check this for return value (2==quit). Maybe we
893 * should, and do something appropriate? 843 * should, and do something appropriate?
894 */ 844 */
895 receive_play_again (pl->ob, buf[0]); 845 receive_play_again (pl->ob, buf[0]);
896 break; 846 break;
897 847
898 case ST_ROLL_STAT: 848 case ST_ROLL_STAT:
899 key_roll_stat (pl->ob, buf[0]); 849 key_roll_stat (pl->ob, buf[0]);
900 break; 850 break;
901 851
902 case ST_CHANGE_CLASS: 852 case ST_CHANGE_CLASS:
903 853
904 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
905 break; 855 break;
906 856
907 case ST_CONFIRM_QUIT: 857 case ST_CONFIRM_QUIT:
908 key_confirm_quit (pl->ob, buf[0]); 858 key_confirm_quit (pl->ob, buf[0]);
909 break; 859 break;
910 860
911 case ST_CONFIGURE: 861 case ST_CONFIGURE:
912 LOG (llevError, "In client input handling, but into configure state\n"); 862 LOG (llevError, "In client input handling, but into configure state\n");
913 pl->state = ST_PLAYING; 863 pl->state = ST_PLAYING;
914 break; 864 break;
915 865
916 case ST_GET_NAME: 866 case ST_GET_NAME:
917 receive_player_name (pl->ob, 13); 867 receive_player_name (pl->ob, 13);
918 break; 868 break;
919 869
920 case ST_GET_PASSWORD: 870 case ST_GET_PASSWORD:
921 case ST_CONFIRM_PASSWORD: 871 case ST_CONFIRM_PASSWORD:
922 receive_player_password (pl->ob, 13); 872 receive_player_password (pl->ob, 13);
923 break; 873 break;
924 874
925 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 875 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 876 receive_party_password (pl->ob, 13);
927 break; 877 break;
928 878
929 default: 879 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 880 LOG (llevError, "Unknown input state: %d\n", pl->state);
931 } 881 }
932} 882}
933 883
934/** 884/**
935 * 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
… …
937 * 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
938 * 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
939 * problem. 889 * problem.
940 */ 890 */
941void 891void
942VersionCmd (char *buf, int len, client_socket * ns) 892VersionCmd (char *buf, int len, client * ns)
943{ 893{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 894 if (!buf)
948 { 895 {
949 LOG (llevError, "CS: received corrupted version command\n"); 896 LOG (llevError, "CS: received corrupted version command\n");
950 return; 897 return;
951 } 898 }
952 899
953 ns->cs_version = atoi (buf); 900 ns->cs_version = atoi (buf);
954 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
955 if (VERSION_CS != ns->cs_version) 908 //if (VERSION_CS != ns->cs_version)
956 { 909 // unchecked;
957#ifdef ESRV_DEBUG 910
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 911 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 912 if (!cp)
963 return; 913 return;
914
964 ns->sc_version = atoi (cp); 915 ns->sc_version = atoi (cp);
916
965 if (VERSION_SC != ns->sc_version) 917 //if (VERSION_SC != ns->sc_version)
966 { 918 // unchecked;
967#ifdef ESRV_DEBUG 919
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 920 cp = strchr (cp + 1, ' ');
921
972 if (cp) 922 if (cp)
973 { 923 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 924 assign (ns->version, cp + 1);
975 925
976 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
977
978 /* This is first implementation - i skip all beta DX clients with it
979 * Add later stuff here for other clients
980 */
981
982 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time.
986 */
987 if (ns->sc_version < 1026) 926 if (ns->sc_version < 1026)
988 { 927 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 929 }
995} 930}
996 931
997/** sound related functions. */ 932/** sound related functions. */
998
999void 933void
1000SetSound (char *buf, int len, client_socket * ns) 934SetSound (char *buf, int len, client * ns)
1001{ 935{
1002 ns->sound = atoi (buf); 936 ns->sound = atoi (buf);
1003} 937}
1004 938
1005/** client wants the map resent */ 939/** client wants the map resent */
1006 940
1007void 941void
1008MapRedrawCmd (char *buf, int len, player *pl) 942MapRedrawCmd (char *buf, int len, player *pl)
1009{ 943{
1010
1011/* 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
1012 * 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.
1013 * Unfortunately this solution does not work because some client versions send 946 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 947 * a mapredraw command after receiving a newmap command.
1015 */ 948 */
1016#if 0
1017 /* Okay, this is MAJOR UGLY. but the only way I know how to
1018 * clear the "cache"
1019 */
1020 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021 draw_client_map (pl->ob);
1022#endif
1023} 949}
1024 950
1025/** 951/**
1026 * Moves an object (typically, container to inventory). 952 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 953 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 956MoveCmd (char *buf, int len, player *pl)
1031{ 957{
1032 int vals[3], i; 958 int vals[3], i;
1033 959
1034 /* A little funky here. We only cycle for 2 records, because 960 /* A little funky here. We only cycle for 2 records, because
1035 * 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
1036 * record. Perhaps we should just replace this with a 962 * record. Perhaps we should just replace this with a
1037 * sscanf? 963 * sscanf?
1038 */ 964 */
1039 for (i = 0; i < 2; i++) 965 for (i = 0; i < 2; i++)
1040 { 966 {
1041 vals[i] = atoi (buf); 967 vals[i] = atoi (buf);
968
1042 if (!(buf = strchr (buf, ' '))) 969 if (!(buf = strchr (buf, ' ')))
1043 { 970 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 971 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 972 return;
1046 } 973 }
974
1047 buf++; 975 buf++;
1048 } 976 }
977
1049 vals[2] = atoi (buf); 978 vals[2] = atoi (buf);
1050 979
1051/* 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]);*/
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 982}
1054
1055
1056 983
1057/****************************************************************************** 984/******************************************************************************
1058 * 985 *
1059 * Start of commands the server sends to the client. 986 * Start of commands the server sends to the client.
1060 * 987 *
… …
1063/** 990/**
1064 * 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
1065 * 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)
1066 */ 993 */
1067void 994void
1068send_query (client_socket * ns, uint8 flags, char *text) 995send_query (client *ns, uint8 flags, char *text)
1069{ 996{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 997 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 998}
1075 999
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1000#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1001 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 1002 sl << uint8 (Type) << uint64 (New); \
… …
1108esrv_update_stats (player *pl) 1032esrv_update_stats (player *pl)
1109{ 1033{
1110 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1111 uint16 flags; 1035 uint16 flags;
1112 1036
1113 packet sl; 1037 packet sl ("stats");
1114 sl << "stats ";
1115 1038
1116 if (pl->ob != NULL) 1039 if (pl->ob)
1117 { 1040 {
1118 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);
1119 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);
1120 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);
1121 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);
… …
1129 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);
1130 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);
1131 } 1054 }
1132 1055
1133 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1138 {
1139 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)
1140 { 1059 {
1141 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1143 */ 1062 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1147 1066
1148 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;
1149 } 1068 }
1150 }
1151 }
1152 1069
1153 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1154 { 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) }
1155 else 1072 else
1156 { 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) }
… …
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1175 1092
1176 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1177 { 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) }
1178 else 1095 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1097 {
1184 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1186 continue; 1100 continue;
1187 1101
1188 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]);
1189 } 1103 }
1190 }
1191 1104
1192 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1193 { 1106 {
1194 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);
1195 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);
… …
1212void 1125void
1213esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1214{ 1127{
1215 pl->last_weight = weight; 1128 pl->last_weight = weight;
1216 1129
1217 packet sl; 1130 packet sl ("player");
1218 sl << "player ";
1219 1131
1220 sl << uint32 (pl->ob->count) 1132 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 1133 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 1134 << uint32 (pl->ob->face->number)
1223 << data8 (pl->ob->name); 1135 << data8 (pl->ob->name);
… …
1232 * 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
1233 * 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
1234 * when the player logs in and picks stuff up. 1146 * when the player logs in and picks stuff up.
1235 */ 1147 */
1236void 1148void
1237esrv_send_animation (client_socket * ns, short anim_num) 1149esrv_send_animation (client * ns, short anim_num)
1238{ 1150{
1239 int i;
1240
1241 /* 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
1242 * 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
1243 * range, it must be a valid animation. 1153 * range, it must be a valid animation.
1244 */ 1154 */
1245 if (anim_num < 0 || anim_num > num_animations) 1155 if (anim_num < 0 || anim_num > num_animations)
1246 { 1156 {
1247 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);
1248 return; 1158 return;
1249 } 1159 }
1250 1160
1251 packet sl; 1161 packet sl ("anim");
1252 1162
1253 sl << "anim "
1254 << uint16 (anim_num) 1163 sl << uint16 (anim_num)
1255 << uint16 (0); /* flags - not used right now */ 1164 << uint16 (0); /* flags - not used right now */
1256 1165
1257 /* 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
1258 * the face itself) down to the client. 1167 * the face itself) down to the client.
1259 */ 1168 */
1260 for (i = 0; i < animations[anim_num].num_animations; i++) 1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1261 { 1170 {
1262 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))
1263 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1264 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 */
1265 } 1175 }
1266 1176
1267 ns->send_packet (sl); 1177 ns->send_packet (sl);
1268 1178
… …
1279/** 1189/**
1280 * 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
1281 * the face yet, we will also send it. 1191 * the face yet, we will also send it.
1282 */ 1192 */
1283static void 1193static void
1284esrv_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)
1285{ 1195{
1286 if (newmap->cells[x][y].count >= MAP_LAYERS) 1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1287 { 1197 {
1198 //TODO: one or the other, can't both have abort and return, verify and act
1288 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);
1289 return; 1200 return;
1290 abort (); 1201 abort ();
1291 } 1202 }
1292 1203
1293 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;
1294 newmap->cells[x][y].count++; 1205 newmap->cells[x][y].count++;
1295 1206
1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297 esrv_send_face (ns, face_num, 0); 1208 esrv_send_face (ns, face_num, 0);
1298}
1299
1300struct LayerCell
1301{
1302 uint16 xy;
1303 short face;
1304};
1305
1306struct MapLayer
1307{
1308 int count;
1309 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1310};
1311
1312/** Checkes if map cells have changed */
1313static int
1314mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1315{
1316 int k;
1317
1318 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1319 return 1;
1320 for (k = 0; k < newmap->cells[i][j].count; k++)
1321 {
1322 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1323 {
1324 return 1;
1325 }
1326 }
1327 return 0;
1328}
1329
1330/**
1331 * Basically, what this does is pack the data into layers.
1332 * cnum is the client number, cur is the the buffer we put all of
1333 * this data into. we return the end of the data. layers is
1334 * how many layers of data we should back.
1335 */
1336static uint8 *
1337compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1338{
1339 int x, y, k;
1340 int face;
1341 unsigned char *fcur;
1342 struct MapLayer layers[MAP_LAYERS];
1343
1344 for (k = 0; k < MAP_LAYERS; k++)
1345 layers[k].count = 0;
1346 fcur = cur;
1347 for (x = 0; x < ns->mapx; x++)
1348 {
1349 for (y = 0; y < ns->mapy; y++)
1350 {
1351 if (!mapcellchanged (ns, x, y, newmap))
1352 continue;
1353 if (newmap->cells[x][y].count == 0)
1354 {
1355 *cur = x * ns->mapy + y; /* mark empty space */
1356 cur++;
1357 continue;
1358 }
1359 for (k = 0; k < newmap->cells[x][y].count; k++)
1360 {
1361 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1362 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1363 layers[k].count++;
1364 }
1365 }
1366 }
1367 /* If no data, return now. */
1368 if (fcur == cur && layers[0].count == 0)
1369 return cur;
1370 *cur = 255; /* mark end of explicitly cleared cells */
1371 cur++;
1372 /* First pack by layers. */
1373 for (k = 0; k < numlayers; k++)
1374 {
1375 if (layers[k].count == 0)
1376 break; /* once a layer is entirely empty, no layer below it can
1377 have anything in it either */
1378 /* Pack by entries in thie layer */
1379 for (x = 0; x < layers[k].count;)
1380 {
1381 fcur = cur;
1382 *cur = layers[k].lcells[x].face >> 8;
1383 cur++;
1384 *cur = layers[k].lcells[x].face & 0xFF;
1385 cur++;
1386 face = layers[k].lcells[x].face;
1387 /* Now, we back the redundant data into 1 byte xy pairings */
1388 for (y = x; y < layers[k].count; y++)
1389 {
1390 if (layers[k].lcells[y].face == face)
1391 {
1392 *cur = (uint8) layers[k].lcells[y].xy;
1393 cur++;
1394 layers[k].lcells[y].face = -1;
1395 }
1396 }
1397 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1398 /* forward over the now redundant data */
1399 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1400 x++;
1401 }
1402 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1403 }
1404 return cur;
1405} 1209}
1406 1210
1407/** Clears a map cell */ 1211/** Clears a map cell */
1408static void 1212static void
1409map_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)
… …
1421#define MAX_LAYERS 3 1225#define MAX_LAYERS 3
1422 1226
1423/* 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
1424 * 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,
1425 * 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
1426 * 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
1427 * re-examined. 1231 * re-examined.
1428 */ 1232 */
1429
1430static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431 1234
1432/** 1235/**
1433 * Returns true if any of the heads for this 1236 * Returns true if any of the heads for this
1434 * 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
1435 * for empty space checking. 1238 * for empty space checking.
1436 */ 1239 */
1437static inline int 1240static inline int
1438have_head (int ax, int ay) 1241have_head (int ax, int ay)
1439{ 1242{
1440
1441 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1243 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1442 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])
1443 return 1; 1245 return 1;
1246
1444 return 0; 1247 return 0;
1445} 1248}
1446 1249
1447/** 1250/**
1448 * check_head is a bit simplistic version of update_space below. 1251 * check_head is a bit simplistic version of update_space below.
1449 * 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
1450 * 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
1451 * 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
1452 * sent, it returns zero. 1255 * sent, it returns zero.
1453 */ 1256 */
1454static int 1257static int
1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456{ 1259{
1457 short face_num; 1260 short face_num;
1458 1261
1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1262 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460 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;
… …
1492 * numbers the spaces differently - I think this was a leftover from 1295 * numbers the spaces differently - I think this was a leftover from
1493 * 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
1494 * 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
1495 * actually match. 1298 * actually match.
1496 */ 1299 */
1497
1498static int 1300static int
1499update_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)
1500{ 1302{
1501 object *ob, *head; 1303 object *ob, *head;
1502 uint16 face_num; 1304 uint16 face_num;
1503 int bx, by, i; 1305 int bx, by, i;
1504 1306
… …
1717 * 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
1718 * take. 1520 * take.
1719 */ 1521 */
1720 1522
1721static inline int 1523static inline int
1722update_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)
1723{ 1525{
1724 object *ob; 1526 object *ob;
1725 int smoothlevel; /* old face_num; */ 1527 int smoothlevel; /* old face_num; */
1726 1528
1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1761 * 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
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1564 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1565 * available.
1764 */ 1566 */
1765int 1567int
1766getExtendedMapInfoSize (client_socket * ns) 1568getExtendedMapInfoSize (client * ns)
1767{ 1569{
1768 int result = 0; 1570 int result = 0;
1769 1571
1770 if (ns->ext_mapinfos) 1572 if (ns->ext_mapinfos)
1771 { 1573 {
1772 if (ns->EMI_smooth) 1574 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1575 result += 1; /*One byte for smoothlevel */
1774 } 1576 }
1577
1775 return result; 1578 return result;
1776} 1579}
1777 1580
1778/** 1581/**
1779 * 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
… …
1807 uint8 eentrysize; 1610 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1611 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1612 uint8 extendedinfos;
1810 maptile *m; 1613 maptile *m;
1811 1614
1812 client_socket &socket = *pl->contr->socket; 1615 client &socket = *pl->contr->socket;
1813 1616
1814 check_map_change (pl->contr); 1617 check_map_change (pl->contr);
1815 1618
1816 packet sl; 1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1620 packet esl;
1818 1621
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1622 startlen = sl.length ();
1821 1623
1822 /*Extendedmapinfo structure initialisation */ 1624 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1625 if (socket.ext_mapinfos)
1824 { 1626 {
… …
2216 { 2018 {
2217 ax = i; 2019 ax = i;
2218 ay = j; 2020 ay = j;
2219 m = pm; 2021 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2022 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023
2221 if (mflags & P_OUT_OF_MAP) 2024 if (mflags & P_OUT_OF_MAP)
2222 continue; 2025 continue;
2026
2223 if (mflags & P_NEED_UPDATE) 2027 if (mflags & P_NEED_UPDATE)
2224 update_position (m, ax, ay); 2028 update_position (m, ax, ay);
2029
2225 /* If a map is visible to the player, we don't want to swap it out 2030 /* If a map is visible to the player, we don't want to swap it out
2226 * just to reload it. This should really call something like 2031 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 2032 * swap_map, but this is much more efficient and 'good enough'
2228 */ 2033 */
2229 if (mflags & P_NEW_MAP) 2034 if (mflags & P_NEW_MAP)
… …
2260/** 2065/**
2261 * This sends the skill number to name mapping. We ignore 2066 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 2067 * the params - we always send the same info no matter what.
2263 */ 2068 */
2264void 2069void
2265send_skill_info (client_socket *ns, char *params) 2070send_skill_info (client *ns, char *params)
2266{ 2071{
2267 packet sl; 2072 packet sl;
2268 sl << "replyinfo skill_info\n"; 2073 sl << "replyinfo skill_info\n";
2269 2074
2270 for (int i = 1; i < NUM_SKILLS; i++) 2075 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 2087/**
2283 * This sends the spell path to name mapping. We ignore 2088 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 2089 * the params - we always send the same info no matter what.
2285 */ 2090 */
2286void 2091void
2287send_spell_paths (client_socket * ns, char *params) 2092send_spell_paths (client * ns, char *params)
2288{ 2093{
2289 packet sl; 2094 packet sl;
2290 2095
2291 sl << "replyinfo spell_paths\n"; 2096 sl << "replyinfo spell_paths\n";
2292 2097
… …
2365 { 2170 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 2171 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 2172 return;
2368 } 2173 }
2369 2174
2370 packet sl; 2175 packet sl ("delspell");
2371 2176
2372 sl << "delspell "
2373 << uint32 (spell->count); 2177 sl << uint32 (spell->count);
2374 2178
2375 pl->socket->send_packet (sl); 2179 pl->socket->send_packet (sl);
2376} 2180}
2377 2181
2378/* appends the spell *spell to the Socklist we will send the data to. */ 2182/* appends the spell *spell to the Socklist we will send the data to. */
… …
2431 } 2235 }
2432 2236
2433 if (!pl->socket->monitor_spells) 2237 if (!pl->socket->monitor_spells)
2434 return; 2238 return;
2435 2239
2436 packet sl; 2240 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 2241
2440 if (!spell) 2242 if (!spell)
2441 { 2243 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2244 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2443 { 2245 {

Diff Legend

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