… | |
… | |
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 | |
92 | static void |
87 | static void |
93 | socket_map_scroll (client_socket * ns, int dx, int dy) |
88 | socket_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 | |
150 | static void |
140 | static void |
151 | clear_map (player *pl) |
141 | clear_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 */ |
165 | static void |
152 | static void |
166 | check_map_change (player *pl) |
153 | check_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 | */ |
226 | void |
212 | void |
227 | RequestInfo (char *buf, int len, client_socket * ns) |
213 | RequestInfo (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 | |
265 | void |
251 | void |
266 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (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 | |
|
|
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
269 | } |
261 | } |
270 | |
262 | |
271 | void |
263 | void |
272 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (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 */ |
359 | void |
351 | void |
360 | SetUp (char *buf, int len, client_socket * ns) |
352 | SetUp (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 | */ |
579 | void |
571 | void |
580 | AddMeCmd (char *buf, int len, client_socket * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
581 | { |
573 | { |
582 | Settings oldsettings; |
574 | if (INVOKE_CLIENT (ADDME, ns)) |
|
|
575 | return; |
583 | |
576 | |
584 | oldsettings = settings; |
|
|
585 | if (ns->status != Ns_Add || add_player (ns)) |
577 | if (ns->pl || add_player (ns)) |
586 | ns->send_packet ("addme_failed"); |
578 | ns->send_packet ("addme_failed"); |
587 | else |
579 | else |
588 | ns->send_packet ("addme_success"); |
580 | ns->send_packet ("addme_success"); |
589 | |
|
|
590 | settings = oldsettings; |
|
|
591 | } |
581 | } |
592 | |
582 | |
593 | /** Reply to ExtendedInfos command */ |
583 | /** Reply to ExtendedInfos command */ |
594 | void |
584 | void |
595 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
585 | ToggleExtendedInfos (char *buf, int len, client * ns) |
596 | { |
586 | { |
597 | char cmdback[MAX_BUF]; |
587 | char cmdback[MAX_BUF]; |
598 | char command[50]; |
588 | char command[50]; |
599 | int info, nextinfo; |
589 | int info, nextinfo; |
600 | |
590 | |
… | |
… | |
651 | #define MSG_TYPE_MONUMENT 5 |
641 | #define MSG_TYPE_MONUMENT 5 |
652 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
642 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
653 | |
643 | |
654 | /** Reply to ExtendedInfos command */ |
644 | /** Reply to ExtendedInfos command */ |
655 | void |
645 | void |
656 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
646 | ToggleExtendedText (char *buf, int len, client * ns) |
657 | { |
647 | { |
658 | char cmdback[MAX_BUF]; |
648 | char cmdback[MAX_BUF]; |
659 | char temp[10]; |
649 | char temp[10]; |
660 | char command[50]; |
650 | char command[50]; |
661 | int info, nextinfo, i, flag; |
651 | int info, nextinfo, i, flag; |
… | |
… | |
712 | * 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 |
713 | * 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 |
714 | * client. |
704 | * client. |
715 | */ |
705 | */ |
716 | static void |
706 | static void |
717 | SendSmooth (client_socket * ns, uint16 face) |
707 | SendSmooth (client *ns, uint16 face) |
718 | { |
708 | { |
719 | uint16 smoothface; |
709 | uint16 smoothface; |
720 | |
710 | |
721 | /* 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 |
722 | * again. |
712 | * again. |
… | |
… | |
732 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
722 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
733 | esrv_send_face (ns, smoothface, 0); |
723 | esrv_send_face (ns, smoothface, 0); |
734 | |
724 | |
735 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
725 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
736 | |
726 | |
737 | packet sl; |
727 | packet sl ("smooth"); |
738 | |
728 | |
739 | sl << "smooth " |
|
|
740 | << uint16 (face) |
729 | sl << uint16 (face) |
741 | << uint16 (smoothface); |
730 | << uint16 (smoothface); |
742 | |
731 | |
743 | ns->send_packet (sl); |
732 | ns->send_packet (sl); |
744 | } |
733 | } |
745 | |
734 | |
746 | /** |
735 | /** |
747 | * Tells client the picture it has to use |
736 | * Tells client the picture it has to use |
748 | * to smooth a picture number given as argument. |
737 | * to smooth a picture number given as argument. |
749 | */ |
738 | */ |
750 | void |
739 | void |
751 | AskSmooth (char *buf, int len, client_socket * ns) |
740 | AskSmooth (char *buf, int len, client *ns) |
752 | { |
741 | { |
753 | uint16 facenbr; |
742 | SendSmooth (ns, atoi (buf)); |
754 | |
|
|
755 | facenbr = atoi (buf); |
|
|
756 | SendSmooth (ns, facenbr); |
|
|
757 | } |
743 | } |
758 | |
744 | |
759 | /** |
745 | /** |
760 | * 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, |
761 | * etc.) |
747 | * etc.) |
762 | */ |
748 | */ |
763 | void |
749 | void |
764 | PlayerCmd (char *buf, int len, player *pl) |
750 | PlayerCmd (char *buf, int len, player *pl) |
765 | { |
751 | { |
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 |
752 | /* Check if there is a count. In theory, a zero count could also be |
778 | * sent, so check for that also. |
753 | * sent, so check for that also. |
779 | */ |
754 | */ |
780 | if (atoi (buf) || buf[0] == '0') |
755 | if (atoi (buf) || buf[0] == '0') |
781 | { |
756 | { |
782 | pl->count = atoi ((char *) buf); |
757 | pl->count = atoi ((char *) buf); |
|
|
758 | |
783 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
759 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
784 | if (!buf) |
760 | if (!buf) |
785 | { |
|
|
786 | #ifdef ESRV_DEBUG |
|
|
787 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
788 | #endif |
|
|
789 | return; |
761 | return; |
790 | } |
762 | |
791 | buf++; |
763 | buf++; |
792 | } |
764 | } |
793 | /* This should not happen anymore. */ |
765 | |
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); |
766 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
767 | |
800 | /* Perhaps something better should be done with a left over count. |
768 | /* Perhaps something better should be done with a left over count. |
801 | * Cleaning up the input should probably be done first - all actions |
769 | * 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 |
770 | * for the command that issued the count should be done before any other |
803 | * commands. |
771 | * commands. |
804 | */ |
772 | */ |
805 | |
|
|
806 | pl->count = 0; |
773 | pl->count = 0; |
807 | |
|
|
808 | } |
774 | } |
809 | |
775 | |
810 | |
776 | |
811 | /** |
777 | /** |
812 | * 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, |
… | |
… | |
815 | * can throttle. |
781 | * can throttle. |
816 | */ |
782 | */ |
817 | void |
783 | void |
818 | NewPlayerCmd (char *buf, int len, player *pl) |
784 | NewPlayerCmd (char *buf, int len, player *pl) |
819 | { |
785 | { |
820 | int time, repeat; |
|
|
821 | char command[MAX_BUF]; |
|
|
822 | int pktlen; |
|
|
823 | |
|
|
824 | if (len < 7) |
786 | if (len <= 6) |
825 | { |
787 | { |
826 | 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); |
827 | return; |
789 | return; |
828 | } |
790 | } |
829 | |
791 | |
830 | pktlen = net_uint16 ((uint8 *)buf); |
792 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
831 | repeat = net_uint32 ((uint8 *)buf + 2); |
793 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
832 | |
794 | |
833 | /* -1 is special - no repeat, but don't update */ |
795 | /* -1 is special - no repeat, but don't update */ |
834 | if (repeat != -1) |
796 | if (repeat != -1) |
835 | pl->count = repeat; |
797 | pl->count = repeat; |
836 | |
798 | |
837 | if ((len - 4) >= MAX_BUF) |
799 | buf += 6; //len -= 6; |
838 | len = MAX_BUF - 5; |
|
|
839 | |
800 | |
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); |
801 | execute_newserver_command (pl->ob, buf); |
|
|
802 | |
849 | /* Perhaps something better should be done with a left over count. |
803 | /* Perhaps something better should be done with a left over count. |
850 | * Cleaning up the input should probably be done first - all actions |
804 | * 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 |
805 | * for the command that issued the count should be done before any other |
852 | * commands. |
806 | * commands. |
853 | */ |
807 | */ |
854 | pl->count = 0; |
808 | pl->count = 0; |
855 | |
809 | |
|
|
810 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
856 | if (FABS (pl->ob->speed) < 0.001) |
811 | int time = FABS (pl->ob->speed) < 0.001 |
857 | time = MAX_TIME * 100; |
812 | ? time = MAX_TIME * 100 |
858 | else |
|
|
859 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
813 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
860 | |
814 | |
861 | /* Send confirmation of command execution now */ |
815 | /* Send confirmation of command execution now */ |
862 | |
816 | packet sl ("comc"); |
863 | packet sl; |
|
|
864 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
817 | sl << uint16 (cmdid) << uint32 (time); |
865 | pl->socket->send_packet (sl); |
818 | pl->socket->send_packet (sl); |
866 | } |
819 | } |
867 | |
820 | |
868 | |
|
|
869 | /** This is a reply to a previous query. */ |
821 | /** This is a reply to a previous query. */ |
870 | void |
822 | void |
871 | ReplyCmd (char *buf, int len, player *pl) |
823 | ReplyCmd (char *buf, int len, client *ns) |
872 | { |
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 | |
873 | /* 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 |
874 | * 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 |
875 | * once all the X11 code is removed from the server. |
833 | * once all the X11 code is removed from the server. |
876 | * |
834 | * |
877 | * 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 |
878 | * think it was the carriage return that was entered, and the |
836 | * think it was the carriage return that was entered, and the |
879 | * function then does not try to do additional input. |
837 | * function then does not try to do additional input. |
… | |
… | |
882 | |
840 | |
883 | /* this avoids any hacking here */ |
841 | /* this avoids any hacking here */ |
884 | |
842 | |
885 | switch (pl->state) |
843 | switch (pl->state) |
886 | { |
844 | { |
887 | case ST_PLAYING: |
845 | case ST_PLAYING: |
888 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
846 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
889 | break; |
847 | break; |
890 | |
848 | |
891 | case ST_PLAY_AGAIN: |
849 | case ST_PLAY_AGAIN: |
892 | /* We can check this for return value (2==quit). Maybe we |
850 | /* We can check this for return value (2==quit). Maybe we |
893 | * should, and do something appropriate? |
851 | * should, and do something appropriate? |
894 | */ |
852 | */ |
895 | receive_play_again (pl->ob, buf[0]); |
853 | receive_play_again (pl->ob, buf[0]); |
896 | break; |
854 | break; |
897 | |
855 | |
898 | case ST_ROLL_STAT: |
856 | case ST_ROLL_STAT: |
899 | key_roll_stat (pl->ob, buf[0]); |
857 | key_roll_stat (pl->ob, buf[0]); |
900 | break; |
858 | break; |
901 | |
859 | |
902 | case ST_CHANGE_CLASS: |
860 | case ST_CHANGE_CLASS: |
903 | |
|
|
904 | key_change_class (pl->ob, buf[0]); |
861 | key_change_class (pl->ob, buf[0]); |
905 | break; |
862 | break; |
906 | |
863 | |
907 | case ST_CONFIRM_QUIT: |
864 | case ST_CONFIRM_QUIT: |
908 | key_confirm_quit (pl->ob, buf[0]); |
865 | key_confirm_quit (pl->ob, buf[0]); |
909 | break; |
866 | break; |
910 | |
867 | |
911 | case ST_CONFIGURE: |
868 | case ST_CONFIGURE: |
912 | LOG (llevError, "In client input handling, but into configure state\n"); |
869 | LOG (llevError, "In client input handling, but into configure state\n"); |
913 | pl->state = ST_PLAYING; |
870 | pl->state = ST_PLAYING; |
914 | break; |
871 | break; |
915 | |
872 | |
916 | case ST_GET_NAME: |
873 | case ST_GET_NAME: |
917 | receive_player_name (pl->ob, 13); |
874 | receive_player_name (pl->ob, 13); |
918 | break; |
875 | break; |
919 | |
876 | |
920 | case ST_GET_PASSWORD: |
877 | case ST_GET_PASSWORD: |
921 | case ST_CONFIRM_PASSWORD: |
878 | case ST_CONFIRM_PASSWORD: |
922 | receive_player_password (pl->ob, 13); |
879 | receive_player_password (pl->ob, 13); |
923 | break; |
880 | break; |
924 | |
881 | |
925 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
882 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
926 | receive_party_password (pl->ob, 13); |
883 | receive_party_password (pl->ob, 13); |
927 | break; |
884 | break; |
928 | |
885 | |
929 | default: |
886 | default: |
930 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
887 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
931 | } |
888 | } |
932 | } |
889 | } |
933 | |
890 | |
934 | /** |
891 | /** |
935 | * 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 |
… | |
… | |
937 | * something older than the server. If we assume the client will be |
894 | * 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 |
895 | * backwards compatible, having it be a later version should not be a |
939 | * problem. |
896 | * problem. |
940 | */ |
897 | */ |
941 | void |
898 | void |
942 | VersionCmd (char *buf, int len, client_socket * ns) |
899 | VersionCmd (char *buf, int len, client * ns) |
943 | { |
900 | { |
944 | char *cp; |
|
|
945 | char version_warning[256]; |
|
|
946 | |
|
|
947 | if (!buf) |
901 | if (!buf) |
948 | { |
902 | { |
949 | LOG (llevError, "CS: received corrupted version command\n"); |
903 | LOG (llevError, "CS: received corrupted version command\n"); |
950 | return; |
904 | return; |
951 | } |
905 | } |
952 | |
906 | |
953 | ns->cs_version = atoi (buf); |
907 | ns->cs_version = atoi (buf); |
954 | 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 | |
955 | if (VERSION_CS != ns->cs_version) |
915 | //if (VERSION_CS != ns->cs_version) |
956 | { |
916 | // unchecked; |
957 | #ifdef ESRV_DEBUG |
917 | |
958 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
959 | #endif |
|
|
960 | } |
|
|
961 | cp = strchr (buf + 1, ' '); |
918 | char *cp = strchr (buf + 1, ' '); |
962 | if (!cp) |
919 | if (!cp) |
963 | return; |
920 | return; |
|
|
921 | |
964 | ns->sc_version = atoi (cp); |
922 | ns->sc_version = atoi (cp); |
|
|
923 | |
965 | if (VERSION_SC != ns->sc_version) |
924 | //if (VERSION_SC != ns->sc_version) |
966 | { |
925 | // unchecked; |
967 | #ifdef ESRV_DEBUG |
926 | |
968 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
969 | #endif |
|
|
970 | } |
|
|
971 | cp = strchr (cp + 1, ' '); |
927 | cp = strchr (cp + 1, ' '); |
|
|
928 | |
972 | if (cp) |
929 | if (cp) |
973 | { |
930 | { |
974 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
931 | assign (ns->version, cp + 1); |
975 | |
932 | |
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) |
933 | if (ns->sc_version < 1026) |
988 | { |
934 | 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!! ****"); |
935 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
991 | ns->send_packet (version_warning); |
|
|
992 | } |
|
|
993 | |
|
|
994 | } |
936 | } |
995 | } |
937 | } |
996 | |
938 | |
997 | /** sound related functions. */ |
939 | /** sound related functions. */ |
998 | |
|
|
999 | void |
940 | void |
1000 | SetSound (char *buf, int len, client_socket * ns) |
941 | SetSound (char *buf, int len, client * ns) |
1001 | { |
942 | { |
1002 | ns->sound = atoi (buf); |
943 | ns->sound = atoi (buf); |
1003 | } |
944 | } |
1004 | |
945 | |
1005 | /** client wants the map resent */ |
946 | /** client wants the map resent */ |
1006 | |
947 | |
1007 | void |
948 | void |
1008 | MapRedrawCmd (char *buf, int len, player *pl) |
949 | MapRedrawCmd (char *buf, int len, player *pl) |
1009 | { |
950 | { |
1010 | |
|
|
1011 | /* 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 |
1012 | * 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. |
1013 | * Unfortunately this solution does not work because some client versions send |
953 | * Unfortunately this solution does not work because some client versions send |
1014 | * a mapredraw command after receiving a newmap command. |
954 | * a mapredraw command after receiving a newmap command. |
1015 | */ |
955 | */ |
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 | } |
956 | } |
1024 | |
957 | |
1025 | /** |
958 | /** |
1026 | * Moves an object (typically, container to inventory). |
959 | * Moves an object (typically, container to inventory). |
1027 | * syntax is: move (to) (tag) (nrof) |
960 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1030 | MoveCmd (char *buf, int len, player *pl) |
963 | MoveCmd (char *buf, int len, player *pl) |
1031 | { |
964 | { |
1032 | int vals[3], i; |
965 | int vals[3], i; |
1033 | |
966 | |
1034 | /* A little funky here. We only cycle for 2 records, because |
967 | /* A little funky here. We only cycle for 2 records, because |
1035 | * 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 |
1036 | * record. Perhaps we should just replace this with a |
969 | * record. Perhaps we should just replace this with a |
1037 | * sscanf? |
970 | * sscanf? |
1038 | */ |
971 | */ |
1039 | for (i = 0; i < 2; i++) |
972 | for (i = 0; i < 2; i++) |
1040 | { |
973 | { |
1041 | vals[i] = atoi (buf); |
974 | vals[i] = atoi (buf); |
|
|
975 | |
1042 | if (!(buf = strchr (buf, ' '))) |
976 | if (!(buf = strchr (buf, ' '))) |
1043 | { |
977 | { |
1044 | LOG (llevError, "Incomplete move command: %s\n", buf); |
978 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1045 | return; |
979 | return; |
1046 | } |
980 | } |
|
|
981 | |
1047 | buf++; |
982 | buf++; |
1048 | } |
983 | } |
|
|
984 | |
1049 | vals[2] = atoi (buf); |
985 | vals[2] = atoi (buf); |
1050 | |
986 | |
1051 | /* 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]);*/ |
1052 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
988 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1053 | } |
989 | } |
1054 | |
|
|
1055 | |
|
|
1056 | |
990 | |
1057 | /****************************************************************************** |
991 | /****************************************************************************** |
1058 | * |
992 | * |
1059 | * Start of commands the server sends to the client. |
993 | * Start of commands the server sends to the client. |
1060 | * |
994 | * |
… | |
… | |
1063 | /** |
997 | /** |
1064 | * 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 |
1065 | * 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) |
1066 | */ |
1000 | */ |
1067 | void |
1001 | void |
1068 | send_query (client_socket * ns, uint8 flags, char *text) |
1002 | send_query (client *ns, uint8 flags, char *text) |
1069 | { |
1003 | { |
1070 | char buf[MAX_BUF]; |
|
|
1071 | |
|
|
1072 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1004 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1073 | ns->send_packet (buf); |
|
|
1074 | } |
1005 | } |
1075 | |
1006 | |
1076 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1007 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
1008 | Old = New; \ |
1078 | sl << uint8 (Type) << uint64 (New); \ |
1009 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1108 | esrv_update_stats (player *pl) |
1039 | esrv_update_stats (player *pl) |
1109 | { |
1040 | { |
1110 | char buf[MAX_BUF]; |
1041 | char buf[MAX_BUF]; |
1111 | uint16 flags; |
1042 | uint16 flags; |
1112 | |
1043 | |
1113 | packet sl; |
1044 | packet sl ("stats"); |
1114 | sl << "stats "; |
|
|
1115 | |
1045 | |
1116 | if (pl->ob != NULL) |
1046 | if (pl->ob) |
1117 | { |
1047 | { |
1118 | 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); |
1119 | 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); |
1120 | 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); |
1121 | 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); |
… | |
… | |
1129 | 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); |
1130 | 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); |
1131 | } |
1061 | } |
1132 | |
1062 | |
1133 | if (pl->socket->exp64) |
1063 | if (pl->socket->exp64) |
1134 | { |
|
|
1135 | uint8 s; |
|
|
1136 | |
|
|
1137 | for (s = 0; s < NUM_SKILLS; s++) |
1064 | 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) |
1065 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1140 | { |
1066 | { |
1141 | /* Always send along the level if exp changes. This is only |
1067 | /* Always send along the level if exp changes. This is only |
1142 | * 1 extra byte, but keeps processing simpler. |
1068 | * 1 extra byte, but keeps processing simpler. |
1143 | */ |
1069 | */ |
1144 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1070 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1145 | << uint8 (pl->last_skill_ob[s]->level) |
1071 | << uint8 (pl->last_skill_ob[s]->level) |
1146 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1072 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1147 | |
1073 | |
1148 | 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; |
1149 | } |
1075 | } |
1150 | } |
|
|
1151 | } |
|
|
1152 | |
1076 | |
1153 | if (pl->socket->exp64) |
1077 | if (pl->socket->exp64) |
1154 | { 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) } |
1155 | else |
1079 | else |
1156 | { 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) } |
… | |
… | |
1174 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1098 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1175 | |
1099 | |
1176 | if (pl->socket->sc_version < 1025) |
1100 | if (pl->socket->sc_version < 1025) |
1177 | { 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) } |
1178 | else |
1102 | else |
1179 | { |
|
|
1180 | int i; |
|
|
1181 | |
|
|
1182 | for (i = 0; i < NROFATTACKS; i++) |
1103 | for (int i = 0; i < NROFATTACKS; i++) |
1183 | { |
1104 | { |
1184 | /* Skip ones we won't send */ |
1105 | /* Skip ones we won't send */ |
1185 | if (atnr_cs_stat[i] == -1) |
1106 | if (atnr_cs_stat[i] == -1) |
1186 | continue; |
1107 | continue; |
1187 | |
1108 | |
1188 | 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]); |
1189 | } |
1110 | } |
1190 | } |
|
|
1191 | |
1111 | |
1192 | if (pl->socket->monitor_spells) |
1112 | if (pl->socket->monitor_spells) |
1193 | { |
1113 | { |
1194 | 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); |
1195 | 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); |
… | |
… | |
1212 | void |
1132 | void |
1213 | esrv_new_player (player *pl, uint32 weight) |
1133 | esrv_new_player (player *pl, uint32 weight) |
1214 | { |
1134 | { |
1215 | pl->last_weight = weight; |
1135 | pl->last_weight = weight; |
1216 | |
1136 | |
1217 | packet sl; |
1137 | packet sl ("player"); |
1218 | sl << "player "; |
|
|
1219 | |
1138 | |
1220 | sl << uint32 (pl->ob->count) |
1139 | sl << uint32 (pl->ob->count) |
1221 | << uint32 (weight) |
1140 | << uint32 (weight) |
1222 | << uint32 (pl->ob->face->number) |
1141 | << uint32 (pl->ob->face->number) |
1223 | << data8 (pl->ob->name); |
1142 | << data8 (pl->ob->name); |
… | |
… | |
1232 | * sent them the face yet (this can become quite costly in terms of |
1151 | * 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 |
1152 | * how much we are sending - on the other hand, this should only happen |
1234 | * when the player logs in and picks stuff up. |
1153 | * when the player logs in and picks stuff up. |
1235 | */ |
1154 | */ |
1236 | void |
1155 | void |
1237 | esrv_send_animation (client_socket * ns, short anim_num) |
1156 | esrv_send_animation (client * ns, short anim_num) |
1238 | { |
1157 | { |
1239 | int i; |
|
|
1240 | |
|
|
1241 | /* 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 |
1242 | * 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 |
1243 | * range, it must be a valid animation. |
1160 | * range, it must be a valid animation. |
1244 | */ |
1161 | */ |
1245 | if (anim_num < 0 || anim_num > num_animations) |
1162 | if (anim_num < 0 || anim_num > num_animations) |
1246 | { |
1163 | { |
1247 | 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); |
1248 | return; |
1165 | return; |
1249 | } |
1166 | } |
1250 | |
1167 | |
1251 | packet sl; |
1168 | packet sl ("anim"); |
1252 | |
1169 | |
1253 | sl << "anim " |
|
|
1254 | << uint16 (anim_num) |
1170 | sl << uint16 (anim_num) |
1255 | << uint16 (0); /* flags - not used right now */ |
1171 | << uint16 (0); /* flags - not used right now */ |
1256 | |
1172 | |
1257 | /* 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 |
1258 | * the face itself) down to the client. |
1174 | * the face itself) down to the client. |
1259 | */ |
1175 | */ |
1260 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1176 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1261 | { |
1177 | { |
1262 | 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)) |
1263 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1179 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1180 | |
1264 | 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 */ |
1265 | } |
1182 | } |
1266 | |
1183 | |
1267 | ns->send_packet (sl); |
1184 | ns->send_packet (sl); |
1268 | |
1185 | |
… | |
… | |
1279 | /** |
1196 | /** |
1280 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1197 | * 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. |
1198 | * the face yet, we will also send it. |
1282 | */ |
1199 | */ |
1283 | static void |
1200 | static void |
1284 | esrv_map_setbelow (client_socket * 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) |
1285 | { |
1202 | { |
1286 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1203 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1287 | { |
1204 | { |
|
|
1205 | //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); |
1206 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1289 | return; |
1207 | return; |
1290 | abort (); |
1208 | abort (); |
1291 | } |
1209 | } |
1292 | |
1210 | |
1293 | 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; |
1294 | newmap->cells[x][y].count++; |
1212 | newmap->cells[x][y].count++; |
1295 | |
1213 | |
1296 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1214 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1297 | esrv_send_face (ns, face_num, 0); |
1215 | esrv_send_face (ns, face_num, 0); |
1298 | } |
|
|
1299 | |
|
|
1300 | struct LayerCell |
|
|
1301 | { |
|
|
1302 | uint16 xy; |
|
|
1303 | short face; |
|
|
1304 | }; |
|
|
1305 | |
|
|
1306 | struct MapLayer |
|
|
1307 | { |
|
|
1308 | int count; |
|
|
1309 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1310 | }; |
|
|
1311 | |
|
|
1312 | /** Checkes if map cells have changed */ |
|
|
1313 | static int |
|
|
1314 | mapcellchanged (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 | */ |
|
|
1336 | static uint8 * |
|
|
1337 | compactlayer (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 | } |
1216 | } |
1406 | |
1217 | |
1407 | /** Clears a map cell */ |
1218 | /** Clears a map cell */ |
1408 | static void |
1219 | static void |
1409 | 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) |
… | |
… | |
1421 | #define MAX_LAYERS 3 |
1232 | #define MAX_LAYERS 3 |
1422 | |
1233 | |
1423 | /* 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 |
1424 | * 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, |
1425 | * 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 |
1426 | * 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 |
1427 | * re-examined. |
1238 | * re-examined. |
1428 | */ |
1239 | */ |
1429 | |
|
|
1430 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1240 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1431 | |
1241 | |
1432 | /** |
1242 | /** |
1433 | * Returns true if any of the heads for this |
1243 | * Returns true if any of the heads for this |
1434 | * 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 |
1435 | * for empty space checking. |
1245 | * for empty space checking. |
1436 | */ |
1246 | */ |
1437 | static inline int |
1247 | static inline int |
1438 | have_head (int ax, int ay) |
1248 | have_head (int ax, int ay) |
1439 | { |
1249 | { |
1440 | |
|
|
1441 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1250 | 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]) |
1251 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1443 | return 1; |
1252 | return 1; |
|
|
1253 | |
1444 | return 0; |
1254 | return 0; |
1445 | } |
1255 | } |
1446 | |
1256 | |
1447 | /** |
1257 | /** |
1448 | * check_head is a bit simplistic version of update_space below. |
1258 | * 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 |
1259 | * 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 |
1260 | * 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 |
1261 | * if needed, and returning 1. If this no data needs to get |
1452 | * sent, it returns zero. |
1262 | * sent, it returns zero. |
1453 | */ |
1263 | */ |
1454 | static int |
1264 | static int |
1455 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1265 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1456 | { |
1266 | { |
1457 | short face_num; |
1267 | short face_num; |
1458 | |
1268 | |
1459 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1269 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1460 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1270 | 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 |
1302 | * 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 |
1303 | * 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 |
1304 | * the case, it seems to make more sense to have these layer values |
1495 | * actually match. |
1305 | * actually match. |
1496 | */ |
1306 | */ |
1497 | |
|
|
1498 | static int |
1307 | static int |
1499 | update_space (packet &sl, client_socket &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) |
1500 | { |
1309 | { |
1501 | object *ob, *head; |
1310 | object *ob, *head; |
1502 | uint16 face_num; |
1311 | uint16 face_num; |
1503 | int bx, by, i; |
1312 | int bx, by, i; |
1504 | |
1313 | |
… | |
… | |
1717 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1526 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1718 | * take. |
1527 | * take. |
1719 | */ |
1528 | */ |
1720 | |
1529 | |
1721 | static inline int |
1530 | static inline int |
1722 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1531 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1723 | { |
1532 | { |
1724 | object *ob; |
1533 | object *ob; |
1725 | int smoothlevel; /* old face_num; */ |
1534 | int smoothlevel; /* old face_num; */ |
1726 | |
1535 | |
1727 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1536 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1761 | * Returns the size of a data for a map square as returned by |
1570 | * Returns the size of a data for a map square as returned by |
1762 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1571 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1763 | * available. |
1572 | * available. |
1764 | */ |
1573 | */ |
1765 | int |
1574 | int |
1766 | getExtendedMapInfoSize (client_socket * ns) |
1575 | getExtendedMapInfoSize (client * ns) |
1767 | { |
1576 | { |
1768 | int result = 0; |
1577 | int result = 0; |
1769 | |
1578 | |
1770 | if (ns->ext_mapinfos) |
1579 | if (ns->ext_mapinfos) |
1771 | { |
1580 | { |
1772 | if (ns->EMI_smooth) |
1581 | if (ns->EMI_smooth) |
1773 | result += 1; /*One byte for smoothlevel */ |
1582 | result += 1; /*One byte for smoothlevel */ |
1774 | } |
1583 | } |
|
|
1584 | |
1775 | return result; |
1585 | return result; |
1776 | } |
1586 | } |
1777 | |
1587 | |
1778 | /** |
1588 | /** |
1779 | * 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 |
… | |
… | |
1807 | uint8 eentrysize; |
1617 | uint8 eentrysize; |
1808 | uint16 ewhatstart, ewhatflag; |
1618 | uint16 ewhatstart, ewhatflag; |
1809 | uint8 extendedinfos; |
1619 | uint8 extendedinfos; |
1810 | maptile *m; |
1620 | maptile *m; |
1811 | |
1621 | |
1812 | client_socket &socket = *pl->contr->socket; |
1622 | client &socket = *pl->contr->socket; |
1813 | |
1623 | |
1814 | check_map_change (pl->contr); |
1624 | check_map_change (pl->contr); |
1815 | |
1625 | |
1816 | packet sl; |
1626 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1817 | packet esl; |
1627 | packet esl; |
1818 | |
1628 | |
1819 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1820 | startlen = sl.length (); |
1629 | startlen = sl.length (); |
1821 | |
1630 | |
1822 | /*Extendedmapinfo structure initialisation */ |
1631 | /*Extendedmapinfo structure initialisation */ |
1823 | if (socket.ext_mapinfos) |
1632 | if (socket.ext_mapinfos) |
1824 | { |
1633 | { |
… | |
… | |
1868 | 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++) |
1869 | { |
1678 | { |
1870 | ax = 0; |
1679 | ax = 0; |
1871 | 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++) |
1872 | { |
1681 | { |
1873 | |
|
|
1874 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1682 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1875 | |
1683 | |
1876 | /* 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 |
1877 | * 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 |
1878 | * the client wants if using the map1a command - this is because |
1686 | * the client wants if using the map1a command - this is because |
… | |
… | |
2209 | return; |
2017 | return; |
2210 | |
2018 | |
2211 | memset (&newmap, 0, sizeof (struct Map)); |
2019 | memset (&newmap, 0, sizeof (struct Map)); |
2212 | |
2020 | |
2213 | 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++) |
2214 | { |
|
|
2215 | 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++) |
2216 | { |
2023 | { |
2217 | ax = i; |
2024 | ax = i; |
2218 | ay = j; |
2025 | ay = j; |
2219 | m = pm; |
2026 | m = pm; |
2220 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2027 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2028 | |
2221 | if (mflags & P_OUT_OF_MAP) |
2029 | if (mflags & P_OUT_OF_MAP) |
2222 | continue; |
2030 | continue; |
2223 | if (mflags & P_NEED_UPDATE) |
2031 | |
2224 | update_position (m, ax, ay); |
|
|
2225 | /* 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 |
2226 | * just to reload it. This should really call something like |
2033 | * just to reload it. This should really call something like |
2227 | * swap_map, but this is much more efficient and 'good enough' |
2034 | * swap_map, but this is much more efficient and 'good enough' |
2228 | */ |
2035 | */ |
2229 | if (mflags & P_NEW_MAP) |
2036 | if (mflags & P_NEW_MAP) |
2230 | m->timeout = 50; |
2037 | m->timeout = 50; |
2231 | } |
2038 | } |
2232 | } |
2039 | |
2233 | /* do LOS after calls to update_position */ |
2040 | /* do LOS after calls to update_position */ |
2234 | if (pl->contr->do_los) |
2041 | if (pl->contr->do_los) |
2235 | { |
2042 | { |
2236 | update_los (pl); |
2043 | update_los (pl); |
2237 | pl->contr->do_los = 0; |
2044 | pl->contr->do_los = 0; |
… | |
… | |
2260 | /** |
2067 | /** |
2261 | * This sends the skill number to name mapping. We ignore |
2068 | * This sends the skill number to name mapping. We ignore |
2262 | * the params - we always send the same info no matter what. |
2069 | * the params - we always send the same info no matter what. |
2263 | */ |
2070 | */ |
2264 | void |
2071 | void |
2265 | send_skill_info (client_socket *ns, char *params) |
2072 | send_skill_info (client *ns, char *params) |
2266 | { |
2073 | { |
2267 | packet sl; |
2074 | packet sl; |
2268 | sl << "replyinfo skill_info\n"; |
2075 | sl << "replyinfo skill_info\n"; |
2269 | |
2076 | |
2270 | for (int i = 1; i < NUM_SKILLS; i++) |
2077 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2282 | /** |
2089 | /** |
2283 | * This sends the spell path to name mapping. We ignore |
2090 | * This sends the spell path to name mapping. We ignore |
2284 | * the params - we always send the same info no matter what. |
2091 | * the params - we always send the same info no matter what. |
2285 | */ |
2092 | */ |
2286 | void |
2093 | void |
2287 | send_spell_paths (client_socket * ns, char *params) |
2094 | send_spell_paths (client * ns, char *params) |
2288 | { |
2095 | { |
2289 | packet sl; |
2096 | packet sl; |
2290 | |
2097 | |
2291 | sl << "replyinfo spell_paths\n"; |
2098 | sl << "replyinfo spell_paths\n"; |
2292 | |
2099 | |
… | |
… | |
2365 | { |
2172 | { |
2366 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2173 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2367 | return; |
2174 | return; |
2368 | } |
2175 | } |
2369 | |
2176 | |
2370 | packet sl; |
2177 | packet sl ("delspell"); |
2371 | |
2178 | |
2372 | sl << "delspell " |
|
|
2373 | << uint32 (spell->count); |
2179 | sl << uint32 (spell->count); |
2374 | |
2180 | |
2375 | pl->socket->send_packet (sl); |
2181 | pl->socket->send_packet (sl); |
2376 | } |
2182 | } |
2377 | |
2183 | |
2378 | /* 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. */ |
… | |
… | |
2431 | } |
2237 | } |
2432 | |
2238 | |
2433 | if (!pl->socket->monitor_spells) |
2239 | if (!pl->socket->monitor_spells) |
2434 | return; |
2240 | return; |
2435 | |
2241 | |
2436 | packet sl; |
2242 | packet sl ("addspell"); |
2437 | |
|
|
2438 | sl << "addspell "; |
|
|
2439 | |
2243 | |
2440 | if (!spell) |
2244 | if (!spell) |
2441 | { |
2245 | { |
2442 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2246 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2443 | { |
2247 | { |