… | |
… | |
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 | |
… | |
… | |
141 | } |
138 | } |
142 | |
139 | |
143 | static void |
140 | static void |
144 | clear_map (player *pl) |
141 | clear_map (player *pl) |
145 | { |
142 | { |
146 | client &socket = *pl->socket; |
|
|
147 | |
|
|
148 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); |
149 | |
144 | |
150 | if (socket.newmapcmd == 1) |
145 | if (pl->socket->newmapcmd == 1) |
151 | socket.send_packet ("newmap"); |
146 | pl->socket->send_packet ("newmap"); |
152 | |
147 | |
153 | socket.update_look = 1; |
148 | pl->socket->floorbox_reset (); |
154 | socket.look_position = 0; |
|
|
155 | } |
149 | } |
156 | |
150 | |
157 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
158 | static void |
152 | static void |
159 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
… | |
… | |
200 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
201 | 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 |
202 | else |
196 | else |
203 | { |
197 | { |
204 | 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); |
205 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
206 | socket.look_position = 0; |
|
|
207 | } |
200 | } |
208 | } |
201 | } |
209 | |
202 | |
210 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
211 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
… | |
… | |
257 | |
250 | |
258 | void |
251 | void |
259 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
260 | { |
253 | { |
261 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
255 | } |
|
|
256 | |
|
|
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
262 | } |
261 | } |
263 | |
262 | |
264 | void |
263 | void |
265 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
266 | { |
265 | { |
… | |
… | |
700 | * 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 |
701 | * 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 |
702 | * client. |
701 | * client. |
703 | */ |
702 | */ |
704 | static void |
703 | static void |
705 | SendSmooth (client * ns, uint16 face) |
704 | SendSmooth (client *ns, uint16 face) |
706 | { |
705 | { |
707 | uint16 smoothface; |
706 | uint16 smoothface; |
708 | |
707 | |
709 | /* 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 |
710 | * again. |
709 | * again. |
… | |
… | |
720 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
719 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
721 | esrv_send_face (ns, smoothface, 0); |
720 | esrv_send_face (ns, smoothface, 0); |
722 | |
721 | |
723 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
722 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
724 | |
723 | |
725 | packet sl; |
724 | packet sl ("smooth"); |
726 | |
725 | |
727 | sl << "smooth " |
|
|
728 | << uint16 (face) |
726 | sl << uint16 (face) |
729 | << uint16 (smoothface); |
727 | << uint16 (smoothface); |
730 | |
728 | |
731 | ns->send_packet (sl); |
729 | ns->send_packet (sl); |
732 | } |
730 | } |
733 | |
731 | |
734 | /** |
732 | /** |
735 | * Tells client the picture it has to use |
733 | * Tells client the picture it has to use |
736 | * to smooth a picture number given as argument. |
734 | * to smooth a picture number given as argument. |
737 | */ |
735 | */ |
738 | void |
736 | void |
739 | AskSmooth (char *buf, int len, client * ns) |
737 | AskSmooth (char *buf, int len, client *ns) |
740 | { |
738 | { |
741 | uint16 facenbr; |
739 | SendSmooth (ns, atoi (buf)); |
742 | |
|
|
743 | facenbr = atoi (buf); |
|
|
744 | SendSmooth (ns, facenbr); |
|
|
745 | } |
740 | } |
746 | |
741 | |
747 | /** |
742 | /** |
748 | * 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, |
749 | * etc.) |
744 | * etc.) |
750 | */ |
745 | */ |
751 | void |
746 | void |
752 | PlayerCmd (char *buf, int len, player *pl) |
747 | PlayerCmd (char *buf, int len, player *pl) |
753 | { |
748 | { |
754 | |
|
|
755 | /* The following should never happen with a proper or honest client. |
|
|
756 | * Therefore, the error message doesn't have to be too clear - if |
|
|
757 | * someone is playing with a hacked/non working client, this gives them |
|
|
758 | * an idea of the problem, but they deserve what they get |
|
|
759 | */ |
|
|
760 | if (pl->state != ST_PLAYING) |
|
|
761 | { |
|
|
762 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
763 | return; |
|
|
764 | } |
|
|
765 | /* 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 |
766 | * sent, so check for that also. |
750 | * sent, so check for that also. |
767 | */ |
751 | */ |
768 | if (atoi (buf) || buf[0] == '0') |
752 | if (atoi (buf) || buf[0] == '0') |
769 | { |
753 | { |
770 | pl->count = atoi ((char *) buf); |
754 | pl->count = atoi ((char *) buf); |
|
|
755 | |
771 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
756 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
772 | if (!buf) |
757 | if (!buf) |
773 | { |
|
|
774 | #ifdef ESRV_DEBUG |
|
|
775 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
776 | #endif |
|
|
777 | return; |
758 | return; |
778 | } |
759 | |
779 | buf++; |
760 | buf++; |
780 | } |
761 | } |
781 | /* This should not happen anymore. */ |
762 | |
782 | if (pl->ob->speed_left < -1.0) |
|
|
783 | { |
|
|
784 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
785 | } |
|
|
786 | /* In c_new.c */ |
|
|
787 | execute_newserver_command (pl->ob, (char *) buf); |
763 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
764 | |
788 | /* Perhaps something better should be done with a left over count. |
765 | /* Perhaps something better should be done with a left over count. |
789 | * Cleaning up the input should probably be done first - all actions |
766 | * Cleaning up the input should probably be done first - all actions |
790 | * 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 |
791 | * commands. |
768 | * commands. |
792 | */ |
769 | */ |
793 | |
|
|
794 | pl->count = 0; |
770 | pl->count = 0; |
795 | |
|
|
796 | } |
771 | } |
797 | |
772 | |
798 | |
773 | |
799 | /** |
774 | /** |
800 | * 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, |
… | |
… | |
803 | * can throttle. |
778 | * can throttle. |
804 | */ |
779 | */ |
805 | void |
780 | void |
806 | NewPlayerCmd (char *buf, int len, player *pl) |
781 | NewPlayerCmd (char *buf, int len, player *pl) |
807 | { |
782 | { |
808 | int time, repeat; |
|
|
809 | char command[MAX_BUF]; |
|
|
810 | int pktlen; |
|
|
811 | |
|
|
812 | if (len < 7) |
783 | if (len <= 6) |
813 | { |
784 | { |
814 | 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); |
815 | return; |
786 | return; |
816 | } |
787 | } |
817 | |
788 | |
818 | pktlen = net_uint16 ((uint8 *)buf); |
789 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
819 | repeat = net_uint32 ((uint8 *)buf + 2); |
790 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
820 | |
791 | |
821 | /* -1 is special - no repeat, but don't update */ |
792 | /* -1 is special - no repeat, but don't update */ |
822 | if (repeat != -1) |
793 | if (repeat != -1) |
823 | pl->count = repeat; |
794 | pl->count = repeat; |
824 | |
795 | |
825 | if ((len - 4) >= MAX_BUF) |
796 | buf += 6; //len -= 6; |
826 | len = MAX_BUF - 5; |
|
|
827 | |
797 | |
828 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
829 | command[len - 4] = 0; |
|
|
830 | |
|
|
831 | /* This should not happen anymore. */ |
|
|
832 | if (pl->ob->speed_left < -1.0) |
|
|
833 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
834 | |
|
|
835 | /* In c_new.c */ |
|
|
836 | execute_newserver_command (pl->ob, (char *) command); |
798 | execute_newserver_command (pl->ob, buf); |
|
|
799 | |
837 | /* Perhaps something better should be done with a left over count. |
800 | /* Perhaps something better should be done with a left over count. |
838 | * Cleaning up the input should probably be done first - all actions |
801 | * Cleaning up the input should probably be done first - all actions |
839 | * 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 |
840 | * commands. |
803 | * commands. |
841 | */ |
804 | */ |
842 | pl->count = 0; |
805 | pl->count = 0; |
843 | |
806 | |
|
|
807 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
844 | if (FABS (pl->ob->speed) < 0.001) |
808 | int time = FABS (pl->ob->speed) < 0.001 |
845 | time = MAX_TIME * 100; |
809 | ? time = MAX_TIME * 100 |
846 | else |
|
|
847 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
810 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
848 | |
811 | |
849 | /* Send confirmation of command execution now */ |
812 | /* Send confirmation of command execution now */ |
850 | |
813 | packet sl ("comc"); |
851 | packet sl; |
|
|
852 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
814 | sl << uint16 (cmdid) << uint32 (time); |
853 | pl->socket->send_packet (sl); |
815 | pl->socket->send_packet (sl); |
854 | } |
816 | } |
855 | |
817 | |
856 | |
818 | |
857 | /** This is a reply to a previous query. */ |
819 | /** This is a reply to a previous query. */ |
858 | void |
820 | void |
859 | ReplyCmd (char *buf, int len, player *pl) |
821 | ReplyCmd (char *buf, int len, player *pl) |
860 | { |
822 | { |
861 | /* 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 |
862 | * 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 |
863 | * once all the X11 code is removed from the server. |
825 | * once all the X11 code is removed from the server. |
864 | * |
826 | * |
865 | * 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 |
866 | * think it was the carriage return that was entered, and the |
828 | * think it was the carriage return that was entered, and the |
867 | * function then does not try to do additional input. |
829 | * function then does not try to do additional input. |
… | |
… | |
870 | |
832 | |
871 | /* this avoids any hacking here */ |
833 | /* this avoids any hacking here */ |
872 | |
834 | |
873 | switch (pl->state) |
835 | switch (pl->state) |
874 | { |
836 | { |
875 | case ST_PLAYING: |
837 | case ST_PLAYING: |
876 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
838 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
877 | break; |
839 | break; |
878 | |
840 | |
879 | case ST_PLAY_AGAIN: |
841 | case ST_PLAY_AGAIN: |
880 | /* We can check this for return value (2==quit). Maybe we |
842 | /* We can check this for return value (2==quit). Maybe we |
881 | * should, and do something appropriate? |
843 | * should, and do something appropriate? |
882 | */ |
844 | */ |
883 | receive_play_again (pl->ob, buf[0]); |
845 | receive_play_again (pl->ob, buf[0]); |
884 | break; |
846 | break; |
885 | |
847 | |
886 | case ST_ROLL_STAT: |
848 | case ST_ROLL_STAT: |
887 | key_roll_stat (pl->ob, buf[0]); |
849 | key_roll_stat (pl->ob, buf[0]); |
888 | break; |
850 | break; |
889 | |
851 | |
890 | case ST_CHANGE_CLASS: |
852 | case ST_CHANGE_CLASS: |
891 | |
853 | |
892 | key_change_class (pl->ob, buf[0]); |
854 | key_change_class (pl->ob, buf[0]); |
893 | break; |
855 | break; |
894 | |
856 | |
895 | case ST_CONFIRM_QUIT: |
857 | case ST_CONFIRM_QUIT: |
896 | key_confirm_quit (pl->ob, buf[0]); |
858 | key_confirm_quit (pl->ob, buf[0]); |
897 | break; |
859 | break; |
898 | |
860 | |
899 | case ST_CONFIGURE: |
861 | case ST_CONFIGURE: |
900 | LOG (llevError, "In client input handling, but into configure state\n"); |
862 | LOG (llevError, "In client input handling, but into configure state\n"); |
901 | pl->state = ST_PLAYING; |
863 | pl->state = ST_PLAYING; |
902 | break; |
864 | break; |
903 | |
865 | |
904 | case ST_GET_NAME: |
866 | case ST_GET_NAME: |
905 | receive_player_name (pl->ob, 13); |
867 | receive_player_name (pl->ob, 13); |
906 | break; |
868 | break; |
907 | |
869 | |
908 | case ST_GET_PASSWORD: |
870 | case ST_GET_PASSWORD: |
909 | case ST_CONFIRM_PASSWORD: |
871 | case ST_CONFIRM_PASSWORD: |
910 | receive_player_password (pl->ob, 13); |
872 | receive_player_password (pl->ob, 13); |
911 | break; |
873 | break; |
912 | |
874 | |
913 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
875 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
914 | receive_party_password (pl->ob, 13); |
876 | receive_party_password (pl->ob, 13); |
915 | break; |
877 | break; |
916 | |
878 | |
917 | default: |
879 | default: |
918 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
880 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
919 | } |
881 | } |
920 | } |
882 | } |
921 | |
883 | |
922 | /** |
884 | /** |
923 | * 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 |
… | |
… | |
927 | * problem. |
889 | * problem. |
928 | */ |
890 | */ |
929 | void |
891 | void |
930 | VersionCmd (char *buf, int len, client * ns) |
892 | VersionCmd (char *buf, int len, client * ns) |
931 | { |
893 | { |
932 | char *cp; |
|
|
933 | char version_warning[256]; |
|
|
934 | |
|
|
935 | if (!buf) |
894 | if (!buf) |
936 | { |
895 | { |
937 | LOG (llevError, "CS: received corrupted version command\n"); |
896 | LOG (llevError, "CS: received corrupted version command\n"); |
938 | return; |
897 | return; |
939 | } |
898 | } |
940 | |
899 | |
941 | ns->cs_version = atoi (buf); |
900 | ns->cs_version = atoi (buf); |
942 | 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 | |
943 | if (VERSION_CS != ns->cs_version) |
908 | //if (VERSION_CS != ns->cs_version) |
944 | { |
909 | // unchecked; |
945 | #ifdef ESRV_DEBUG |
910 | |
946 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
947 | #endif |
|
|
948 | } |
|
|
949 | cp = strchr (buf + 1, ' '); |
911 | char *cp = strchr (buf + 1, ' '); |
950 | if (!cp) |
912 | if (!cp) |
951 | return; |
913 | return; |
|
|
914 | |
952 | ns->sc_version = atoi (cp); |
915 | ns->sc_version = atoi (cp); |
|
|
916 | |
953 | if (VERSION_SC != ns->sc_version) |
917 | //if (VERSION_SC != ns->sc_version) |
954 | { |
918 | // unchecked; |
955 | #ifdef ESRV_DEBUG |
919 | |
956 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
957 | #endif |
|
|
958 | } |
|
|
959 | cp = strchr (cp + 1, ' '); |
920 | cp = strchr (cp + 1, ' '); |
|
|
921 | |
960 | if (cp) |
922 | if (cp) |
961 | { |
923 | { |
962 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
|
|
963 | |
|
|
964 | assign (ns->version, cp + 1); |
924 | assign (ns->version, cp + 1); |
965 | |
925 | |
966 | if (ns->sc_version < 1026) |
926 | if (ns->sc_version < 1026) |
967 | { |
927 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
968 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
969 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
928 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
970 | ns->send_packet (version_warning); |
|
|
971 | } |
|
|
972 | |
|
|
973 | } |
929 | } |
974 | } |
930 | } |
975 | |
931 | |
976 | /** sound related functions. */ |
932 | /** sound related functions. */ |
977 | void |
933 | void |
… | |
… | |
983 | /** client wants the map resent */ |
939 | /** client wants the map resent */ |
984 | |
940 | |
985 | void |
941 | void |
986 | MapRedrawCmd (char *buf, int len, player *pl) |
942 | MapRedrawCmd (char *buf, int len, player *pl) |
987 | { |
943 | { |
988 | |
|
|
989 | /* 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 |
990 | * 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. |
991 | * Unfortunately this solution does not work because some client versions send |
946 | * Unfortunately this solution does not work because some client versions send |
992 | * a mapredraw command after receiving a newmap command. |
947 | * a mapredraw command after receiving a newmap command. |
993 | */ |
948 | */ |
994 | #if 0 |
|
|
995 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
996 | * clear the "cache" |
|
|
997 | */ |
|
|
998 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
999 | draw_client_map (pl->ob); |
|
|
1000 | #endif |
|
|
1001 | } |
949 | } |
1002 | |
950 | |
1003 | /** |
951 | /** |
1004 | * Moves an object (typically, container to inventory). |
952 | * Moves an object (typically, container to inventory). |
1005 | * syntax is: move (to) (tag) (nrof) |
953 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1008 | MoveCmd (char *buf, int len, player *pl) |
956 | MoveCmd (char *buf, int len, player *pl) |
1009 | { |
957 | { |
1010 | int vals[3], i; |
958 | int vals[3], i; |
1011 | |
959 | |
1012 | /* A little funky here. We only cycle for 2 records, because |
960 | /* A little funky here. We only cycle for 2 records, because |
1013 | * 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 |
1014 | * record. Perhaps we should just replace this with a |
962 | * record. Perhaps we should just replace this with a |
1015 | * sscanf? |
963 | * sscanf? |
1016 | */ |
964 | */ |
1017 | for (i = 0; i < 2; i++) |
965 | for (i = 0; i < 2; i++) |
1018 | { |
966 | { |
1019 | vals[i] = atoi (buf); |
967 | vals[i] = atoi (buf); |
|
|
968 | |
1020 | if (!(buf = strchr (buf, ' '))) |
969 | if (!(buf = strchr (buf, ' '))) |
1021 | { |
970 | { |
1022 | LOG (llevError, "Incomplete move command: %s\n", buf); |
971 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1023 | return; |
972 | return; |
1024 | } |
973 | } |
|
|
974 | |
1025 | buf++; |
975 | buf++; |
1026 | } |
976 | } |
|
|
977 | |
1027 | vals[2] = atoi (buf); |
978 | vals[2] = atoi (buf); |
1028 | |
979 | |
1029 | /* 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]);*/ |
1030 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
981 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1031 | } |
982 | } |
1032 | |
|
|
1033 | |
|
|
1034 | |
983 | |
1035 | /****************************************************************************** |
984 | /****************************************************************************** |
1036 | * |
985 | * |
1037 | * Start of commands the server sends to the client. |
986 | * Start of commands the server sends to the client. |
1038 | * |
987 | * |
… | |
… | |
1041 | /** |
990 | /** |
1042 | * 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 |
1043 | * 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) |
1044 | */ |
993 | */ |
1045 | void |
994 | void |
1046 | send_query (client * ns, uint8 flags, char *text) |
995 | send_query (client *ns, uint8 flags, char *text) |
1047 | { |
996 | { |
1048 | char buf[MAX_BUF]; |
|
|
1049 | |
|
|
1050 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
997 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1051 | ns->send_packet (buf); |
|
|
1052 | } |
998 | } |
1053 | |
999 | |
1054 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1000 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1055 | Old = New; \ |
1001 | Old = New; \ |
1056 | sl << uint8 (Type) << uint64 (New); \ |
1002 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1086 | esrv_update_stats (player *pl) |
1032 | esrv_update_stats (player *pl) |
1087 | { |
1033 | { |
1088 | char buf[MAX_BUF]; |
1034 | char buf[MAX_BUF]; |
1089 | uint16 flags; |
1035 | uint16 flags; |
1090 | |
1036 | |
1091 | packet sl; |
1037 | packet sl ("stats"); |
1092 | sl << "stats "; |
|
|
1093 | |
1038 | |
1094 | if (pl->ob != NULL) |
1039 | if (pl->ob) |
1095 | { |
1040 | { |
1096 | 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); |
1097 | 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); |
1098 | 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); |
1099 | 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); |
… | |
… | |
1107 | 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); |
1108 | 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); |
1109 | } |
1054 | } |
1110 | |
1055 | |
1111 | if (pl->socket->exp64) |
1056 | if (pl->socket->exp64) |
1112 | { |
|
|
1113 | uint8 s; |
|
|
1114 | |
|
|
1115 | for (s = 0; s < NUM_SKILLS; s++) |
1057 | for (int s = 0; s < NUM_SKILLS; s++) |
1116 | { |
|
|
1117 | 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) |
1118 | { |
1059 | { |
1119 | /* Always send along the level if exp changes. This is only |
1060 | /* Always send along the level if exp changes. This is only |
1120 | * 1 extra byte, but keeps processing simpler. |
1061 | * 1 extra byte, but keeps processing simpler. |
1121 | */ |
1062 | */ |
1122 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1063 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1123 | << uint8 (pl->last_skill_ob[s]->level) |
1064 | << uint8 (pl->last_skill_ob[s]->level) |
1124 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1065 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1125 | |
1066 | |
1126 | 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; |
1127 | } |
1068 | } |
1128 | } |
|
|
1129 | } |
|
|
1130 | |
1069 | |
1131 | if (pl->socket->exp64) |
1070 | if (pl->socket->exp64) |
1132 | { 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) } |
1133 | else |
1072 | else |
1134 | { 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) } |
… | |
… | |
1152 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1091 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1153 | |
1092 | |
1154 | if (pl->socket->sc_version < 1025) |
1093 | if (pl->socket->sc_version < 1025) |
1155 | { 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) } |
1156 | else |
1095 | else |
1157 | { |
|
|
1158 | int i; |
|
|
1159 | |
|
|
1160 | for (i = 0; i < NROFATTACKS; i++) |
1096 | for (int i = 0; i < NROFATTACKS; i++) |
1161 | { |
1097 | { |
1162 | /* Skip ones we won't send */ |
1098 | /* Skip ones we won't send */ |
1163 | if (atnr_cs_stat[i] == -1) |
1099 | if (atnr_cs_stat[i] == -1) |
1164 | continue; |
1100 | continue; |
1165 | |
1101 | |
1166 | 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]); |
1167 | } |
1103 | } |
1168 | } |
|
|
1169 | |
1104 | |
1170 | if (pl->socket->monitor_spells) |
1105 | if (pl->socket->monitor_spells) |
1171 | { |
1106 | { |
1172 | 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); |
1173 | 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); |
… | |
… | |
1190 | void |
1125 | void |
1191 | esrv_new_player (player *pl, uint32 weight) |
1126 | esrv_new_player (player *pl, uint32 weight) |
1192 | { |
1127 | { |
1193 | pl->last_weight = weight; |
1128 | pl->last_weight = weight; |
1194 | |
1129 | |
1195 | packet sl; |
1130 | packet sl ("player"); |
1196 | sl << "player "; |
|
|
1197 | |
1131 | |
1198 | sl << uint32 (pl->ob->count) |
1132 | sl << uint32 (pl->ob->count) |
1199 | << uint32 (weight) |
1133 | << uint32 (weight) |
1200 | << uint32 (pl->ob->face->number) |
1134 | << uint32 (pl->ob->face->number) |
1201 | << data8 (pl->ob->name); |
1135 | << data8 (pl->ob->name); |
… | |
… | |
1212 | * when the player logs in and picks stuff up. |
1146 | * when the player logs in and picks stuff up. |
1213 | */ |
1147 | */ |
1214 | void |
1148 | void |
1215 | esrv_send_animation (client * ns, short anim_num) |
1149 | esrv_send_animation (client * ns, short anim_num) |
1216 | { |
1150 | { |
1217 | int i; |
|
|
1218 | |
|
|
1219 | /* 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 |
1220 | * 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 |
1221 | * range, it must be a valid animation. |
1153 | * range, it must be a valid animation. |
1222 | */ |
1154 | */ |
1223 | if (anim_num < 0 || anim_num > num_animations) |
1155 | if (anim_num < 0 || anim_num > num_animations) |
1224 | { |
1156 | { |
1225 | 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); |
1226 | return; |
1158 | return; |
1227 | } |
1159 | } |
1228 | |
1160 | |
1229 | packet sl; |
1161 | packet sl ("anim"); |
1230 | |
1162 | |
1231 | sl << "anim " |
|
|
1232 | << uint16 (anim_num) |
1163 | sl << uint16 (anim_num) |
1233 | << uint16 (0); /* flags - not used right now */ |
1164 | << uint16 (0); /* flags - not used right now */ |
1234 | |
1165 | |
1235 | /* 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 |
1236 | * the face itself) down to the client. |
1167 | * the face itself) down to the client. |
1237 | */ |
1168 | */ |
1238 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1169 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1239 | { |
1170 | { |
1240 | 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)) |
1241 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1172 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1173 | |
1242 | 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 */ |
1243 | } |
1175 | } |
1244 | |
1176 | |
1245 | ns->send_packet (sl); |
1177 | ns->send_packet (sl); |
1246 | |
1178 | |
… | |
… | |
1261 | static void |
1193 | static void |
1262 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1194 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1263 | { |
1195 | { |
1264 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1196 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1265 | { |
1197 | { |
|
|
1198 | //TODO: one or the other, can't both have abort and return, verify and act |
1266 | 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); |
1267 | return; |
1200 | return; |
1268 | abort (); |
1201 | abort (); |
1269 | } |
1202 | } |
1270 | |
1203 | |
1271 | 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; |
1272 | newmap->cells[x][y].count++; |
1205 | newmap->cells[x][y].count++; |
1273 | |
1206 | |
1274 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1207 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1275 | esrv_send_face (ns, face_num, 0); |
1208 | esrv_send_face (ns, face_num, 0); |
1276 | } |
|
|
1277 | |
|
|
1278 | struct LayerCell |
|
|
1279 | { |
|
|
1280 | uint16 xy; |
|
|
1281 | short face; |
|
|
1282 | }; |
|
|
1283 | |
|
|
1284 | struct MapLayer |
|
|
1285 | { |
|
|
1286 | int count; |
|
|
1287 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1288 | }; |
|
|
1289 | |
|
|
1290 | /** Checkes if map cells have changed */ |
|
|
1291 | static int |
|
|
1292 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
|
|
1293 | { |
|
|
1294 | int k; |
|
|
1295 | |
|
|
1296 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1297 | return 1; |
|
|
1298 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1299 | { |
|
|
1300 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1301 | { |
|
|
1302 | return 1; |
|
|
1303 | } |
|
|
1304 | } |
|
|
1305 | return 0; |
|
|
1306 | } |
|
|
1307 | |
|
|
1308 | /** |
|
|
1309 | * Basically, what this does is pack the data into layers. |
|
|
1310 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1311 | * this data into. we return the end of the data. layers is |
|
|
1312 | * how many layers of data we should back. |
|
|
1313 | */ |
|
|
1314 | static uint8 * |
|
|
1315 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1316 | { |
|
|
1317 | int x, y, k; |
|
|
1318 | int face; |
|
|
1319 | unsigned char *fcur; |
|
|
1320 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1321 | |
|
|
1322 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1323 | layers[k].count = 0; |
|
|
1324 | fcur = cur; |
|
|
1325 | for (x = 0; x < ns->mapx; x++) |
|
|
1326 | { |
|
|
1327 | for (y = 0; y < ns->mapy; y++) |
|
|
1328 | { |
|
|
1329 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1330 | continue; |
|
|
1331 | if (newmap->cells[x][y].count == 0) |
|
|
1332 | { |
|
|
1333 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1334 | cur++; |
|
|
1335 | continue; |
|
|
1336 | } |
|
|
1337 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1338 | { |
|
|
1339 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1340 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1341 | layers[k].count++; |
|
|
1342 | } |
|
|
1343 | } |
|
|
1344 | } |
|
|
1345 | /* If no data, return now. */ |
|
|
1346 | if (fcur == cur && layers[0].count == 0) |
|
|
1347 | return cur; |
|
|
1348 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1349 | cur++; |
|
|
1350 | /* First pack by layers. */ |
|
|
1351 | for (k = 0; k < numlayers; k++) |
|
|
1352 | { |
|
|
1353 | if (layers[k].count == 0) |
|
|
1354 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1355 | have anything in it either */ |
|
|
1356 | /* Pack by entries in thie layer */ |
|
|
1357 | for (x = 0; x < layers[k].count;) |
|
|
1358 | { |
|
|
1359 | fcur = cur; |
|
|
1360 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1361 | cur++; |
|
|
1362 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1363 | cur++; |
|
|
1364 | face = layers[k].lcells[x].face; |
|
|
1365 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1366 | for (y = x; y < layers[k].count; y++) |
|
|
1367 | { |
|
|
1368 | if (layers[k].lcells[y].face == face) |
|
|
1369 | { |
|
|
1370 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1371 | cur++; |
|
|
1372 | layers[k].lcells[y].face = -1; |
|
|
1373 | } |
|
|
1374 | } |
|
|
1375 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1376 | /* forward over the now redundant data */ |
|
|
1377 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1378 | x++; |
|
|
1379 | } |
|
|
1380 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1381 | } |
|
|
1382 | return cur; |
|
|
1383 | } |
1209 | } |
1384 | |
1210 | |
1385 | /** Clears a map cell */ |
1211 | /** Clears a map cell */ |
1386 | static void |
1212 | static void |
1387 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1213 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1399 | #define MAX_LAYERS 3 |
1225 | #define MAX_LAYERS 3 |
1400 | |
1226 | |
1401 | /* 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 |
1402 | * 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, |
1403 | * 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 |
1404 | * 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 |
1405 | * re-examined. |
1231 | * re-examined. |
1406 | */ |
1232 | */ |
1407 | |
|
|
1408 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1233 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1409 | |
1234 | |
1410 | /** |
1235 | /** |
1411 | * Returns true if any of the heads for this |
1236 | * Returns true if any of the heads for this |
1412 | * 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 |
1413 | * for empty space checking. |
1238 | * for empty space checking. |
1414 | */ |
1239 | */ |
1415 | static inline int |
1240 | static inline int |
1416 | have_head (int ax, int ay) |
1241 | have_head (int ax, int ay) |
1417 | { |
1242 | { |
1418 | |
|
|
1419 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1243 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1420 | 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]) |
1421 | return 1; |
1245 | return 1; |
|
|
1246 | |
1422 | return 0; |
1247 | return 0; |
1423 | } |
1248 | } |
1424 | |
1249 | |
1425 | /** |
1250 | /** |
1426 | * check_head is a bit simplistic version of update_space below. |
1251 | * check_head is a bit simplistic version of update_space below. |
1427 | * 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 |
1428 | * 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 |
1429 | * 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 |
1430 | * sent, it returns zero. |
1255 | * sent, it returns zero. |
1431 | */ |
1256 | */ |
1432 | static int |
1257 | static int |
1433 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1258 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1434 | { |
1259 | { |
… | |
… | |
1470 | * numbers the spaces differently - I think this was a leftover from |
1295 | * numbers the spaces differently - I think this was a leftover from |
1471 | * 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 |
1472 | * 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 |
1473 | * actually match. |
1298 | * actually match. |
1474 | */ |
1299 | */ |
1475 | |
|
|
1476 | static int |
1300 | static int |
1477 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1301 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1478 | { |
1302 | { |
1479 | object *ob, *head; |
1303 | object *ob, *head; |
1480 | uint16 face_num; |
1304 | uint16 face_num; |
… | |
… | |
1748 | if (ns->ext_mapinfos) |
1572 | if (ns->ext_mapinfos) |
1749 | { |
1573 | { |
1750 | if (ns->EMI_smooth) |
1574 | if (ns->EMI_smooth) |
1751 | result += 1; /*One byte for smoothlevel */ |
1575 | result += 1; /*One byte for smoothlevel */ |
1752 | } |
1576 | } |
|
|
1577 | |
1753 | return result; |
1578 | return result; |
1754 | } |
1579 | } |
1755 | |
1580 | |
1756 | /** |
1581 | /** |
1757 | * 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 |
… | |
… | |
1789 | |
1614 | |
1790 | client &socket = *pl->contr->socket; |
1615 | client &socket = *pl->contr->socket; |
1791 | |
1616 | |
1792 | check_map_change (pl->contr); |
1617 | check_map_change (pl->contr); |
1793 | |
1618 | |
1794 | packet sl; |
1619 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1795 | packet esl; |
1620 | packet esl; |
1796 | |
1621 | |
1797 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1798 | startlen = sl.length (); |
1622 | startlen = sl.length (); |
1799 | |
1623 | |
1800 | /*Extendedmapinfo structure initialisation */ |
1624 | /*Extendedmapinfo structure initialisation */ |
1801 | if (socket.ext_mapinfos) |
1625 | if (socket.ext_mapinfos) |
1802 | { |
1626 | { |
… | |
… | |
1846 | 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++) |
1847 | { |
1671 | { |
1848 | ax = 0; |
1672 | ax = 0; |
1849 | 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++) |
1850 | { |
1674 | { |
1851 | |
|
|
1852 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1675 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1853 | |
1676 | |
1854 | /* 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 |
1855 | * 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 |
1856 | * the client wants if using the map1a command - this is because |
1679 | * the client wants if using the map1a command - this is because |
… | |
… | |
2187 | return; |
2010 | return; |
2188 | |
2011 | |
2189 | memset (&newmap, 0, sizeof (struct Map)); |
2012 | memset (&newmap, 0, sizeof (struct Map)); |
2190 | |
2013 | |
2191 | 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++) |
2192 | { |
|
|
2193 | 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++) |
2194 | { |
2016 | { |
2195 | ax = i; |
2017 | ax = i; |
2196 | ay = j; |
2018 | ay = j; |
2197 | m = pm; |
2019 | m = pm; |
2198 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2020 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2021 | |
2199 | if (mflags & P_OUT_OF_MAP) |
2022 | if (mflags & P_OUT_OF_MAP) |
2200 | continue; |
2023 | continue; |
2201 | if (mflags & P_NEED_UPDATE) |
2024 | |
2202 | update_position (m, ax, ay); |
|
|
2203 | /* 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 |
2204 | * just to reload it. This should really call something like |
2026 | * just to reload it. This should really call something like |
2205 | * swap_map, but this is much more efficient and 'good enough' |
2027 | * swap_map, but this is much more efficient and 'good enough' |
2206 | */ |
2028 | */ |
2207 | if (mflags & P_NEW_MAP) |
2029 | if (mflags & P_NEW_MAP) |
2208 | m->timeout = 50; |
2030 | m->timeout = 50; |
2209 | } |
2031 | } |
2210 | } |
2032 | |
2211 | /* do LOS after calls to update_position */ |
2033 | /* do LOS after calls to update_position */ |
2212 | if (pl->contr->do_los) |
2034 | if (pl->contr->do_los) |
2213 | { |
2035 | { |
2214 | update_los (pl); |
2036 | update_los (pl); |
2215 | pl->contr->do_los = 0; |
2037 | pl->contr->do_los = 0; |
… | |
… | |
2343 | { |
2165 | { |
2344 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2166 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2345 | return; |
2167 | return; |
2346 | } |
2168 | } |
2347 | |
2169 | |
2348 | packet sl; |
2170 | packet sl ("delspell"); |
2349 | |
2171 | |
2350 | sl << "delspell " |
|
|
2351 | << uint32 (spell->count); |
2172 | sl << uint32 (spell->count); |
2352 | |
2173 | |
2353 | pl->socket->send_packet (sl); |
2174 | pl->socket->send_packet (sl); |
2354 | } |
2175 | } |
2355 | |
2176 | |
2356 | /* 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. */ |
… | |
… | |
2409 | } |
2230 | } |
2410 | |
2231 | |
2411 | if (!pl->socket->monitor_spells) |
2232 | if (!pl->socket->monitor_spells) |
2412 | return; |
2233 | return; |
2413 | |
2234 | |
2414 | packet sl; |
2235 | packet sl ("addspell"); |
2415 | |
|
|
2416 | sl << "addspell "; |
|
|
2417 | |
2236 | |
2418 | if (!spell) |
2237 | if (!spell) |
2419 | { |
2238 | { |
2420 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2239 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2421 | { |
2240 | { |