… | |
… | |
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 | |
… | |
… | |
86 | -1, /* life stealing */ |
83 | -1, /* life stealing */ |
87 | -1 /* Disease - not fully done yet */ |
84 | -1 /* Disease - not fully done yet */ |
88 | }; |
85 | }; |
89 | |
86 | |
90 | static void |
87 | static void |
91 | socket_map_scroll (client * ns, int dx, int dy) |
88 | socket_map_scroll (client *ns, int dx, int dy) |
92 | { |
89 | { |
93 | struct Map newmap; |
90 | struct Map newmap; |
94 | int x, y, mx, my; |
91 | int x, y, mx, my; |
95 | |
92 | |
96 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
93 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
… | |
… | |
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 | { |
… | |
… | |
570 | * 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. |
571 | */ |
570 | */ |
572 | void |
571 | void |
573 | AddMeCmd (char *buf, int len, client * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
574 | { |
573 | { |
575 | Settings oldsettings; |
574 | if (INVOKE_CLIENT (ADDME, ns)) |
|
|
575 | return; |
576 | |
576 | |
577 | oldsettings = settings; |
|
|
578 | if (ns->status != Ns_Add || add_player (ns)) |
577 | if (ns->pl || add_player (ns)) |
579 | ns->send_packet ("addme_failed"); |
578 | ns->send_packet ("addme_failed"); |
580 | else |
579 | else |
581 | ns->send_packet ("addme_success"); |
580 | ns->send_packet ("addme_success"); |
582 | |
|
|
583 | settings = oldsettings; |
|
|
584 | } |
581 | } |
585 | |
582 | |
586 | /** Reply to ExtendedInfos command */ |
583 | /** Reply to ExtendedInfos command */ |
587 | void |
584 | void |
588 | ToggleExtendedInfos (char *buf, int len, client * ns) |
585 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
705 | * a piece of data from us that we know the client wants. So |
702 | * a piece of data from us that we know the client wants. So |
706 | * if we know the client wants it, might as well push it to the |
703 | * if we know the client wants it, might as well push it to the |
707 | * client. |
704 | * client. |
708 | */ |
705 | */ |
709 | static void |
706 | static void |
710 | SendSmooth (client * ns, uint16 face) |
707 | SendSmooth (client *ns, uint16 face) |
711 | { |
708 | { |
712 | uint16 smoothface; |
709 | uint16 smoothface; |
713 | |
710 | |
714 | /* If we can't find a face, return and set it so we won't try to send this |
711 | /* If we can't find a face, return and set it so we won't try to send this |
715 | * again. |
712 | * again. |
… | |
… | |
725 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
722 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
726 | esrv_send_face (ns, smoothface, 0); |
723 | esrv_send_face (ns, smoothface, 0); |
727 | |
724 | |
728 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
725 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
729 | |
726 | |
730 | packet sl; |
727 | packet sl ("smooth"); |
731 | |
728 | |
732 | sl << "smooth " |
|
|
733 | << uint16 (face) |
729 | sl << uint16 (face) |
734 | << uint16 (smoothface); |
730 | << uint16 (smoothface); |
735 | |
731 | |
736 | ns->send_packet (sl); |
732 | ns->send_packet (sl); |
737 | } |
733 | } |
738 | |
734 | |
739 | /** |
735 | /** |
740 | * Tells client the picture it has to use |
736 | * Tells client the picture it has to use |
741 | * to smooth a picture number given as argument. |
737 | * to smooth a picture number given as argument. |
742 | */ |
738 | */ |
743 | void |
739 | void |
744 | AskSmooth (char *buf, int len, client * ns) |
740 | AskSmooth (char *buf, int len, client *ns) |
745 | { |
741 | { |
746 | uint16 facenbr; |
742 | SendSmooth (ns, atoi (buf)); |
747 | |
|
|
748 | facenbr = atoi (buf); |
|
|
749 | SendSmooth (ns, facenbr); |
|
|
750 | } |
743 | } |
751 | |
744 | |
752 | /** |
745 | /** |
753 | * This handles the general commands from the client (ie, north, fire, cast, |
746 | * This handles the general commands from the client (ie, north, fire, cast, |
754 | * etc.) |
747 | * etc.) |
755 | */ |
748 | */ |
756 | void |
749 | void |
757 | PlayerCmd (char *buf, int len, player *pl) |
750 | PlayerCmd (char *buf, int len, player *pl) |
758 | { |
751 | { |
759 | |
|
|
760 | /* The following should never happen with a proper or honest client. |
|
|
761 | * Therefore, the error message doesn't have to be too clear - if |
|
|
762 | * someone is playing with a hacked/non working client, this gives them |
|
|
763 | * an idea of the problem, but they deserve what they get |
|
|
764 | */ |
|
|
765 | if (pl->state != ST_PLAYING) |
|
|
766 | { |
|
|
767 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
768 | return; |
|
|
769 | } |
|
|
770 | /* Check if there is a count. In theory, a zero count could also be |
752 | /* Check if there is a count. In theory, a zero count could also be |
771 | * sent, so check for that also. |
753 | * sent, so check for that also. |
772 | */ |
754 | */ |
773 | if (atoi (buf) || buf[0] == '0') |
755 | if (atoi (buf) || buf[0] == '0') |
774 | { |
756 | { |
775 | pl->count = atoi ((char *) buf); |
757 | pl->count = atoi ((char *) buf); |
|
|
758 | |
776 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
759 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
777 | if (!buf) |
760 | if (!buf) |
778 | { |
|
|
779 | #ifdef ESRV_DEBUG |
|
|
780 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
781 | #endif |
|
|
782 | return; |
761 | return; |
783 | } |
762 | |
784 | buf++; |
763 | buf++; |
785 | } |
764 | } |
786 | /* This should not happen anymore. */ |
765 | |
787 | if (pl->ob->speed_left < -1.0) |
|
|
788 | { |
|
|
789 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
790 | } |
|
|
791 | /* In c_new.c */ |
|
|
792 | execute_newserver_command (pl->ob, (char *) buf); |
766 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
767 | |
793 | /* Perhaps something better should be done with a left over count. |
768 | /* Perhaps something better should be done with a left over count. |
794 | * Cleaning up the input should probably be done first - all actions |
769 | * Cleaning up the input should probably be done first - all actions |
795 | * for the command that issued the count should be done before any other |
770 | * for the command that issued the count should be done before any other |
796 | * commands. |
771 | * commands. |
797 | */ |
772 | */ |
798 | |
|
|
799 | pl->count = 0; |
773 | pl->count = 0; |
800 | |
|
|
801 | } |
774 | } |
802 | |
775 | |
803 | |
776 | |
804 | /** |
777 | /** |
805 | * This handles the general commands from the client (ie, north, fire, cast, |
778 | * This handles the general commands from the client (ie, north, fire, cast, |
… | |
… | |
808 | * can throttle. |
781 | * can throttle. |
809 | */ |
782 | */ |
810 | void |
783 | void |
811 | NewPlayerCmd (char *buf, int len, player *pl) |
784 | NewPlayerCmd (char *buf, int len, player *pl) |
812 | { |
785 | { |
813 | int time, repeat; |
|
|
814 | char command[MAX_BUF]; |
|
|
815 | int pktlen; |
|
|
816 | |
|
|
817 | if (len < 7) |
786 | if (len <= 6) |
818 | { |
787 | { |
819 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
788 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
820 | return; |
789 | return; |
821 | } |
790 | } |
822 | |
791 | |
823 | pktlen = net_uint16 ((uint8 *)buf); |
792 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
824 | repeat = net_uint32 ((uint8 *)buf + 2); |
793 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
825 | |
794 | |
826 | /* -1 is special - no repeat, but don't update */ |
795 | /* -1 is special - no repeat, but don't update */ |
827 | if (repeat != -1) |
796 | if (repeat != -1) |
828 | pl->count = repeat; |
797 | pl->count = repeat; |
829 | |
798 | |
830 | if ((len - 4) >= MAX_BUF) |
799 | buf += 6; //len -= 6; |
831 | len = MAX_BUF - 5; |
|
|
832 | |
800 | |
833 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
834 | command[len - 4] = 0; |
|
|
835 | |
|
|
836 | /* This should not happen anymore. */ |
|
|
837 | if (pl->ob->speed_left < -1.0) |
|
|
838 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
839 | |
|
|
840 | /* In c_new.c */ |
|
|
841 | execute_newserver_command (pl->ob, (char *) command); |
801 | execute_newserver_command (pl->ob, buf); |
|
|
802 | |
842 | /* Perhaps something better should be done with a left over count. |
803 | /* Perhaps something better should be done with a left over count. |
843 | * Cleaning up the input should probably be done first - all actions |
804 | * Cleaning up the input should probably be done first - all actions |
844 | * for the command that issued the count should be done before any other |
805 | * for the command that issued the count should be done before any other |
845 | * commands. |
806 | * commands. |
846 | */ |
807 | */ |
847 | pl->count = 0; |
808 | pl->count = 0; |
848 | |
809 | |
|
|
810 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
849 | if (FABS (pl->ob->speed) < 0.001) |
811 | int time = FABS (pl->ob->speed) < 0.001 |
850 | time = MAX_TIME * 100; |
812 | ? time = MAX_TIME * 100 |
851 | else |
|
|
852 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
813 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
853 | |
814 | |
854 | /* Send confirmation of command execution now */ |
815 | /* Send confirmation of command execution now */ |
855 | |
816 | packet sl ("comc"); |
856 | packet sl; |
|
|
857 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
817 | sl << uint16 (cmdid) << uint32 (time); |
858 | pl->socket->send_packet (sl); |
818 | pl->socket->send_packet (sl); |
859 | } |
819 | } |
860 | |
820 | |
861 | |
|
|
862 | /** This is a reply to a previous query. */ |
821 | /** This is a reply to a previous query. */ |
863 | void |
822 | void |
864 | ReplyCmd (char *buf, int len, player *pl) |
823 | ReplyCmd (char *buf, int len, client *ns) |
865 | { |
824 | { |
|
|
825 | if (!ns->pl) |
|
|
826 | return; //TODO: depends on the exact reply we are after |
|
|
827 | //TODO: but right now, we always have a ns->pl |
|
|
828 | |
|
|
829 | player *pl = ns->pl; |
|
|
830 | |
866 | /* This is to synthesize how the data would be stored if it |
831 | /* This is to synthesize how the data would be stored if it |
867 | * was normally entered. A bit of a hack, and should be cleaned up |
832 | * was normally entered. A bit of a hack, and should be cleaned up |
868 | * once all the X11 code is removed from the server. |
833 | * once all the X11 code is removed from the server. |
869 | * |
834 | * |
870 | * We pass 13 to many of the functions because this way they |
835 | * We pass 13 to many of the functions because this way they |
871 | * think it was the carriage return that was entered, and the |
836 | * think it was the carriage return that was entered, and the |
872 | * function then does not try to do additional input. |
837 | * function then does not try to do additional input. |
… | |
… | |
875 | |
840 | |
876 | /* this avoids any hacking here */ |
841 | /* this avoids any hacking here */ |
877 | |
842 | |
878 | switch (pl->state) |
843 | switch (pl->state) |
879 | { |
844 | { |
880 | case ST_PLAYING: |
845 | case ST_PLAYING: |
881 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
846 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
882 | break; |
847 | break; |
883 | |
848 | |
884 | case ST_PLAY_AGAIN: |
849 | case ST_PLAY_AGAIN: |
885 | /* We can check this for return value (2==quit). Maybe we |
850 | /* We can check this for return value (2==quit). Maybe we |
886 | * should, and do something appropriate? |
851 | * should, and do something appropriate? |
887 | */ |
852 | */ |
888 | receive_play_again (pl->ob, buf[0]); |
853 | receive_play_again (pl->ob, buf[0]); |
889 | break; |
854 | break; |
890 | |
855 | |
891 | case ST_ROLL_STAT: |
856 | case ST_ROLL_STAT: |
892 | key_roll_stat (pl->ob, buf[0]); |
857 | key_roll_stat (pl->ob, buf[0]); |
893 | break; |
858 | break; |
894 | |
859 | |
895 | case ST_CHANGE_CLASS: |
860 | case ST_CHANGE_CLASS: |
896 | |
|
|
897 | key_change_class (pl->ob, buf[0]); |
861 | key_change_class (pl->ob, buf[0]); |
898 | break; |
862 | break; |
899 | |
863 | |
900 | case ST_CONFIRM_QUIT: |
864 | case ST_CONFIRM_QUIT: |
901 | key_confirm_quit (pl->ob, buf[0]); |
865 | key_confirm_quit (pl->ob, buf[0]); |
902 | break; |
866 | break; |
903 | |
867 | |
904 | case ST_CONFIGURE: |
868 | case ST_CONFIGURE: |
905 | LOG (llevError, "In client input handling, but into configure state\n"); |
869 | LOG (llevError, "In client input handling, but into configure state\n"); |
906 | pl->state = ST_PLAYING; |
870 | pl->state = ST_PLAYING; |
907 | break; |
871 | break; |
908 | |
872 | |
909 | case ST_GET_NAME: |
873 | case ST_GET_NAME: |
910 | receive_player_name (pl->ob, 13); |
874 | receive_player_name (pl->ob, 13); |
911 | break; |
875 | break; |
912 | |
876 | |
913 | case ST_GET_PASSWORD: |
877 | case ST_GET_PASSWORD: |
914 | case ST_CONFIRM_PASSWORD: |
878 | case ST_CONFIRM_PASSWORD: |
915 | receive_player_password (pl->ob, 13); |
879 | receive_player_password (pl->ob, 13); |
916 | break; |
880 | break; |
917 | |
881 | |
918 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
882 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
919 | receive_party_password (pl->ob, 13); |
883 | receive_party_password (pl->ob, 13); |
920 | break; |
884 | break; |
921 | |
885 | |
922 | default: |
886 | default: |
923 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
887 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
924 | } |
888 | } |
925 | } |
889 | } |
926 | |
890 | |
927 | /** |
891 | /** |
928 | * Client tells its version. If there is a mismatch, we close the |
892 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
932 | * problem. |
896 | * problem. |
933 | */ |
897 | */ |
934 | void |
898 | void |
935 | VersionCmd (char *buf, int len, client * ns) |
899 | VersionCmd (char *buf, int len, client * ns) |
936 | { |
900 | { |
937 | char *cp; |
|
|
938 | char version_warning[256]; |
|
|
939 | |
|
|
940 | if (!buf) |
901 | if (!buf) |
941 | { |
902 | { |
942 | LOG (llevError, "CS: received corrupted version command\n"); |
903 | LOG (llevError, "CS: received corrupted version command\n"); |
943 | return; |
904 | return; |
944 | } |
905 | } |
945 | |
906 | |
946 | ns->cs_version = atoi (buf); |
907 | ns->cs_version = atoi (buf); |
947 | ns->sc_version = ns->cs_version; |
908 | ns->sc_version = ns->cs_version; |
|
|
909 | |
|
|
910 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
911 | |
|
|
912 | |
|
|
913 | //TODO: should log here just for statistics |
|
|
914 | |
948 | if (VERSION_CS != ns->cs_version) |
915 | //if (VERSION_CS != ns->cs_version) |
949 | { |
916 | // unchecked; |
950 | #ifdef ESRV_DEBUG |
917 | |
951 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
952 | #endif |
|
|
953 | } |
|
|
954 | cp = strchr (buf + 1, ' '); |
918 | char *cp = strchr (buf + 1, ' '); |
955 | if (!cp) |
919 | if (!cp) |
956 | return; |
920 | return; |
|
|
921 | |
957 | ns->sc_version = atoi (cp); |
922 | ns->sc_version = atoi (cp); |
|
|
923 | |
958 | if (VERSION_SC != ns->sc_version) |
924 | //if (VERSION_SC != ns->sc_version) |
959 | { |
925 | // unchecked; |
960 | #ifdef ESRV_DEBUG |
926 | |
961 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
962 | #endif |
|
|
963 | } |
|
|
964 | cp = strchr (cp + 1, ' '); |
927 | cp = strchr (cp + 1, ' '); |
|
|
928 | |
965 | if (cp) |
929 | if (cp) |
966 | { |
930 | { |
967 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
|
|
968 | |
|
|
969 | assign (ns->version, cp + 1); |
931 | assign (ns->version, cp + 1); |
970 | |
932 | |
971 | if (ns->sc_version < 1026) |
933 | if (ns->sc_version < 1026) |
972 | { |
934 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
973 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
974 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
935 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
975 | ns->send_packet (version_warning); |
|
|
976 | } |
|
|
977 | |
|
|
978 | } |
936 | } |
979 | } |
937 | } |
980 | |
938 | |
981 | /** sound related functions. */ |
939 | /** sound related functions. */ |
982 | void |
940 | void |
… | |
… | |
988 | /** client wants the map resent */ |
946 | /** client wants the map resent */ |
989 | |
947 | |
990 | void |
948 | void |
991 | MapRedrawCmd (char *buf, int len, player *pl) |
949 | MapRedrawCmd (char *buf, int len, player *pl) |
992 | { |
950 | { |
993 | |
|
|
994 | /* This function is currently disabled; just clearing the map state results in |
951 | /* This function is currently disabled; just clearing the map state results in |
995 | * display errors. It should clear the cache and send a newmap command. |
952 | * display errors. It should clear the cache and send a newmap command. |
996 | * Unfortunately this solution does not work because some client versions send |
953 | * Unfortunately this solution does not work because some client versions send |
997 | * a mapredraw command after receiving a newmap command. |
954 | * a mapredraw command after receiving a newmap command. |
998 | */ |
955 | */ |
999 | #if 0 |
|
|
1000 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
1001 | * clear the "cache" |
|
|
1002 | */ |
|
|
1003 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
1004 | draw_client_map (pl->ob); |
|
|
1005 | #endif |
|
|
1006 | } |
956 | } |
1007 | |
957 | |
1008 | /** |
958 | /** |
1009 | * Moves an object (typically, container to inventory). |
959 | * Moves an object (typically, container to inventory). |
1010 | * syntax is: move (to) (tag) (nrof) |
960 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1013 | MoveCmd (char *buf, int len, player *pl) |
963 | MoveCmd (char *buf, int len, player *pl) |
1014 | { |
964 | { |
1015 | int vals[3], i; |
965 | int vals[3], i; |
1016 | |
966 | |
1017 | /* A little funky here. We only cycle for 2 records, because |
967 | /* A little funky here. We only cycle for 2 records, because |
1018 | * we obviously am not going to find a space after the third |
968 | * we obviously are not going to find a space after the third |
1019 | * record. Perhaps we should just replace this with a |
969 | * record. Perhaps we should just replace this with a |
1020 | * sscanf? |
970 | * sscanf? |
1021 | */ |
971 | */ |
1022 | for (i = 0; i < 2; i++) |
972 | for (i = 0; i < 2; i++) |
1023 | { |
973 | { |
1024 | vals[i] = atoi (buf); |
974 | vals[i] = atoi (buf); |
|
|
975 | |
1025 | if (!(buf = strchr (buf, ' '))) |
976 | if (!(buf = strchr (buf, ' '))) |
1026 | { |
977 | { |
1027 | LOG (llevError, "Incomplete move command: %s\n", buf); |
978 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1028 | return; |
979 | return; |
1029 | } |
980 | } |
|
|
981 | |
1030 | buf++; |
982 | buf++; |
1031 | } |
983 | } |
|
|
984 | |
1032 | vals[2] = atoi (buf); |
985 | vals[2] = atoi (buf); |
1033 | |
986 | |
1034 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
987 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1035 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
988 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1036 | } |
989 | } |
1037 | |
|
|
1038 | |
|
|
1039 | |
990 | |
1040 | /****************************************************************************** |
991 | /****************************************************************************** |
1041 | * |
992 | * |
1042 | * Start of commands the server sends to the client. |
993 | * Start of commands the server sends to the client. |
1043 | * |
994 | * |
… | |
… | |
1046 | /** |
997 | /** |
1047 | * Asks the client to query the user. This way, the client knows |
998 | * Asks the client to query the user. This way, the client knows |
1048 | * it needs to send something back (vs just printing out a message) |
999 | * it needs to send something back (vs just printing out a message) |
1049 | */ |
1000 | */ |
1050 | void |
1001 | void |
1051 | send_query (client * ns, uint8 flags, char *text) |
1002 | send_query (client *ns, uint8 flags, char *text) |
1052 | { |
1003 | { |
1053 | char buf[MAX_BUF]; |
|
|
1054 | |
|
|
1055 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1004 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1056 | ns->send_packet (buf); |
|
|
1057 | } |
1005 | } |
1058 | |
1006 | |
1059 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1007 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1060 | Old = New; \ |
1008 | Old = New; \ |
1061 | sl << uint8 (Type) << uint64 (New); \ |
1009 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1091 | esrv_update_stats (player *pl) |
1039 | esrv_update_stats (player *pl) |
1092 | { |
1040 | { |
1093 | char buf[MAX_BUF]; |
1041 | char buf[MAX_BUF]; |
1094 | uint16 flags; |
1042 | uint16 flags; |
1095 | |
1043 | |
1096 | packet sl; |
1044 | packet sl ("stats"); |
1097 | sl << "stats "; |
|
|
1098 | |
1045 | |
1099 | if (pl->ob != NULL) |
1046 | if (pl->ob) |
1100 | { |
1047 | { |
1101 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1048 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1102 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1049 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1103 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1050 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1104 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1051 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
… | |
… | |
1112 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1059 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1113 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1060 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1114 | } |
1061 | } |
1115 | |
1062 | |
1116 | if (pl->socket->exp64) |
1063 | if (pl->socket->exp64) |
1117 | { |
|
|
1118 | uint8 s; |
|
|
1119 | |
|
|
1120 | for (s = 0; s < NUM_SKILLS; s++) |
1064 | for (int s = 0; s < NUM_SKILLS; s++) |
1121 | { |
|
|
1122 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1065 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1123 | { |
1066 | { |
1124 | /* Always send along the level if exp changes. This is only |
1067 | /* Always send along the level if exp changes. This is only |
1125 | * 1 extra byte, but keeps processing simpler. |
1068 | * 1 extra byte, but keeps processing simpler. |
1126 | */ |
1069 | */ |
1127 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1070 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1128 | << uint8 (pl->last_skill_ob[s]->level) |
1071 | << uint8 (pl->last_skill_ob[s]->level) |
1129 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1072 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1130 | |
1073 | |
1131 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1074 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1132 | } |
1075 | } |
1133 | } |
|
|
1134 | } |
|
|
1135 | |
1076 | |
1136 | if (pl->socket->exp64) |
1077 | if (pl->socket->exp64) |
1137 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1078 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1138 | else |
1079 | else |
1139 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1080 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
… | |
… | |
1157 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1098 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1158 | |
1099 | |
1159 | if (pl->socket->sc_version < 1025) |
1100 | if (pl->socket->sc_version < 1025) |
1160 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1101 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1161 | else |
1102 | else |
1162 | { |
|
|
1163 | int i; |
|
|
1164 | |
|
|
1165 | for (i = 0; i < NROFATTACKS; i++) |
1103 | for (int i = 0; i < NROFATTACKS; i++) |
1166 | { |
1104 | { |
1167 | /* Skip ones we won't send */ |
1105 | /* Skip ones we won't send */ |
1168 | if (atnr_cs_stat[i] == -1) |
1106 | if (atnr_cs_stat[i] == -1) |
1169 | continue; |
1107 | continue; |
1170 | |
1108 | |
1171 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1109 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1172 | } |
1110 | } |
1173 | } |
|
|
1174 | |
1111 | |
1175 | if (pl->socket->monitor_spells) |
1112 | if (pl->socket->monitor_spells) |
1176 | { |
1113 | { |
1177 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1114 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1178 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1115 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
… | |
… | |
1195 | void |
1132 | void |
1196 | esrv_new_player (player *pl, uint32 weight) |
1133 | esrv_new_player (player *pl, uint32 weight) |
1197 | { |
1134 | { |
1198 | pl->last_weight = weight; |
1135 | pl->last_weight = weight; |
1199 | |
1136 | |
1200 | packet sl; |
1137 | packet sl ("player"); |
1201 | sl << "player "; |
|
|
1202 | |
1138 | |
1203 | sl << uint32 (pl->ob->count) |
1139 | sl << uint32 (pl->ob->count) |
1204 | << uint32 (weight) |
1140 | << uint32 (weight) |
1205 | << uint32 (pl->ob->face->number) |
1141 | << uint32 (pl->ob->face->number) |
1206 | << data8 (pl->ob->name); |
1142 | << data8 (pl->ob->name); |
… | |
… | |
1217 | * when the player logs in and picks stuff up. |
1153 | * when the player logs in and picks stuff up. |
1218 | */ |
1154 | */ |
1219 | void |
1155 | void |
1220 | esrv_send_animation (client * ns, short anim_num) |
1156 | esrv_send_animation (client * ns, short anim_num) |
1221 | { |
1157 | { |
1222 | int i; |
|
|
1223 | |
|
|
1224 | /* Do some checking on the anim_num we got. Note that the animations |
1158 | /* Do some checking on the anim_num we got. Note that the animations |
1225 | * are added in contigous order, so if the number is in the valid |
1159 | * are added in contigous order, so if the number is in the valid |
1226 | * range, it must be a valid animation. |
1160 | * range, it must be a valid animation. |
1227 | */ |
1161 | */ |
1228 | if (anim_num < 0 || anim_num > num_animations) |
1162 | if (anim_num < 0 || anim_num > num_animations) |
1229 | { |
1163 | { |
1230 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1164 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1231 | return; |
1165 | return; |
1232 | } |
1166 | } |
1233 | |
1167 | |
1234 | packet sl; |
1168 | packet sl ("anim"); |
1235 | |
1169 | |
1236 | sl << "anim " |
|
|
1237 | << uint16 (anim_num) |
1170 | sl << uint16 (anim_num) |
1238 | << uint16 (0); /* flags - not used right now */ |
1171 | << uint16 (0); /* flags - not used right now */ |
1239 | |
1172 | |
1240 | /* Build up the list of faces. Also, send any information (ie, the |
1173 | /* Build up the list of faces. Also, send any information (ie, the |
1241 | * the face itself) down to the client. |
1174 | * the face itself) down to the client. |
1242 | */ |
1175 | */ |
1243 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1176 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1244 | { |
1177 | { |
1245 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1178 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1246 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1179 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1180 | |
1247 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1181 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1248 | } |
1182 | } |
1249 | |
1183 | |
1250 | ns->send_packet (sl); |
1184 | ns->send_packet (sl); |
1251 | |
1185 | |
… | |
… | |
1266 | static void |
1200 | static void |
1267 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1201 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1268 | { |
1202 | { |
1269 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1203 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1270 | { |
1204 | { |
|
|
1205 | //TODO: one or the other, can't both have abort and return, verify and act |
1271 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1206 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1272 | return; |
1207 | return; |
1273 | abort (); |
1208 | abort (); |
1274 | } |
1209 | } |
1275 | |
1210 | |
1276 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1211 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1277 | newmap->cells[x][y].count++; |
1212 | newmap->cells[x][y].count++; |
1278 | |
1213 | |
1279 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1214 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1280 | esrv_send_face (ns, face_num, 0); |
1215 | esrv_send_face (ns, face_num, 0); |
1281 | } |
|
|
1282 | |
|
|
1283 | struct LayerCell |
|
|
1284 | { |
|
|
1285 | uint16 xy; |
|
|
1286 | short face; |
|
|
1287 | }; |
|
|
1288 | |
|
|
1289 | struct MapLayer |
|
|
1290 | { |
|
|
1291 | int count; |
|
|
1292 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1293 | }; |
|
|
1294 | |
|
|
1295 | /** Checkes if map cells have changed */ |
|
|
1296 | static int |
|
|
1297 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
|
|
1298 | { |
|
|
1299 | int k; |
|
|
1300 | |
|
|
1301 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1302 | return 1; |
|
|
1303 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1304 | { |
|
|
1305 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1306 | { |
|
|
1307 | return 1; |
|
|
1308 | } |
|
|
1309 | } |
|
|
1310 | return 0; |
|
|
1311 | } |
|
|
1312 | |
|
|
1313 | /** |
|
|
1314 | * Basically, what this does is pack the data into layers. |
|
|
1315 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1316 | * this data into. we return the end of the data. layers is |
|
|
1317 | * how many layers of data we should back. |
|
|
1318 | */ |
|
|
1319 | static uint8 * |
|
|
1320 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1321 | { |
|
|
1322 | int x, y, k; |
|
|
1323 | int face; |
|
|
1324 | unsigned char *fcur; |
|
|
1325 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1326 | |
|
|
1327 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1328 | layers[k].count = 0; |
|
|
1329 | fcur = cur; |
|
|
1330 | for (x = 0; x < ns->mapx; x++) |
|
|
1331 | { |
|
|
1332 | for (y = 0; y < ns->mapy; y++) |
|
|
1333 | { |
|
|
1334 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1335 | continue; |
|
|
1336 | if (newmap->cells[x][y].count == 0) |
|
|
1337 | { |
|
|
1338 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1339 | cur++; |
|
|
1340 | continue; |
|
|
1341 | } |
|
|
1342 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1343 | { |
|
|
1344 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1345 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1346 | layers[k].count++; |
|
|
1347 | } |
|
|
1348 | } |
|
|
1349 | } |
|
|
1350 | /* If no data, return now. */ |
|
|
1351 | if (fcur == cur && layers[0].count == 0) |
|
|
1352 | return cur; |
|
|
1353 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1354 | cur++; |
|
|
1355 | /* First pack by layers. */ |
|
|
1356 | for (k = 0; k < numlayers; k++) |
|
|
1357 | { |
|
|
1358 | if (layers[k].count == 0) |
|
|
1359 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1360 | have anything in it either */ |
|
|
1361 | /* Pack by entries in thie layer */ |
|
|
1362 | for (x = 0; x < layers[k].count;) |
|
|
1363 | { |
|
|
1364 | fcur = cur; |
|
|
1365 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1366 | cur++; |
|
|
1367 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1368 | cur++; |
|
|
1369 | face = layers[k].lcells[x].face; |
|
|
1370 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1371 | for (y = x; y < layers[k].count; y++) |
|
|
1372 | { |
|
|
1373 | if (layers[k].lcells[y].face == face) |
|
|
1374 | { |
|
|
1375 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1376 | cur++; |
|
|
1377 | layers[k].lcells[y].face = -1; |
|
|
1378 | } |
|
|
1379 | } |
|
|
1380 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1381 | /* forward over the now redundant data */ |
|
|
1382 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1383 | x++; |
|
|
1384 | } |
|
|
1385 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1386 | } |
|
|
1387 | return cur; |
|
|
1388 | } |
1216 | } |
1389 | |
1217 | |
1390 | /** Clears a map cell */ |
1218 | /** Clears a map cell */ |
1391 | static void |
1219 | static void |
1392 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1220 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1404 | #define MAX_LAYERS 3 |
1232 | #define MAX_LAYERS 3 |
1405 | |
1233 | |
1406 | /* Using a global really isn't a good approach, but saves the over head of |
1234 | /* Using a global really isn't a good approach, but saves the over head of |
1407 | * allocating and deallocating such a block of data each time run through, |
1235 | * allocating and deallocating such a block of data each time run through, |
1408 | * and saves the space of allocating this in the socket object when we only |
1236 | * and saves the space of allocating this in the socket object when we only |
1409 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1237 | * need it for this cycle. If the server is ever threaded, this needs to be |
1410 | * re-examined. |
1238 | * re-examined. |
1411 | */ |
1239 | */ |
1412 | |
|
|
1413 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1240 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1414 | |
1241 | |
1415 | /** |
1242 | /** |
1416 | * Returns true if any of the heads for this |
1243 | * Returns true if any of the heads for this |
1417 | * space is set. Returns false if all are blank - this is used |
1244 | * space is set. Returns false if all are blank - this is used |
1418 | * for empty space checking. |
1245 | * for empty space checking. |
1419 | */ |
1246 | */ |
1420 | static inline int |
1247 | static inline int |
1421 | have_head (int ax, int ay) |
1248 | have_head (int ax, int ay) |
1422 | { |
1249 | { |
1423 | |
|
|
1424 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1250 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1425 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1251 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1426 | return 1; |
1252 | return 1; |
|
|
1253 | |
1427 | return 0; |
1254 | return 0; |
1428 | } |
1255 | } |
1429 | |
1256 | |
1430 | /** |
1257 | /** |
1431 | * check_head is a bit simplistic version of update_space below. |
1258 | * check_head is a bit simplistic version of update_space below. |
1432 | * basically, it only checks the that the head on space ax,ay at layer |
1259 | * basically, it only checks the that the head on space ax,ay at layer |
1433 | * needs to get sent - if so, it adds the data, sending the head |
1260 | * needs to get sent - if so, it adds the data, sending the head |
1434 | * if needed, and returning 1. If this no data needs to get |
1261 | * if needed, and returning 1. If this no data needs to get |
1435 | * sent, it returns zero. |
1262 | * sent, it returns zero. |
1436 | */ |
1263 | */ |
1437 | static int |
1264 | static int |
1438 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1265 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1439 | { |
1266 | { |
… | |
… | |
1475 | * numbers the spaces differently - I think this was a leftover from |
1302 | * numbers the spaces differently - I think this was a leftover from |
1476 | * the map command, where the faces stack up. Sinces that is no longer |
1303 | * the map command, where the faces stack up. Sinces that is no longer |
1477 | * the case, it seems to make more sense to have these layer values |
1304 | * the case, it seems to make more sense to have these layer values |
1478 | * actually match. |
1305 | * actually match. |
1479 | */ |
1306 | */ |
1480 | |
|
|
1481 | static int |
1307 | static int |
1482 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1308 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1483 | { |
1309 | { |
1484 | object *ob, *head; |
1310 | object *ob, *head; |
1485 | uint16 face_num; |
1311 | uint16 face_num; |
… | |
… | |
1753 | if (ns->ext_mapinfos) |
1579 | if (ns->ext_mapinfos) |
1754 | { |
1580 | { |
1755 | if (ns->EMI_smooth) |
1581 | if (ns->EMI_smooth) |
1756 | result += 1; /*One byte for smoothlevel */ |
1582 | result += 1; /*One byte for smoothlevel */ |
1757 | } |
1583 | } |
|
|
1584 | |
1758 | return result; |
1585 | return result; |
1759 | } |
1586 | } |
1760 | |
1587 | |
1761 | /** |
1588 | /** |
1762 | * This function uses the new map1 protocol command to send the map |
1589 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1794 | |
1621 | |
1795 | client &socket = *pl->contr->socket; |
1622 | client &socket = *pl->contr->socket; |
1796 | |
1623 | |
1797 | check_map_change (pl->contr); |
1624 | check_map_change (pl->contr); |
1798 | |
1625 | |
1799 | packet sl; |
1626 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1800 | packet esl; |
1627 | packet esl; |
1801 | |
1628 | |
1802 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1803 | startlen = sl.length (); |
1629 | startlen = sl.length (); |
1804 | |
1630 | |
1805 | /*Extendedmapinfo structure initialisation */ |
1631 | /*Extendedmapinfo structure initialisation */ |
1806 | if (socket.ext_mapinfos) |
1632 | if (socket.ext_mapinfos) |
1807 | { |
1633 | { |
… | |
… | |
1851 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1677 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1852 | { |
1678 | { |
1853 | ax = 0; |
1679 | ax = 0; |
1854 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1680 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1855 | { |
1681 | { |
1856 | |
|
|
1857 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1682 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1858 | |
1683 | |
1859 | /* If this space is out of the normal viewable area, we only check |
1684 | /* If this space is out of the normal viewable area, we only check |
1860 | * the heads value ax or ay will only be greater than what |
1685 | * the heads value ax or ay will only be greater than what |
1861 | * the client wants if using the map1a command - this is because |
1686 | * the client wants if using the map1a command - this is because |
… | |
… | |
2192 | return; |
2017 | return; |
2193 | |
2018 | |
2194 | memset (&newmap, 0, sizeof (struct Map)); |
2019 | memset (&newmap, 0, sizeof (struct Map)); |
2195 | |
2020 | |
2196 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2021 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2197 | { |
|
|
2198 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2022 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2199 | { |
2023 | { |
2200 | ax = i; |
2024 | ax = i; |
2201 | ay = j; |
2025 | ay = j; |
2202 | m = pm; |
2026 | m = pm; |
2203 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2027 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2028 | |
2204 | if (mflags & P_OUT_OF_MAP) |
2029 | if (mflags & P_OUT_OF_MAP) |
2205 | continue; |
2030 | continue; |
2206 | if (mflags & P_NEED_UPDATE) |
2031 | |
2207 | update_position (m, ax, ay); |
|
|
2208 | /* If a map is visible to the player, we don't want to swap it out |
2032 | /* If a map is visible to the player, we don't want to swap it out |
2209 | * just to reload it. This should really call something like |
2033 | * just to reload it. This should really call something like |
2210 | * swap_map, but this is much more efficient and 'good enough' |
2034 | * swap_map, but this is much more efficient and 'good enough' |
2211 | */ |
2035 | */ |
2212 | if (mflags & P_NEW_MAP) |
2036 | if (mflags & P_NEW_MAP) |
2213 | m->timeout = 50; |
2037 | m->timeout = 50; |
2214 | } |
2038 | } |
2215 | } |
2039 | |
2216 | /* do LOS after calls to update_position */ |
2040 | /* do LOS after calls to update_position */ |
2217 | if (pl->contr->do_los) |
2041 | if (pl->contr->do_los) |
2218 | { |
2042 | { |
2219 | update_los (pl); |
2043 | update_los (pl); |
2220 | pl->contr->do_los = 0; |
2044 | pl->contr->do_los = 0; |
… | |
… | |
2348 | { |
2172 | { |
2349 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2173 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2350 | return; |
2174 | return; |
2351 | } |
2175 | } |
2352 | |
2176 | |
2353 | packet sl; |
2177 | packet sl ("delspell"); |
2354 | |
2178 | |
2355 | sl << "delspell " |
|
|
2356 | << uint32 (spell->count); |
2179 | sl << uint32 (spell->count); |
2357 | |
2180 | |
2358 | pl->socket->send_packet (sl); |
2181 | pl->socket->send_packet (sl); |
2359 | } |
2182 | } |
2360 | |
2183 | |
2361 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2184 | /* appends the spell *spell to the Socklist we will send the data to. */ |
… | |
… | |
2414 | } |
2237 | } |
2415 | |
2238 | |
2416 | if (!pl->socket->monitor_spells) |
2239 | if (!pl->socket->monitor_spells) |
2417 | return; |
2240 | return; |
2418 | |
2241 | |
2419 | packet sl; |
2242 | packet sl ("addspell"); |
2420 | |
|
|
2421 | sl << "addspell "; |
|
|
2422 | |
2243 | |
2423 | if (!spell) |
2244 | if (!spell) |
2424 | { |
2245 | { |
2425 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2246 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2426 | { |
2247 | { |