… | |
… | |
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 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
47 | * map updates. |
|
|
48 | * |
|
|
49 | */ |
43 | */ |
50 | |
44 | |
51 | #include <global.h> |
45 | #include <global.h> |
52 | #include <sproto.h> |
46 | #include <sproto.h> |
53 | |
47 | |
54 | #include <newclient.h> |
|
|
55 | #include <newserver.h> |
|
|
56 | #include <living.h> |
48 | #include <living.h> |
57 | #include <commands.h> |
49 | #include <commands.h> |
58 | |
50 | |
59 | /* 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, |
60 | * it should work here. |
52 | * it should work here. |
… | |
… | |
63 | #include <sys/time.h> |
55 | #include <sys/time.h> |
64 | #include <sys/socket.h> |
56 | #include <sys/socket.h> |
65 | #include <netinet/in.h> |
57 | #include <netinet/in.h> |
66 | #include <netdb.h> |
58 | #include <netdb.h> |
67 | |
59 | |
68 | #ifdef HAVE_UNISTD_H |
|
|
69 | # include <unistd.h> |
60 | #include <unistd.h> |
70 | #endif |
|
|
71 | |
|
|
72 | #ifdef HAVE_SYS_TIME_H |
|
|
73 | # include <sys/time.h> |
61 | #include <sys/time.h> |
74 | #endif |
|
|
75 | |
62 | |
76 | #include "sounds.h" |
63 | #include "sounds.h" |
77 | |
64 | |
78 | /** |
65 | /** |
79 | * This table translates the attack numbers as used within the |
66 | * This table translates the attack numbers as used within the |
… | |
… | |
96 | -1, /* life stealing */ |
83 | -1, /* life stealing */ |
97 | -1 /* Disease - not fully done yet */ |
84 | -1 /* Disease - not fully done yet */ |
98 | }; |
85 | }; |
99 | |
86 | |
100 | static void |
87 | static void |
101 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
88 | socket_map_scroll (client *ns, int dx, int dy) |
102 | { |
89 | { |
103 | struct Map newmap; |
90 | struct Map newmap; |
104 | int x, y, mx, my; |
91 | int x, y, mx, my; |
105 | |
92 | |
106 | { |
|
|
107 | packet sl; |
|
|
108 | |
|
|
109 | sl.printf ("map_scroll %d %d", dx, dy); |
93 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
110 | ns->send_packet (sl); |
|
|
111 | } |
|
|
112 | |
94 | |
113 | /* If we are using the Map1aCmd, we may in fact send |
95 | /* If we are using the Map1aCmd, we may in fact send |
114 | * head information that is outside the viewable map. |
96 | * head information that is outside the viewable map. |
115 | * 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 |
116 | * look for. Removed code to do so - it caused extra |
98 | * look for. Removed code to do so - it caused extra |
… | |
… | |
156 | } |
138 | } |
157 | |
139 | |
158 | static void |
140 | static void |
159 | clear_map (player *pl) |
141 | clear_map (player *pl) |
160 | { |
142 | { |
161 | NewSocket & socket = pl->socket; |
|
|
162 | |
|
|
163 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); |
164 | |
144 | |
165 | if (socket.newmapcmd == 1) |
145 | if (pl->socket->newmapcmd == 1) |
166 | socket.send_packet ("newmap"); |
146 | pl->socket->send_packet ("newmap"); |
167 | |
147 | |
168 | socket.update_look = 1; |
148 | pl->socket->floorbox_reset (); |
169 | socket.look_position = 0; |
|
|
170 | } |
149 | } |
171 | |
150 | |
172 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
173 | static void |
152 | static void |
174 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
175 | { |
154 | { |
176 | NewSocket & socket = pl->socket; |
155 | client &socket = *pl->socket; |
177 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
178 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
179 | |
158 | |
180 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
181 | { |
160 | { |
… | |
… | |
215 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
216 | 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 |
217 | else |
196 | else |
218 | { |
197 | { |
219 | 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); |
220 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
221 | socket.look_position = 0; |
|
|
222 | } |
200 | } |
223 | } |
201 | } |
224 | |
202 | |
225 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
226 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
227 | } |
205 | } |
228 | |
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 | |
229 | void |
251 | void |
230 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
231 | { |
253 | { |
232 | 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)); |
233 | } |
261 | } |
234 | |
262 | |
235 | void |
263 | void |
236 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
237 | { |
265 | { |
… | |
… | |
252 | buf += 8; |
280 | buf += 8; |
253 | |
281 | |
254 | // initial map and its origin |
282 | // initial map and its origin |
255 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
256 | sint16 dx, dy; |
284 | sint16 dx, dy; |
257 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
285 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
258 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
286 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
259 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
260 | |
288 | |
261 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
262 | { |
290 | { |
263 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
315 | } |
343 | } |
316 | else |
344 | else |
317 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
318 | |
346 | |
319 | pl->socket.send_packet (bigbuf); |
347 | pl->socket->send_packet (bigbuf); |
320 | } |
348 | } |
321 | |
349 | |
322 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
323 | void |
351 | void |
324 | SetUp (char *buf, int len, NewSocket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
325 | { |
353 | { |
326 | int s, slen; |
354 | int s, slen; |
327 | char *cmd, *param, cmdback[HUGE_BUF]; |
355 | char *cmd, *param, cmdback[HUGE_BUF]; |
328 | |
356 | |
329 | /* run through the cmds of setup |
357 | /* run through the cmds of setup |
… | |
… | |
539 | * 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. |
540 | * 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, |
541 | * 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. |
542 | */ |
570 | */ |
543 | void |
571 | void |
544 | AddMeCmd (char *buf, int len, NewSocket * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
545 | { |
573 | { |
546 | Settings oldsettings; |
|
|
547 | |
|
|
548 | oldsettings = settings; |
|
|
549 | if (ns->status != Ns_Add || add_player (ns)) |
574 | if (ns->status != Ns_Add || add_player (ns)) |
550 | ns->send_packet ("addme_failed"); |
575 | ns->send_packet ("addme_failed"); |
551 | else |
576 | else |
552 | { |
|
|
553 | /* Basically, the add_player copies the socket structure into |
|
|
554 | * the player structure, so this one (which is from init_sockets) |
|
|
555 | * is not needed anymore. The write below should still work, as the |
|
|
556 | * stuff in ns is still relevant. |
|
|
557 | */ |
|
|
558 | ns->send_packet ("addme_success"); |
577 | ns->send_packet ("addme_success"); |
559 | socket_info.nconns--; |
|
|
560 | ns->status = Ns_Avail; |
|
|
561 | } |
|
|
562 | |
|
|
563 | settings = oldsettings; |
|
|
564 | } |
578 | } |
565 | |
579 | |
566 | /** Reply to ExtendedInfos command */ |
580 | /** Reply to ExtendedInfos command */ |
567 | void |
581 | void |
568 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
569 | { |
583 | { |
570 | char cmdback[MAX_BUF]; |
584 | char cmdback[MAX_BUF]; |
571 | char command[50]; |
585 | char command[50]; |
572 | int info, nextinfo; |
586 | int info, nextinfo; |
573 | |
587 | |
… | |
… | |
624 | #define MSG_TYPE_MONUMENT 5 |
638 | #define MSG_TYPE_MONUMENT 5 |
625 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
639 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
626 | |
640 | |
627 | /** Reply to ExtendedInfos command */ |
641 | /** Reply to ExtendedInfos command */ |
628 | void |
642 | void |
629 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
643 | ToggleExtendedText (char *buf, int len, client * ns) |
630 | { |
644 | { |
631 | char cmdback[MAX_BUF]; |
645 | char cmdback[MAX_BUF]; |
632 | char temp[10]; |
646 | char temp[10]; |
633 | char command[50]; |
647 | char command[50]; |
634 | int info, nextinfo, i, flag; |
648 | int info, nextinfo, i, flag; |
… | |
… | |
685 | * a piece of data from us that we know the client wants. So |
699 | * a piece of data from us that we know the client wants. So |
686 | * if we know the client wants it, might as well push it to the |
700 | * if we know the client wants it, might as well push it to the |
687 | * client. |
701 | * client. |
688 | */ |
702 | */ |
689 | static void |
703 | static void |
690 | SendSmooth (NewSocket * ns, uint16 face) |
704 | SendSmooth (client *ns, uint16 face) |
691 | { |
705 | { |
692 | uint16 smoothface; |
706 | uint16 smoothface; |
693 | |
707 | |
694 | /* If we can't find a face, return and set it so we won't try to send this |
708 | /* If we can't find a face, return and set it so we won't try to send this |
695 | * again. |
709 | * again. |
… | |
… | |
711 | |
725 | |
712 | sl << "smooth " |
726 | sl << "smooth " |
713 | << uint16 (face) |
727 | << uint16 (face) |
714 | << uint16 (smoothface); |
728 | << uint16 (smoothface); |
715 | |
729 | |
716 | Send_With_Handling (ns, &sl); |
730 | ns->send_packet (sl); |
717 | } |
731 | } |
718 | |
732 | |
719 | /** |
733 | /** |
720 | * Tells client the picture it has to use |
734 | * Tells client the picture it has to use |
721 | * to smooth a picture number given as argument. |
735 | * to smooth a picture number given as argument. |
722 | */ |
736 | */ |
723 | void |
737 | void |
724 | AskSmooth (char *buf, int len, NewSocket * ns) |
738 | AskSmooth (char *buf, int len, client *ns) |
725 | { |
739 | { |
726 | uint16 facenbr; |
740 | SendSmooth (ns, atoi (buf)); |
727 | |
|
|
728 | facenbr = atoi (buf); |
|
|
729 | SendSmooth (ns, facenbr); |
|
|
730 | } |
741 | } |
731 | |
742 | |
732 | /** |
743 | /** |
733 | * This handles the general commands from the client (ie, north, fire, cast, |
744 | * This handles the general commands from the client (ie, north, fire, cast, |
734 | * etc.) |
745 | * etc.) |
735 | */ |
746 | */ |
736 | void |
747 | void |
737 | PlayerCmd (char *buf, int len, player *pl) |
748 | PlayerCmd (char *buf, int len, player *pl) |
738 | { |
749 | { |
739 | |
|
|
740 | /* The following should never happen with a proper or honest client. |
|
|
741 | * Therefore, the error message doesn't have to be too clear - if |
|
|
742 | * someone is playing with a hacked/non working client, this gives them |
|
|
743 | * an idea of the problem, but they deserve what they get |
|
|
744 | */ |
|
|
745 | if (pl->state != ST_PLAYING) |
|
|
746 | { |
|
|
747 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
748 | return; |
|
|
749 | } |
|
|
750 | /* Check if there is a count. In theory, a zero count could also be |
750 | /* Check if there is a count. In theory, a zero count could also be |
751 | * sent, so check for that also. |
751 | * sent, so check for that also. |
752 | */ |
752 | */ |
753 | if (atoi (buf) || buf[0] == '0') |
753 | if (atoi (buf) || buf[0] == '0') |
754 | { |
754 | { |
755 | pl->count = atoi ((char *) buf); |
755 | pl->count = atoi ((char *) buf); |
|
|
756 | |
756 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
757 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
757 | if (!buf) |
758 | if (!buf) |
758 | { |
|
|
759 | #ifdef ESRV_DEBUG |
|
|
760 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
761 | #endif |
|
|
762 | return; |
759 | return; |
763 | } |
760 | |
764 | buf++; |
761 | buf++; |
765 | } |
762 | } |
766 | /* This should not happen anymore. */ |
763 | |
767 | if (pl->ob->speed_left < -1.0) |
|
|
768 | { |
|
|
769 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
770 | } |
|
|
771 | /* In c_new.c */ |
|
|
772 | execute_newserver_command (pl->ob, (char *) buf); |
764 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
765 | |
773 | /* Perhaps something better should be done with a left over count. |
766 | /* Perhaps something better should be done with a left over count. |
774 | * Cleaning up the input should probably be done first - all actions |
767 | * Cleaning up the input should probably be done first - all actions |
775 | * for the command that issued the count should be done before any other |
768 | * for the command that issued the count should be done before any other |
776 | * commands. |
769 | * commands. |
777 | */ |
770 | */ |
778 | |
|
|
779 | pl->count = 0; |
771 | pl->count = 0; |
780 | |
|
|
781 | } |
772 | } |
782 | |
773 | |
783 | |
774 | |
784 | /** |
775 | /** |
785 | * This handles the general commands from the client (ie, north, fire, cast, |
776 | * This handles the general commands from the client (ie, north, fire, cast, |
786 | * etc.). It is a lot like PlayerCmd above, but is called with the |
777 | * etc.). It is a lot like PlayerCmd above, but is called with the |
787 | * 'ncom' method which gives more information back to the client so it |
778 | * 'ncom' method which gives more information back to the client so it |
788 | * can throttle. |
779 | * can throttle. |
789 | */ |
780 | */ |
790 | void |
781 | void |
791 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
782 | NewPlayerCmd (char *buf, int len, player *pl) |
792 | { |
783 | { |
793 | int time, repeat; |
|
|
794 | char command[MAX_BUF]; |
|
|
795 | int pktlen; |
|
|
796 | |
|
|
797 | if (len < 7) |
784 | if (len <= 6) |
798 | { |
785 | { |
799 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
786 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
800 | return; |
787 | return; |
801 | } |
788 | } |
802 | |
789 | |
803 | pktlen = net_uint16 (buf); |
790 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
804 | repeat = net_uint32 (buf + 2); |
791 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
805 | |
792 | |
806 | /* -1 is special - no repeat, but don't update */ |
793 | /* -1 is special - no repeat, but don't update */ |
807 | if (repeat != -1) |
794 | if (repeat != -1) |
808 | pl->count = repeat; |
795 | pl->count = repeat; |
809 | |
796 | |
810 | if ((len - 4) >= MAX_BUF) |
797 | buf += 6; //len -= 6; |
811 | len = MAX_BUF - 5; |
|
|
812 | |
798 | |
813 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
814 | command[len - 4] = '\0'; |
|
|
815 | |
|
|
816 | /* The following should never happen with a proper or honest client. |
|
|
817 | * Therefore, the error message doesn't have to be too clear - if |
|
|
818 | * someone is playing with a hacked/non working client, this gives them |
|
|
819 | * an idea of the problem, but they deserve what they get |
|
|
820 | */ |
|
|
821 | if (pl->state != ST_PLAYING) |
|
|
822 | { |
|
|
823 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
824 | return; |
|
|
825 | } |
|
|
826 | |
|
|
827 | /* This should not happen anymore. */ |
|
|
828 | if (pl->ob->speed_left < -1.0) |
|
|
829 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
830 | |
|
|
831 | /* In c_new.c */ |
|
|
832 | execute_newserver_command (pl->ob, (char *) command); |
799 | execute_newserver_command (pl->ob, buf); |
|
|
800 | |
833 | /* Perhaps something better should be done with a left over count. |
801 | /* Perhaps something better should be done with a left over count. |
834 | * Cleaning up the input should probably be done first - all actions |
802 | * Cleaning up the input should probably be done first - all actions |
835 | * for the command that issued the count should be done before any other |
803 | * for the command that issued the count should be done before any other |
836 | * commands. |
804 | * commands. |
837 | */ |
805 | */ |
838 | pl->count = 0; |
806 | pl->count = 0; |
839 | |
807 | |
|
|
808 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
840 | if (FABS (pl->ob->speed) < 0.001) |
809 | int time = FABS (pl->ob->speed) < 0.001 |
841 | time = MAX_TIME * 100; |
810 | ? time = MAX_TIME * 100 |
842 | else |
|
|
843 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
811 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
844 | |
812 | |
845 | /* Send confirmation of command execution now */ |
813 | /* Send confirmation of command execution now */ |
846 | |
|
|
847 | packet sl; |
814 | packet sl; |
848 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
815 | sl << "comc " << uint16 (cmdid) << uint32 (time); |
849 | Send_With_Handling (&pl->socket, &sl); |
816 | pl->socket->send_packet (sl); |
850 | } |
817 | } |
851 | |
818 | |
852 | |
819 | |
853 | /** This is a reply to a previous query. */ |
820 | /** This is a reply to a previous query. */ |
854 | void |
821 | void |
855 | ReplyCmd (char *buf, int len, player *pl) |
822 | ReplyCmd (char *buf, int len, player *pl) |
856 | { |
823 | { |
857 | /* This is to synthesize how the data would be stored if it |
824 | /* This is to synthesize how the data would be stored if it |
858 | * was normally entered. A bit of a hack, and should be cleaned up |
825 | * was normally entered. A bit of a hack, and should be cleaned up |
859 | * once all the X11 code is removed from the server. |
826 | * once all the X11 code is removed from the server. |
860 | * |
827 | * |
861 | * We pass 13 to many of the functions because this way they |
828 | * We pass 13 to many of the functions because this way they |
862 | * think it was the carriage return that was entered, and the |
829 | * think it was the carriage return that was entered, and the |
863 | * function then does not try to do additional input. |
830 | * function then does not try to do additional input. |
… | |
… | |
866 | |
833 | |
867 | /* this avoids any hacking here */ |
834 | /* this avoids any hacking here */ |
868 | |
835 | |
869 | switch (pl->state) |
836 | switch (pl->state) |
870 | { |
837 | { |
871 | case ST_PLAYING: |
838 | case ST_PLAYING: |
872 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
839 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
873 | break; |
840 | break; |
874 | |
841 | |
875 | case ST_PLAY_AGAIN: |
842 | case ST_PLAY_AGAIN: |
876 | /* We can check this for return value (2==quit). Maybe we |
843 | /* We can check this for return value (2==quit). Maybe we |
877 | * should, and do something appropriate? |
844 | * should, and do something appropriate? |
878 | */ |
845 | */ |
879 | receive_play_again (pl->ob, buf[0]); |
846 | receive_play_again (pl->ob, buf[0]); |
880 | break; |
847 | break; |
881 | |
848 | |
882 | case ST_ROLL_STAT: |
849 | case ST_ROLL_STAT: |
883 | key_roll_stat (pl->ob, buf[0]); |
850 | key_roll_stat (pl->ob, buf[0]); |
884 | break; |
851 | break; |
885 | |
852 | |
886 | case ST_CHANGE_CLASS: |
853 | case ST_CHANGE_CLASS: |
887 | |
854 | |
888 | key_change_class (pl->ob, buf[0]); |
855 | key_change_class (pl->ob, buf[0]); |
889 | break; |
856 | break; |
890 | |
857 | |
891 | case ST_CONFIRM_QUIT: |
858 | case ST_CONFIRM_QUIT: |
892 | key_confirm_quit (pl->ob, buf[0]); |
859 | key_confirm_quit (pl->ob, buf[0]); |
893 | break; |
860 | break; |
894 | |
861 | |
895 | case ST_CONFIGURE: |
862 | case ST_CONFIGURE: |
896 | LOG (llevError, "In client input handling, but into configure state\n"); |
863 | LOG (llevError, "In client input handling, but into configure state\n"); |
897 | pl->state = ST_PLAYING; |
864 | pl->state = ST_PLAYING; |
898 | break; |
865 | break; |
899 | |
866 | |
900 | case ST_GET_NAME: |
867 | case ST_GET_NAME: |
901 | receive_player_name (pl->ob, 13); |
868 | receive_player_name (pl->ob, 13); |
902 | break; |
869 | break; |
903 | |
870 | |
904 | case ST_GET_PASSWORD: |
871 | case ST_GET_PASSWORD: |
905 | case ST_CONFIRM_PASSWORD: |
872 | case ST_CONFIRM_PASSWORD: |
906 | receive_player_password (pl->ob, 13); |
873 | receive_player_password (pl->ob, 13); |
907 | break; |
874 | break; |
908 | |
875 | |
909 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
876 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
910 | receive_party_password (pl->ob, 13); |
877 | receive_party_password (pl->ob, 13); |
911 | break; |
878 | break; |
912 | |
879 | |
913 | default: |
880 | default: |
914 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
881 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
915 | } |
882 | } |
916 | } |
883 | } |
917 | |
884 | |
918 | /** |
885 | /** |
919 | * Client tells its version. If there is a mismatch, we close the |
886 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
921 | * something older than the server. If we assume the client will be |
888 | * something older than the server. If we assume the client will be |
922 | * backwards compatible, having it be a later version should not be a |
889 | * backwards compatible, having it be a later version should not be a |
923 | * problem. |
890 | * problem. |
924 | */ |
891 | */ |
925 | void |
892 | void |
926 | VersionCmd (char *buf, int len, NewSocket * ns) |
893 | VersionCmd (char *buf, int len, client * ns) |
927 | { |
894 | { |
928 | char *cp; |
|
|
929 | char version_warning[256]; |
|
|
930 | |
|
|
931 | if (!buf) |
895 | if (!buf) |
932 | { |
896 | { |
933 | LOG (llevError, "CS: received corrupted version command\n"); |
897 | LOG (llevError, "CS: received corrupted version command\n"); |
934 | return; |
898 | return; |
935 | } |
899 | } |
936 | |
900 | |
937 | ns->cs_version = atoi (buf); |
901 | ns->cs_version = atoi (buf); |
938 | ns->sc_version = ns->cs_version; |
902 | ns->sc_version = ns->cs_version; |
|
|
903 | |
|
|
904 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
905 | |
|
|
906 | |
|
|
907 | //TODO: should log here just for statistics |
|
|
908 | |
939 | if (VERSION_CS != ns->cs_version) |
909 | //if (VERSION_CS != ns->cs_version) |
940 | { |
910 | // unchecked; |
941 | #ifdef ESRV_DEBUG |
911 | |
942 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
943 | #endif |
|
|
944 | } |
|
|
945 | cp = strchr (buf + 1, ' '); |
912 | char *cp = strchr (buf + 1, ' '); |
946 | if (!cp) |
913 | if (!cp) |
947 | return; |
914 | return; |
|
|
915 | |
948 | ns->sc_version = atoi (cp); |
916 | ns->sc_version = atoi (cp); |
|
|
917 | |
949 | if (VERSION_SC != ns->sc_version) |
918 | //if (VERSION_SC != ns->sc_version) |
950 | { |
919 | // unchecked; |
951 | #ifdef ESRV_DEBUG |
920 | |
952 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
953 | #endif |
|
|
954 | } |
|
|
955 | cp = strchr (cp + 1, ' '); |
921 | cp = strchr (cp + 1, ' '); |
|
|
922 | |
956 | if (cp) |
923 | if (cp) |
957 | { |
924 | { |
958 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
925 | assign (ns->version, cp + 1); |
959 | |
926 | |
960 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
961 | |
|
|
962 | /* This is first implementation - i skip all beta DX clients with it |
|
|
963 | * Add later stuff here for other clients |
|
|
964 | */ |
|
|
965 | |
|
|
966 | /* these are old dxclients */ |
|
|
967 | /* Version 1024 added support for singular + plural name values - |
|
|
968 | * requiing this minimal value reduces complexity of that code, and it |
|
|
969 | * has been around for a long time. |
|
|
970 | */ |
|
|
971 | if (ns->sc_version < 1026) |
927 | if (ns->sc_version < 1026) |
972 | { |
928 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
973 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
974 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
929 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
975 | ns->send_packet (version_warning); |
|
|
976 | } |
|
|
977 | |
|
|
978 | } |
930 | } |
979 | } |
931 | } |
980 | |
932 | |
981 | /** sound related functions. */ |
933 | /** sound related functions. */ |
982 | |
|
|
983 | void |
934 | void |
984 | SetSound (char *buf, int len, NewSocket * ns) |
935 | SetSound (char *buf, int len, client * ns) |
985 | { |
936 | { |
986 | ns->sound = atoi (buf); |
937 | ns->sound = atoi (buf); |
987 | } |
938 | } |
988 | |
939 | |
989 | /** client wants the map resent */ |
940 | /** client wants the map resent */ |
990 | |
941 | |
991 | void |
942 | void |
992 | MapRedrawCmd (char *buf, int len, player *pl) |
943 | MapRedrawCmd (char *buf, int len, player *pl) |
993 | { |
944 | { |
994 | |
|
|
995 | /* This function is currently disabled; just clearing the map state results in |
945 | /* This function is currently disabled; just clearing the map state results in |
996 | * display errors. It should clear the cache and send a newmap command. |
946 | * display errors. It should clear the cache and send a newmap command. |
997 | * Unfortunately this solution does not work because some client versions send |
947 | * Unfortunately this solution does not work because some client versions send |
998 | * a mapredraw command after receiving a newmap command. |
948 | * a mapredraw command after receiving a newmap command. |
999 | */ |
949 | */ |
1000 | #if 0 |
|
|
1001 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
1002 | * clear the "cache" |
|
|
1003 | */ |
|
|
1004 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
|
|
1005 | draw_client_map (pl->ob); |
|
|
1006 | #endif |
|
|
1007 | } |
950 | } |
1008 | |
951 | |
1009 | /** |
952 | /** |
1010 | * Moves an object (typically, container to inventory). |
953 | * Moves an object (typically, container to inventory). |
1011 | * syntax is: move (to) (tag) (nrof) |
954 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1014 | MoveCmd (char *buf, int len, player *pl) |
957 | MoveCmd (char *buf, int len, player *pl) |
1015 | { |
958 | { |
1016 | int vals[3], i; |
959 | int vals[3], i; |
1017 | |
960 | |
1018 | /* A little funky here. We only cycle for 2 records, because |
961 | /* A little funky here. We only cycle for 2 records, because |
1019 | * we obviously am not going to find a space after the third |
962 | * we obviously are not going to find a space after the third |
1020 | * record. Perhaps we should just replace this with a |
963 | * record. Perhaps we should just replace this with a |
1021 | * sscanf? |
964 | * sscanf? |
1022 | */ |
965 | */ |
1023 | for (i = 0; i < 2; i++) |
966 | for (i = 0; i < 2; i++) |
1024 | { |
967 | { |
1025 | vals[i] = atoi (buf); |
968 | vals[i] = atoi (buf); |
|
|
969 | |
1026 | if (!(buf = strchr (buf, ' '))) |
970 | if (!(buf = strchr (buf, ' '))) |
1027 | { |
971 | { |
1028 | LOG (llevError, "Incomplete move command: %s\n", buf); |
972 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1029 | return; |
973 | return; |
1030 | } |
974 | } |
|
|
975 | |
1031 | buf++; |
976 | buf++; |
1032 | } |
977 | } |
|
|
978 | |
1033 | vals[2] = atoi (buf); |
979 | vals[2] = atoi (buf); |
1034 | |
980 | |
1035 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
981 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1036 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
982 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1037 | } |
983 | } |
1038 | |
|
|
1039 | |
|
|
1040 | |
984 | |
1041 | /****************************************************************************** |
985 | /****************************************************************************** |
1042 | * |
986 | * |
1043 | * Start of commands the server sends to the client. |
987 | * Start of commands the server sends to the client. |
1044 | * |
988 | * |
… | |
… | |
1047 | /** |
991 | /** |
1048 | * Asks the client to query the user. This way, the client knows |
992 | * Asks the client to query the user. This way, the client knows |
1049 | * it needs to send something back (vs just printing out a message) |
993 | * it needs to send something back (vs just printing out a message) |
1050 | */ |
994 | */ |
1051 | void |
995 | void |
1052 | send_query (NewSocket * ns, uint8 flags, char *text) |
996 | send_query (client *ns, uint8 flags, char *text) |
1053 | { |
997 | { |
1054 | char buf[MAX_BUF]; |
|
|
1055 | |
|
|
1056 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
998 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1057 | ns->send_packet (buf); |
|
|
1058 | } |
999 | } |
1059 | |
1000 | |
1060 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1001 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1061 | Old = New; \ |
1002 | Old = New; \ |
1062 | sl << uint8 (Type) << uint64 (New); \ |
1003 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1095 | uint16 flags; |
1036 | uint16 flags; |
1096 | |
1037 | |
1097 | packet sl; |
1038 | packet sl; |
1098 | sl << "stats "; |
1039 | sl << "stats "; |
1099 | |
1040 | |
1100 | if (pl->ob != NULL) |
1041 | if (pl->ob) |
1101 | { |
1042 | { |
1102 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1043 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1103 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1044 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1104 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1045 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1105 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1046 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
… | |
… | |
1112 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1053 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1113 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1054 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1114 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1055 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1115 | } |
1056 | } |
1116 | |
1057 | |
1117 | if (pl->socket.exp64) |
1058 | if (pl->socket->exp64) |
1118 | { |
|
|
1119 | uint8 s; |
|
|
1120 | |
|
|
1121 | for (s = 0; s < NUM_SKILLS; s++) |
1059 | for (int s = 0; s < NUM_SKILLS; s++) |
1122 | { |
|
|
1123 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1060 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1124 | { |
1061 | { |
1125 | /* Always send along the level if exp changes. This is only |
1062 | /* Always send along the level if exp changes. This is only |
1126 | * 1 extra byte, but keeps processing simpler. |
1063 | * 1 extra byte, but keeps processing simpler. |
1127 | */ |
1064 | */ |
1128 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1065 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1129 | << uint8 (pl->last_skill_ob[s]->level) |
1066 | << uint8 (pl->last_skill_ob[s]->level) |
1130 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1067 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1131 | |
1068 | |
1132 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1069 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1133 | } |
1070 | } |
1134 | } |
|
|
1135 | } |
|
|
1136 | |
1071 | |
1137 | if (pl->socket.exp64) |
1072 | if (pl->socket->exp64) |
1138 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1073 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1139 | else |
1074 | else |
1140 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1075 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1141 | |
1076 | |
1142 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1077 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1155 | if (pl->run_on) |
1090 | if (pl->run_on) |
1156 | flags |= SF_RUNON; |
1091 | flags |= SF_RUNON; |
1157 | |
1092 | |
1158 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1093 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1159 | |
1094 | |
1160 | if (pl->socket.sc_version < 1025) |
1095 | if (pl->socket->sc_version < 1025) |
1161 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1096 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1162 | else |
1097 | else |
1163 | { |
|
|
1164 | int i; |
|
|
1165 | |
|
|
1166 | for (i = 0; i < NROFATTACKS; i++) |
1098 | for (int i = 0; i < NROFATTACKS; i++) |
1167 | { |
1099 | { |
1168 | /* Skip ones we won't send */ |
1100 | /* Skip ones we won't send */ |
1169 | if (atnr_cs_stat[i] == -1) |
1101 | if (atnr_cs_stat[i] == -1) |
1170 | continue; |
1102 | continue; |
1171 | |
1103 | |
1172 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1104 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1173 | } |
1105 | } |
1174 | } |
|
|
1175 | |
1106 | |
1176 | if (pl->socket.monitor_spells) |
1107 | if (pl->socket->monitor_spells) |
1177 | { |
1108 | { |
1178 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1109 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1179 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1110 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1180 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1111 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1181 | } |
1112 | } |
1182 | |
1113 | |
1183 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1114 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1184 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1115 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1185 | set_title (pl->ob, buf); |
1116 | set_title (pl->ob, buf); |
1186 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1117 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1187 | |
1118 | |
1188 | /* Only send it away if we have some actual data */ |
1119 | /* Only send it away if we have some actual data */ |
1189 | if (sl.len > 6) |
1120 | if (sl.length () > 6) |
1190 | { |
1121 | pl->socket->send_packet (sl); |
1191 | #ifdef ESRV_DEBUG |
|
|
1192 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1193 | #endif |
|
|
1194 | Send_With_Handling (&pl->socket, &sl); |
|
|
1195 | } |
|
|
1196 | |
|
|
1197 | } |
1122 | } |
1198 | |
1123 | |
1199 | /** |
1124 | /** |
1200 | * Tells the client that here is a player it should start using. |
1125 | * Tells the client that here is a player it should start using. |
1201 | */ |
1126 | */ |
… | |
… | |
1210 | sl << uint32 (pl->ob->count) |
1135 | sl << uint32 (pl->ob->count) |
1211 | << uint32 (weight) |
1136 | << uint32 (weight) |
1212 | << uint32 (pl->ob->face->number) |
1137 | << uint32 (pl->ob->face->number) |
1213 | << data8 (pl->ob->name); |
1138 | << data8 (pl->ob->name); |
1214 | |
1139 | |
1215 | Send_With_Handling (&pl->socket, &sl); |
1140 | pl->socket->send_packet (sl); |
1216 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1141 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1217 | } |
1142 | } |
1218 | |
1143 | |
1219 | /** |
1144 | /** |
1220 | * Need to send an animation sequence to the client. |
1145 | * Need to send an animation sequence to the client. |
… | |
… | |
1222 | * sent them the face yet (this can become quite costly in terms of |
1147 | * sent them the face yet (this can become quite costly in terms of |
1223 | * how much we are sending - on the other hand, this should only happen |
1148 | * how much we are sending - on the other hand, this should only happen |
1224 | * when the player logs in and picks stuff up. |
1149 | * when the player logs in and picks stuff up. |
1225 | */ |
1150 | */ |
1226 | void |
1151 | void |
1227 | esrv_send_animation (NewSocket * ns, short anim_num) |
1152 | esrv_send_animation (client * ns, short anim_num) |
1228 | { |
1153 | { |
1229 | int i; |
|
|
1230 | |
|
|
1231 | /* Do some checking on the anim_num we got. Note that the animations |
1154 | /* Do some checking on the anim_num we got. Note that the animations |
1232 | * are added in contigous order, so if the number is in the valid |
1155 | * are added in contigous order, so if the number is in the valid |
1233 | * range, it must be a valid animation. |
1156 | * range, it must be a valid animation. |
1234 | */ |
1157 | */ |
1235 | if (anim_num < 0 || anim_num > num_animations) |
1158 | if (anim_num < 0 || anim_num > num_animations) |
… | |
… | |
1245 | << uint16 (0); /* flags - not used right now */ |
1168 | << uint16 (0); /* flags - not used right now */ |
1246 | |
1169 | |
1247 | /* Build up the list of faces. Also, send any information (ie, the |
1170 | /* Build up the list of faces. Also, send any information (ie, the |
1248 | * the face itself) down to the client. |
1171 | * the face itself) down to the client. |
1249 | */ |
1172 | */ |
1250 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1173 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1251 | { |
1174 | { |
1252 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1175 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1253 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1176 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1177 | |
1254 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1178 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1255 | } |
1179 | } |
1256 | |
1180 | |
1257 | Send_With_Handling (ns, &sl); |
1181 | ns->send_packet (sl); |
1258 | |
1182 | |
1259 | ns->anims_sent[anim_num] = 1; |
1183 | ns->anims_sent[anim_num] = 1; |
1260 | } |
1184 | } |
1261 | |
1185 | |
1262 | |
1186 | |
… | |
… | |
1269 | /** |
1193 | /** |
1270 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1194 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1271 | * the face yet, we will also send it. |
1195 | * the face yet, we will also send it. |
1272 | */ |
1196 | */ |
1273 | static void |
1197 | static void |
1274 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
1198 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1275 | { |
1199 | { |
1276 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1200 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1277 | { |
1201 | { |
|
|
1202 | //TODO: one or the other, can't both have abort and return, verify and act |
1278 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1203 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1279 | return; |
1204 | return; |
1280 | abort (); |
1205 | abort (); |
1281 | } |
1206 | } |
1282 | |
1207 | |
… | |
… | |
1284 | newmap->cells[x][y].count++; |
1209 | newmap->cells[x][y].count++; |
1285 | |
1210 | |
1286 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1211 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1287 | esrv_send_face (ns, face_num, 0); |
1212 | esrv_send_face (ns, face_num, 0); |
1288 | } |
1213 | } |
1289 | |
|
|
1290 | struct LayerCell |
|
|
1291 | { |
|
|
1292 | uint16 xy; |
|
|
1293 | short face; |
|
|
1294 | }; |
|
|
1295 | |
|
|
1296 | struct MapLayer |
|
|
1297 | { |
|
|
1298 | int count; |
|
|
1299 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1300 | }; |
|
|
1301 | |
|
|
1302 | /** Checkes if map cells have changed */ |
|
|
1303 | static int |
|
|
1304 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
|
|
1305 | { |
|
|
1306 | int k; |
|
|
1307 | |
|
|
1308 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1309 | return 1; |
|
|
1310 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1311 | { |
|
|
1312 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1313 | { |
|
|
1314 | return 1; |
|
|
1315 | } |
|
|
1316 | } |
|
|
1317 | return 0; |
|
|
1318 | } |
|
|
1319 | |
|
|
1320 | /** |
|
|
1321 | * Basically, what this does is pack the data into layers. |
|
|
1322 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1323 | * this data into. we return the end of the data. layers is |
|
|
1324 | * how many layers of data we should back. |
|
|
1325 | */ |
|
|
1326 | static uint8 * |
|
|
1327 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1328 | { |
|
|
1329 | int x, y, k; |
|
|
1330 | int face; |
|
|
1331 | unsigned char *fcur; |
|
|
1332 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1333 | |
|
|
1334 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1335 | layers[k].count = 0; |
|
|
1336 | fcur = cur; |
|
|
1337 | for (x = 0; x < ns->mapx; x++) |
|
|
1338 | { |
|
|
1339 | for (y = 0; y < ns->mapy; y++) |
|
|
1340 | { |
|
|
1341 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1342 | continue; |
|
|
1343 | if (newmap->cells[x][y].count == 0) |
|
|
1344 | { |
|
|
1345 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1346 | cur++; |
|
|
1347 | continue; |
|
|
1348 | } |
|
|
1349 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1350 | { |
|
|
1351 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1352 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1353 | layers[k].count++; |
|
|
1354 | } |
|
|
1355 | } |
|
|
1356 | } |
|
|
1357 | /* If no data, return now. */ |
|
|
1358 | if (fcur == cur && layers[0].count == 0) |
|
|
1359 | return cur; |
|
|
1360 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1361 | cur++; |
|
|
1362 | /* First pack by layers. */ |
|
|
1363 | for (k = 0; k < numlayers; k++) |
|
|
1364 | { |
|
|
1365 | if (layers[k].count == 0) |
|
|
1366 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1367 | have anything in it either */ |
|
|
1368 | /* Pack by entries in thie layer */ |
|
|
1369 | for (x = 0; x < layers[k].count;) |
|
|
1370 | { |
|
|
1371 | fcur = cur; |
|
|
1372 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1373 | cur++; |
|
|
1374 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1375 | cur++; |
|
|
1376 | face = layers[k].lcells[x].face; |
|
|
1377 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1378 | for (y = x; y < layers[k].count; y++) |
|
|
1379 | { |
|
|
1380 | if (layers[k].lcells[y].face == face) |
|
|
1381 | { |
|
|
1382 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1383 | cur++; |
|
|
1384 | layers[k].lcells[y].face = -1; |
|
|
1385 | } |
|
|
1386 | } |
|
|
1387 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1388 | /* forward over the now redundant data */ |
|
|
1389 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1390 | x++; |
|
|
1391 | } |
|
|
1392 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1393 | } |
|
|
1394 | return cur; |
|
|
1395 | } |
|
|
1396 | |
|
|
1397 | static void |
|
|
1398 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1399 | { |
|
|
1400 | static long frames, bytes, tbytes, tframes; |
|
|
1401 | char *cur; |
|
|
1402 | |
|
|
1403 | packet sl; |
|
|
1404 | sl << "map "; |
|
|
1405 | |
|
|
1406 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1407 | sl.len = cur - (char *) sl.buf; |
|
|
1408 | |
|
|
1409 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1410 | |
|
|
1411 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1412 | { |
|
|
1413 | /* All of this is just accounting stuff */ |
|
|
1414 | if (tframes > 100) |
|
|
1415 | tframes = tbytes = 0; |
|
|
1416 | |
|
|
1417 | tframes++; |
|
|
1418 | frames++; |
|
|
1419 | tbytes += sl.len; |
|
|
1420 | bytes += sl.len; |
|
|
1421 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1422 | Send_With_Handling (ns, &sl); |
|
|
1423 | ns->sent_scroll = 0; |
|
|
1424 | } |
|
|
1425 | |
|
|
1426 | } |
|
|
1427 | |
|
|
1428 | |
1214 | |
1429 | /** Clears a map cell */ |
1215 | /** Clears a map cell */ |
1430 | static void |
1216 | static void |
1431 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1217 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1432 | { |
1218 | { |
… | |
… | |
1443 | #define MAX_LAYERS 3 |
1229 | #define MAX_LAYERS 3 |
1444 | |
1230 | |
1445 | /* Using a global really isn't a good approach, but saves the over head of |
1231 | /* Using a global really isn't a good approach, but saves the over head of |
1446 | * allocating and deallocating such a block of data each time run through, |
1232 | * allocating and deallocating such a block of data each time run through, |
1447 | * and saves the space of allocating this in the socket object when we only |
1233 | * and saves the space of allocating this in the socket object when we only |
1448 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1234 | * need it for this cycle. If the server is ever threaded, this needs to be |
1449 | * re-examined. |
1235 | * re-examined. |
1450 | */ |
1236 | */ |
1451 | |
|
|
1452 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1237 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1453 | |
1238 | |
1454 | /** |
1239 | /** |
1455 | * Returns true if any of the heads for this |
1240 | * Returns true if any of the heads for this |
1456 | * space is set. Returns false if all are blank - this is used |
1241 | * space is set. Returns false if all are blank - this is used |
1457 | * for empty space checking. |
1242 | * for empty space checking. |
1458 | */ |
1243 | */ |
1459 | static inline int |
1244 | static inline int |
1460 | have_head (int ax, int ay) |
1245 | have_head (int ax, int ay) |
1461 | { |
1246 | { |
1462 | |
|
|
1463 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1247 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1464 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1248 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1465 | return 1; |
1249 | return 1; |
|
|
1250 | |
1466 | return 0; |
1251 | return 0; |
1467 | } |
1252 | } |
1468 | |
1253 | |
1469 | /** |
1254 | /** |
1470 | * check_head is a bit simplistic version of update_space below. |
1255 | * check_head is a bit simplistic version of update_space below. |
1471 | * basically, it only checks the that the head on space ax,ay at layer |
1256 | * basically, it only checks the that the head on space ax,ay at layer |
1472 | * needs to get sent - if so, it adds the data, sending the head |
1257 | * needs to get sent - if so, it adds the data, sending the head |
1473 | * if needed, and returning 1. If this no data needs to get |
1258 | * if needed, and returning 1. If this no data needs to get |
1474 | * sent, it returns zero. |
1259 | * sent, it returns zero. |
1475 | */ |
1260 | */ |
1476 | static int |
1261 | static int |
1477 | check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) |
1262 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1478 | { |
1263 | { |
1479 | short face_num; |
1264 | short face_num; |
1480 | |
1265 | |
1481 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1266 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1482 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1267 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1514 | * numbers the spaces differently - I think this was a leftover from |
1299 | * numbers the spaces differently - I think this was a leftover from |
1515 | * the map command, where the faces stack up. Sinces that is no longer |
1300 | * the map command, where the faces stack up. Sinces that is no longer |
1516 | * the case, it seems to make more sense to have these layer values |
1301 | * the case, it seems to make more sense to have these layer values |
1517 | * actually match. |
1302 | * actually match. |
1518 | */ |
1303 | */ |
1519 | |
|
|
1520 | static int |
1304 | static int |
1521 | update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1305 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1522 | { |
1306 | { |
1523 | object *ob, *head; |
1307 | object *ob, *head; |
1524 | uint16 face_num; |
1308 | uint16 face_num; |
1525 | int bx, by, i; |
1309 | int bx, by, i; |
1526 | |
1310 | |
… | |
… | |
1739 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1523 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1740 | * take. |
1524 | * take. |
1741 | */ |
1525 | */ |
1742 | |
1526 | |
1743 | static inline int |
1527 | static inline int |
1744 | update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1528 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1745 | { |
1529 | { |
1746 | object *ob; |
1530 | object *ob; |
1747 | int smoothlevel; /* old face_num; */ |
1531 | int smoothlevel; /* old face_num; */ |
1748 | |
1532 | |
1749 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1533 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1783 | * Returns the size of a data for a map square as returned by |
1567 | * Returns the size of a data for a map square as returned by |
1784 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1568 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1785 | * available. |
1569 | * available. |
1786 | */ |
1570 | */ |
1787 | int |
1571 | int |
1788 | getExtendedMapInfoSize (NewSocket * ns) |
1572 | getExtendedMapInfoSize (client * ns) |
1789 | { |
1573 | { |
1790 | int result = 0; |
1574 | int result = 0; |
1791 | |
1575 | |
1792 | if (ns->ext_mapinfos) |
1576 | if (ns->ext_mapinfos) |
1793 | { |
1577 | { |
1794 | if (ns->EMI_smooth) |
1578 | if (ns->EMI_smooth) |
1795 | result += 1; /*One byte for smoothlevel */ |
1579 | result += 1; /*One byte for smoothlevel */ |
1796 | } |
1580 | } |
|
|
1581 | |
1797 | return result; |
1582 | return result; |
1798 | } |
1583 | } |
1799 | |
1584 | |
1800 | /** |
1585 | /** |
1801 | * This function uses the new map1 protocol command to send the map |
1586 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1829 | uint8 eentrysize; |
1614 | uint8 eentrysize; |
1830 | uint16 ewhatstart, ewhatflag; |
1615 | uint16 ewhatstart, ewhatflag; |
1831 | uint8 extendedinfos; |
1616 | uint8 extendedinfos; |
1832 | maptile *m; |
1617 | maptile *m; |
1833 | |
1618 | |
1834 | NewSocket &socket = pl->contr->socket; |
1619 | client &socket = *pl->contr->socket; |
1835 | |
1620 | |
1836 | check_map_change (pl->contr); |
1621 | check_map_change (pl->contr); |
1837 | |
1622 | |
1838 | packet sl; |
1623 | packet sl; |
1839 | packet esl; |
1624 | packet esl; |
1840 | |
1625 | |
1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1626 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1842 | startlen = sl.len; |
1627 | startlen = sl.length (); |
1843 | |
1628 | |
1844 | /*Extendedmapinfo structure initialisation */ |
1629 | /*Extendedmapinfo structure initialisation */ |
1845 | if (socket.ext_mapinfos) |
1630 | if (socket.ext_mapinfos) |
1846 | { |
1631 | { |
1847 | extendedinfos = EMI_NOREDRAW; |
1632 | extendedinfos = EMI_NOREDRAW; |
1848 | |
1633 | |
1849 | if (socket.EMI_smooth) |
1634 | if (socket.EMI_smooth) |
1850 | extendedinfos |= EMI_SMOOTH; |
1635 | extendedinfos |= EMI_SMOOTH; |
1851 | |
1636 | |
1852 | ewhatstart = esl.len; |
1637 | ewhatstart = esl.length (); |
1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1638 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1854 | could need to be taken away */ |
1639 | could need to be taken away */ |
1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1640 | eentrysize = getExtendedMapInfoSize (&socket); |
1856 | esl << "mapextended " |
1641 | esl << "mapextended " |
1857 | << uint8 (extendedinfos) |
1642 | << uint8 (extendedinfos) |
1858 | << uint8 (eentrysize); |
1643 | << uint8 (eentrysize); |
|
|
1644 | |
1859 | estartlen = esl.len; |
1645 | estartlen = esl.length (); |
1860 | } |
1646 | } |
1861 | else |
1647 | else |
1862 | { |
1648 | { |
1863 | /* suppress compiler warnings */ |
1649 | /* suppress compiler warnings */ |
1864 | ewhatstart = 0; |
1650 | ewhatstart = 0; |
… | |
… | |
1902 | */ |
1688 | */ |
1903 | if (ax >= socket.mapx || ay >= socket.mapy) |
1689 | if (ax >= socket.mapx || ay >= socket.mapy) |
1904 | { |
1690 | { |
1905 | int i, got_one; |
1691 | int i, got_one; |
1906 | |
1692 | |
1907 | oldlen = sl.len; |
1693 | oldlen = sl.length (); |
1908 | |
1694 | |
1909 | sl << uint16 (mask); |
1695 | sl << uint16 (mask); |
1910 | |
1696 | |
1911 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1697 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1912 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1698 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
… | |
… | |
1916 | * actually need to send that - just the coordinates |
1702 | * actually need to send that - just the coordinates |
1917 | * with no faces tells the client to blank out the |
1703 | * with no faces tells the client to blank out the |
1918 | * space. |
1704 | * space. |
1919 | */ |
1705 | */ |
1920 | got_one = 0; |
1706 | got_one = 0; |
1921 | for (i = oldlen + 2; i < sl.len; i++) |
1707 | for (i = oldlen + 2; i < sl.length (); i++) |
1922 | if (sl.buf[i]) |
1708 | if (sl[i]) |
1923 | got_one = 1; |
1709 | got_one = 1; |
1924 | |
1710 | |
1925 | if (got_one && (mask & 0xf)) |
1711 | if (got_one && (mask & 0xf)) |
1926 | sl.buf[oldlen + 1] = mask & 0xff; |
1712 | sl[oldlen + 1] = mask & 0xff; |
1927 | else |
1713 | else |
1928 | { /*either all faces blank, either no face at all */ |
1714 | { /*either all faces blank, either no face at all */ |
1929 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1715 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1930 | sl.len = oldlen + 2; |
1716 | sl.reset (oldlen + 2); |
1931 | else |
1717 | else |
1932 | sl.len = oldlen; |
1718 | sl.reset (oldlen); |
1933 | } |
1719 | } |
1934 | |
1720 | |
1935 | /*What concerns extendinfos, nothing to be done for now |
1721 | /*What concerns extendinfos, nothing to be done for now |
1936 | * (perhaps effects layer later) |
1722 | * (perhaps effects layer later) |
1937 | */ |
1723 | */ |
… | |
… | |
1967 | |
1753 | |
1968 | /* This block deals with spaces that are not visible for whatever |
1754 | /* This block deals with spaces that are not visible for whatever |
1969 | * reason. Still may need to send the head for this space. |
1755 | * reason. Still may need to send the head for this space. |
1970 | */ |
1756 | */ |
1971 | |
1757 | |
1972 | oldlen = sl.len; |
1758 | oldlen = sl.length (); |
1973 | |
1759 | |
1974 | sl << uint16 (mask); |
1760 | sl << uint16 (mask); |
1975 | |
1761 | |
1976 | if (lastcell.count != -1) |
1762 | if (lastcell.count != -1) |
1977 | need_send = 1; |
1763 | need_send = 1; |
… | |
… | |
1997 | |
1783 | |
1998 | map_clearcell (&lastcell, 0, 0, 0, count); |
1784 | map_clearcell (&lastcell, 0, 0, 0, count); |
1999 | } |
1785 | } |
2000 | |
1786 | |
2001 | if ((mask & 0xf) || need_send) |
1787 | if ((mask & 0xf) || need_send) |
2002 | sl.buf[oldlen + 1] = mask & 0xff; |
1788 | sl[oldlen + 1] = mask & 0xff; |
2003 | else |
1789 | else |
2004 | sl.len = oldlen; |
1790 | sl.reset (oldlen); |
2005 | } |
1791 | } |
2006 | else |
1792 | else |
2007 | { |
1793 | { |
2008 | /* In this block, the space is visible or there are head objects |
1794 | /* In this block, the space is visible or there are head objects |
2009 | * we need to send. |
1795 | * we need to send. |
… | |
… | |
2011 | |
1797 | |
2012 | /* Rather than try to figure out what everything that we might |
1798 | /* Rather than try to figure out what everything that we might |
2013 | * need to send is, then form the packet after that, |
1799 | * need to send is, then form the packet after that, |
2014 | * we presume that we will in fact form a packet, and update |
1800 | * we presume that we will in fact form a packet, and update |
2015 | * the bits by what we do actually send. If we send nothing, |
1801 | * the bits by what we do actually send. If we send nothing, |
2016 | * we just back out sl.len to the old value, and no harm |
1802 | * we just back out sl.length () to the old value, and no harm |
2017 | * is done. |
1803 | * is done. |
2018 | * I think this is simpler than doing a bunch of checks to see |
1804 | * I think this is simpler than doing a bunch of checks to see |
2019 | * what if anything we need to send, setting the bits, then |
1805 | * what if anything we need to send, setting the bits, then |
2020 | * doing those checks again to add the real data. |
1806 | * doing those checks again to add the real data. |
2021 | */ |
1807 | */ |
2022 | oldlen = sl.len; |
1808 | oldlen = sl.length (); |
2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1809 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2024 | eoldlen = esl.len; |
1810 | eoldlen = esl.length (); |
2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1811 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2026 | sl << uint16 (mask); |
1812 | sl << uint16 (mask); |
2027 | |
1813 | |
2028 | if (socket.ext_mapinfos) |
1814 | if (socket.ext_mapinfos) |
2029 | esl << uint16 (emask); |
1815 | esl << uint16 (emask); |
… | |
… | |
2037 | mask |= 0x8; |
1823 | mask |= 0x8; |
2038 | |
1824 | |
2039 | if (socket.extmap) |
1825 | if (socket.extmap) |
2040 | { |
1826 | { |
2041 | *last_ext |= 0x80; |
1827 | *last_ext |= 0x80; |
2042 | last_ext = sl.buf + sl.len; |
1828 | last_ext = &sl[sl.length ()]; |
2043 | sl << uint8 (d); |
1829 | sl << uint8 (d); |
2044 | } |
1830 | } |
2045 | else |
1831 | else |
2046 | sl << uint8 (255 - 64 * d); |
1832 | sl << uint8 (255 - 64 * d); |
2047 | } |
1833 | } |
… | |
… | |
2081 | { |
1867 | { |
2082 | lastcell.stat_hp = stat_hp; |
1868 | lastcell.stat_hp = stat_hp; |
2083 | |
1869 | |
2084 | mask |= 0x8; |
1870 | mask |= 0x8; |
2085 | *last_ext |= 0x80; |
1871 | *last_ext |= 0x80; |
2086 | last_ext = sl.buf + sl.len; |
1872 | last_ext = &sl[sl.length ()]; |
2087 | |
1873 | |
2088 | sl << uint8 (5) << uint8 (stat_hp); |
1874 | sl << uint8 (5) << uint8 (stat_hp); |
2089 | |
1875 | |
2090 | if (stat_width > 1) |
1876 | if (stat_width > 1) |
2091 | { |
1877 | { |
2092 | *last_ext |= 0x80; |
1878 | *last_ext |= 0x80; |
2093 | last_ext = sl.buf + sl.len; |
1879 | last_ext = &sl[sl.length ()]; |
2094 | |
1880 | |
2095 | sl << uint8 (6) << uint8 (stat_width); |
1881 | sl << uint8 (6) << uint8 (stat_width); |
2096 | } |
1882 | } |
2097 | } |
1883 | } |
2098 | |
1884 | |
… | |
… | |
2100 | { |
1886 | { |
2101 | lastcell.player = player; |
1887 | lastcell.player = player; |
2102 | |
1888 | |
2103 | mask |= 0x8; |
1889 | mask |= 0x8; |
2104 | *last_ext |= 0x80; |
1890 | *last_ext |= 0x80; |
2105 | last_ext = sl.buf + sl.len; |
1891 | last_ext = &sl[sl.length ()]; |
2106 | |
1892 | |
2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1893 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2108 | } |
1894 | } |
2109 | |
1895 | |
2110 | if (lastcell.flags != flags) |
1896 | if (lastcell.flags != flags) |
2111 | { |
1897 | { |
2112 | lastcell.flags = flags; |
1898 | lastcell.flags = flags; |
2113 | |
1899 | |
2114 | mask |= 0x8; |
1900 | mask |= 0x8; |
2115 | *last_ext |= 0x80; |
1901 | *last_ext |= 0x80; |
2116 | last_ext = sl.buf + sl.len; |
1902 | last_ext = &sl[sl.length ()]; |
2117 | |
1903 | |
2118 | sl << uint8 (8) << uint8 (flags); |
1904 | sl << uint8 (8) << uint8 (flags); |
2119 | } |
1905 | } |
2120 | } |
1906 | } |
2121 | |
1907 | |
… | |
… | |
2163 | * space by checking the mask. If so, update the mask. |
1949 | * space by checking the mask. If so, update the mask. |
2164 | * if not, reset the len to that from before adding the mask |
1950 | * if not, reset the len to that from before adding the mask |
2165 | * value, so we don't send those bits. |
1951 | * value, so we don't send those bits. |
2166 | */ |
1952 | */ |
2167 | if (mask & 0xf) |
1953 | if (mask & 0xf) |
2168 | sl.buf[oldlen + 1] = mask & 0xff; |
1954 | sl[oldlen + 1] = mask & 0xff; |
2169 | else |
1955 | else |
2170 | sl.len = oldlen; |
1956 | sl.reset (oldlen); |
2171 | |
1957 | |
2172 | if (emask & 0xf) |
1958 | if (emask & 0xf) |
2173 | esl.buf[eoldlen + 1] = emask & 0xff; |
1959 | esl[eoldlen + 1] = emask & 0xff; |
2174 | else |
1960 | else |
2175 | esl.len = eoldlen; |
1961 | esl.reset (eoldlen); |
2176 | } /* else this is a viewable space */ |
1962 | } /* else this is a viewable space */ |
2177 | } /* for x loop */ |
1963 | } /* for x loop */ |
2178 | } /* for y loop */ |
1964 | } /* for y loop */ |
2179 | |
1965 | |
2180 | /* Verify that we in fact do need to send this */ |
1966 | /* Verify that we in fact do need to send this */ |
2181 | if (socket.ext_mapinfos) |
1967 | if (socket.ext_mapinfos) |
2182 | { |
1968 | { |
2183 | if (!(sl.len > startlen || socket.sent_scroll)) |
1969 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2184 | { |
1970 | { |
2185 | /* No map data will follow, so don't say the client |
1971 | /* No map data will follow, so don't say the client |
2186 | * it doesn't need draw! |
1972 | * it doesn't need draw! |
2187 | */ |
1973 | */ |
2188 | ewhatflag &= (~EMI_NOREDRAW); |
1974 | ewhatflag &= (~EMI_NOREDRAW); |
2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
1975 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2190 | } |
1976 | } |
2191 | |
1977 | |
2192 | if (esl.len > estartlen) |
1978 | if (esl.length () > estartlen) |
2193 | Send_With_Handling (&socket, &esl); |
1979 | socket.send_packet (esl); |
2194 | } |
1980 | } |
2195 | |
1981 | |
2196 | if (sl.len > startlen || socket.sent_scroll) |
1982 | if (sl.length () > startlen || socket.sent_scroll) |
2197 | { |
1983 | { |
2198 | Send_With_Handling (&socket, &sl); |
1984 | socket.send_packet (sl); |
2199 | socket.sent_scroll = 0; |
1985 | socket.sent_scroll = 0; |
2200 | } |
1986 | } |
2201 | } |
1987 | } |
2202 | |
1988 | |
2203 | /** |
1989 | /** |
… | |
… | |
2229 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2015 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2230 | return; |
2016 | return; |
2231 | |
2017 | |
2232 | memset (&newmap, 0, sizeof (struct Map)); |
2018 | memset (&newmap, 0, sizeof (struct Map)); |
2233 | |
2019 | |
2234 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2020 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2235 | { |
2021 | { |
2236 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2022 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2237 | { |
2023 | { |
2238 | ax = i; |
2024 | ax = i; |
2239 | ay = j; |
2025 | ay = j; |
2240 | m = pm; |
2026 | m = pm; |
2241 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2027 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2028 | |
2242 | if (mflags & P_OUT_OF_MAP) |
2029 | if (mflags & P_OUT_OF_MAP) |
2243 | continue; |
2030 | continue; |
|
|
2031 | |
2244 | if (mflags & P_NEED_UPDATE) |
2032 | if (mflags & P_NEED_UPDATE) |
2245 | update_position (m, ax, ay); |
2033 | update_position (m, ax, ay); |
|
|
2034 | |
2246 | /* If a map is visible to the player, we don't want to swap it out |
2035 | /* If a map is visible to the player, we don't want to swap it out |
2247 | * just to reload it. This should really call something like |
2036 | * just to reload it. This should really call something like |
2248 | * swap_map, but this is much more efficient and 'good enough' |
2037 | * swap_map, but this is much more efficient and 'good enough' |
2249 | */ |
2038 | */ |
2250 | if (mflags & P_NEW_MAP) |
2039 | if (mflags & P_NEW_MAP) |
… | |
… | |
2256 | { |
2045 | { |
2257 | update_los (pl); |
2046 | update_los (pl); |
2258 | pl->contr->do_los = 0; |
2047 | pl->contr->do_los = 0; |
2259 | } |
2048 | } |
2260 | |
2049 | |
2261 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2262 | { |
|
|
2263 | /* Big maps need a different drawing mechanism to work */ |
2050 | /* Big maps need a different drawing mechanism to work */ |
2264 | draw_client_map1 (pl); |
2051 | draw_client_map1 (pl); |
2265 | return; |
|
|
2266 | } |
|
|
2267 | |
|
|
2268 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2269 | { |
|
|
2270 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2271 | } |
|
|
2272 | |
|
|
2273 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2274 | * basically some number of spaces around the player) |
|
|
2275 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2276 | * left corner) and are thus disconnected from the map values. |
|
|
2277 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2278 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2279 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2280 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2281 | * odd, this still works fine. |
|
|
2282 | */ |
|
|
2283 | ay = 0; |
|
|
2284 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2285 | { |
|
|
2286 | ax = 0; |
|
|
2287 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2288 | { |
|
|
2289 | |
|
|
2290 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2291 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2292 | * negation check. |
|
|
2293 | */ |
|
|
2294 | nx = i; |
|
|
2295 | ny = j; |
|
|
2296 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2297 | if (m && d < 4) |
|
|
2298 | { |
|
|
2299 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2300 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2301 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2302 | |
|
|
2303 | /* If all is blank, send a blank face. */ |
|
|
2304 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2305 | { |
|
|
2306 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2307 | } |
|
|
2308 | else |
|
|
2309 | { /* actually have something interesting */ |
|
|
2310 | /* send the darkness mask, if any. */ |
|
|
2311 | if (d && pl->contr->socket.darkness) |
|
|
2312 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2313 | |
|
|
2314 | if (face && face != blank_face) |
|
|
2315 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2316 | if (floor2 && floor2 != blank_face) |
|
|
2317 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2318 | if (floor && floor != blank_face) |
|
|
2319 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2320 | } |
|
|
2321 | } /* Is a valid space */ |
|
|
2322 | } |
|
|
2323 | } |
|
|
2324 | |
|
|
2325 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2326 | |
|
|
2327 | check_map_change (pl->contr); |
|
|
2328 | } |
2052 | } |
2329 | |
2053 | |
2330 | |
2054 | |
2331 | /*****************************************************************************/ |
2055 | /*****************************************************************************/ |
2332 | |
2056 | |
… | |
… | |
2338 | |
2062 | |
2339 | /*****************************************************************************/ |
2063 | /*****************************************************************************/ |
2340 | void |
2064 | void |
2341 | send_plugin_custom_message (object *pl, char *buf) |
2065 | send_plugin_custom_message (object *pl, char *buf) |
2342 | { |
2066 | { |
2343 | pl->contr->socket.send_packet (buf); |
2067 | pl->contr->socket->send_packet (buf); |
2344 | } |
2068 | } |
2345 | |
2069 | |
2346 | /** |
2070 | /** |
2347 | * This sends the skill number to name mapping. We ignore |
2071 | * This sends the skill number to name mapping. We ignore |
2348 | * the params - we always send the same info no matter what. |
2072 | * the params - we always send the same info no matter what. |
2349 | */ |
2073 | */ |
2350 | void |
2074 | void |
2351 | send_skill_info (NewSocket *ns, char *params) |
2075 | send_skill_info (client *ns, char *params) |
2352 | { |
2076 | { |
2353 | packet sl; |
2077 | packet sl; |
2354 | sl << "replyinfo skill_info\n"; |
2078 | sl << "replyinfo skill_info\n"; |
2355 | |
2079 | |
2356 | for (int i = 1; i < NUM_SKILLS; i++) |
2080 | for (int i = 1; i < NUM_SKILLS; i++) |
2357 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2081 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2358 | |
2082 | |
2359 | if (sl.len >= MAXSOCKBUF) |
2083 | if (sl.length () >= MAXSOCKBUF) |
2360 | { |
2084 | { |
2361 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2085 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2362 | fatal (0); |
2086 | fatal (0); |
2363 | } |
2087 | } |
2364 | |
2088 | |
2365 | Send_With_Handling (ns, &sl); |
2089 | ns->send_packet (sl); |
2366 | } |
2090 | } |
2367 | |
2091 | |
2368 | /** |
2092 | /** |
2369 | * This sends the spell path to name mapping. We ignore |
2093 | * This sends the spell path to name mapping. We ignore |
2370 | * the params - we always send the same info no matter what. |
2094 | * the params - we always send the same info no matter what. |
2371 | */ |
2095 | */ |
2372 | void |
2096 | void |
2373 | send_spell_paths (NewSocket * ns, char *params) |
2097 | send_spell_paths (client * ns, char *params) |
2374 | { |
2098 | { |
2375 | packet sl; |
2099 | packet sl; |
2376 | |
2100 | |
2377 | sl << "replyinfo spell_paths\n"; |
2101 | sl << "replyinfo spell_paths\n"; |
2378 | |
2102 | |
2379 | for (int i = 0; i < NRSPELLPATHS; i++) |
2103 | for (int i = 0; i < NRSPELLPATHS; i++) |
2380 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2104 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2381 | |
2105 | |
2382 | if (sl.len >= MAXSOCKBUF) |
2106 | if (sl.length () >= MAXSOCKBUF) |
2383 | { |
2107 | { |
2384 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2108 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2385 | fatal (0); |
2109 | fatal (0); |
2386 | } |
2110 | } |
2387 | |
2111 | |
2388 | Send_With_Handling (ns, &sl); |
2112 | ns->send_packet (sl); |
2389 | } |
2113 | } |
2390 | |
2114 | |
2391 | /** |
2115 | /** |
2392 | * This looks for any spells the player may have that have changed their stats. |
2116 | * This looks for any spells the player may have that have changed their stats. |
2393 | * it then sends an updspell packet for each spell that has changed in this way |
2117 | * it then sends an updspell packet for each spell that has changed in this way |
2394 | */ |
2118 | */ |
2395 | void |
2119 | void |
2396 | esrv_update_spells (player *pl) |
2120 | esrv_update_spells (player *pl) |
2397 | { |
2121 | { |
2398 | if (!pl->socket.monitor_spells) |
2122 | if (!pl->socket->monitor_spells) |
2399 | return; |
2123 | return; |
2400 | |
2124 | |
2401 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2125 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2402 | { |
2126 | { |
2403 | if (spell->type == SPELL) |
2127 | if (spell->type == SPELL) |
… | |
… | |
2433 | |
2157 | |
2434 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2158 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2435 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2159 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2436 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2160 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2437 | |
2161 | |
2438 | Send_With_Handling (&pl->socket, &sl); |
2162 | pl->socket->send_packet (sl); |
2439 | } |
2163 | } |
2440 | } |
2164 | } |
2441 | } |
2165 | } |
2442 | } |
2166 | } |
2443 | |
2167 | |
2444 | void |
2168 | void |
2445 | esrv_remove_spell (player *pl, object *spell) |
2169 | esrv_remove_spell (player *pl, object *spell) |
2446 | { |
2170 | { |
2447 | if (!pl->socket.monitor_spells) |
2171 | if (!pl->socket->monitor_spells) |
2448 | return; |
2172 | return; |
2449 | |
2173 | |
2450 | if (!pl || !spell || spell->env != pl->ob) |
2174 | if (!pl || !spell || spell->env != pl->ob) |
2451 | { |
2175 | { |
2452 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2176 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
… | |
… | |
2456 | packet sl; |
2180 | packet sl; |
2457 | |
2181 | |
2458 | sl << "delspell " |
2182 | sl << "delspell " |
2459 | << uint32 (spell->count); |
2183 | << uint32 (spell->count); |
2460 | |
2184 | |
2461 | Send_With_Handling (&pl->socket, &sl); |
2185 | pl->socket->send_packet (sl); |
2462 | } |
2186 | } |
2463 | |
2187 | |
2464 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2188 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2465 | static void |
2189 | static void |
2466 | append_spell (player *pl, packet &sl, object *spell) |
2190 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2514 | { |
2238 | { |
2515 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2239 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2516 | return; |
2240 | return; |
2517 | } |
2241 | } |
2518 | |
2242 | |
2519 | if (!pl->socket.monitor_spells) |
2243 | if (!pl->socket->monitor_spells) |
2520 | return; |
2244 | return; |
2521 | |
2245 | |
2522 | packet sl; |
2246 | packet sl; |
2523 | |
|
|
2524 | sl << "addspell "; |
2247 | sl << "addspell "; |
2525 | |
2248 | |
2526 | if (!spell) |
2249 | if (!spell) |
2527 | { |
2250 | { |
2528 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2251 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
… | |
… | |
2541 | * like it will fix this |
2264 | * like it will fix this |
2542 | */ |
2265 | */ |
2543 | if (spell->type != SPELL) |
2266 | if (spell->type != SPELL) |
2544 | continue; |
2267 | continue; |
2545 | |
2268 | |
2546 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2269 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2547 | { |
2270 | { |
2548 | Send_With_Handling (&pl->socket, &sl); |
2271 | pl->socket->send_packet (sl); |
2549 | strcpy ((char *) sl.buf, "addspell "); |
2272 | |
2550 | sl.len = strlen ((char *) sl.buf); |
2273 | sl.reset (); |
|
|
2274 | sl << "addspell "; |
2551 | } |
2275 | } |
2552 | |
2276 | |
2553 | append_spell (pl, sl, spell); |
2277 | append_spell (pl, sl, spell); |
2554 | } |
2278 | } |
2555 | } |
2279 | } |
… | |
… | |
2566 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2290 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2567 | fatal (0); |
2291 | fatal (0); |
2568 | } |
2292 | } |
2569 | |
2293 | |
2570 | /* finally, we can send the packet */ |
2294 | /* finally, we can send the packet */ |
2571 | Send_With_Handling (&pl->socket, &sl); |
2295 | pl->socket->send_packet (sl); |
2572 | |
|
|
2573 | } |
2296 | } |
2574 | |
2297 | |