… | |
… | |
38 | * esrv_map_new starts updating the map |
38 | * esrv_map_new starts updating the map |
39 | * |
39 | * |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
41 | * if a face has not already been sent to the client, it is sent now. |
41 | * if a face has not already been sent to the client, it is sent now. |
42 | * |
42 | * |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | */ |
43 | */ |
47 | |
44 | |
48 | #include <global.h> |
45 | #include <global.h> |
49 | #include <sproto.h> |
46 | #include <sproto.h> |
50 | |
47 | |
… | |
… | |
141 | } |
138 | } |
142 | |
139 | |
143 | static void |
140 | static void |
144 | clear_map (player *pl) |
141 | clear_map (player *pl) |
145 | { |
142 | { |
146 | client &socket = *pl->socket; |
|
|
147 | |
|
|
148 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
149 | |
144 | |
150 | if (socket.newmapcmd == 1) |
145 | if (pl->ns->newmapcmd == 1) |
151 | socket.send_packet ("newmap"); |
146 | pl->ns->send_packet ("newmap"); |
152 | |
147 | |
153 | socket.update_look = 1; |
148 | pl->ns->floorbox_reset (); |
154 | socket.look_position = 0; |
|
|
155 | } |
149 | } |
156 | |
150 | |
157 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
158 | static void |
152 | static void |
159 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
160 | { |
154 | { |
161 | client &socket = *pl->socket; |
155 | client &socket = *pl->ns; |
162 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
163 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
164 | |
158 | |
165 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
166 | { |
160 | { |
… | |
… | |
182 | flags |= 4; |
176 | flags |= 4; |
183 | if (ob->map->tile_path[3]) |
177 | if (ob->map->tile_path[3]) |
184 | flags |= 8; |
178 | flags |= 8; |
185 | |
179 | |
186 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
187 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
181 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
188 | } |
182 | } |
189 | else |
183 | else |
190 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
191 | |
185 | |
192 | socket.send_packet (buf); |
186 | socket.send_packet (buf); |
… | |
… | |
200 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
201 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
195 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
202 | else |
196 | else |
203 | { |
197 | { |
204 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
198 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
205 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
206 | socket.look_position = 0; |
|
|
207 | } |
200 | } |
208 | } |
201 | } |
209 | |
202 | |
210 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
211 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
… | |
… | |
260 | { |
253 | { |
261 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
262 | } |
255 | } |
263 | |
256 | |
264 | void |
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
261 | } |
|
|
262 | |
|
|
263 | void |
265 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
266 | { |
265 | { |
267 | // <mapinfo tag spatial tile-path |
266 | // <mapinfo tag spatial tile-path |
268 | // >mapinfo tag spatial flags x y w h hash |
267 | // >mapinfo tag spatial flags x y w h hash |
269 | |
268 | |
… | |
… | |
281 | buf += 8; |
280 | buf += 8; |
282 | |
281 | |
283 | // initial map and its origin |
282 | // initial map and its origin |
284 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
285 | sint16 dx, dy; |
284 | sint16 dx, dy; |
286 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
287 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
288 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
289 | |
288 | |
290 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
291 | { |
290 | { |
292 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
335 | if (map->tile_path[2]) |
334 | if (map->tile_path[2]) |
336 | flags |= 4; |
335 | flags |= 4; |
337 | if (map->tile_path[3]) |
336 | if (map->tile_path[3]) |
338 | flags |= 8; |
337 | flags |= 8; |
339 | |
338 | |
340 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
339 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
341 | } |
340 | } |
342 | else |
341 | else |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
344 | } |
343 | } |
345 | else |
344 | else |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
347 | |
346 | |
348 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
349 | } |
348 | } |
350 | |
349 | |
351 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
352 | void |
351 | void |
353 | SetUp (char *buf, int len, client * ns) |
352 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
400 | { |
399 | { |
401 | ns->sound = atoi (param); |
400 | ns->sound = atoi (param); |
402 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
403 | } |
402 | } |
404 | else if (!strcmp (cmd, "exp64")) |
403 | else if (!strcmp (cmd, "exp64")) |
405 | { |
|
|
406 | ns->exp64 = atoi (param); |
|
|
407 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
404 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | } |
|
|
409 | else if (!strcmp (cmd, "spellmon")) |
405 | else if (!strcmp (cmd, "spellmon")) |
410 | { |
406 | { |
411 | ns->monitor_spells = atoi (param); |
407 | ns->monitor_spells = atoi (param); |
412 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
413 | } |
409 | } |
… | |
… | |
570 | * it either has to be here or init_sockets needs to be exported. |
566 | * it either has to be here or init_sockets needs to be exported. |
571 | */ |
567 | */ |
572 | void |
568 | void |
573 | AddMeCmd (char *buf, int len, client * ns) |
569 | AddMeCmd (char *buf, int len, client * ns) |
574 | { |
570 | { |
575 | if (ns->status != Ns_Add || add_player (ns)) |
571 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
576 | ns->send_packet ("addme_failed"); |
|
|
577 | else |
|
|
578 | ns->send_packet ("addme_success"); |
|
|
579 | } |
572 | } |
580 | |
573 | |
581 | /** Reply to ExtendedInfos command */ |
574 | /** Reply to ExtendedInfos command */ |
582 | void |
575 | void |
583 | ToggleExtendedInfos (char *buf, int len, client * ns) |
576 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
700 | * a piece of data from us that we know the client wants. So |
693 | * a piece of data from us that we know the client wants. So |
701 | * if we know the client wants it, might as well push it to the |
694 | * if we know the client wants it, might as well push it to the |
702 | * client. |
695 | * client. |
703 | */ |
696 | */ |
704 | static void |
697 | static void |
705 | SendSmooth (client * ns, uint16 face) |
698 | SendSmooth (client *ns, uint16 face) |
706 | { |
699 | { |
707 | uint16 smoothface; |
700 | uint16 smoothface; |
708 | |
701 | |
709 | /* If we can't find a face, return and set it so we won't try to send this |
702 | /* If we can't find a face, return and set it so we won't try to send this |
710 | * again. |
703 | * again. |
… | |
… | |
720 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
713 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
721 | esrv_send_face (ns, smoothface, 0); |
714 | esrv_send_face (ns, smoothface, 0); |
722 | |
715 | |
723 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
716 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
724 | |
717 | |
725 | packet sl; |
718 | packet sl ("smooth"); |
726 | |
719 | |
727 | sl << "smooth " |
|
|
728 | << uint16 (face) |
720 | sl << uint16 (face) |
729 | << uint16 (smoothface); |
721 | << uint16 (smoothface); |
730 | |
722 | |
731 | ns->send_packet (sl); |
723 | ns->send_packet (sl); |
732 | } |
724 | } |
733 | |
725 | |
734 | /** |
726 | /** |
735 | * Tells client the picture it has to use |
727 | * Tells client the picture it has to use |
736 | * to smooth a picture number given as argument. |
728 | * to smooth a picture number given as argument. |
737 | */ |
729 | */ |
738 | void |
730 | void |
739 | AskSmooth (char *buf, int len, client * ns) |
731 | AskSmooth (char *buf, int len, client *ns) |
740 | { |
732 | { |
741 | uint16 facenbr; |
733 | SendSmooth (ns, atoi (buf)); |
742 | |
|
|
743 | facenbr = atoi (buf); |
|
|
744 | SendSmooth (ns, facenbr); |
|
|
745 | } |
734 | } |
746 | |
735 | |
747 | /** |
736 | /** |
748 | * This handles the general commands from the client (ie, north, fire, cast, |
737 | * This handles the general commands from the client (ie, north, fire, cast, |
749 | * etc.) |
738 | * etc.) |
750 | */ |
739 | */ |
751 | void |
740 | void |
752 | PlayerCmd (char *buf, int len, player *pl) |
741 | PlayerCmd (char *buf, int len, player *pl) |
753 | { |
742 | { |
754 | |
|
|
755 | /* The following should never happen with a proper or honest client. |
|
|
756 | * Therefore, the error message doesn't have to be too clear - if |
|
|
757 | * someone is playing with a hacked/non working client, this gives them |
|
|
758 | * an idea of the problem, but they deserve what they get |
|
|
759 | */ |
|
|
760 | if (pl->state != ST_PLAYING) |
|
|
761 | { |
|
|
762 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
763 | return; |
|
|
764 | } |
|
|
765 | /* Check if there is a count. In theory, a zero count could also be |
743 | /* Check if there is a count. In theory, a zero count could also be |
766 | * sent, so check for that also. |
744 | * sent, so check for that also. |
767 | */ |
745 | */ |
768 | if (atoi (buf) || buf[0] == '0') |
746 | if (atoi (buf) || buf[0] == '0') |
769 | { |
747 | { |
770 | pl->count = atoi ((char *) buf); |
748 | pl->count = atoi ((char *) buf); |
|
|
749 | |
771 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
750 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
772 | if (!buf) |
751 | if (!buf) |
773 | { |
|
|
774 | #ifdef ESRV_DEBUG |
|
|
775 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
776 | #endif |
|
|
777 | return; |
752 | return; |
778 | } |
753 | |
779 | buf++; |
754 | buf++; |
780 | } |
755 | } |
781 | /* This should not happen anymore. */ |
756 | |
782 | if (pl->ob->speed_left < -1.0) |
|
|
783 | { |
|
|
784 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
785 | } |
|
|
786 | /* In c_new.c */ |
|
|
787 | execute_newserver_command (pl->ob, (char *) buf); |
757 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
758 | |
788 | /* Perhaps something better should be done with a left over count. |
759 | /* Perhaps something better should be done with a left over count. |
789 | * Cleaning up the input should probably be done first - all actions |
760 | * Cleaning up the input should probably be done first - all actions |
790 | * for the command that issued the count should be done before any other |
761 | * for the command that issued the count should be done before any other |
791 | * commands. |
762 | * commands. |
792 | */ |
763 | */ |
793 | |
|
|
794 | pl->count = 0; |
764 | pl->count = 0; |
795 | |
|
|
796 | } |
765 | } |
797 | |
766 | |
798 | |
767 | |
799 | /** |
768 | /** |
800 | * This handles the general commands from the client (ie, north, fire, cast, |
769 | * This handles the general commands from the client (ie, north, fire, cast, |
… | |
… | |
803 | * can throttle. |
772 | * can throttle. |
804 | */ |
773 | */ |
805 | void |
774 | void |
806 | NewPlayerCmd (char *buf, int len, player *pl) |
775 | NewPlayerCmd (char *buf, int len, player *pl) |
807 | { |
776 | { |
808 | int time, repeat; |
|
|
809 | char command[MAX_BUF]; |
|
|
810 | int pktlen; |
|
|
811 | |
|
|
812 | if (len < 7) |
777 | if (len <= 6) |
813 | { |
778 | { |
814 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
779 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
815 | return; |
780 | return; |
816 | } |
781 | } |
817 | |
782 | |
818 | pktlen = net_uint16 ((uint8 *)buf); |
783 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
819 | repeat = net_uint32 ((uint8 *)buf + 2); |
784 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
820 | |
785 | |
821 | /* -1 is special - no repeat, but don't update */ |
786 | /* -1 is special - no repeat, but don't update */ |
822 | if (repeat != -1) |
787 | if (repeat != -1) |
823 | pl->count = repeat; |
788 | pl->count = repeat; |
824 | |
789 | |
825 | if ((len - 4) >= MAX_BUF) |
790 | buf += 6; //len -= 6; |
826 | len = MAX_BUF - 5; |
|
|
827 | |
791 | |
828 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
829 | command[len - 4] = 0; |
|
|
830 | |
|
|
831 | /* This should not happen anymore. */ |
|
|
832 | if (pl->ob->speed_left < -1.0) |
|
|
833 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
834 | |
|
|
835 | /* In c_new.c */ |
|
|
836 | execute_newserver_command (pl->ob, (char *) command); |
792 | execute_newserver_command (pl->ob, buf); |
|
|
793 | |
837 | /* Perhaps something better should be done with a left over count. |
794 | /* Perhaps something better should be done with a left over count. |
838 | * Cleaning up the input should probably be done first - all actions |
795 | * Cleaning up the input should probably be done first - all actions |
839 | * for the command that issued the count should be done before any other |
796 | * for the command that issued the count should be done before any other |
840 | * commands. |
797 | * commands. |
841 | */ |
798 | */ |
842 | pl->count = 0; |
799 | pl->count = 0; |
843 | |
800 | |
|
|
801 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
844 | if (FABS (pl->ob->speed) < 0.001) |
802 | int time = FABS (pl->ob->speed) < 0.001 |
845 | time = MAX_TIME * 100; |
803 | ? time = MAX_TIME * 100 |
846 | else |
|
|
847 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
804 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
848 | |
805 | |
849 | /* Send confirmation of command execution now */ |
806 | /* Send confirmation of command execution now */ |
850 | |
807 | packet sl ("comc"); |
851 | packet sl; |
|
|
852 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
808 | sl << uint16 (cmdid) << uint32 (time); |
853 | pl->socket->send_packet (sl); |
809 | pl->ns->send_packet (sl); |
854 | } |
810 | } |
855 | |
|
|
856 | |
811 | |
857 | /** This is a reply to a previous query. */ |
812 | /** This is a reply to a previous query. */ |
858 | void |
813 | void |
859 | ReplyCmd (char *buf, int len, player *pl) |
814 | ReplyCmd (char *buf, int len, client *ns) |
860 | { |
815 | { |
|
|
816 | if (ns->state == ST_CUSTOM) |
|
|
817 | { |
|
|
818 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
819 | return; |
|
|
820 | } |
|
|
821 | |
|
|
822 | if (!ns->pl) |
|
|
823 | return; //TODO: depends on the exact reply we are after |
|
|
824 | //TODO: but right now, we always have a ns->pl |
|
|
825 | |
|
|
826 | player *pl = ns->pl; |
|
|
827 | |
861 | /* This is to synthesize how the data would be stored if it |
828 | /* This is to synthesize how the data would be stored if it |
862 | * was normally entered. A bit of a hack, and should be cleaned up |
829 | * was normally entered. A bit of a hack, and should be cleaned up |
863 | * once all the X11 code is removed from the server. |
830 | * once all the X11 code is removed from the server. |
864 | * |
831 | * |
865 | * We pass 13 to many of the functions because this way they |
832 | * We pass 13 to many of the functions because this way they |
866 | * think it was the carriage return that was entered, and the |
833 | * think it was the carriage return that was entered, and the |
867 | * function then does not try to do additional input. |
834 | * function then does not try to do additional input. |
868 | */ |
835 | */ |
869 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
836 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
870 | |
837 | |
871 | /* this avoids any hacking here */ |
838 | /* this avoids any hacking here */ |
872 | |
839 | |
873 | switch (pl->state) |
840 | switch (ns->state) |
874 | { |
841 | { |
875 | case ST_PLAYING: |
842 | case ST_PLAYING: |
876 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
843 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
877 | break; |
844 | break; |
878 | |
845 | |
879 | case ST_PLAY_AGAIN: |
|
|
880 | /* We can check this for return value (2==quit). Maybe we |
|
|
881 | * should, and do something appropriate? |
|
|
882 | */ |
|
|
883 | receive_play_again (pl->ob, buf[0]); |
|
|
884 | break; |
|
|
885 | |
|
|
886 | case ST_ROLL_STAT: |
|
|
887 | key_roll_stat (pl->ob, buf[0]); |
|
|
888 | break; |
|
|
889 | |
|
|
890 | case ST_CHANGE_CLASS: |
846 | case ST_CHANGE_CLASS: |
891 | |
|
|
892 | key_change_class (pl->ob, buf[0]); |
847 | key_change_class (pl->ob, buf[0]); |
893 | break; |
848 | break; |
894 | |
849 | |
895 | case ST_CONFIRM_QUIT: |
850 | case ST_CONFIRM_QUIT: |
896 | key_confirm_quit (pl->ob, buf[0]); |
851 | key_confirm_quit (pl->ob, buf[0]); |
897 | break; |
852 | break; |
898 | |
853 | |
899 | case ST_CONFIGURE: |
|
|
900 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
901 | pl->state = ST_PLAYING; |
|
|
902 | break; |
|
|
903 | |
|
|
904 | case ST_GET_NAME: |
|
|
905 | receive_player_name (pl->ob, 13); |
|
|
906 | break; |
|
|
907 | |
|
|
908 | case ST_GET_PASSWORD: |
|
|
909 | case ST_CONFIRM_PASSWORD: |
|
|
910 | receive_player_password (pl->ob, 13); |
|
|
911 | break; |
|
|
912 | |
|
|
913 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
854 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
914 | receive_party_password (pl->ob, 13); |
855 | receive_party_password (pl->ob, 13); |
915 | break; |
856 | break; |
916 | |
857 | |
917 | default: |
858 | default: |
918 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
859 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
919 | } |
860 | } |
920 | } |
861 | } |
921 | |
862 | |
922 | /** |
863 | /** |
923 | * Client tells its version. If there is a mismatch, we close the |
864 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
927 | * problem. |
868 | * problem. |
928 | */ |
869 | */ |
929 | void |
870 | void |
930 | VersionCmd (char *buf, int len, client * ns) |
871 | VersionCmd (char *buf, int len, client * ns) |
931 | { |
872 | { |
932 | char *cp; |
|
|
933 | char version_warning[256]; |
|
|
934 | |
|
|
935 | if (!buf) |
873 | if (!buf) |
936 | { |
874 | { |
937 | LOG (llevError, "CS: received corrupted version command\n"); |
875 | LOG (llevError, "CS: received corrupted version command\n"); |
938 | return; |
876 | return; |
939 | } |
877 | } |
940 | |
878 | |
941 | ns->cs_version = atoi (buf); |
879 | ns->cs_version = atoi (buf); |
942 | ns->sc_version = ns->cs_version; |
880 | ns->sc_version = ns->cs_version; |
|
|
881 | |
|
|
882 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
883 | |
|
|
884 | |
|
|
885 | //TODO: should log here just for statistics |
|
|
886 | |
943 | if (VERSION_CS != ns->cs_version) |
887 | //if (VERSION_CS != ns->cs_version) |
944 | { |
888 | // unchecked; |
945 | #ifdef ESRV_DEBUG |
889 | |
946 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
947 | #endif |
|
|
948 | } |
|
|
949 | cp = strchr (buf + 1, ' '); |
890 | char *cp = strchr (buf + 1, ' '); |
950 | if (!cp) |
891 | if (!cp) |
951 | return; |
892 | return; |
|
|
893 | |
952 | ns->sc_version = atoi (cp); |
894 | ns->sc_version = atoi (cp); |
|
|
895 | |
953 | if (VERSION_SC != ns->sc_version) |
896 | //if (VERSION_SC != ns->sc_version) |
954 | { |
897 | // unchecked; |
955 | #ifdef ESRV_DEBUG |
898 | |
956 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
957 | #endif |
|
|
958 | } |
|
|
959 | cp = strchr (cp + 1, ' '); |
899 | cp = strchr (cp + 1, ' '); |
|
|
900 | |
960 | if (cp) |
901 | if (cp) |
961 | { |
902 | { |
962 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
|
|
963 | |
|
|
964 | assign (ns->version, cp + 1); |
903 | assign (ns->version, cp + 1); |
965 | |
904 | |
966 | if (ns->sc_version < 1026) |
905 | if (ns->sc_version < 1026) |
967 | { |
906 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
968 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
969 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
907 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
970 | ns->send_packet (version_warning); |
|
|
971 | } |
|
|
972 | |
|
|
973 | } |
908 | } |
974 | } |
909 | } |
975 | |
910 | |
976 | /** sound related functions. */ |
911 | /** sound related functions. */ |
977 | void |
912 | void |
… | |
… | |
983 | /** client wants the map resent */ |
918 | /** client wants the map resent */ |
984 | |
919 | |
985 | void |
920 | void |
986 | MapRedrawCmd (char *buf, int len, player *pl) |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
987 | { |
922 | { |
988 | |
|
|
989 | /* This function is currently disabled; just clearing the map state results in |
923 | /* This function is currently disabled; just clearing the map state results in |
990 | * display errors. It should clear the cache and send a newmap command. |
924 | * display errors. It should clear the cache and send a newmap command. |
991 | * Unfortunately this solution does not work because some client versions send |
925 | * Unfortunately this solution does not work because some client versions send |
992 | * a mapredraw command after receiving a newmap command. |
926 | * a mapredraw command after receiving a newmap command. |
993 | */ |
927 | */ |
994 | #if 0 |
|
|
995 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
996 | * clear the "cache" |
|
|
997 | */ |
|
|
998 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
999 | draw_client_map (pl->ob); |
|
|
1000 | #endif |
|
|
1001 | } |
928 | } |
1002 | |
929 | |
1003 | /** |
930 | /** |
1004 | * Moves an object (typically, container to inventory). |
931 | * Moves an object (typically, container to inventory). |
1005 | * syntax is: move (to) (tag) (nrof) |
932 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1008 | MoveCmd (char *buf, int len, player *pl) |
935 | MoveCmd (char *buf, int len, player *pl) |
1009 | { |
936 | { |
1010 | int vals[3], i; |
937 | int vals[3], i; |
1011 | |
938 | |
1012 | /* A little funky here. We only cycle for 2 records, because |
939 | /* A little funky here. We only cycle for 2 records, because |
1013 | * we obviously am not going to find a space after the third |
940 | * we obviously are not going to find a space after the third |
1014 | * record. Perhaps we should just replace this with a |
941 | * record. Perhaps we should just replace this with a |
1015 | * sscanf? |
942 | * sscanf? |
1016 | */ |
943 | */ |
1017 | for (i = 0; i < 2; i++) |
944 | for (i = 0; i < 2; i++) |
1018 | { |
945 | { |
1019 | vals[i] = atoi (buf); |
946 | vals[i] = atoi (buf); |
|
|
947 | |
1020 | if (!(buf = strchr (buf, ' '))) |
948 | if (!(buf = strchr (buf, ' '))) |
1021 | { |
949 | { |
1022 | LOG (llevError, "Incomplete move command: %s\n", buf); |
950 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1023 | return; |
951 | return; |
1024 | } |
952 | } |
|
|
953 | |
1025 | buf++; |
954 | buf++; |
1026 | } |
955 | } |
|
|
956 | |
1027 | vals[2] = atoi (buf); |
957 | vals[2] = atoi (buf); |
1028 | |
958 | |
1029 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
959 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1030 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
960 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1031 | } |
961 | } |
1032 | |
|
|
1033 | |
|
|
1034 | |
962 | |
1035 | /****************************************************************************** |
963 | /****************************************************************************** |
1036 | * |
964 | * |
1037 | * Start of commands the server sends to the client. |
965 | * Start of commands the server sends to the client. |
1038 | * |
966 | * |
… | |
… | |
1041 | /** |
969 | /** |
1042 | * Asks the client to query the user. This way, the client knows |
970 | * Asks the client to query the user. This way, the client knows |
1043 | * it needs to send something back (vs just printing out a message) |
971 | * it needs to send something back (vs just printing out a message) |
1044 | */ |
972 | */ |
1045 | void |
973 | void |
1046 | send_query (client * ns, uint8 flags, char *text) |
974 | send_query (client *ns, uint8 flags, char *text) |
1047 | { |
975 | { |
1048 | char buf[MAX_BUF]; |
|
|
1049 | |
|
|
1050 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
976 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1051 | ns->send_packet (buf); |
|
|
1052 | } |
977 | } |
1053 | |
978 | |
1054 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
979 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1055 | Old = New; \ |
980 | Old = New; \ |
1056 | sl << uint8 (Type) << uint64 (New); \ |
981 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1086 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1087 | { |
1012 | { |
1088 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1089 | uint16 flags; |
1014 | uint16 flags; |
1090 | |
1015 | |
1091 | packet sl; |
1016 | if (!pl->ns) |
1092 | sl << "stats "; |
1017 | return; |
1093 | |
1018 | |
|
|
1019 | packet sl ("stats"); |
|
|
1020 | |
1094 | if (pl->ob != NULL) |
1021 | if (pl->ob) |
1095 | { |
1022 | { |
1096 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1023 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1097 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1024 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1098 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1025 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1099 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1026 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1100 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1027 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1101 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1028 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1102 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1029 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1103 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1104 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1105 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1106 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1030 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1107 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1031 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
|
|
1032 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1033 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1034 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1108 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1035 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1109 | } |
1036 | } |
1110 | |
1037 | |
1111 | if (pl->socket->exp64) |
|
|
1112 | { |
|
|
1113 | uint8 s; |
|
|
1114 | |
|
|
1115 | for (s = 0; s < NUM_SKILLS; s++) |
1038 | for (int s = 0; s < NUM_SKILLS; s++) |
1116 | { |
|
|
1117 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1039 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1118 | { |
1040 | { |
1119 | /* Always send along the level if exp changes. This is only |
1041 | /* Always send along the level if exp changes. This is only |
1120 | * 1 extra byte, but keeps processing simpler. |
1042 | * 1 extra byte, but keeps processing simpler. |
1121 | */ |
1043 | */ |
1122 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1044 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1123 | << uint8 (pl->last_skill_ob[s]->level) |
1045 | << uint8 (pl->last_skill_ob[s]->level) |
1124 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1046 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1125 | |
1047 | |
1126 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1048 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1127 | } |
|
|
1128 | } |
1049 | } |
1129 | } |
|
|
1130 | |
1050 | |
1131 | if (pl->socket->exp64) |
|
|
1132 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1051 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1133 | else |
|
|
1134 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1135 | |
|
|
1136 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1052 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1137 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1053 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1138 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1054 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1139 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1055 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1140 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1056 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
… | |
… | |
1149 | if (pl->run_on) |
1065 | if (pl->run_on) |
1150 | flags |= SF_RUNON; |
1066 | flags |= SF_RUNON; |
1151 | |
1067 | |
1152 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1068 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1153 | |
1069 | |
1154 | if (pl->socket->sc_version < 1025) |
1070 | if (pl->ns->sc_version < 1025) |
1155 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1071 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1156 | else |
1072 | else |
1157 | { |
|
|
1158 | int i; |
|
|
1159 | |
|
|
1160 | for (i = 0; i < NROFATTACKS; i++) |
1073 | for (int i = 0; i < NROFATTACKS; i++) |
1161 | { |
1074 | { |
1162 | /* Skip ones we won't send */ |
1075 | /* Skip ones we won't send */ |
1163 | if (atnr_cs_stat[i] == -1) |
1076 | if (atnr_cs_stat[i] == -1) |
1164 | continue; |
1077 | continue; |
1165 | |
1078 | |
1166 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1079 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1167 | } |
1080 | } |
1168 | } |
|
|
1169 | |
1081 | |
1170 | if (pl->socket->monitor_spells) |
1082 | if (pl->ns->monitor_spells) |
1171 | { |
1083 | { |
1172 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1084 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1173 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1085 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1174 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1086 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1175 | } |
1087 | } |
1176 | |
1088 | |
1177 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1089 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1178 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1090 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1179 | set_title (pl->ob, buf); |
1091 | set_title (pl->ob, buf); |
1180 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1092 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1181 | |
1093 | |
1182 | /* Only send it away if we have some actual data */ |
1094 | /* Only send it away if we have some actual data */ |
1183 | if (sl.length () > 6) |
1095 | if (sl.length () > 6) |
1184 | pl->socket->send_packet (sl); |
1096 | pl->ns->send_packet (sl); |
1185 | } |
1097 | } |
1186 | |
1098 | |
1187 | /** |
1099 | /** |
1188 | * Tells the client that here is a player it should start using. |
1100 | * Tells the client that here is a player it should start using. |
1189 | */ |
1101 | */ |
1190 | void |
1102 | void |
1191 | esrv_new_player (player *pl, uint32 weight) |
1103 | esrv_new_player (player *pl, uint32 weight) |
1192 | { |
1104 | { |
1193 | pl->last_weight = weight; |
1105 | pl->last_weight = weight; |
1194 | |
1106 | |
1195 | packet sl; |
1107 | packet sl ("player"); |
1196 | sl << "player "; |
|
|
1197 | |
1108 | |
1198 | sl << uint32 (pl->ob->count) |
1109 | sl << uint32 (pl->ob->count) |
1199 | << uint32 (weight) |
1110 | << uint32 (weight) |
1200 | << uint32 (pl->ob->face->number) |
1111 | << uint32 (pl->ob->face->number) |
1201 | << data8 (pl->ob->name); |
1112 | << data8 (pl->ob->name); |
1202 | |
1113 | |
1203 | pl->socket->send_packet (sl); |
1114 | pl->ns->send_packet (sl); |
1204 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1115 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1205 | } |
1116 | } |
1206 | |
1117 | |
1207 | /** |
1118 | /** |
1208 | * Need to send an animation sequence to the client. |
1119 | * Need to send an animation sequence to the client. |
… | |
… | |
1212 | * when the player logs in and picks stuff up. |
1123 | * when the player logs in and picks stuff up. |
1213 | */ |
1124 | */ |
1214 | void |
1125 | void |
1215 | esrv_send_animation (client * ns, short anim_num) |
1126 | esrv_send_animation (client * ns, short anim_num) |
1216 | { |
1127 | { |
1217 | int i; |
|
|
1218 | |
|
|
1219 | /* Do some checking on the anim_num we got. Note that the animations |
1128 | /* Do some checking on the anim_num we got. Note that the animations |
1220 | * are added in contigous order, so if the number is in the valid |
1129 | * are added in contigous order, so if the number is in the valid |
1221 | * range, it must be a valid animation. |
1130 | * range, it must be a valid animation. |
1222 | */ |
1131 | */ |
1223 | if (anim_num < 0 || anim_num > num_animations) |
1132 | if (anim_num < 0 || anim_num > num_animations) |
1224 | { |
1133 | { |
1225 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1134 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1226 | return; |
1135 | return; |
1227 | } |
1136 | } |
1228 | |
1137 | |
1229 | packet sl; |
1138 | packet sl ("anim"); |
1230 | |
1139 | |
1231 | sl << "anim " |
|
|
1232 | << uint16 (anim_num) |
1140 | sl << uint16 (anim_num) |
1233 | << uint16 (0); /* flags - not used right now */ |
1141 | << uint16 (0); /* flags - not used right now */ |
1234 | |
1142 | |
1235 | /* Build up the list of faces. Also, send any information (ie, the |
1143 | /* Build up the list of faces. Also, send any information (ie, the |
1236 | * the face itself) down to the client. |
1144 | * the face itself) down to the client. |
1237 | */ |
1145 | */ |
1238 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1146 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1239 | { |
1147 | { |
1240 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1148 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1241 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1149 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1150 | |
1242 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1151 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1243 | } |
1152 | } |
1244 | |
1153 | |
1245 | ns->send_packet (sl); |
1154 | ns->send_packet (sl); |
1246 | |
1155 | |
… | |
… | |
1261 | static void |
1170 | static void |
1262 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1171 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1263 | { |
1172 | { |
1264 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1173 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1265 | { |
1174 | { |
|
|
1175 | //TODO: one or the other, can't both have abort and return, verify and act |
1266 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1176 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1267 | return; |
1177 | return; |
1268 | abort (); |
1178 | abort (); |
1269 | } |
1179 | } |
1270 | |
1180 | |
1271 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1181 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1272 | newmap->cells[x][y].count++; |
1182 | newmap->cells[x][y].count++; |
1273 | |
1183 | |
1274 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1184 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1275 | esrv_send_face (ns, face_num, 0); |
1185 | esrv_send_face (ns, face_num, 0); |
1276 | } |
|
|
1277 | |
|
|
1278 | struct LayerCell |
|
|
1279 | { |
|
|
1280 | uint16 xy; |
|
|
1281 | short face; |
|
|
1282 | }; |
|
|
1283 | |
|
|
1284 | struct MapLayer |
|
|
1285 | { |
|
|
1286 | int count; |
|
|
1287 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1288 | }; |
|
|
1289 | |
|
|
1290 | /** Checkes if map cells have changed */ |
|
|
1291 | static int |
|
|
1292 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
|
|
1293 | { |
|
|
1294 | int k; |
|
|
1295 | |
|
|
1296 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1297 | return 1; |
|
|
1298 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1299 | { |
|
|
1300 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1301 | { |
|
|
1302 | return 1; |
|
|
1303 | } |
|
|
1304 | } |
|
|
1305 | return 0; |
|
|
1306 | } |
|
|
1307 | |
|
|
1308 | /** |
|
|
1309 | * Basically, what this does is pack the data into layers. |
|
|
1310 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1311 | * this data into. we return the end of the data. layers is |
|
|
1312 | * how many layers of data we should back. |
|
|
1313 | */ |
|
|
1314 | static uint8 * |
|
|
1315 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1316 | { |
|
|
1317 | int x, y, k; |
|
|
1318 | int face; |
|
|
1319 | unsigned char *fcur; |
|
|
1320 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1321 | |
|
|
1322 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1323 | layers[k].count = 0; |
|
|
1324 | fcur = cur; |
|
|
1325 | for (x = 0; x < ns->mapx; x++) |
|
|
1326 | { |
|
|
1327 | for (y = 0; y < ns->mapy; y++) |
|
|
1328 | { |
|
|
1329 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1330 | continue; |
|
|
1331 | if (newmap->cells[x][y].count == 0) |
|
|
1332 | { |
|
|
1333 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1334 | cur++; |
|
|
1335 | continue; |
|
|
1336 | } |
|
|
1337 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1338 | { |
|
|
1339 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1340 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1341 | layers[k].count++; |
|
|
1342 | } |
|
|
1343 | } |
|
|
1344 | } |
|
|
1345 | /* If no data, return now. */ |
|
|
1346 | if (fcur == cur && layers[0].count == 0) |
|
|
1347 | return cur; |
|
|
1348 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1349 | cur++; |
|
|
1350 | /* First pack by layers. */ |
|
|
1351 | for (k = 0; k < numlayers; k++) |
|
|
1352 | { |
|
|
1353 | if (layers[k].count == 0) |
|
|
1354 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1355 | have anything in it either */ |
|
|
1356 | /* Pack by entries in thie layer */ |
|
|
1357 | for (x = 0; x < layers[k].count;) |
|
|
1358 | { |
|
|
1359 | fcur = cur; |
|
|
1360 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1361 | cur++; |
|
|
1362 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1363 | cur++; |
|
|
1364 | face = layers[k].lcells[x].face; |
|
|
1365 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1366 | for (y = x; y < layers[k].count; y++) |
|
|
1367 | { |
|
|
1368 | if (layers[k].lcells[y].face == face) |
|
|
1369 | { |
|
|
1370 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1371 | cur++; |
|
|
1372 | layers[k].lcells[y].face = -1; |
|
|
1373 | } |
|
|
1374 | } |
|
|
1375 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1376 | /* forward over the now redundant data */ |
|
|
1377 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1378 | x++; |
|
|
1379 | } |
|
|
1380 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1381 | } |
|
|
1382 | return cur; |
|
|
1383 | } |
1186 | } |
1384 | |
1187 | |
1385 | /** Clears a map cell */ |
1188 | /** Clears a map cell */ |
1386 | static void |
1189 | static void |
1387 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1190 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1399 | #define MAX_LAYERS 3 |
1202 | #define MAX_LAYERS 3 |
1400 | |
1203 | |
1401 | /* Using a global really isn't a good approach, but saves the over head of |
1204 | /* Using a global really isn't a good approach, but saves the over head of |
1402 | * allocating and deallocating such a block of data each time run through, |
1205 | * allocating and deallocating such a block of data each time run through, |
1403 | * and saves the space of allocating this in the socket object when we only |
1206 | * and saves the space of allocating this in the socket object when we only |
1404 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1207 | * need it for this cycle. If the server is ever threaded, this needs to be |
1405 | * re-examined. |
1208 | * re-examined. |
1406 | */ |
1209 | */ |
1407 | |
|
|
1408 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1210 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1409 | |
1211 | |
1410 | /** |
1212 | /** |
1411 | * Returns true if any of the heads for this |
1213 | * Returns true if any of the heads for this |
1412 | * space is set. Returns false if all are blank - this is used |
1214 | * space is set. Returns false if all are blank - this is used |
1413 | * for empty space checking. |
1215 | * for empty space checking. |
1414 | */ |
1216 | */ |
1415 | static inline int |
1217 | static inline int |
1416 | have_head (int ax, int ay) |
1218 | have_head (int ax, int ay) |
1417 | { |
1219 | { |
1418 | |
|
|
1419 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1220 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1420 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1221 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1421 | return 1; |
1222 | return 1; |
|
|
1223 | |
1422 | return 0; |
1224 | return 0; |
1423 | } |
1225 | } |
1424 | |
1226 | |
1425 | /** |
1227 | /** |
1426 | * check_head is a bit simplistic version of update_space below. |
1228 | * check_head is a bit simplistic version of update_space below. |
1427 | * basically, it only checks the that the head on space ax,ay at layer |
1229 | * basically, it only checks the that the head on space ax,ay at layer |
1428 | * needs to get sent - if so, it adds the data, sending the head |
1230 | * needs to get sent - if so, it adds the data, sending the head |
1429 | * if needed, and returning 1. If this no data needs to get |
1231 | * if needed, and returning 1. If this no data needs to get |
1430 | * sent, it returns zero. |
1232 | * sent, it returns zero. |
1431 | */ |
1233 | */ |
1432 | static int |
1234 | static int |
1433 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1235 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1434 | { |
1236 | { |
… | |
… | |
1470 | * numbers the spaces differently - I think this was a leftover from |
1272 | * numbers the spaces differently - I think this was a leftover from |
1471 | * the map command, where the faces stack up. Sinces that is no longer |
1273 | * the map command, where the faces stack up. Sinces that is no longer |
1472 | * the case, it seems to make more sense to have these layer values |
1274 | * the case, it seems to make more sense to have these layer values |
1473 | * actually match. |
1275 | * actually match. |
1474 | */ |
1276 | */ |
1475 | |
|
|
1476 | static int |
1277 | static int |
1477 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1278 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1478 | { |
1279 | { |
1479 | object *ob, *head; |
1280 | object *ob, *head; |
1480 | uint16 face_num; |
1281 | uint16 face_num; |
… | |
… | |
1705 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1506 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1706 | |
1507 | |
1707 | /* If there is no object for this space, or if the face for the object |
1508 | /* If there is no object for this space, or if the face for the object |
1708 | * is the blank face, set the smoothlevel to zero. |
1509 | * is the blank face, set the smoothlevel to zero. |
1709 | */ |
1510 | */ |
1710 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1511 | if (!ob || ob->face == blank_face) |
1711 | smoothlevel = 0; |
1512 | smoothlevel = 0; |
1712 | else |
1513 | else |
1713 | { |
1514 | { |
1714 | smoothlevel = ob->smoothlevel; |
1515 | smoothlevel = ob->smoothlevel; |
1715 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1748 | if (ns->ext_mapinfos) |
1549 | if (ns->ext_mapinfos) |
1749 | { |
1550 | { |
1750 | if (ns->EMI_smooth) |
1551 | if (ns->EMI_smooth) |
1751 | result += 1; /*One byte for smoothlevel */ |
1552 | result += 1; /*One byte for smoothlevel */ |
1752 | } |
1553 | } |
|
|
1554 | |
1753 | return result; |
1555 | return result; |
1754 | } |
1556 | } |
1755 | |
1557 | |
1756 | /** |
1558 | /** |
1757 | * This function uses the new map1 protocol command to send the map |
1559 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1764 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1566 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1765 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1567 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1766 | * and use the other 4 bits for other informatiion. For full documentation |
1568 | * and use the other 4 bits for other informatiion. For full documentation |
1767 | * of what we send, see the doc/Protocol file. |
1569 | * of what we send, see the doc/Protocol file. |
1768 | * I will describe internally what we do: |
1570 | * I will describe internally what we do: |
1769 | * the socket->lastmap shows how the map last looked when sent to the client. |
1571 | * the ns->lastmap shows how the map last looked when sent to the client. |
1770 | * in the lastmap structure, there is a cells array, which is set to the |
1572 | * in the lastmap structure, there is a cells array, which is set to the |
1771 | * maximum viewable size (As set in config.h). |
1573 | * maximum viewable size (As set in config.h). |
1772 | * in the cells, there are faces and a count value. |
1574 | * in the cells, there are faces and a count value. |
1773 | * we use the count value to hold the darkness value. If -1, then this space |
1575 | * we use the count value to hold the darkness value. If -1, then this space |
1774 | * is not viewable. |
1576 | * is not viewable. |
… | |
… | |
1785 | uint8 eentrysize; |
1587 | uint8 eentrysize; |
1786 | uint16 ewhatstart, ewhatflag; |
1588 | uint16 ewhatstart, ewhatflag; |
1787 | uint8 extendedinfos; |
1589 | uint8 extendedinfos; |
1788 | maptile *m; |
1590 | maptile *m; |
1789 | |
1591 | |
1790 | client &socket = *pl->contr->socket; |
1592 | client &socket = *pl->contr->ns; |
1791 | |
1593 | |
1792 | check_map_change (pl->contr); |
1594 | check_map_change (pl->contr); |
1793 | |
1595 | |
1794 | packet sl; |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1795 | packet esl; |
1597 | packet esl; |
1796 | |
1598 | |
1797 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1798 | startlen = sl.length (); |
1599 | startlen = sl.length (); |
1799 | |
1600 | |
1800 | /*Extendedmapinfo structure initialisation */ |
1601 | /*Extendedmapinfo structure initialisation */ |
1801 | if (socket.ext_mapinfos) |
1602 | if (socket.ext_mapinfos) |
1802 | { |
1603 | { |
… | |
… | |
1846 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1647 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1847 | { |
1648 | { |
1848 | ax = 0; |
1649 | ax = 0; |
1849 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1650 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1850 | { |
1651 | { |
1851 | |
|
|
1852 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1652 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1853 | |
1653 | |
1854 | /* If this space is out of the normal viewable area, we only check |
1654 | /* If this space is out of the normal viewable area, we only check |
1855 | * the heads value ax or ay will only be greater than what |
1655 | * the heads value ax or ay will only be greater than what |
1856 | * the client wants if using the map1a command - this is because |
1656 | * the client wants if using the map1a command - this is because |
… | |
… | |
1918 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1718 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1919 | } |
1719 | } |
1920 | } |
1720 | } |
1921 | else if (d > 3) |
1721 | else if (d > 3) |
1922 | { |
1722 | { |
|
|
1723 | m->touch (); |
|
|
1724 | |
1923 | int need_send = 0, count; |
1725 | int need_send = 0, count; |
1924 | |
1726 | |
1925 | /* This block deals with spaces that are not visible for whatever |
1727 | /* This block deals with spaces that are not visible for whatever |
1926 | * reason. Still may need to send the head for this space. |
1728 | * reason. Still may need to send the head for this space. |
1927 | */ |
1729 | */ |
… | |
… | |
1960 | else |
1762 | else |
1961 | sl.reset (oldlen); |
1763 | sl.reset (oldlen); |
1962 | } |
1764 | } |
1963 | else |
1765 | else |
1964 | { |
1766 | { |
|
|
1767 | m->touch (); |
|
|
1768 | |
1965 | /* In this block, the space is visible or there are head objects |
1769 | /* In this block, the space is visible or there are head objects |
1966 | * we need to send. |
1770 | * we need to send. |
1967 | */ |
1771 | */ |
1968 | |
1772 | |
1969 | /* Rather than try to figure out what everything that we might |
1773 | /* Rather than try to figure out what everything that we might |
… | |
… | |
2186 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1990 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2187 | return; |
1991 | return; |
2188 | |
1992 | |
2189 | memset (&newmap, 0, sizeof (struct Map)); |
1993 | memset (&newmap, 0, sizeof (struct Map)); |
2190 | |
1994 | |
2191 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1995 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2192 | { |
|
|
2193 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1996 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2194 | { |
1997 | { |
2195 | ax = i; |
1998 | ax = i; |
2196 | ay = j; |
1999 | ay = j; |
2197 | m = pm; |
2000 | m = pm; |
2198 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2001 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2002 | |
2199 | if (mflags & P_OUT_OF_MAP) |
2003 | if (mflags & P_OUT_OF_MAP) |
2200 | continue; |
2004 | continue; |
2201 | if (mflags & P_NEED_UPDATE) |
2005 | |
2202 | update_position (m, ax, ay); |
|
|
2203 | /* If a map is visible to the player, we don't want to swap it out |
2006 | /* If a map is visible to the player, we don't want to swap it out |
2204 | * just to reload it. This should really call something like |
2007 | * just to reload it. This should really call something like |
2205 | * swap_map, but this is much more efficient and 'good enough' |
2008 | * swap_map, but this is much more efficient and 'good enough' |
2206 | */ |
2009 | */ |
2207 | if (mflags & P_NEW_MAP) |
2010 | if (mflags & P_NEW_MAP) |
2208 | m->timeout = 50; |
2011 | m->timeout = 50; |
2209 | } |
2012 | } |
2210 | } |
2013 | |
2211 | /* do LOS after calls to update_position */ |
2014 | /* do LOS after calls to update_position */ |
2212 | if (pl->contr->do_los) |
2015 | if (pl->contr->do_los) |
2213 | { |
2016 | { |
2214 | update_los (pl); |
2017 | update_los (pl); |
2215 | pl->contr->do_los = 0; |
2018 | pl->contr->do_los = 0; |
… | |
… | |
2230 | |
2033 | |
2231 | /*****************************************************************************/ |
2034 | /*****************************************************************************/ |
2232 | void |
2035 | void |
2233 | send_plugin_custom_message (object *pl, char *buf) |
2036 | send_plugin_custom_message (object *pl, char *buf) |
2234 | { |
2037 | { |
2235 | pl->contr->socket->send_packet (buf); |
2038 | pl->contr->ns->send_packet (buf); |
2236 | } |
2039 | } |
2237 | |
2040 | |
2238 | /** |
2041 | /** |
2239 | * This sends the skill number to name mapping. We ignore |
2042 | * This sends the skill number to name mapping. We ignore |
2240 | * the params - we always send the same info no matter what. |
2043 | * the params - we always send the same info no matter what. |
… | |
… | |
2285 | * it then sends an updspell packet for each spell that has changed in this way |
2088 | * it then sends an updspell packet for each spell that has changed in this way |
2286 | */ |
2089 | */ |
2287 | void |
2090 | void |
2288 | esrv_update_spells (player *pl) |
2091 | esrv_update_spells (player *pl) |
2289 | { |
2092 | { |
|
|
2093 | if (!pl->ns) |
|
|
2094 | return; |
|
|
2095 | |
2290 | if (!pl->socket->monitor_spells) |
2096 | if (!pl->ns->monitor_spells) |
2291 | return; |
2097 | return; |
2292 | |
2098 | |
2293 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2099 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2294 | { |
2100 | { |
2295 | if (spell->type == SPELL) |
2101 | if (spell->type == SPELL) |
… | |
… | |
2325 | |
2131 | |
2326 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2132 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2327 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2133 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2328 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2134 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2329 | |
2135 | |
2330 | pl->socket->send_packet (sl); |
2136 | pl->ns->send_packet (sl); |
2331 | } |
2137 | } |
2332 | } |
2138 | } |
2333 | } |
2139 | } |
2334 | } |
2140 | } |
2335 | |
2141 | |
2336 | void |
2142 | void |
2337 | esrv_remove_spell (player *pl, object *spell) |
2143 | esrv_remove_spell (player *pl, object *spell) |
2338 | { |
2144 | { |
2339 | if (!pl->socket->monitor_spells) |
2145 | if (!pl->ns->monitor_spells) |
2340 | return; |
2146 | return; |
2341 | |
2147 | |
2342 | if (!pl || !spell || spell->env != pl->ob) |
2148 | if (!pl || !spell || spell->env != pl->ob) |
2343 | { |
2149 | { |
2344 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2150 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2345 | return; |
2151 | return; |
2346 | } |
2152 | } |
2347 | |
2153 | |
2348 | packet sl; |
2154 | packet sl ("delspell"); |
2349 | |
2155 | |
2350 | sl << "delspell " |
|
|
2351 | << uint32 (spell->count); |
2156 | sl << uint32 (spell->count); |
2352 | |
2157 | |
2353 | pl->socket->send_packet (sl); |
2158 | pl->ns->send_packet (sl); |
2354 | } |
2159 | } |
2355 | |
2160 | |
2356 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2161 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2357 | static void |
2162 | static void |
2358 | append_spell (player *pl, packet &sl, object *spell) |
2163 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2406 | { |
2211 | { |
2407 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2212 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2408 | return; |
2213 | return; |
2409 | } |
2214 | } |
2410 | |
2215 | |
2411 | if (!pl->socket->monitor_spells) |
2216 | if (!pl->ns->monitor_spells) |
2412 | return; |
2217 | return; |
2413 | |
2218 | |
2414 | packet sl; |
2219 | packet sl ("addspell"); |
2415 | |
|
|
2416 | sl << "addspell "; |
|
|
2417 | |
2220 | |
2418 | if (!spell) |
2221 | if (!spell) |
2419 | { |
2222 | { |
2420 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2223 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2421 | { |
2224 | { |
… | |
… | |
2435 | if (spell->type != SPELL) |
2238 | if (spell->type != SPELL) |
2436 | continue; |
2239 | continue; |
2437 | |
2240 | |
2438 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2241 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2439 | { |
2242 | { |
2440 | pl->socket->send_packet (sl); |
2243 | pl->ns->send_packet (sl); |
2441 | |
2244 | |
2442 | sl.reset (); |
2245 | sl.reset (); |
2443 | sl << "addspell "; |
2246 | sl << "addspell "; |
2444 | } |
2247 | } |
2445 | |
2248 | |
… | |
… | |
2459 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2262 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2460 | fatal (0); |
2263 | fatal (0); |
2461 | } |
2264 | } |
2462 | |
2265 | |
2463 | /* finally, we can send the packet */ |
2266 | /* finally, we can send the packet */ |
2464 | pl->socket->send_packet (sl); |
2267 | pl->ns->send_packet (sl); |
2465 | } |
2268 | } |
2466 | |
2269 | |