… | |
… | |
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->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
156 | |
144 | |
157 | if (socket.newmapcmd == 1) |
145 | if (pl->ns->newmapcmd == 1) |
158 | socket.send_packet ("newmap"); |
146 | pl->ns->send_packet ("newmap"); |
159 | |
147 | |
160 | socket.update_look = 1; |
148 | pl->ns->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->ns; |
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 | { |
… | |
… | |
244 | buf += 8; |
280 | buf += 8; |
245 | |
281 | |
246 | // initial map and its origin |
282 | // initial map and its origin |
247 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
248 | sint16 dx, dy; |
284 | sint16 dx, dy; |
249 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
250 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
251 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
252 | |
288 | |
253 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
254 | { |
290 | { |
255 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
306 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
307 | } |
343 | } |
308 | else |
344 | else |
309 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
310 | |
346 | |
311 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->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; |
574 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
539 | |
|
|
540 | oldsettings = settings; |
|
|
541 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
542 | ns->send_packet ("addme_failed"); |
|
|
543 | else |
|
|
544 | ns->send_packet ("addme_success"); |
|
|
545 | |
|
|
546 | settings = oldsettings; |
|
|
547 | } |
575 | } |
548 | |
576 | |
549 | /** Reply to ExtendedInfos command */ |
577 | /** Reply to ExtendedInfos command */ |
550 | void |
578 | void |
551 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
579 | ToggleExtendedInfos (char *buf, int len, client * ns) |
552 | { |
580 | { |
553 | char cmdback[MAX_BUF]; |
581 | char cmdback[MAX_BUF]; |
554 | char command[50]; |
582 | char command[50]; |
555 | int info, nextinfo; |
583 | int info, nextinfo; |
556 | |
584 | |
… | |
… | |
607 | #define MSG_TYPE_MONUMENT 5 |
635 | #define MSG_TYPE_MONUMENT 5 |
608 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
636 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
609 | |
637 | |
610 | /** Reply to ExtendedInfos command */ |
638 | /** Reply to ExtendedInfos command */ |
611 | void |
639 | void |
612 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
640 | ToggleExtendedText (char *buf, int len, client * ns) |
613 | { |
641 | { |
614 | char cmdback[MAX_BUF]; |
642 | char cmdback[MAX_BUF]; |
615 | char temp[10]; |
643 | char temp[10]; |
616 | char command[50]; |
644 | char command[50]; |
617 | int info, nextinfo, i, flag; |
645 | int info, nextinfo, i, flag; |
… | |
… | |
668 | * a piece of data from us that we know the client wants. So |
696 | * 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 |
697 | * if we know the client wants it, might as well push it to the |
670 | * client. |
698 | * client. |
671 | */ |
699 | */ |
672 | static void |
700 | static void |
673 | SendSmooth (client_socket * ns, uint16 face) |
701 | SendSmooth (client *ns, uint16 face) |
674 | { |
702 | { |
675 | uint16 smoothface; |
703 | uint16 smoothface; |
676 | |
704 | |
677 | /* If we can't find a face, return and set it so we won't try to send this |
705 | /* If we can't find a face, return and set it so we won't try to send this |
678 | * again. |
706 | * again. |
… | |
… | |
688 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
716 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
689 | esrv_send_face (ns, smoothface, 0); |
717 | esrv_send_face (ns, smoothface, 0); |
690 | |
718 | |
691 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
719 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
692 | |
720 | |
693 | packet sl; |
721 | packet sl ("smooth"); |
694 | |
722 | |
695 | sl << "smooth " |
|
|
696 | << uint16 (face) |
723 | sl << uint16 (face) |
697 | << uint16 (smoothface); |
724 | << uint16 (smoothface); |
698 | |
725 | |
699 | ns->send_packet (sl); |
726 | ns->send_packet (sl); |
700 | } |
727 | } |
701 | |
728 | |
702 | /** |
729 | /** |
703 | * Tells client the picture it has to use |
730 | * Tells client the picture it has to use |
704 | * to smooth a picture number given as argument. |
731 | * to smooth a picture number given as argument. |
705 | */ |
732 | */ |
706 | void |
733 | void |
707 | AskSmooth (char *buf, int len, client_socket * ns) |
734 | AskSmooth (char *buf, int len, client *ns) |
708 | { |
735 | { |
709 | uint16 facenbr; |
736 | SendSmooth (ns, atoi (buf)); |
710 | |
|
|
711 | facenbr = atoi (buf); |
|
|
712 | SendSmooth (ns, facenbr); |
|
|
713 | } |
737 | } |
714 | |
738 | |
715 | /** |
739 | /** |
716 | * This handles the general commands from the client (ie, north, fire, cast, |
740 | * This handles the general commands from the client (ie, north, fire, cast, |
717 | * etc.) |
741 | * etc.) |
718 | */ |
742 | */ |
719 | void |
743 | void |
720 | PlayerCmd (char *buf, int len, player *pl) |
744 | PlayerCmd (char *buf, int len, player *pl) |
721 | { |
745 | { |
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 |
746 | /* Check if there is a count. In theory, a zero count could also be |
734 | * sent, so check for that also. |
747 | * sent, so check for that also. |
735 | */ |
748 | */ |
736 | if (atoi (buf) || buf[0] == '0') |
749 | if (atoi (buf) || buf[0] == '0') |
737 | { |
750 | { |
738 | pl->count = atoi ((char *) buf); |
751 | pl->count = atoi ((char *) buf); |
|
|
752 | |
739 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
753 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
740 | if (!buf) |
754 | if (!buf) |
741 | { |
|
|
742 | #ifdef ESRV_DEBUG |
|
|
743 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
744 | #endif |
|
|
745 | return; |
755 | return; |
746 | } |
756 | |
747 | buf++; |
757 | buf++; |
748 | } |
758 | } |
749 | /* This should not happen anymore. */ |
759 | |
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); |
760 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
761 | |
756 | /* Perhaps something better should be done with a left over count. |
762 | /* Perhaps something better should be done with a left over count. |
757 | * Cleaning up the input should probably be done first - all actions |
763 | * 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 |
764 | * for the command that issued the count should be done before any other |
759 | * commands. |
765 | * commands. |
760 | */ |
766 | */ |
761 | |
|
|
762 | pl->count = 0; |
767 | pl->count = 0; |
763 | |
|
|
764 | } |
768 | } |
765 | |
769 | |
766 | |
770 | |
767 | /** |
771 | /** |
768 | * This handles the general commands from the client (ie, north, fire, cast, |
772 | * This handles the general commands from the client (ie, north, fire, cast, |
769 | * etc.). It is a lot like PlayerCmd above, but is called with the |
773 | * etc.). It is a lot like PlayerCmd above, but is called with the |
770 | * 'ncom' method which gives more information back to the client so it |
774 | * 'ncom' method which gives more information back to the client so it |
771 | * can throttle. |
775 | * can throttle. |
772 | */ |
776 | */ |
773 | void |
777 | void |
774 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
778 | NewPlayerCmd (char *buf, int len, player *pl) |
775 | { |
779 | { |
776 | int time, repeat; |
|
|
777 | char command[MAX_BUF]; |
|
|
778 | int pktlen; |
|
|
779 | |
|
|
780 | if (len < 7) |
780 | if (len <= 6) |
781 | { |
781 | { |
782 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
782 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
783 | return; |
783 | return; |
784 | } |
784 | } |
785 | |
785 | |
786 | pktlen = net_uint16 (buf); |
786 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
787 | repeat = net_uint32 (buf + 2); |
787 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
788 | |
788 | |
789 | /* -1 is special - no repeat, but don't update */ |
789 | /* -1 is special - no repeat, but don't update */ |
790 | if (repeat != -1) |
790 | if (repeat != -1) |
791 | pl->count = repeat; |
791 | pl->count = repeat; |
792 | |
792 | |
793 | if ((len - 4) >= MAX_BUF) |
793 | buf += 6; //len -= 6; |
794 | len = MAX_BUF - 5; |
|
|
795 | |
794 | |
796 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
797 | command[len - 4] = '\0'; |
|
|
798 | |
|
|
799 | /* The following should never happen with a proper or honest client. |
|
|
800 | * Therefore, the error message doesn't have to be too clear - if |
|
|
801 | * someone is playing with a hacked/non working client, this gives them |
|
|
802 | * an idea of the problem, but they deserve what they get |
|
|
803 | */ |
|
|
804 | if (pl->state != ST_PLAYING) |
|
|
805 | { |
|
|
806 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
807 | return; |
|
|
808 | } |
|
|
809 | |
|
|
810 | /* This should not happen anymore. */ |
|
|
811 | if (pl->ob->speed_left < -1.0) |
|
|
812 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
813 | |
|
|
814 | /* In c_new.c */ |
|
|
815 | execute_newserver_command (pl->ob, (char *) command); |
795 | execute_newserver_command (pl->ob, buf); |
|
|
796 | |
816 | /* Perhaps something better should be done with a left over count. |
797 | /* Perhaps something better should be done with a left over count. |
817 | * Cleaning up the input should probably be done first - all actions |
798 | * Cleaning up the input should probably be done first - all actions |
818 | * for the command that issued the count should be done before any other |
799 | * for the command that issued the count should be done before any other |
819 | * commands. |
800 | * commands. |
820 | */ |
801 | */ |
821 | pl->count = 0; |
802 | pl->count = 0; |
822 | |
803 | |
|
|
804 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
823 | if (FABS (pl->ob->speed) < 0.001) |
805 | int time = FABS (pl->ob->speed) < 0.001 |
824 | time = MAX_TIME * 100; |
806 | ? time = MAX_TIME * 100 |
825 | else |
|
|
826 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
807 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
827 | |
808 | |
828 | /* Send confirmation of command execution now */ |
809 | /* Send confirmation of command execution now */ |
829 | |
810 | packet sl ("comc"); |
830 | packet sl; |
|
|
831 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
811 | sl << uint16 (cmdid) << uint32 (time); |
832 | pl->socket->send_packet (sl); |
812 | pl->ns->send_packet (sl); |
833 | } |
813 | } |
834 | |
|
|
835 | |
814 | |
836 | /** This is a reply to a previous query. */ |
815 | /** This is a reply to a previous query. */ |
837 | void |
816 | void |
838 | ReplyCmd (char *buf, int len, player *pl) |
817 | ReplyCmd (char *buf, int len, client *ns) |
839 | { |
818 | { |
|
|
819 | if (ns->state == ST_CUSTOM) |
|
|
820 | { |
|
|
821 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
822 | return; |
|
|
823 | } |
|
|
824 | |
|
|
825 | if (!ns->pl) |
|
|
826 | return; //TODO: depends on the exact reply we are after |
|
|
827 | //TODO: but right now, we always have a ns->pl |
|
|
828 | |
|
|
829 | player *pl = ns->pl; |
|
|
830 | |
840 | /* This is to synthesize how the data would be stored if it |
831 | /* This is to synthesize how the data would be stored if it |
841 | * was normally entered. A bit of a hack, and should be cleaned up |
832 | * was normally entered. A bit of a hack, and should be cleaned up |
842 | * once all the X11 code is removed from the server. |
833 | * once all the X11 code is removed from the server. |
843 | * |
834 | * |
844 | * We pass 13 to many of the functions because this way they |
835 | * We pass 13 to many of the functions because this way they |
845 | * think it was the carriage return that was entered, and the |
836 | * think it was the carriage return that was entered, and the |
846 | * function then does not try to do additional input. |
837 | * function then does not try to do additional input. |
847 | */ |
838 | */ |
848 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
839 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
849 | |
840 | |
850 | /* this avoids any hacking here */ |
841 | /* this avoids any hacking here */ |
851 | |
842 | |
852 | switch (pl->state) |
843 | switch (ns->state) |
853 | { |
844 | { |
854 | case ST_PLAYING: |
845 | case ST_PLAYING: |
855 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
846 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
856 | break; |
847 | break; |
857 | |
848 | |
858 | case ST_PLAY_AGAIN: |
|
|
859 | /* We can check this for return value (2==quit). Maybe we |
|
|
860 | * should, and do something appropriate? |
|
|
861 | */ |
|
|
862 | receive_play_again (pl->ob, buf[0]); |
|
|
863 | break; |
|
|
864 | |
|
|
865 | case ST_ROLL_STAT: |
|
|
866 | key_roll_stat (pl->ob, buf[0]); |
|
|
867 | break; |
|
|
868 | |
|
|
869 | case ST_CHANGE_CLASS: |
849 | case ST_CHANGE_CLASS: |
870 | |
|
|
871 | key_change_class (pl->ob, buf[0]); |
850 | key_change_class (pl->ob, buf[0]); |
872 | break; |
851 | break; |
873 | |
852 | |
874 | case ST_CONFIRM_QUIT: |
853 | case ST_CONFIRM_QUIT: |
875 | key_confirm_quit (pl->ob, buf[0]); |
854 | key_confirm_quit (pl->ob, buf[0]); |
876 | break; |
855 | break; |
877 | |
856 | |
878 | case ST_CONFIGURE: |
|
|
879 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
880 | pl->state = ST_PLAYING; |
|
|
881 | break; |
|
|
882 | |
|
|
883 | case ST_GET_NAME: |
|
|
884 | receive_player_name (pl->ob, 13); |
|
|
885 | break; |
|
|
886 | |
|
|
887 | case ST_GET_PASSWORD: |
|
|
888 | case ST_CONFIRM_PASSWORD: |
|
|
889 | receive_player_password (pl->ob, 13); |
|
|
890 | break; |
|
|
891 | |
|
|
892 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
857 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
893 | receive_party_password (pl->ob, 13); |
858 | receive_party_password (pl->ob, 13); |
894 | break; |
859 | break; |
895 | |
860 | |
896 | default: |
861 | default: |
897 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
862 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
898 | } |
863 | } |
899 | } |
864 | } |
900 | |
865 | |
901 | /** |
866 | /** |
902 | * Client tells its version. If there is a mismatch, we close the |
867 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
904 | * something older than the server. If we assume the client will be |
869 | * something older than the server. If we assume the client will be |
905 | * backwards compatible, having it be a later version should not be a |
870 | * backwards compatible, having it be a later version should not be a |
906 | * problem. |
871 | * problem. |
907 | */ |
872 | */ |
908 | void |
873 | void |
909 | VersionCmd (char *buf, int len, client_socket * ns) |
874 | VersionCmd (char *buf, int len, client * ns) |
910 | { |
875 | { |
911 | char *cp; |
|
|
912 | char version_warning[256]; |
|
|
913 | |
|
|
914 | if (!buf) |
876 | if (!buf) |
915 | { |
877 | { |
916 | LOG (llevError, "CS: received corrupted version command\n"); |
878 | LOG (llevError, "CS: received corrupted version command\n"); |
917 | return; |
879 | return; |
918 | } |
880 | } |
919 | |
881 | |
920 | ns->cs_version = atoi (buf); |
882 | ns->cs_version = atoi (buf); |
921 | ns->sc_version = ns->cs_version; |
883 | ns->sc_version = ns->cs_version; |
|
|
884 | |
|
|
885 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
886 | |
|
|
887 | |
|
|
888 | //TODO: should log here just for statistics |
|
|
889 | |
922 | if (VERSION_CS != ns->cs_version) |
890 | //if (VERSION_CS != ns->cs_version) |
923 | { |
891 | // unchecked; |
924 | #ifdef ESRV_DEBUG |
892 | |
925 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
926 | #endif |
|
|
927 | } |
|
|
928 | cp = strchr (buf + 1, ' '); |
893 | char *cp = strchr (buf + 1, ' '); |
929 | if (!cp) |
894 | if (!cp) |
930 | return; |
895 | return; |
|
|
896 | |
931 | ns->sc_version = atoi (cp); |
897 | ns->sc_version = atoi (cp); |
|
|
898 | |
932 | if (VERSION_SC != ns->sc_version) |
899 | //if (VERSION_SC != ns->sc_version) |
933 | { |
900 | // unchecked; |
934 | #ifdef ESRV_DEBUG |
901 | |
935 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
936 | #endif |
|
|
937 | } |
|
|
938 | cp = strchr (cp + 1, ' '); |
902 | cp = strchr (cp + 1, ' '); |
|
|
903 | |
939 | if (cp) |
904 | if (cp) |
940 | { |
905 | { |
941 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
906 | assign (ns->version, cp + 1); |
942 | |
907 | |
943 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
944 | |
|
|
945 | /* This is first implementation - i skip all beta DX clients with it |
|
|
946 | * Add later stuff here for other clients |
|
|
947 | */ |
|
|
948 | |
|
|
949 | /* these are old dxclients */ |
|
|
950 | /* Version 1024 added support for singular + plural name values - |
|
|
951 | * requiing this minimal value reduces complexity of that code, and it |
|
|
952 | * has been around for a long time. |
|
|
953 | */ |
|
|
954 | if (ns->sc_version < 1026) |
908 | if (ns->sc_version < 1026) |
955 | { |
909 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
956 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
957 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
910 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
958 | ns->send_packet (version_warning); |
|
|
959 | } |
|
|
960 | |
|
|
961 | } |
911 | } |
962 | } |
912 | } |
963 | |
913 | |
964 | /** sound related functions. */ |
914 | /** sound related functions. */ |
965 | |
|
|
966 | void |
915 | void |
967 | SetSound (char *buf, int len, client_socket * ns) |
916 | SetSound (char *buf, int len, client * ns) |
968 | { |
917 | { |
969 | ns->sound = atoi (buf); |
918 | ns->sound = atoi (buf); |
970 | } |
919 | } |
971 | |
920 | |
972 | /** client wants the map resent */ |
921 | /** client wants the map resent */ |
973 | |
922 | |
974 | void |
923 | void |
975 | MapRedrawCmd (char *buf, int len, player *pl) |
924 | MapRedrawCmd (char *buf, int len, player *pl) |
976 | { |
925 | { |
977 | |
|
|
978 | /* This function is currently disabled; just clearing the map state results in |
926 | /* This function is currently disabled; just clearing the map state results in |
979 | * display errors. It should clear the cache and send a newmap command. |
927 | * display errors. It should clear the cache and send a newmap command. |
980 | * Unfortunately this solution does not work because some client versions send |
928 | * Unfortunately this solution does not work because some client versions send |
981 | * a mapredraw command after receiving a newmap command. |
929 | * a mapredraw command after receiving a newmap command. |
982 | */ |
930 | */ |
983 | #if 0 |
|
|
984 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
985 | * clear the "cache" |
|
|
986 | */ |
|
|
987 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
988 | draw_client_map (pl->ob); |
|
|
989 | #endif |
|
|
990 | } |
931 | } |
991 | |
932 | |
992 | /** |
933 | /** |
993 | * Moves an object (typically, container to inventory). |
934 | * Moves an object (typically, container to inventory). |
994 | * syntax is: move (to) (tag) (nrof) |
935 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
997 | MoveCmd (char *buf, int len, player *pl) |
938 | MoveCmd (char *buf, int len, player *pl) |
998 | { |
939 | { |
999 | int vals[3], i; |
940 | int vals[3], i; |
1000 | |
941 | |
1001 | /* A little funky here. We only cycle for 2 records, because |
942 | /* A little funky here. We only cycle for 2 records, because |
1002 | * we obviously am not going to find a space after the third |
943 | * we obviously are not going to find a space after the third |
1003 | * record. Perhaps we should just replace this with a |
944 | * record. Perhaps we should just replace this with a |
1004 | * sscanf? |
945 | * sscanf? |
1005 | */ |
946 | */ |
1006 | for (i = 0; i < 2; i++) |
947 | for (i = 0; i < 2; i++) |
1007 | { |
948 | { |
1008 | vals[i] = atoi (buf); |
949 | vals[i] = atoi (buf); |
|
|
950 | |
1009 | if (!(buf = strchr (buf, ' '))) |
951 | if (!(buf = strchr (buf, ' '))) |
1010 | { |
952 | { |
1011 | LOG (llevError, "Incomplete move command: %s\n", buf); |
953 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1012 | return; |
954 | return; |
1013 | } |
955 | } |
|
|
956 | |
1014 | buf++; |
957 | buf++; |
1015 | } |
958 | } |
|
|
959 | |
1016 | vals[2] = atoi (buf); |
960 | vals[2] = atoi (buf); |
1017 | |
961 | |
1018 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
962 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1019 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
963 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1020 | } |
964 | } |
1021 | |
|
|
1022 | |
|
|
1023 | |
965 | |
1024 | /****************************************************************************** |
966 | /****************************************************************************** |
1025 | * |
967 | * |
1026 | * Start of commands the server sends to the client. |
968 | * Start of commands the server sends to the client. |
1027 | * |
969 | * |
… | |
… | |
1030 | /** |
972 | /** |
1031 | * Asks the client to query the user. This way, the client knows |
973 | * Asks the client to query the user. This way, the client knows |
1032 | * it needs to send something back (vs just printing out a message) |
974 | * it needs to send something back (vs just printing out a message) |
1033 | */ |
975 | */ |
1034 | void |
976 | void |
1035 | send_query (client_socket * ns, uint8 flags, char *text) |
977 | send_query (client *ns, uint8 flags, char *text) |
1036 | { |
978 | { |
1037 | char buf[MAX_BUF]; |
|
|
1038 | |
|
|
1039 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
979 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1040 | ns->send_packet (buf); |
|
|
1041 | } |
980 | } |
1042 | |
981 | |
1043 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
982 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1044 | Old = New; \ |
983 | Old = New; \ |
1045 | sl << uint8 (Type) << uint64 (New); \ |
984 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1075 | esrv_update_stats (player *pl) |
1014 | esrv_update_stats (player *pl) |
1076 | { |
1015 | { |
1077 | char buf[MAX_BUF]; |
1016 | char buf[MAX_BUF]; |
1078 | uint16 flags; |
1017 | uint16 flags; |
1079 | |
1018 | |
1080 | packet sl; |
1019 | packet sl ("stats"); |
1081 | sl << "stats "; |
|
|
1082 | |
1020 | |
1083 | if (pl->ob != NULL) |
1021 | if (pl->ob) |
1084 | { |
1022 | { |
1085 | 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); |
1086 | 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); |
1087 | 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); |
1088 | 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); |
1089 | 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); |
1090 | 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); |
1091 | 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); |
1092 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1093 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1094 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1095 | 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); |
1096 | 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); |
1097 | 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); |
1098 | } |
1036 | } |
1099 | |
1037 | |
1100 | if (pl->socket->exp64) |
1038 | if (pl->ns->exp64) |
1101 | { |
|
|
1102 | uint8 s; |
|
|
1103 | |
|
|
1104 | for (s = 0; s < NUM_SKILLS; s++) |
1039 | for (int s = 0; s < NUM_SKILLS; s++) |
1105 | { |
|
|
1106 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1040 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1107 | { |
1041 | { |
1108 | /* Always send along the level if exp changes. This is only |
1042 | /* Always send along the level if exp changes. This is only |
1109 | * 1 extra byte, but keeps processing simpler. |
1043 | * 1 extra byte, but keeps processing simpler. |
1110 | */ |
1044 | */ |
1111 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1045 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1112 | << uint8 (pl->last_skill_ob[s]->level) |
1046 | << uint8 (pl->last_skill_ob[s]->level) |
1113 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1047 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1114 | |
1048 | |
1115 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1049 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1116 | } |
1050 | } |
1117 | } |
|
|
1118 | } |
|
|
1119 | |
1051 | |
1120 | if (pl->socket->exp64) |
1052 | if (pl->ns->exp64) |
1121 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1053 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1122 | else |
1054 | else |
1123 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1055 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1124 | |
1056 | |
1125 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1057 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1138 | if (pl->run_on) |
1070 | if (pl->run_on) |
1139 | flags |= SF_RUNON; |
1071 | flags |= SF_RUNON; |
1140 | |
1072 | |
1141 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1073 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1142 | |
1074 | |
1143 | if (pl->socket->sc_version < 1025) |
1075 | if (pl->ns->sc_version < 1025) |
1144 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1076 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1145 | else |
1077 | else |
1146 | { |
|
|
1147 | int i; |
|
|
1148 | |
|
|
1149 | for (i = 0; i < NROFATTACKS; i++) |
1078 | for (int i = 0; i < NROFATTACKS; i++) |
1150 | { |
1079 | { |
1151 | /* Skip ones we won't send */ |
1080 | /* Skip ones we won't send */ |
1152 | if (atnr_cs_stat[i] == -1) |
1081 | if (atnr_cs_stat[i] == -1) |
1153 | continue; |
1082 | continue; |
1154 | |
1083 | |
1155 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1084 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1156 | } |
1085 | } |
1157 | } |
|
|
1158 | |
1086 | |
1159 | if (pl->socket->monitor_spells) |
1087 | if (pl->ns->monitor_spells) |
1160 | { |
1088 | { |
1161 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1089 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1162 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1090 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1163 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1091 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1164 | } |
1092 | } |
1165 | |
1093 | |
1166 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1094 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1167 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1095 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1168 | set_title (pl->ob, buf); |
1096 | set_title (pl->ob, buf); |
1169 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1097 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1170 | |
1098 | |
1171 | /* Only send it away if we have some actual data */ |
1099 | /* Only send it away if we have some actual data */ |
1172 | if (sl.length () > 6) |
1100 | if (sl.length () > 6) |
1173 | pl->socket->send_packet (sl); |
1101 | pl->ns->send_packet (sl); |
1174 | } |
1102 | } |
1175 | |
1103 | |
1176 | /** |
1104 | /** |
1177 | * Tells the client that here is a player it should start using. |
1105 | * Tells the client that here is a player it should start using. |
1178 | */ |
1106 | */ |
1179 | void |
1107 | void |
1180 | esrv_new_player (player *pl, uint32 weight) |
1108 | esrv_new_player (player *pl, uint32 weight) |
1181 | { |
1109 | { |
1182 | pl->last_weight = weight; |
1110 | pl->last_weight = weight; |
1183 | |
1111 | |
1184 | packet sl; |
1112 | packet sl ("player"); |
1185 | sl << "player "; |
|
|
1186 | |
1113 | |
1187 | sl << uint32 (pl->ob->count) |
1114 | sl << uint32 (pl->ob->count) |
1188 | << uint32 (weight) |
1115 | << uint32 (weight) |
1189 | << uint32 (pl->ob->face->number) |
1116 | << uint32 (pl->ob->face->number) |
1190 | << data8 (pl->ob->name); |
1117 | << data8 (pl->ob->name); |
1191 | |
1118 | |
1192 | pl->socket->send_packet (sl); |
1119 | pl->ns->send_packet (sl); |
1193 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1120 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1194 | } |
1121 | } |
1195 | |
1122 | |
1196 | /** |
1123 | /** |
1197 | * Need to send an animation sequence to the client. |
1124 | * Need to send an animation sequence to the client. |
… | |
… | |
1199 | * sent them the face yet (this can become quite costly in terms of |
1126 | * sent them the face yet (this can become quite costly in terms of |
1200 | * how much we are sending - on the other hand, this should only happen |
1127 | * how much we are sending - on the other hand, this should only happen |
1201 | * when the player logs in and picks stuff up. |
1128 | * when the player logs in and picks stuff up. |
1202 | */ |
1129 | */ |
1203 | void |
1130 | void |
1204 | esrv_send_animation (client_socket * ns, short anim_num) |
1131 | esrv_send_animation (client * ns, short anim_num) |
1205 | { |
1132 | { |
1206 | int i; |
|
|
1207 | |
|
|
1208 | /* Do some checking on the anim_num we got. Note that the animations |
1133 | /* Do some checking on the anim_num we got. Note that the animations |
1209 | * are added in contigous order, so if the number is in the valid |
1134 | * are added in contigous order, so if the number is in the valid |
1210 | * range, it must be a valid animation. |
1135 | * range, it must be a valid animation. |
1211 | */ |
1136 | */ |
1212 | if (anim_num < 0 || anim_num > num_animations) |
1137 | if (anim_num < 0 || anim_num > num_animations) |
1213 | { |
1138 | { |
1214 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1139 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1215 | return; |
1140 | return; |
1216 | } |
1141 | } |
1217 | |
1142 | |
1218 | packet sl; |
1143 | packet sl ("anim"); |
1219 | |
1144 | |
1220 | sl << "anim " |
|
|
1221 | << uint16 (anim_num) |
1145 | sl << uint16 (anim_num) |
1222 | << uint16 (0); /* flags - not used right now */ |
1146 | << uint16 (0); /* flags - not used right now */ |
1223 | |
1147 | |
1224 | /* Build up the list of faces. Also, send any information (ie, the |
1148 | /* Build up the list of faces. Also, send any information (ie, the |
1225 | * the face itself) down to the client. |
1149 | * the face itself) down to the client. |
1226 | */ |
1150 | */ |
1227 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1151 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1228 | { |
1152 | { |
1229 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1153 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1230 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1154 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1155 | |
1231 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1156 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1232 | } |
1157 | } |
1233 | |
1158 | |
1234 | ns->send_packet (sl); |
1159 | ns->send_packet (sl); |
1235 | |
1160 | |
… | |
… | |
1246 | /** |
1171 | /** |
1247 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1172 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1248 | * the face yet, we will also send it. |
1173 | * the face yet, we will also send it. |
1249 | */ |
1174 | */ |
1250 | static void |
1175 | static void |
1251 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1176 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1252 | { |
1177 | { |
1253 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1178 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1254 | { |
1179 | { |
|
|
1180 | //TODO: one or the other, can't both have abort and return, verify and act |
1255 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1181 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1256 | return; |
1182 | return; |
1257 | abort (); |
1183 | abort (); |
1258 | } |
1184 | } |
1259 | |
1185 | |
1260 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1186 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1261 | newmap->cells[x][y].count++; |
1187 | newmap->cells[x][y].count++; |
1262 | |
1188 | |
1263 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1189 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1264 | esrv_send_face (ns, face_num, 0); |
1190 | esrv_send_face (ns, face_num, 0); |
1265 | } |
|
|
1266 | |
|
|
1267 | struct LayerCell |
|
|
1268 | { |
|
|
1269 | uint16 xy; |
|
|
1270 | short face; |
|
|
1271 | }; |
|
|
1272 | |
|
|
1273 | struct MapLayer |
|
|
1274 | { |
|
|
1275 | int count; |
|
|
1276 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1277 | }; |
|
|
1278 | |
|
|
1279 | /** Checkes if map cells have changed */ |
|
|
1280 | static int |
|
|
1281 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1282 | { |
|
|
1283 | int k; |
|
|
1284 | |
|
|
1285 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1286 | return 1; |
|
|
1287 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1288 | { |
|
|
1289 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1290 | { |
|
|
1291 | return 1; |
|
|
1292 | } |
|
|
1293 | } |
|
|
1294 | return 0; |
|
|
1295 | } |
|
|
1296 | |
|
|
1297 | /** |
|
|
1298 | * Basically, what this does is pack the data into layers. |
|
|
1299 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1300 | * this data into. we return the end of the data. layers is |
|
|
1301 | * how many layers of data we should back. |
|
|
1302 | */ |
|
|
1303 | static uint8 * |
|
|
1304 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1305 | { |
|
|
1306 | int x, y, k; |
|
|
1307 | int face; |
|
|
1308 | unsigned char *fcur; |
|
|
1309 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1310 | |
|
|
1311 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1312 | layers[k].count = 0; |
|
|
1313 | fcur = cur; |
|
|
1314 | for (x = 0; x < ns->mapx; x++) |
|
|
1315 | { |
|
|
1316 | for (y = 0; y < ns->mapy; y++) |
|
|
1317 | { |
|
|
1318 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1319 | continue; |
|
|
1320 | if (newmap->cells[x][y].count == 0) |
|
|
1321 | { |
|
|
1322 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1323 | cur++; |
|
|
1324 | continue; |
|
|
1325 | } |
|
|
1326 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1327 | { |
|
|
1328 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1329 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1330 | layers[k].count++; |
|
|
1331 | } |
|
|
1332 | } |
|
|
1333 | } |
|
|
1334 | /* If no data, return now. */ |
|
|
1335 | if (fcur == cur && layers[0].count == 0) |
|
|
1336 | return cur; |
|
|
1337 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1338 | cur++; |
|
|
1339 | /* First pack by layers. */ |
|
|
1340 | for (k = 0; k < numlayers; k++) |
|
|
1341 | { |
|
|
1342 | if (layers[k].count == 0) |
|
|
1343 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1344 | have anything in it either */ |
|
|
1345 | /* Pack by entries in thie layer */ |
|
|
1346 | for (x = 0; x < layers[k].count;) |
|
|
1347 | { |
|
|
1348 | fcur = cur; |
|
|
1349 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1350 | cur++; |
|
|
1351 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1352 | cur++; |
|
|
1353 | face = layers[k].lcells[x].face; |
|
|
1354 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1355 | for (y = x; y < layers[k].count; y++) |
|
|
1356 | { |
|
|
1357 | if (layers[k].lcells[y].face == face) |
|
|
1358 | { |
|
|
1359 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1360 | cur++; |
|
|
1361 | layers[k].lcells[y].face = -1; |
|
|
1362 | } |
|
|
1363 | } |
|
|
1364 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1365 | /* forward over the now redundant data */ |
|
|
1366 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1367 | x++; |
|
|
1368 | } |
|
|
1369 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1370 | } |
|
|
1371 | return cur; |
|
|
1372 | } |
1191 | } |
1373 | |
1192 | |
1374 | /** Clears a map cell */ |
1193 | /** Clears a map cell */ |
1375 | static void |
1194 | static void |
1376 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1195 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1388 | #define MAX_LAYERS 3 |
1207 | #define MAX_LAYERS 3 |
1389 | |
1208 | |
1390 | /* Using a global really isn't a good approach, but saves the over head of |
1209 | /* Using a global really isn't a good approach, but saves the over head of |
1391 | * allocating and deallocating such a block of data each time run through, |
1210 | * allocating and deallocating such a block of data each time run through, |
1392 | * and saves the space of allocating this in the socket object when we only |
1211 | * and saves the space of allocating this in the socket object when we only |
1393 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1212 | * need it for this cycle. If the server is ever threaded, this needs to be |
1394 | * re-examined. |
1213 | * re-examined. |
1395 | */ |
1214 | */ |
1396 | |
|
|
1397 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1215 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1398 | |
1216 | |
1399 | /** |
1217 | /** |
1400 | * Returns true if any of the heads for this |
1218 | * Returns true if any of the heads for this |
1401 | * space is set. Returns false if all are blank - this is used |
1219 | * space is set. Returns false if all are blank - this is used |
1402 | * for empty space checking. |
1220 | * for empty space checking. |
1403 | */ |
1221 | */ |
1404 | static inline int |
1222 | static inline int |
1405 | have_head (int ax, int ay) |
1223 | have_head (int ax, int ay) |
1406 | { |
1224 | { |
1407 | |
|
|
1408 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1225 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1409 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1226 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1410 | return 1; |
1227 | return 1; |
|
|
1228 | |
1411 | return 0; |
1229 | return 0; |
1412 | } |
1230 | } |
1413 | |
1231 | |
1414 | /** |
1232 | /** |
1415 | * check_head is a bit simplistic version of update_space below. |
1233 | * check_head is a bit simplistic version of update_space below. |
1416 | * basically, it only checks the that the head on space ax,ay at layer |
1234 | * basically, it only checks the that the head on space ax,ay at layer |
1417 | * needs to get sent - if so, it adds the data, sending the head |
1235 | * needs to get sent - if so, it adds the data, sending the head |
1418 | * if needed, and returning 1. If this no data needs to get |
1236 | * if needed, and returning 1. If this no data needs to get |
1419 | * sent, it returns zero. |
1237 | * sent, it returns zero. |
1420 | */ |
1238 | */ |
1421 | static int |
1239 | static int |
1422 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1240 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1423 | { |
1241 | { |
1424 | short face_num; |
1242 | short face_num; |
1425 | |
1243 | |
1426 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1244 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1427 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1245 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1459 | * numbers the spaces differently - I think this was a leftover from |
1277 | * numbers the spaces differently - I think this was a leftover from |
1460 | * the map command, where the faces stack up. Sinces that is no longer |
1278 | * the map command, where the faces stack up. Sinces that is no longer |
1461 | * the case, it seems to make more sense to have these layer values |
1279 | * the case, it seems to make more sense to have these layer values |
1462 | * actually match. |
1280 | * actually match. |
1463 | */ |
1281 | */ |
1464 | |
|
|
1465 | static int |
1282 | static int |
1466 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1283 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1467 | { |
1284 | { |
1468 | object *ob, *head; |
1285 | object *ob, *head; |
1469 | uint16 face_num; |
1286 | uint16 face_num; |
1470 | int bx, by, i; |
1287 | int bx, by, i; |
1471 | |
1288 | |
… | |
… | |
1684 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1501 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1685 | * take. |
1502 | * take. |
1686 | */ |
1503 | */ |
1687 | |
1504 | |
1688 | static inline int |
1505 | static inline int |
1689 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1506 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1690 | { |
1507 | { |
1691 | object *ob; |
1508 | object *ob; |
1692 | int smoothlevel; /* old face_num; */ |
1509 | int smoothlevel; /* old face_num; */ |
1693 | |
1510 | |
1694 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1511 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1728 | * Returns the size of a data for a map square as returned by |
1545 | * Returns the size of a data for a map square as returned by |
1729 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1546 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1730 | * available. |
1547 | * available. |
1731 | */ |
1548 | */ |
1732 | int |
1549 | int |
1733 | getExtendedMapInfoSize (client_socket * ns) |
1550 | getExtendedMapInfoSize (client * ns) |
1734 | { |
1551 | { |
1735 | int result = 0; |
1552 | int result = 0; |
1736 | |
1553 | |
1737 | if (ns->ext_mapinfos) |
1554 | if (ns->ext_mapinfos) |
1738 | { |
1555 | { |
1739 | if (ns->EMI_smooth) |
1556 | if (ns->EMI_smooth) |
1740 | result += 1; /*One byte for smoothlevel */ |
1557 | result += 1; /*One byte for smoothlevel */ |
1741 | } |
1558 | } |
|
|
1559 | |
1742 | return result; |
1560 | return result; |
1743 | } |
1561 | } |
1744 | |
1562 | |
1745 | /** |
1563 | /** |
1746 | * This function uses the new map1 protocol command to send the map |
1564 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1753 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1571 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1754 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1572 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1755 | * and use the other 4 bits for other informatiion. For full documentation |
1573 | * and use the other 4 bits for other informatiion. For full documentation |
1756 | * of what we send, see the doc/Protocol file. |
1574 | * of what we send, see the doc/Protocol file. |
1757 | * I will describe internally what we do: |
1575 | * I will describe internally what we do: |
1758 | * the socket->lastmap shows how the map last looked when sent to the client. |
1576 | * the ns->lastmap shows how the map last looked when sent to the client. |
1759 | * in the lastmap structure, there is a cells array, which is set to the |
1577 | * in the lastmap structure, there is a cells array, which is set to the |
1760 | * maximum viewable size (As set in config.h). |
1578 | * maximum viewable size (As set in config.h). |
1761 | * in the cells, there are faces and a count value. |
1579 | * in the cells, there are faces and a count value. |
1762 | * we use the count value to hold the darkness value. If -1, then this space |
1580 | * we use the count value to hold the darkness value. If -1, then this space |
1763 | * is not viewable. |
1581 | * is not viewable. |
… | |
… | |
1774 | uint8 eentrysize; |
1592 | uint8 eentrysize; |
1775 | uint16 ewhatstart, ewhatflag; |
1593 | uint16 ewhatstart, ewhatflag; |
1776 | uint8 extendedinfos; |
1594 | uint8 extendedinfos; |
1777 | maptile *m; |
1595 | maptile *m; |
1778 | |
1596 | |
1779 | client_socket &socket = *pl->contr->socket; |
1597 | client &socket = *pl->contr->ns; |
1780 | |
1598 | |
1781 | check_map_change (pl->contr); |
1599 | check_map_change (pl->contr); |
1782 | |
1600 | |
1783 | packet sl; |
1601 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1784 | packet esl; |
1602 | packet esl; |
1785 | |
1603 | |
1786 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1787 | startlen = sl.length (); |
1604 | startlen = sl.length (); |
1788 | |
1605 | |
1789 | /*Extendedmapinfo structure initialisation */ |
1606 | /*Extendedmapinfo structure initialisation */ |
1790 | if (socket.ext_mapinfos) |
1607 | if (socket.ext_mapinfos) |
1791 | { |
1608 | { |
… | |
… | |
1835 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1652 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1836 | { |
1653 | { |
1837 | ax = 0; |
1654 | ax = 0; |
1838 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1655 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1839 | { |
1656 | { |
1840 | |
|
|
1841 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1657 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1842 | |
1658 | |
1843 | /* If this space is out of the normal viewable area, we only check |
1659 | /* If this space is out of the normal viewable area, we only check |
1844 | * the heads value ax or ay will only be greater than what |
1660 | * the heads value ax or ay will only be greater than what |
1845 | * the client wants if using the map1a command - this is because |
1661 | * the client wants if using the map1a command - this is because |
… | |
… | |
2175 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1991 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2176 | return; |
1992 | return; |
2177 | |
1993 | |
2178 | memset (&newmap, 0, sizeof (struct Map)); |
1994 | memset (&newmap, 0, sizeof (struct Map)); |
2179 | |
1995 | |
2180 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1996 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2181 | { |
|
|
2182 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1997 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2183 | { |
1998 | { |
2184 | ax = i; |
1999 | ax = i; |
2185 | ay = j; |
2000 | ay = j; |
2186 | m = pm; |
2001 | m = pm; |
2187 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2002 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2003 | |
2188 | if (mflags & P_OUT_OF_MAP) |
2004 | if (mflags & P_OUT_OF_MAP) |
2189 | continue; |
2005 | continue; |
2190 | if (mflags & P_NEED_UPDATE) |
2006 | |
2191 | update_position (m, ax, ay); |
|
|
2192 | /* If a map is visible to the player, we don't want to swap it out |
2007 | /* If a map is visible to the player, we don't want to swap it out |
2193 | * just to reload it. This should really call something like |
2008 | * just to reload it. This should really call something like |
2194 | * swap_map, but this is much more efficient and 'good enough' |
2009 | * swap_map, but this is much more efficient and 'good enough' |
2195 | */ |
2010 | */ |
2196 | if (mflags & P_NEW_MAP) |
2011 | if (mflags & P_NEW_MAP) |
2197 | m->timeout = 50; |
2012 | m->timeout = 50; |
2198 | } |
2013 | } |
2199 | } |
2014 | |
2200 | /* do LOS after calls to update_position */ |
2015 | /* do LOS after calls to update_position */ |
2201 | if (pl->contr->do_los) |
2016 | if (pl->contr->do_los) |
2202 | { |
2017 | { |
2203 | update_los (pl); |
2018 | update_los (pl); |
2204 | pl->contr->do_los = 0; |
2019 | pl->contr->do_los = 0; |
… | |
… | |
2219 | |
2034 | |
2220 | /*****************************************************************************/ |
2035 | /*****************************************************************************/ |
2221 | void |
2036 | void |
2222 | send_plugin_custom_message (object *pl, char *buf) |
2037 | send_plugin_custom_message (object *pl, char *buf) |
2223 | { |
2038 | { |
2224 | pl->contr->socket->send_packet (buf); |
2039 | pl->contr->ns->send_packet (buf); |
2225 | } |
2040 | } |
2226 | |
2041 | |
2227 | /** |
2042 | /** |
2228 | * This sends the skill number to name mapping. We ignore |
2043 | * This sends the skill number to name mapping. We ignore |
2229 | * the params - we always send the same info no matter what. |
2044 | * the params - we always send the same info no matter what. |
2230 | */ |
2045 | */ |
2231 | void |
2046 | void |
2232 | send_skill_info (client_socket *ns, char *params) |
2047 | send_skill_info (client *ns, char *params) |
2233 | { |
2048 | { |
2234 | packet sl; |
2049 | packet sl; |
2235 | sl << "replyinfo skill_info\n"; |
2050 | sl << "replyinfo skill_info\n"; |
2236 | |
2051 | |
2237 | for (int i = 1; i < NUM_SKILLS; i++) |
2052 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2249 | /** |
2064 | /** |
2250 | * This sends the spell path to name mapping. We ignore |
2065 | * This sends the spell path to name mapping. We ignore |
2251 | * the params - we always send the same info no matter what. |
2066 | * the params - we always send the same info no matter what. |
2252 | */ |
2067 | */ |
2253 | void |
2068 | void |
2254 | send_spell_paths (client_socket * ns, char *params) |
2069 | send_spell_paths (client * ns, char *params) |
2255 | { |
2070 | { |
2256 | packet sl; |
2071 | packet sl; |
2257 | |
2072 | |
2258 | sl << "replyinfo spell_paths\n"; |
2073 | sl << "replyinfo spell_paths\n"; |
2259 | |
2074 | |
… | |
… | |
2274 | * it then sends an updspell packet for each spell that has changed in this way |
2089 | * it then sends an updspell packet for each spell that has changed in this way |
2275 | */ |
2090 | */ |
2276 | void |
2091 | void |
2277 | esrv_update_spells (player *pl) |
2092 | esrv_update_spells (player *pl) |
2278 | { |
2093 | { |
2279 | if (!pl->socket->monitor_spells) |
2094 | if (!pl->ns->monitor_spells) |
2280 | return; |
2095 | return; |
2281 | |
2096 | |
2282 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2097 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2283 | { |
2098 | { |
2284 | if (spell->type == SPELL) |
2099 | if (spell->type == SPELL) |
… | |
… | |
2314 | |
2129 | |
2315 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2130 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2316 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2131 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2317 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2132 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2318 | |
2133 | |
2319 | pl->socket->send_packet (sl); |
2134 | pl->ns->send_packet (sl); |
2320 | } |
2135 | } |
2321 | } |
2136 | } |
2322 | } |
2137 | } |
2323 | } |
2138 | } |
2324 | |
2139 | |
2325 | void |
2140 | void |
2326 | esrv_remove_spell (player *pl, object *spell) |
2141 | esrv_remove_spell (player *pl, object *spell) |
2327 | { |
2142 | { |
2328 | if (!pl->socket->monitor_spells) |
2143 | if (!pl->ns->monitor_spells) |
2329 | return; |
2144 | return; |
2330 | |
2145 | |
2331 | if (!pl || !spell || spell->env != pl->ob) |
2146 | if (!pl || !spell || spell->env != pl->ob) |
2332 | { |
2147 | { |
2333 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2148 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2334 | return; |
2149 | return; |
2335 | } |
2150 | } |
2336 | |
2151 | |
2337 | packet sl; |
2152 | packet sl ("delspell"); |
2338 | |
2153 | |
2339 | sl << "delspell " |
|
|
2340 | << uint32 (spell->count); |
2154 | sl << uint32 (spell->count); |
2341 | |
2155 | |
2342 | pl->socket->send_packet (sl); |
2156 | pl->ns->send_packet (sl); |
2343 | } |
2157 | } |
2344 | |
2158 | |
2345 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2159 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2346 | static void |
2160 | static void |
2347 | append_spell (player *pl, packet &sl, object *spell) |
2161 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2395 | { |
2209 | { |
2396 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2210 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2397 | return; |
2211 | return; |
2398 | } |
2212 | } |
2399 | |
2213 | |
2400 | if (!pl->socket->monitor_spells) |
2214 | if (!pl->ns->monitor_spells) |
2401 | return; |
2215 | return; |
2402 | |
2216 | |
2403 | packet sl; |
2217 | packet sl ("addspell"); |
2404 | |
|
|
2405 | sl << "addspell "; |
|
|
2406 | |
2218 | |
2407 | if (!spell) |
2219 | if (!spell) |
2408 | { |
2220 | { |
2409 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2221 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2410 | { |
2222 | { |
… | |
… | |
2424 | if (spell->type != SPELL) |
2236 | if (spell->type != SPELL) |
2425 | continue; |
2237 | continue; |
2426 | |
2238 | |
2427 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2239 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2428 | { |
2240 | { |
2429 | pl->socket->send_packet (sl); |
2241 | pl->ns->send_packet (sl); |
2430 | |
2242 | |
2431 | sl.reset (); |
2243 | sl.reset (); |
2432 | sl << "addspell "; |
2244 | sl << "addspell "; |
2433 | } |
2245 | } |
2434 | |
2246 | |
… | |
… | |
2448 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2260 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2449 | fatal (0); |
2261 | fatal (0); |
2450 | } |
2262 | } |
2451 | |
2263 | |
2452 | /* finally, we can send the packet */ |
2264 | /* finally, we can send the packet */ |
2453 | pl->socket->send_packet (sl); |
2265 | pl->ns->send_packet (sl); |
2454 | } |
2266 | } |
2455 | |
2267 | |