… | |
… | |
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; |
219 | } |
205 | } |
220 | |
206 | |
|
|
207 | /** |
|
|
208 | * RequestInfo is sort of a meta command. There is some specific |
|
|
209 | * request of information, but we call other functions to provide |
|
|
210 | * that information. |
|
|
211 | */ |
|
|
212 | void |
|
|
213 | RequestInfo (char *buf, int len, client * ns) |
|
|
214 | { |
|
|
215 | char *params = NULL, *cp; |
|
|
216 | |
|
|
217 | /* No match */ |
|
|
218 | char bigbuf[MAX_BUF]; |
|
|
219 | int slen; |
|
|
220 | |
|
|
221 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
222 | * if we don't find a match. |
|
|
223 | */ |
|
|
224 | strcpy (bigbuf, "replyinfo "); |
|
|
225 | slen = strlen (bigbuf); |
|
|
226 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
227 | |
|
|
228 | /* find the first space, make it null, and update the |
|
|
229 | * params pointer. |
|
|
230 | */ |
|
|
231 | for (cp = buf; *cp != '\0'; cp++) |
|
|
232 | if (*cp == ' ') |
|
|
233 | { |
|
|
234 | *cp = '\0'; |
|
|
235 | params = cp + 1; |
|
|
236 | break; |
|
|
237 | } |
|
|
238 | |
|
|
239 | if (!strcmp (buf, "image_info")) |
|
|
240 | send_image_info (ns, params); |
|
|
241 | else if (!strcmp (buf, "image_sums")) |
|
|
242 | send_image_sums (ns, params); |
|
|
243 | else if (!strcmp (buf, "skill_info")) |
|
|
244 | send_skill_info (ns, params); |
|
|
245 | else if (!strcmp (buf, "spell_paths")) |
|
|
246 | send_spell_paths (ns, params); |
|
|
247 | else |
|
|
248 | ns->send_packet (bigbuf, len); |
|
|
249 | } |
|
|
250 | |
221 | void |
251 | void |
222 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
223 | { |
253 | { |
224 | 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)); |
225 | } |
261 | } |
226 | |
262 | |
227 | void |
263 | void |
228 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
229 | { |
265 | { |
… | |
… | |
311 | pl->socket->send_packet (bigbuf); |
347 | pl->socket->send_packet (bigbuf); |
312 | } |
348 | } |
313 | |
349 | |
314 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
315 | void |
351 | void |
316 | SetUp (char *buf, int len, client_socket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
317 | { |
353 | { |
318 | int s, slen; |
354 | int s, slen; |
319 | char *cmd, *param, cmdback[HUGE_BUF]; |
355 | char *cmd, *param, cmdback[HUGE_BUF]; |
320 | |
356 | |
321 | /* run through the cmds of setup |
357 | /* run through the cmds of setup |
… | |
… | |
531 | * 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. |
532 | * 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, |
533 | * 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. |
534 | */ |
570 | */ |
535 | void |
571 | void |
536 | AddMeCmd (char *buf, int len, client_socket * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
537 | { |
573 | { |
538 | Settings oldsettings; |
|
|
539 | |
|
|
540 | oldsettings = settings; |
|
|
541 | if (ns->status != Ns_Add || add_player (ns)) |
574 | if (ns->status != Ns_Add || add_player (ns)) |
542 | ns->send_packet ("addme_failed"); |
575 | ns->send_packet ("addme_failed"); |
543 | else |
576 | else |
544 | ns->send_packet ("addme_success"); |
577 | ns->send_packet ("addme_success"); |
545 | |
|
|
546 | settings = oldsettings; |
|
|
547 | } |
578 | } |
548 | |
579 | |
549 | /** Reply to ExtendedInfos command */ |
580 | /** Reply to ExtendedInfos command */ |
550 | void |
581 | void |
551 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
552 | { |
583 | { |
553 | char cmdback[MAX_BUF]; |
584 | char cmdback[MAX_BUF]; |
554 | char command[50]; |
585 | char command[50]; |
555 | int info, nextinfo; |
586 | int info, nextinfo; |
556 | |
587 | |
… | |
… | |
607 | #define MSG_TYPE_MONUMENT 5 |
638 | #define MSG_TYPE_MONUMENT 5 |
608 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
639 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
609 | |
640 | |
610 | /** Reply to ExtendedInfos command */ |
641 | /** Reply to ExtendedInfos command */ |
611 | void |
642 | void |
612 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
643 | ToggleExtendedText (char *buf, int len, client * ns) |
613 | { |
644 | { |
614 | char cmdback[MAX_BUF]; |
645 | char cmdback[MAX_BUF]; |
615 | char temp[10]; |
646 | char temp[10]; |
616 | char command[50]; |
647 | char command[50]; |
617 | int info, nextinfo, i, flag; |
648 | int info, nextinfo, i, flag; |
… | |
… | |
668 | * a piece of data from us that we know the client wants. So |
699 | * a piece of data from us that we know the client wants. So |
669 | * if we know the client wants it, might as well push it to the |
700 | * if we know the client wants it, might as well push it to the |
670 | * client. |
701 | * client. |
671 | */ |
702 | */ |
672 | static void |
703 | static void |
673 | SendSmooth (client_socket * ns, uint16 face) |
704 | SendSmooth (client *ns, uint16 face) |
674 | { |
705 | { |
675 | uint16 smoothface; |
706 | uint16 smoothface; |
676 | |
707 | |
677 | /* If we can't find a face, return and set it so we won't try to send this |
708 | /* If we can't find a face, return and set it so we won't try to send this |
678 | * again. |
709 | * again. |
… | |
… | |
702 | /** |
733 | /** |
703 | * Tells client the picture it has to use |
734 | * Tells client the picture it has to use |
704 | * to smooth a picture number given as argument. |
735 | * to smooth a picture number given as argument. |
705 | */ |
736 | */ |
706 | void |
737 | void |
707 | AskSmooth (char *buf, int len, client_socket * ns) |
738 | AskSmooth (char *buf, int len, client *ns) |
708 | { |
739 | { |
709 | uint16 facenbr; |
740 | SendSmooth (ns, atoi (buf)); |
710 | |
|
|
711 | facenbr = atoi (buf); |
|
|
712 | SendSmooth (ns, facenbr); |
|
|
713 | } |
741 | } |
714 | |
742 | |
715 | /** |
743 | /** |
716 | * This handles the general commands from the client (ie, north, fire, cast, |
744 | * This handles the general commands from the client (ie, north, fire, cast, |
717 | * etc.) |
745 | * etc.) |
718 | */ |
746 | */ |
719 | void |
747 | void |
720 | PlayerCmd (char *buf, int len, player *pl) |
748 | PlayerCmd (char *buf, int len, player *pl) |
721 | { |
749 | { |
722 | |
|
|
723 | /* The following should never happen with a proper or honest client. |
|
|
724 | * Therefore, the error message doesn't have to be too clear - if |
|
|
725 | * someone is playing with a hacked/non working client, this gives them |
|
|
726 | * an idea of the problem, but they deserve what they get |
|
|
727 | */ |
|
|
728 | if (pl->state != ST_PLAYING) |
|
|
729 | { |
|
|
730 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
731 | return; |
|
|
732 | } |
|
|
733 | /* Check if there is a count. In theory, a zero count could also be |
750 | /* Check if there is a count. In theory, a zero count could also be |
734 | * sent, so check for that also. |
751 | * sent, so check for that also. |
735 | */ |
752 | */ |
736 | if (atoi (buf) || buf[0] == '0') |
753 | if (atoi (buf) || buf[0] == '0') |
737 | { |
754 | { |
738 | pl->count = atoi ((char *) buf); |
755 | pl->count = atoi ((char *) buf); |
|
|
756 | |
739 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
757 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
740 | if (!buf) |
758 | if (!buf) |
741 | { |
|
|
742 | #ifdef ESRV_DEBUG |
|
|
743 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
744 | #endif |
|
|
745 | return; |
759 | return; |
746 | } |
760 | |
747 | buf++; |
761 | buf++; |
748 | } |
762 | } |
749 | /* This should not happen anymore. */ |
763 | |
750 | if (pl->ob->speed_left < -1.0) |
|
|
751 | { |
|
|
752 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
753 | } |
|
|
754 | /* In c_new.c */ |
|
|
755 | execute_newserver_command (pl->ob, (char *) buf); |
764 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
765 | |
756 | /* Perhaps something better should be done with a left over count. |
766 | /* Perhaps something better should be done with a left over count. |
757 | * Cleaning up the input should probably be done first - all actions |
767 | * Cleaning up the input should probably be done first - all actions |
758 | * for the command that issued the count should be done before any other |
768 | * for the command that issued the count should be done before any other |
759 | * commands. |
769 | * commands. |
760 | */ |
770 | */ |
761 | |
|
|
762 | pl->count = 0; |
771 | pl->count = 0; |
763 | |
|
|
764 | } |
772 | } |
765 | |
773 | |
766 | |
774 | |
767 | /** |
775 | /** |
768 | * This handles the general commands from the client (ie, north, fire, cast, |
776 | * This handles the general commands from the client (ie, north, fire, cast, |
… | |
… | |
771 | * can throttle. |
779 | * can throttle. |
772 | */ |
780 | */ |
773 | void |
781 | void |
774 | NewPlayerCmd (char *buf, int len, player *pl) |
782 | NewPlayerCmd (char *buf, int len, player *pl) |
775 | { |
783 | { |
776 | int time, repeat; |
|
|
777 | char command[MAX_BUF]; |
|
|
778 | int pktlen; |
|
|
779 | |
|
|
780 | if (len < 7) |
784 | if (len <= 6) |
781 | { |
785 | { |
782 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
786 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
783 | return; |
787 | return; |
784 | } |
788 | } |
785 | |
789 | |
786 | pktlen = net_uint16 ((uint8 *)buf); |
790 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
787 | repeat = net_uint32 ((uint8 *)buf + 2); |
791 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
788 | |
792 | |
789 | /* -1 is special - no repeat, but don't update */ |
793 | /* -1 is special - no repeat, but don't update */ |
790 | if (repeat != -1) |
794 | if (repeat != -1) |
791 | pl->count = repeat; |
795 | pl->count = repeat; |
792 | |
796 | |
793 | if ((len - 4) >= MAX_BUF) |
797 | buf += 6; //len -= 6; |
794 | len = MAX_BUF - 5; |
|
|
795 | |
798 | |
796 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
797 | command[len - 4] = 0; |
|
|
798 | |
|
|
799 | /* This should not happen anymore. */ |
|
|
800 | if (pl->ob->speed_left < -1.0) |
|
|
801 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
802 | |
|
|
803 | /* In c_new.c */ |
|
|
804 | execute_newserver_command (pl->ob, (char *) command); |
799 | execute_newserver_command (pl->ob, buf); |
|
|
800 | |
805 | /* Perhaps something better should be done with a left over count. |
801 | /* Perhaps something better should be done with a left over count. |
806 | * Cleaning up the input should probably be done first - all actions |
802 | * Cleaning up the input should probably be done first - all actions |
807 | * for the command that issued the count should be done before any other |
803 | * for the command that issued the count should be done before any other |
808 | * commands. |
804 | * commands. |
809 | */ |
805 | */ |
810 | pl->count = 0; |
806 | pl->count = 0; |
811 | |
807 | |
|
|
808 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
812 | if (FABS (pl->ob->speed) < 0.001) |
809 | int time = FABS (pl->ob->speed) < 0.001 |
813 | time = MAX_TIME * 100; |
810 | ? time = MAX_TIME * 100 |
814 | else |
|
|
815 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
811 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
816 | |
812 | |
817 | /* Send confirmation of command execution now */ |
813 | /* Send confirmation of command execution now */ |
818 | |
|
|
819 | packet sl; |
814 | packet sl; |
820 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
815 | sl << "comc " << uint16 (cmdid) << uint32 (time); |
821 | pl->socket->send_packet (sl); |
816 | pl->socket->send_packet (sl); |
822 | } |
817 | } |
823 | |
818 | |
824 | |
819 | |
825 | /** This is a reply to a previous query. */ |
820 | /** This is a reply to a previous query. */ |
826 | void |
821 | void |
827 | ReplyCmd (char *buf, int len, player *pl) |
822 | ReplyCmd (char *buf, int len, player *pl) |
828 | { |
823 | { |
829 | /* This is to synthesize how the data would be stored if it |
824 | /* This is to synthesize how the data would be stored if it |
830 | * was normally entered. A bit of a hack, and should be cleaned up |
825 | * was normally entered. A bit of a hack, and should be cleaned up |
831 | * once all the X11 code is removed from the server. |
826 | * once all the X11 code is removed from the server. |
832 | * |
827 | * |
833 | * We pass 13 to many of the functions because this way they |
828 | * We pass 13 to many of the functions because this way they |
834 | * think it was the carriage return that was entered, and the |
829 | * think it was the carriage return that was entered, and the |
835 | * function then does not try to do additional input. |
830 | * function then does not try to do additional input. |
… | |
… | |
838 | |
833 | |
839 | /* this avoids any hacking here */ |
834 | /* this avoids any hacking here */ |
840 | |
835 | |
841 | switch (pl->state) |
836 | switch (pl->state) |
842 | { |
837 | { |
843 | case ST_PLAYING: |
838 | case ST_PLAYING: |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
839 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
845 | break; |
840 | break; |
846 | |
841 | |
847 | case ST_PLAY_AGAIN: |
842 | case ST_PLAY_AGAIN: |
848 | /* We can check this for return value (2==quit). Maybe we |
843 | /* We can check this for return value (2==quit). Maybe we |
849 | * should, and do something appropriate? |
844 | * should, and do something appropriate? |
850 | */ |
845 | */ |
851 | receive_play_again (pl->ob, buf[0]); |
846 | receive_play_again (pl->ob, buf[0]); |
852 | break; |
847 | break; |
853 | |
848 | |
854 | case ST_ROLL_STAT: |
849 | case ST_ROLL_STAT: |
855 | key_roll_stat (pl->ob, buf[0]); |
850 | key_roll_stat (pl->ob, buf[0]); |
856 | break; |
851 | break; |
857 | |
852 | |
858 | case ST_CHANGE_CLASS: |
853 | case ST_CHANGE_CLASS: |
859 | |
854 | |
860 | key_change_class (pl->ob, buf[0]); |
855 | key_change_class (pl->ob, buf[0]); |
861 | break; |
856 | break; |
862 | |
857 | |
863 | case ST_CONFIRM_QUIT: |
858 | case ST_CONFIRM_QUIT: |
864 | key_confirm_quit (pl->ob, buf[0]); |
859 | key_confirm_quit (pl->ob, buf[0]); |
865 | break; |
860 | break; |
866 | |
861 | |
867 | case ST_CONFIGURE: |
862 | case ST_CONFIGURE: |
868 | LOG (llevError, "In client input handling, but into configure state\n"); |
863 | LOG (llevError, "In client input handling, but into configure state\n"); |
869 | pl->state = ST_PLAYING; |
864 | pl->state = ST_PLAYING; |
870 | break; |
865 | break; |
871 | |
866 | |
872 | case ST_GET_NAME: |
867 | case ST_GET_NAME: |
873 | receive_player_name (pl->ob, 13); |
868 | receive_player_name (pl->ob, 13); |
874 | break; |
869 | break; |
875 | |
870 | |
876 | case ST_GET_PASSWORD: |
871 | case ST_GET_PASSWORD: |
877 | case ST_CONFIRM_PASSWORD: |
872 | case ST_CONFIRM_PASSWORD: |
878 | receive_player_password (pl->ob, 13); |
873 | receive_player_password (pl->ob, 13); |
879 | break; |
874 | break; |
880 | |
875 | |
881 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
876 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
882 | receive_party_password (pl->ob, 13); |
877 | receive_party_password (pl->ob, 13); |
883 | break; |
878 | break; |
884 | |
879 | |
885 | default: |
880 | default: |
886 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
881 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
887 | } |
882 | } |
888 | } |
883 | } |
889 | |
884 | |
890 | /** |
885 | /** |
891 | * Client tells its version. If there is a mismatch, we close the |
886 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
893 | * something older than the server. If we assume the client will be |
888 | * something older than the server. If we assume the client will be |
894 | * backwards compatible, having it be a later version should not be a |
889 | * backwards compatible, having it be a later version should not be a |
895 | * problem. |
890 | * problem. |
896 | */ |
891 | */ |
897 | void |
892 | void |
898 | VersionCmd (char *buf, int len, client_socket * ns) |
893 | VersionCmd (char *buf, int len, client * ns) |
899 | { |
894 | { |
900 | char *cp; |
|
|
901 | char version_warning[256]; |
|
|
902 | |
|
|
903 | if (!buf) |
895 | if (!buf) |
904 | { |
896 | { |
905 | LOG (llevError, "CS: received corrupted version command\n"); |
897 | LOG (llevError, "CS: received corrupted version command\n"); |
906 | return; |
898 | return; |
907 | } |
899 | } |
908 | |
900 | |
909 | ns->cs_version = atoi (buf); |
901 | ns->cs_version = atoi (buf); |
910 | ns->sc_version = ns->cs_version; |
902 | ns->sc_version = ns->cs_version; |
|
|
903 | |
|
|
904 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
905 | |
|
|
906 | |
|
|
907 | //TODO: should log here just for statistics |
|
|
908 | |
911 | if (VERSION_CS != ns->cs_version) |
909 | //if (VERSION_CS != ns->cs_version) |
912 | { |
910 | // unchecked; |
913 | #ifdef ESRV_DEBUG |
911 | |
914 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
915 | #endif |
|
|
916 | } |
|
|
917 | cp = strchr (buf + 1, ' '); |
912 | char *cp = strchr (buf + 1, ' '); |
918 | if (!cp) |
913 | if (!cp) |
919 | return; |
914 | return; |
|
|
915 | |
920 | ns->sc_version = atoi (cp); |
916 | ns->sc_version = atoi (cp); |
|
|
917 | |
921 | if (VERSION_SC != ns->sc_version) |
918 | //if (VERSION_SC != ns->sc_version) |
922 | { |
919 | // unchecked; |
923 | #ifdef ESRV_DEBUG |
920 | |
924 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
925 | #endif |
|
|
926 | } |
|
|
927 | cp = strchr (cp + 1, ' '); |
921 | cp = strchr (cp + 1, ' '); |
|
|
922 | |
928 | if (cp) |
923 | if (cp) |
929 | { |
924 | { |
930 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
925 | assign (ns->version, cp + 1); |
931 | |
926 | |
932 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
933 | |
|
|
934 | /* This is first implementation - i skip all beta DX clients with it |
|
|
935 | * Add later stuff here for other clients |
|
|
936 | */ |
|
|
937 | |
|
|
938 | /* these are old dxclients */ |
|
|
939 | /* Version 1024 added support for singular + plural name values - |
|
|
940 | * requiing this minimal value reduces complexity of that code, and it |
|
|
941 | * has been around for a long time. |
|
|
942 | */ |
|
|
943 | if (ns->sc_version < 1026) |
927 | if (ns->sc_version < 1026) |
944 | { |
928 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
945 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
946 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
929 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
947 | ns->send_packet (version_warning); |
|
|
948 | } |
|
|
949 | |
|
|
950 | } |
930 | } |
951 | } |
931 | } |
952 | |
932 | |
953 | /** sound related functions. */ |
933 | /** sound related functions. */ |
954 | |
|
|
955 | void |
934 | void |
956 | SetSound (char *buf, int len, client_socket * ns) |
935 | SetSound (char *buf, int len, client * ns) |
957 | { |
936 | { |
958 | ns->sound = atoi (buf); |
937 | ns->sound = atoi (buf); |
959 | } |
938 | } |
960 | |
939 | |
961 | /** client wants the map resent */ |
940 | /** client wants the map resent */ |
962 | |
941 | |
963 | void |
942 | void |
964 | MapRedrawCmd (char *buf, int len, player *pl) |
943 | MapRedrawCmd (char *buf, int len, player *pl) |
965 | { |
944 | { |
966 | |
|
|
967 | /* This function is currently disabled; just clearing the map state results in |
945 | /* This function is currently disabled; just clearing the map state results in |
968 | * display errors. It should clear the cache and send a newmap command. |
946 | * display errors. It should clear the cache and send a newmap command. |
969 | * Unfortunately this solution does not work because some client versions send |
947 | * Unfortunately this solution does not work because some client versions send |
970 | * a mapredraw command after receiving a newmap command. |
948 | * a mapredraw command after receiving a newmap command. |
971 | */ |
949 | */ |
972 | #if 0 |
|
|
973 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
974 | * clear the "cache" |
|
|
975 | */ |
|
|
976 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
977 | draw_client_map (pl->ob); |
|
|
978 | #endif |
|
|
979 | } |
950 | } |
980 | |
951 | |
981 | /** |
952 | /** |
982 | * Moves an object (typically, container to inventory). |
953 | * Moves an object (typically, container to inventory). |
983 | * syntax is: move (to) (tag) (nrof) |
954 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
986 | MoveCmd (char *buf, int len, player *pl) |
957 | MoveCmd (char *buf, int len, player *pl) |
987 | { |
958 | { |
988 | int vals[3], i; |
959 | int vals[3], i; |
989 | |
960 | |
990 | /* A little funky here. We only cycle for 2 records, because |
961 | /* A little funky here. We only cycle for 2 records, because |
991 | * we obviously am not going to find a space after the third |
962 | * we obviously are not going to find a space after the third |
992 | * record. Perhaps we should just replace this with a |
963 | * record. Perhaps we should just replace this with a |
993 | * sscanf? |
964 | * sscanf? |
994 | */ |
965 | */ |
995 | for (i = 0; i < 2; i++) |
966 | for (i = 0; i < 2; i++) |
996 | { |
967 | { |
997 | vals[i] = atoi (buf); |
968 | vals[i] = atoi (buf); |
|
|
969 | |
998 | if (!(buf = strchr (buf, ' '))) |
970 | if (!(buf = strchr (buf, ' '))) |
999 | { |
971 | { |
1000 | LOG (llevError, "Incomplete move command: %s\n", buf); |
972 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1001 | return; |
973 | return; |
1002 | } |
974 | } |
|
|
975 | |
1003 | buf++; |
976 | buf++; |
1004 | } |
977 | } |
|
|
978 | |
1005 | vals[2] = atoi (buf); |
979 | vals[2] = atoi (buf); |
1006 | |
980 | |
1007 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
981 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1008 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
982 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1009 | } |
983 | } |
1010 | |
|
|
1011 | |
|
|
1012 | |
984 | |
1013 | /****************************************************************************** |
985 | /****************************************************************************** |
1014 | * |
986 | * |
1015 | * Start of commands the server sends to the client. |
987 | * Start of commands the server sends to the client. |
1016 | * |
988 | * |
… | |
… | |
1019 | /** |
991 | /** |
1020 | * Asks the client to query the user. This way, the client knows |
992 | * Asks the client to query the user. This way, the client knows |
1021 | * it needs to send something back (vs just printing out a message) |
993 | * it needs to send something back (vs just printing out a message) |
1022 | */ |
994 | */ |
1023 | void |
995 | void |
1024 | send_query (client_socket * ns, uint8 flags, char *text) |
996 | send_query (client *ns, uint8 flags, char *text) |
1025 | { |
997 | { |
1026 | char buf[MAX_BUF]; |
|
|
1027 | |
|
|
1028 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
998 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1029 | ns->send_packet (buf); |
|
|
1030 | } |
999 | } |
1031 | |
1000 | |
1032 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1001 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1033 | Old = New; \ |
1002 | Old = New; \ |
1034 | sl << uint8 (Type) << uint64 (New); \ |
1003 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1067 | uint16 flags; |
1036 | uint16 flags; |
1068 | |
1037 | |
1069 | packet sl; |
1038 | packet sl; |
1070 | sl << "stats "; |
1039 | sl << "stats "; |
1071 | |
1040 | |
1072 | if (pl->ob != NULL) |
1041 | if (pl->ob) |
1073 | { |
1042 | { |
1074 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1043 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1075 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1044 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1076 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1045 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1077 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1046 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
… | |
… | |
1085 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1054 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1086 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1055 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1087 | } |
1056 | } |
1088 | |
1057 | |
1089 | if (pl->socket->exp64) |
1058 | if (pl->socket->exp64) |
1090 | { |
|
|
1091 | uint8 s; |
|
|
1092 | |
|
|
1093 | for (s = 0; s < NUM_SKILLS; s++) |
1059 | for (int s = 0; s < NUM_SKILLS; s++) |
1094 | { |
|
|
1095 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1060 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1096 | { |
1061 | { |
1097 | /* Always send along the level if exp changes. This is only |
1062 | /* Always send along the level if exp changes. This is only |
1098 | * 1 extra byte, but keeps processing simpler. |
1063 | * 1 extra byte, but keeps processing simpler. |
1099 | */ |
1064 | */ |
1100 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1065 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1101 | << uint8 (pl->last_skill_ob[s]->level) |
1066 | << uint8 (pl->last_skill_ob[s]->level) |
1102 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1067 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1103 | |
1068 | |
1104 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1069 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1105 | } |
1070 | } |
1106 | } |
|
|
1107 | } |
|
|
1108 | |
1071 | |
1109 | if (pl->socket->exp64) |
1072 | if (pl->socket->exp64) |
1110 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1073 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1111 | else |
1074 | else |
1112 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1075 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
… | |
… | |
1130 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1093 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1131 | |
1094 | |
1132 | if (pl->socket->sc_version < 1025) |
1095 | if (pl->socket->sc_version < 1025) |
1133 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1096 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1134 | else |
1097 | else |
1135 | { |
|
|
1136 | int i; |
|
|
1137 | |
|
|
1138 | for (i = 0; i < NROFATTACKS; i++) |
1098 | for (int i = 0; i < NROFATTACKS; i++) |
1139 | { |
1099 | { |
1140 | /* Skip ones we won't send */ |
1100 | /* Skip ones we won't send */ |
1141 | if (atnr_cs_stat[i] == -1) |
1101 | if (atnr_cs_stat[i] == -1) |
1142 | continue; |
1102 | continue; |
1143 | |
1103 | |
1144 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1104 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1145 | } |
1105 | } |
1146 | } |
|
|
1147 | |
1106 | |
1148 | if (pl->socket->monitor_spells) |
1107 | if (pl->socket->monitor_spells) |
1149 | { |
1108 | { |
1150 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1109 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1151 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1110 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
… | |
… | |
1188 | * sent them the face yet (this can become quite costly in terms of |
1147 | * sent them the face yet (this can become quite costly in terms of |
1189 | * how much we are sending - on the other hand, this should only happen |
1148 | * how much we are sending - on the other hand, this should only happen |
1190 | * when the player logs in and picks stuff up. |
1149 | * when the player logs in and picks stuff up. |
1191 | */ |
1150 | */ |
1192 | void |
1151 | void |
1193 | esrv_send_animation (client_socket * ns, short anim_num) |
1152 | esrv_send_animation (client * ns, short anim_num) |
1194 | { |
1153 | { |
1195 | int i; |
|
|
1196 | |
|
|
1197 | /* Do some checking on the anim_num we got. Note that the animations |
1154 | /* Do some checking on the anim_num we got. Note that the animations |
1198 | * are added in contigous order, so if the number is in the valid |
1155 | * are added in contigous order, so if the number is in the valid |
1199 | * range, it must be a valid animation. |
1156 | * range, it must be a valid animation. |
1200 | */ |
1157 | */ |
1201 | if (anim_num < 0 || anim_num > num_animations) |
1158 | if (anim_num < 0 || anim_num > num_animations) |
… | |
… | |
1211 | << uint16 (0); /* flags - not used right now */ |
1168 | << uint16 (0); /* flags - not used right now */ |
1212 | |
1169 | |
1213 | /* Build up the list of faces. Also, send any information (ie, the |
1170 | /* Build up the list of faces. Also, send any information (ie, the |
1214 | * the face itself) down to the client. |
1171 | * the face itself) down to the client. |
1215 | */ |
1172 | */ |
1216 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1173 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1217 | { |
1174 | { |
1218 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1175 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1219 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1176 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1177 | |
1220 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1178 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1221 | } |
1179 | } |
1222 | |
1180 | |
1223 | ns->send_packet (sl); |
1181 | ns->send_packet (sl); |
1224 | |
1182 | |
… | |
… | |
1235 | /** |
1193 | /** |
1236 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1194 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1237 | * the face yet, we will also send it. |
1195 | * the face yet, we will also send it. |
1238 | */ |
1196 | */ |
1239 | static void |
1197 | static void |
1240 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1198 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1241 | { |
1199 | { |
1242 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1200 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1243 | { |
1201 | { |
|
|
1202 | //TODO: one or the other, can't both have abort and return, verify and act |
1244 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1203 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1245 | return; |
1204 | return; |
1246 | abort (); |
1205 | abort (); |
1247 | } |
1206 | } |
1248 | |
1207 | |
1249 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1208 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1250 | newmap->cells[x][y].count++; |
1209 | newmap->cells[x][y].count++; |
1251 | |
1210 | |
1252 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1211 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1253 | esrv_send_face (ns, face_num, 0); |
1212 | esrv_send_face (ns, face_num, 0); |
1254 | } |
|
|
1255 | |
|
|
1256 | struct LayerCell |
|
|
1257 | { |
|
|
1258 | uint16 xy; |
|
|
1259 | short face; |
|
|
1260 | }; |
|
|
1261 | |
|
|
1262 | struct MapLayer |
|
|
1263 | { |
|
|
1264 | int count; |
|
|
1265 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1266 | }; |
|
|
1267 | |
|
|
1268 | /** Checkes if map cells have changed */ |
|
|
1269 | static int |
|
|
1270 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1271 | { |
|
|
1272 | int k; |
|
|
1273 | |
|
|
1274 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1275 | return 1; |
|
|
1276 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1277 | { |
|
|
1278 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1279 | { |
|
|
1280 | return 1; |
|
|
1281 | } |
|
|
1282 | } |
|
|
1283 | return 0; |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | /** |
|
|
1287 | * Basically, what this does is pack the data into layers. |
|
|
1288 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1289 | * this data into. we return the end of the data. layers is |
|
|
1290 | * how many layers of data we should back. |
|
|
1291 | */ |
|
|
1292 | static uint8 * |
|
|
1293 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1294 | { |
|
|
1295 | int x, y, k; |
|
|
1296 | int face; |
|
|
1297 | unsigned char *fcur; |
|
|
1298 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1299 | |
|
|
1300 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1301 | layers[k].count = 0; |
|
|
1302 | fcur = cur; |
|
|
1303 | for (x = 0; x < ns->mapx; x++) |
|
|
1304 | { |
|
|
1305 | for (y = 0; y < ns->mapy; y++) |
|
|
1306 | { |
|
|
1307 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1308 | continue; |
|
|
1309 | if (newmap->cells[x][y].count == 0) |
|
|
1310 | { |
|
|
1311 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1312 | cur++; |
|
|
1313 | continue; |
|
|
1314 | } |
|
|
1315 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1316 | { |
|
|
1317 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1318 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1319 | layers[k].count++; |
|
|
1320 | } |
|
|
1321 | } |
|
|
1322 | } |
|
|
1323 | /* If no data, return now. */ |
|
|
1324 | if (fcur == cur && layers[0].count == 0) |
|
|
1325 | return cur; |
|
|
1326 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1327 | cur++; |
|
|
1328 | /* First pack by layers. */ |
|
|
1329 | for (k = 0; k < numlayers; k++) |
|
|
1330 | { |
|
|
1331 | if (layers[k].count == 0) |
|
|
1332 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1333 | have anything in it either */ |
|
|
1334 | /* Pack by entries in thie layer */ |
|
|
1335 | for (x = 0; x < layers[k].count;) |
|
|
1336 | { |
|
|
1337 | fcur = cur; |
|
|
1338 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1339 | cur++; |
|
|
1340 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1341 | cur++; |
|
|
1342 | face = layers[k].lcells[x].face; |
|
|
1343 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1344 | for (y = x; y < layers[k].count; y++) |
|
|
1345 | { |
|
|
1346 | if (layers[k].lcells[y].face == face) |
|
|
1347 | { |
|
|
1348 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1349 | cur++; |
|
|
1350 | layers[k].lcells[y].face = -1; |
|
|
1351 | } |
|
|
1352 | } |
|
|
1353 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1354 | /* forward over the now redundant data */ |
|
|
1355 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1356 | x++; |
|
|
1357 | } |
|
|
1358 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1359 | } |
|
|
1360 | return cur; |
|
|
1361 | } |
1213 | } |
1362 | |
1214 | |
1363 | /** Clears a map cell */ |
1215 | /** Clears a map cell */ |
1364 | static void |
1216 | static void |
1365 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1217 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1377 | #define MAX_LAYERS 3 |
1229 | #define MAX_LAYERS 3 |
1378 | |
1230 | |
1379 | /* Using a global really isn't a good approach, but saves the over head of |
1231 | /* Using a global really isn't a good approach, but saves the over head of |
1380 | * allocating and deallocating such a block of data each time run through, |
1232 | * allocating and deallocating such a block of data each time run through, |
1381 | * and saves the space of allocating this in the socket object when we only |
1233 | * and saves the space of allocating this in the socket object when we only |
1382 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1234 | * need it for this cycle. If the server is ever threaded, this needs to be |
1383 | * re-examined. |
1235 | * re-examined. |
1384 | */ |
1236 | */ |
1385 | |
|
|
1386 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1237 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1387 | |
1238 | |
1388 | /** |
1239 | /** |
1389 | * Returns true if any of the heads for this |
1240 | * Returns true if any of the heads for this |
1390 | * space is set. Returns false if all are blank - this is used |
1241 | * space is set. Returns false if all are blank - this is used |
1391 | * for empty space checking. |
1242 | * for empty space checking. |
1392 | */ |
1243 | */ |
1393 | static inline int |
1244 | static inline int |
1394 | have_head (int ax, int ay) |
1245 | have_head (int ax, int ay) |
1395 | { |
1246 | { |
1396 | |
|
|
1397 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1247 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1398 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1248 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1399 | return 1; |
1249 | return 1; |
|
|
1250 | |
1400 | return 0; |
1251 | return 0; |
1401 | } |
1252 | } |
1402 | |
1253 | |
1403 | /** |
1254 | /** |
1404 | * check_head is a bit simplistic version of update_space below. |
1255 | * check_head is a bit simplistic version of update_space below. |
1405 | * basically, it only checks the that the head on space ax,ay at layer |
1256 | * basically, it only checks the that the head on space ax,ay at layer |
1406 | * needs to get sent - if so, it adds the data, sending the head |
1257 | * needs to get sent - if so, it adds the data, sending the head |
1407 | * if needed, and returning 1. If this no data needs to get |
1258 | * if needed, and returning 1. If this no data needs to get |
1408 | * sent, it returns zero. |
1259 | * sent, it returns zero. |
1409 | */ |
1260 | */ |
1410 | static int |
1261 | static int |
1411 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1262 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1412 | { |
1263 | { |
1413 | short face_num; |
1264 | short face_num; |
1414 | |
1265 | |
1415 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1266 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1416 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1267 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1448 | * numbers the spaces differently - I think this was a leftover from |
1299 | * numbers the spaces differently - I think this was a leftover from |
1449 | * the map command, where the faces stack up. Sinces that is no longer |
1300 | * the map command, where the faces stack up. Sinces that is no longer |
1450 | * the case, it seems to make more sense to have these layer values |
1301 | * the case, it seems to make more sense to have these layer values |
1451 | * actually match. |
1302 | * actually match. |
1452 | */ |
1303 | */ |
1453 | |
|
|
1454 | static int |
1304 | static int |
1455 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1305 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1456 | { |
1306 | { |
1457 | object *ob, *head; |
1307 | object *ob, *head; |
1458 | uint16 face_num; |
1308 | uint16 face_num; |
1459 | int bx, by, i; |
1309 | int bx, by, i; |
1460 | |
1310 | |
… | |
… | |
1673 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1523 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1674 | * take. |
1524 | * take. |
1675 | */ |
1525 | */ |
1676 | |
1526 | |
1677 | static inline int |
1527 | static inline int |
1678 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1528 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1679 | { |
1529 | { |
1680 | object *ob; |
1530 | object *ob; |
1681 | int smoothlevel; /* old face_num; */ |
1531 | int smoothlevel; /* old face_num; */ |
1682 | |
1532 | |
1683 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1533 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1717 | * Returns the size of a data for a map square as returned by |
1567 | * Returns the size of a data for a map square as returned by |
1718 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1568 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1719 | * available. |
1569 | * available. |
1720 | */ |
1570 | */ |
1721 | int |
1571 | int |
1722 | getExtendedMapInfoSize (client_socket * ns) |
1572 | getExtendedMapInfoSize (client * ns) |
1723 | { |
1573 | { |
1724 | int result = 0; |
1574 | int result = 0; |
1725 | |
1575 | |
1726 | if (ns->ext_mapinfos) |
1576 | if (ns->ext_mapinfos) |
1727 | { |
1577 | { |
1728 | if (ns->EMI_smooth) |
1578 | if (ns->EMI_smooth) |
1729 | result += 1; /*One byte for smoothlevel */ |
1579 | result += 1; /*One byte for smoothlevel */ |
1730 | } |
1580 | } |
|
|
1581 | |
1731 | return result; |
1582 | return result; |
1732 | } |
1583 | } |
1733 | |
1584 | |
1734 | /** |
1585 | /** |
1735 | * This function uses the new map1 protocol command to send the map |
1586 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1763 | uint8 eentrysize; |
1614 | uint8 eentrysize; |
1764 | uint16 ewhatstart, ewhatflag; |
1615 | uint16 ewhatstart, ewhatflag; |
1765 | uint8 extendedinfos; |
1616 | uint8 extendedinfos; |
1766 | maptile *m; |
1617 | maptile *m; |
1767 | |
1618 | |
1768 | client_socket &socket = *pl->contr->socket; |
1619 | client &socket = *pl->contr->socket; |
1769 | |
1620 | |
1770 | check_map_change (pl->contr); |
1621 | check_map_change (pl->contr); |
1771 | |
1622 | |
1772 | packet sl; |
1623 | packet sl; |
1773 | packet esl; |
1624 | packet esl; |
… | |
… | |
2172 | { |
2023 | { |
2173 | ax = i; |
2024 | ax = i; |
2174 | ay = j; |
2025 | ay = j; |
2175 | m = pm; |
2026 | m = pm; |
2176 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2027 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2028 | |
2177 | if (mflags & P_OUT_OF_MAP) |
2029 | if (mflags & P_OUT_OF_MAP) |
2178 | continue; |
2030 | continue; |
|
|
2031 | |
2179 | if (mflags & P_NEED_UPDATE) |
2032 | if (mflags & P_NEED_UPDATE) |
2180 | update_position (m, ax, ay); |
2033 | update_position (m, ax, ay); |
|
|
2034 | |
2181 | /* If a map is visible to the player, we don't want to swap it out |
2035 | /* If a map is visible to the player, we don't want to swap it out |
2182 | * just to reload it. This should really call something like |
2036 | * just to reload it. This should really call something like |
2183 | * swap_map, but this is much more efficient and 'good enough' |
2037 | * swap_map, but this is much more efficient and 'good enough' |
2184 | */ |
2038 | */ |
2185 | if (mflags & P_NEW_MAP) |
2039 | if (mflags & P_NEW_MAP) |
… | |
… | |
2216 | /** |
2070 | /** |
2217 | * This sends the skill number to name mapping. We ignore |
2071 | * This sends the skill number to name mapping. We ignore |
2218 | * the params - we always send the same info no matter what. |
2072 | * the params - we always send the same info no matter what. |
2219 | */ |
2073 | */ |
2220 | void |
2074 | void |
2221 | send_skill_info (client_socket *ns, char *params) |
2075 | send_skill_info (client *ns, char *params) |
2222 | { |
2076 | { |
2223 | packet sl; |
2077 | packet sl; |
2224 | sl << "replyinfo skill_info\n"; |
2078 | sl << "replyinfo skill_info\n"; |
2225 | |
2079 | |
2226 | for (int i = 1; i < NUM_SKILLS; i++) |
2080 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2238 | /** |
2092 | /** |
2239 | * This sends the spell path to name mapping. We ignore |
2093 | * This sends the spell path to name mapping. We ignore |
2240 | * the params - we always send the same info no matter what. |
2094 | * the params - we always send the same info no matter what. |
2241 | */ |
2095 | */ |
2242 | void |
2096 | void |
2243 | send_spell_paths (client_socket * ns, char *params) |
2097 | send_spell_paths (client * ns, char *params) |
2244 | { |
2098 | { |
2245 | packet sl; |
2099 | packet sl; |
2246 | |
2100 | |
2247 | sl << "replyinfo spell_paths\n"; |
2101 | sl << "replyinfo spell_paths\n"; |
2248 | |
2102 | |
… | |
… | |
2388 | |
2242 | |
2389 | if (!pl->socket->monitor_spells) |
2243 | if (!pl->socket->monitor_spells) |
2390 | return; |
2244 | return; |
2391 | |
2245 | |
2392 | packet sl; |
2246 | packet sl; |
2393 | |
|
|
2394 | sl << "addspell "; |
2247 | sl << "addspell "; |
2395 | |
2248 | |
2396 | if (!spell) |
2249 | if (!spell) |
2397 | { |
2250 | { |
2398 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2251 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |