… | |
… | |
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 |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
44 | * operations |
44 | * operations |
45 | * |
45 | * |
46 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
47 | * map updates. |
|
|
48 | * |
|
|
49 | */ |
46 | */ |
50 | |
47 | |
51 | #include <global.h> |
48 | #include <global.h> |
52 | #include <sproto.h> |
49 | #include <sproto.h> |
53 | |
50 | |
54 | #include <newclient.h> |
|
|
55 | #include <newserver.h> |
|
|
56 | #include <living.h> |
51 | #include <living.h> |
57 | #include <commands.h> |
52 | #include <commands.h> |
58 | |
53 | |
59 | /* This block is basically taken from socket.c - I assume if it works there, |
54 | /* This block is basically taken from socket.c - I assume if it works there, |
60 | * it should work here. |
55 | * it should work here. |
… | |
… | |
63 | #include <sys/time.h> |
58 | #include <sys/time.h> |
64 | #include <sys/socket.h> |
59 | #include <sys/socket.h> |
65 | #include <netinet/in.h> |
60 | #include <netinet/in.h> |
66 | #include <netdb.h> |
61 | #include <netdb.h> |
67 | |
62 | |
68 | #ifdef HAVE_UNISTD_H |
|
|
69 | # include <unistd.h> |
63 | #include <unistd.h> |
70 | #endif |
|
|
71 | |
|
|
72 | #ifdef HAVE_SYS_TIME_H |
|
|
73 | # include <sys/time.h> |
64 | #include <sys/time.h> |
74 | #endif |
|
|
75 | |
65 | |
76 | #include "sounds.h" |
66 | #include "sounds.h" |
77 | |
67 | |
78 | /** |
68 | /** |
79 | * This table translates the attack numbers as used within the |
69 | * This table translates the attack numbers as used within the |
… | |
… | |
96 | -1, /* life stealing */ |
86 | -1, /* life stealing */ |
97 | -1 /* Disease - not fully done yet */ |
87 | -1 /* Disease - not fully done yet */ |
98 | }; |
88 | }; |
99 | |
89 | |
100 | static void |
90 | static void |
101 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
91 | socket_map_scroll (client *ns, int dx, int dy) |
102 | { |
92 | { |
103 | struct Map newmap; |
93 | struct Map newmap; |
104 | int x, y, mx, my; |
94 | int x, y, mx, my; |
105 | |
95 | |
106 | { |
|
|
107 | SockList sl (MAXSOCKBUF); |
|
|
108 | |
|
|
109 | sl.printf ("map_scroll %d %d", dx, dy); |
96 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
110 | ns->send_packet (sl); |
|
|
111 | sl.free (); |
|
|
112 | } |
|
|
113 | |
97 | |
114 | /* If we are using the Map1aCmd, we may in fact send |
98 | /* If we are using the Map1aCmd, we may in fact send |
115 | * head information that is outside the viewable map. |
99 | * head information that is outside the viewable map. |
116 | * So set the mx,my to the max value we want to |
100 | * So set the mx,my to the max value we want to |
117 | * look for. Removed code to do so - it caused extra |
101 | * look for. Removed code to do so - it caused extra |
… | |
… | |
157 | } |
141 | } |
158 | |
142 | |
159 | static void |
143 | static void |
160 | clear_map (player *pl) |
144 | clear_map (player *pl) |
161 | { |
145 | { |
162 | NewSocket & socket = pl->socket; |
146 | client &socket = *pl->socket; |
163 | |
147 | |
164 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
148 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
165 | |
149 | |
166 | if (socket.newmapcmd == 1) |
150 | if (socket.newmapcmd == 1) |
167 | socket.send_packet ("newmap"); |
151 | socket.send_packet ("newmap"); |
… | |
… | |
172 | |
156 | |
173 | /** check for map change and send new map data */ |
157 | /** check for map change and send new map data */ |
174 | static void |
158 | static void |
175 | check_map_change (player *pl) |
159 | check_map_change (player *pl) |
176 | { |
160 | { |
177 | NewSocket & socket = pl->socket; |
161 | client &socket = *pl->socket; |
178 | object *ob = pl->ob; |
162 | object *ob = pl->ob; |
179 | char buf[MAX_BUF]; /* eauugggh */ |
163 | char buf[MAX_BUF]; /* eauugggh */ |
180 | |
164 | |
181 | if (socket.current_map != ob->map) |
165 | if (socket.current_map != ob->map) |
182 | { |
166 | { |
… | |
… | |
225 | |
209 | |
226 | socket.current_x = ob->x; |
210 | socket.current_x = ob->x; |
227 | socket.current_y = ob->y; |
211 | socket.current_y = ob->y; |
228 | } |
212 | } |
229 | |
213 | |
|
|
214 | /** |
|
|
215 | * RequestInfo is sort of a meta command. There is some specific |
|
|
216 | * request of information, but we call other functions to provide |
|
|
217 | * that information. |
|
|
218 | */ |
|
|
219 | void |
|
|
220 | RequestInfo (char *buf, int len, client * ns) |
|
|
221 | { |
|
|
222 | char *params = NULL, *cp; |
|
|
223 | |
|
|
224 | /* No match */ |
|
|
225 | char bigbuf[MAX_BUF]; |
|
|
226 | int slen; |
|
|
227 | |
|
|
228 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
229 | * if we don't find a match. |
|
|
230 | */ |
|
|
231 | strcpy (bigbuf, "replyinfo "); |
|
|
232 | slen = strlen (bigbuf); |
|
|
233 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
234 | |
|
|
235 | /* find the first space, make it null, and update the |
|
|
236 | * params pointer. |
|
|
237 | */ |
|
|
238 | for (cp = buf; *cp != '\0'; cp++) |
|
|
239 | if (*cp == ' ') |
|
|
240 | { |
|
|
241 | *cp = '\0'; |
|
|
242 | params = cp + 1; |
|
|
243 | break; |
|
|
244 | } |
|
|
245 | |
|
|
246 | if (!strcmp (buf, "image_info")) |
|
|
247 | send_image_info (ns, params); |
|
|
248 | else if (!strcmp (buf, "image_sums")) |
|
|
249 | send_image_sums (ns, params); |
|
|
250 | else if (!strcmp (buf, "skill_info")) |
|
|
251 | send_skill_info (ns, params); |
|
|
252 | else if (!strcmp (buf, "spell_paths")) |
|
|
253 | send_spell_paths (ns, params); |
|
|
254 | else |
|
|
255 | ns->send_packet (bigbuf, len); |
|
|
256 | } |
|
|
257 | |
230 | void |
258 | void |
231 | ExtCmd (char *buf, int len, player *pl) |
259 | ExtCmd (char *buf, int len, player *pl) |
232 | { |
260 | { |
233 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
261 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
234 | } |
262 | } |
… | |
… | |
253 | buf += 8; |
281 | buf += 8; |
254 | |
282 | |
255 | // initial map and its origin |
283 | // initial map and its origin |
256 | maptile *map = pl->ob->map; |
284 | maptile *map = pl->ob->map; |
257 | sint16 dx, dy; |
285 | sint16 dx, dy; |
258 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
286 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
259 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
287 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
260 | int max_distance = 8; // limit maximum path length to something generous |
288 | int max_distance = 8; // limit maximum path length to something generous |
261 | |
289 | |
262 | while (*buf && map && max_distance) |
290 | while (*buf && map && max_distance) |
263 | { |
291 | { |
264 | int dir = *buf++; |
292 | int dir = *buf++; |
… | |
… | |
315 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
316 | } |
344 | } |
317 | else |
345 | else |
318 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
319 | |
347 | |
320 | pl->socket.send_packet (bigbuf); |
348 | pl->socket->send_packet (bigbuf); |
321 | } |
349 | } |
322 | |
350 | |
323 | /** This is the Setup cmd - easy first implementation */ |
351 | /** This is the Setup cmd - easy first implementation */ |
324 | void |
352 | void |
325 | SetUp (char *buf, int len, NewSocket * ns) |
353 | SetUp (char *buf, int len, client * ns) |
326 | { |
354 | { |
327 | int s, slen; |
355 | int s, slen; |
328 | char *cmd, *param, cmdback[HUGE_BUF]; |
356 | char *cmd, *param, cmdback[HUGE_BUF]; |
329 | |
357 | |
330 | /* run through the cmds of setup |
358 | /* run through the cmds of setup |
… | |
… | |
540 | * This is what takes care of it. We tell the client how things worked out. |
568 | * This is what takes care of it. We tell the client how things worked out. |
541 | * I am not sure if this file is the best place for this function. however, |
569 | * I am not sure if this file is the best place for this function. however, |
542 | * it either has to be here or init_sockets needs to be exported. |
570 | * it either has to be here or init_sockets needs to be exported. |
543 | */ |
571 | */ |
544 | void |
572 | void |
545 | AddMeCmd (char *buf, int len, NewSocket * ns) |
573 | AddMeCmd (char *buf, int len, client * ns) |
546 | { |
574 | { |
547 | Settings oldsettings; |
|
|
548 | |
|
|
549 | oldsettings = settings; |
|
|
550 | if (ns->status != Ns_Add || add_player (ns)) |
575 | if (ns->status != Ns_Add || add_player (ns)) |
551 | ns->send_packet ("addme_failed"); |
576 | ns->send_packet ("addme_failed"); |
552 | else |
577 | else |
553 | { |
|
|
554 | /* Basically, the add_player copies the socket structure into |
|
|
555 | * the player structure, so this one (which is from init_sockets) |
|
|
556 | * is not needed anymore. The write below should still work, as the |
|
|
557 | * stuff in ns is still relevant. |
|
|
558 | */ |
|
|
559 | ns->send_packet ("addme_success"); |
578 | ns->send_packet ("addme_success"); |
560 | socket_info.nconns--; |
|
|
561 | ns->status = Ns_Avail; |
|
|
562 | } |
|
|
563 | |
|
|
564 | settings = oldsettings; |
|
|
565 | } |
579 | } |
566 | |
580 | |
567 | /** Reply to ExtendedInfos command */ |
581 | /** Reply to ExtendedInfos command */ |
568 | void |
582 | void |
569 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
583 | ToggleExtendedInfos (char *buf, int len, client * ns) |
570 | { |
584 | { |
571 | char cmdback[MAX_BUF]; |
585 | char cmdback[MAX_BUF]; |
572 | char command[50]; |
586 | char command[50]; |
573 | int info, nextinfo; |
587 | int info, nextinfo; |
574 | |
588 | |
… | |
… | |
625 | #define MSG_TYPE_MONUMENT 5 |
639 | #define MSG_TYPE_MONUMENT 5 |
626 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
640 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
627 | |
641 | |
628 | /** Reply to ExtendedInfos command */ |
642 | /** Reply to ExtendedInfos command */ |
629 | void |
643 | void |
630 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
644 | ToggleExtendedText (char *buf, int len, client * ns) |
631 | { |
645 | { |
632 | char cmdback[MAX_BUF]; |
646 | char cmdback[MAX_BUF]; |
633 | char temp[10]; |
647 | char temp[10]; |
634 | char command[50]; |
648 | char command[50]; |
635 | int info, nextinfo, i, flag; |
649 | int info, nextinfo, i, flag; |
… | |
… | |
686 | * a piece of data from us that we know the client wants. So |
700 | * a piece of data from us that we know the client wants. So |
687 | * if we know the client wants it, might as well push it to the |
701 | * if we know the client wants it, might as well push it to the |
688 | * client. |
702 | * client. |
689 | */ |
703 | */ |
690 | static void |
704 | static void |
691 | SendSmooth (NewSocket * ns, uint16 face) |
705 | SendSmooth (client * ns, uint16 face) |
692 | { |
706 | { |
693 | uint16 smoothface; |
707 | uint16 smoothface; |
694 | |
708 | |
695 | /* If we can't find a face, return and set it so we won't try to send this |
709 | /* If we can't find a face, return and set it so we won't try to send this |
696 | * again. |
710 | * again. |
… | |
… | |
706 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
720 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
707 | esrv_send_face (ns, smoothface, 0); |
721 | esrv_send_face (ns, smoothface, 0); |
708 | |
722 | |
709 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
723 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
710 | |
724 | |
711 | SockList sl (MAXSOCKBUF); |
725 | packet sl; |
712 | |
726 | |
713 | sl << "smooth " |
727 | sl << "smooth " |
714 | << uint16 (face) |
728 | << uint16 (face) |
715 | << uint16 (smoothface); |
729 | << uint16 (smoothface); |
716 | |
730 | |
717 | Send_With_Handling (ns, &sl); |
731 | ns->send_packet (sl); |
718 | sl.free (); |
|
|
719 | } |
732 | } |
720 | |
733 | |
721 | /** |
734 | /** |
722 | * Tells client the picture it has to use |
735 | * Tells client the picture it has to use |
723 | * to smooth a picture number given as argument. |
736 | * to smooth a picture number given as argument. |
724 | */ |
737 | */ |
725 | void |
738 | void |
726 | AskSmooth (char *buf, int len, NewSocket * ns) |
739 | AskSmooth (char *buf, int len, client * ns) |
727 | { |
740 | { |
728 | uint16 facenbr; |
741 | uint16 facenbr; |
729 | |
742 | |
730 | facenbr = atoi (buf); |
743 | facenbr = atoi (buf); |
731 | SendSmooth (ns, facenbr); |
744 | SendSmooth (ns, facenbr); |
… | |
… | |
788 | * etc.). It is a lot like PlayerCmd above, but is called with the |
801 | * etc.). It is a lot like PlayerCmd above, but is called with the |
789 | * 'ncom' method which gives more information back to the client so it |
802 | * 'ncom' method which gives more information back to the client so it |
790 | * can throttle. |
803 | * can throttle. |
791 | */ |
804 | */ |
792 | void |
805 | void |
793 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
806 | NewPlayerCmd (char *buf, int len, player *pl) |
794 | { |
807 | { |
795 | int time, repeat; |
808 | int time, repeat; |
796 | char command[MAX_BUF]; |
809 | char command[MAX_BUF]; |
797 | short packet; |
810 | int pktlen; |
798 | |
811 | |
799 | if (len < 7) |
812 | if (len < 7) |
800 | { |
813 | { |
801 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
814 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
802 | return; |
815 | return; |
803 | } |
816 | } |
804 | |
817 | |
805 | packet = net_uint16 (buf); |
818 | pktlen = net_uint16 ((uint8 *)buf); |
806 | repeat = net_uint32 (buf + 2); |
819 | repeat = net_uint32 ((uint8 *)buf + 2); |
807 | |
820 | |
808 | /* -1 is special - no repeat, but don't update */ |
821 | /* -1 is special - no repeat, but don't update */ |
809 | if (repeat != -1) |
822 | if (repeat != -1) |
810 | pl->count = repeat; |
823 | pl->count = repeat; |
811 | |
824 | |
812 | if ((len - 4) >= MAX_BUF) |
825 | if ((len - 4) >= MAX_BUF) |
813 | len = MAX_BUF - 5; |
826 | len = MAX_BUF - 5; |
814 | |
827 | |
815 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
828 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
816 | command[len - 4] = '\0'; |
829 | command[len - 4] = 0; |
817 | |
|
|
818 | /* The following should never happen with a proper or honest client. |
|
|
819 | * Therefore, the error message doesn't have to be too clear - if |
|
|
820 | * someone is playing with a hacked/non working client, this gives them |
|
|
821 | * an idea of the problem, but they deserve what they get |
|
|
822 | */ |
|
|
823 | if (pl->state != ST_PLAYING) |
|
|
824 | { |
|
|
825 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
826 | return; |
|
|
827 | } |
|
|
828 | |
830 | |
829 | /* This should not happen anymore. */ |
831 | /* This should not happen anymore. */ |
830 | if (pl->ob->speed_left < -1.0) |
832 | if (pl->ob->speed_left < -1.0) |
831 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
833 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
832 | |
834 | |
… | |
… | |
844 | else |
846 | else |
845 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
847 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
846 | |
848 | |
847 | /* Send confirmation of command execution now */ |
849 | /* Send confirmation of command execution now */ |
848 | |
850 | |
849 | SockList sl (MAXSOCKBUF); |
851 | packet sl; |
850 | sl << "comc " << uint16 (packet) << uint32 (time); |
852 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
851 | Send_With_Handling (&pl->socket, &sl); |
853 | pl->socket->send_packet (sl); |
852 | sl.free (); |
|
|
853 | } |
854 | } |
854 | |
855 | |
855 | |
856 | |
856 | /** This is a reply to a previous query. */ |
857 | /** This is a reply to a previous query. */ |
857 | void |
858 | void |
… | |
… | |
924 | * something older than the server. If we assume the client will be |
925 | * something older than the server. If we assume the client will be |
925 | * backwards compatible, having it be a later version should not be a |
926 | * backwards compatible, having it be a later version should not be a |
926 | * problem. |
927 | * problem. |
927 | */ |
928 | */ |
928 | void |
929 | void |
929 | VersionCmd (char *buf, int len, NewSocket * ns) |
930 | VersionCmd (char *buf, int len, client * ns) |
930 | { |
931 | { |
931 | char *cp; |
932 | char *cp; |
932 | char version_warning[256]; |
933 | char version_warning[256]; |
933 | |
934 | |
934 | if (!buf) |
935 | if (!buf) |
… | |
… | |
958 | cp = strchr (cp + 1, ' '); |
959 | cp = strchr (cp + 1, ' '); |
959 | if (cp) |
960 | if (cp) |
960 | { |
961 | { |
961 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
962 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
962 | |
963 | |
963 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
964 | assign (ns->version, cp + 1); |
964 | |
965 | |
965 | /* This is first implementation - i skip all beta DX clients with it |
|
|
966 | * Add later stuff here for other clients |
|
|
967 | */ |
|
|
968 | |
|
|
969 | /* these are old dxclients */ |
|
|
970 | /* Version 1024 added support for singular + plural name values - |
|
|
971 | * requiing this minimal value reduces complexity of that code, and it |
|
|
972 | * has been around for a long time. |
|
|
973 | */ |
|
|
974 | if (ns->sc_version < 1026) |
966 | if (ns->sc_version < 1026) |
975 | { |
967 | { |
976 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
968 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
977 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
969 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
978 | ns->send_packet (version_warning); |
970 | ns->send_packet (version_warning); |
… | |
… | |
980 | |
972 | |
981 | } |
973 | } |
982 | } |
974 | } |
983 | |
975 | |
984 | /** sound related functions. */ |
976 | /** sound related functions. */ |
985 | |
|
|
986 | void |
977 | void |
987 | SetSound (char *buf, int len, NewSocket * ns) |
978 | SetSound (char *buf, int len, client * ns) |
988 | { |
979 | { |
989 | ns->sound = atoi (buf); |
980 | ns->sound = atoi (buf); |
990 | } |
981 | } |
991 | |
982 | |
992 | /** client wants the map resent */ |
983 | /** client wants the map resent */ |
… | |
… | |
1002 | */ |
993 | */ |
1003 | #if 0 |
994 | #if 0 |
1004 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
995 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
1005 | * clear the "cache" |
996 | * clear the "cache" |
1006 | */ |
997 | */ |
1007 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
998 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
1008 | draw_client_map (pl->ob); |
999 | draw_client_map (pl->ob); |
1009 | #endif |
1000 | #endif |
1010 | } |
1001 | } |
1011 | |
1002 | |
1012 | /** |
1003 | /** |
… | |
… | |
1050 | /** |
1041 | /** |
1051 | * Asks the client to query the user. This way, the client knows |
1042 | * Asks the client to query the user. This way, the client knows |
1052 | * it needs to send something back (vs just printing out a message) |
1043 | * it needs to send something back (vs just printing out a message) |
1053 | */ |
1044 | */ |
1054 | void |
1045 | void |
1055 | send_query (NewSocket * ns, uint8 flags, char *text) |
1046 | send_query (client * ns, uint8 flags, char *text) |
1056 | { |
1047 | { |
1057 | char buf[MAX_BUF]; |
1048 | char buf[MAX_BUF]; |
1058 | |
1049 | |
1059 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1050 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1060 | ns->send_packet (buf); |
1051 | ns->send_packet (buf); |
… | |
… | |
1095 | esrv_update_stats (player *pl) |
1086 | esrv_update_stats (player *pl) |
1096 | { |
1087 | { |
1097 | char buf[MAX_BUF]; |
1088 | char buf[MAX_BUF]; |
1098 | uint16 flags; |
1089 | uint16 flags; |
1099 | |
1090 | |
1100 | SockList sl (MAXSOCKBUF); |
1091 | packet sl; |
1101 | sl << "stats "; |
1092 | sl << "stats "; |
1102 | |
1093 | |
1103 | if (pl->ob != NULL) |
1094 | if (pl->ob != NULL) |
1104 | { |
1095 | { |
1105 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1096 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
… | |
… | |
1115 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1106 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1116 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1107 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1117 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1108 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1118 | } |
1109 | } |
1119 | |
1110 | |
1120 | if (pl->socket.exp64) |
1111 | if (pl->socket->exp64) |
1121 | { |
1112 | { |
1122 | uint8 s; |
1113 | uint8 s; |
1123 | |
1114 | |
1124 | for (s = 0; s < NUM_SKILLS; s++) |
1115 | for (s = 0; s < NUM_SKILLS; s++) |
1125 | { |
1116 | { |
… | |
… | |
1135 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1126 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1136 | } |
1127 | } |
1137 | } |
1128 | } |
1138 | } |
1129 | } |
1139 | |
1130 | |
1140 | if (pl->socket.exp64) |
1131 | if (pl->socket->exp64) |
1141 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1132 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1142 | else |
1133 | else |
1143 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1134 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1144 | |
1135 | |
1145 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1136 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1158 | if (pl->run_on) |
1149 | if (pl->run_on) |
1159 | flags |= SF_RUNON; |
1150 | flags |= SF_RUNON; |
1160 | |
1151 | |
1161 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1152 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1162 | |
1153 | |
1163 | if (pl->socket.sc_version < 1025) |
1154 | if (pl->socket->sc_version < 1025) |
1164 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1155 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1165 | else |
1156 | else |
1166 | { |
1157 | { |
1167 | int i; |
1158 | int i; |
1168 | |
1159 | |
… | |
… | |
1174 | |
1165 | |
1175 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1166 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1176 | } |
1167 | } |
1177 | } |
1168 | } |
1178 | |
1169 | |
1179 | if (pl->socket.monitor_spells) |
1170 | if (pl->socket->monitor_spells) |
1180 | { |
1171 | { |
1181 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1172 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1182 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1173 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1183 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1174 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1184 | } |
1175 | } |
1185 | |
1176 | |
1186 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1177 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1187 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1178 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1188 | set_title (pl->ob, buf); |
1179 | set_title (pl->ob, buf); |
1189 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1180 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1190 | |
1181 | |
1191 | /* Only send it away if we have some actual data */ |
1182 | /* Only send it away if we have some actual data */ |
1192 | if (sl.len > 6) |
1183 | if (sl.length () > 6) |
1193 | { |
1184 | pl->socket->send_packet (sl); |
1194 | #ifdef ESRV_DEBUG |
|
|
1195 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1196 | #endif |
|
|
1197 | Send_With_Handling (&pl->socket, &sl); |
|
|
1198 | } |
|
|
1199 | |
|
|
1200 | sl.free (); |
|
|
1201 | } |
1185 | } |
1202 | |
1186 | |
1203 | /** |
1187 | /** |
1204 | * Tells the client that here is a player it should start using. |
1188 | * Tells the client that here is a player it should start using. |
1205 | */ |
1189 | */ |
1206 | void |
1190 | void |
1207 | esrv_new_player (player *pl, uint32 weight) |
1191 | esrv_new_player (player *pl, uint32 weight) |
1208 | { |
1192 | { |
1209 | pl->last_weight = weight; |
1193 | pl->last_weight = weight; |
1210 | |
1194 | |
1211 | SockList sl (MAXSOCKBUF); |
1195 | packet sl; |
1212 | sl << "player "; |
1196 | sl << "player "; |
1213 | |
1197 | |
1214 | sl << uint32 (pl->ob->count) |
1198 | sl << uint32 (pl->ob->count) |
1215 | << uint32 (weight) |
1199 | << uint32 (weight) |
1216 | << uint32 (pl->ob->face->number) |
1200 | << uint32 (pl->ob->face->number) |
1217 | << data8 (pl->ob->name); |
1201 | << data8 (pl->ob->name); |
1218 | |
1202 | |
1219 | Send_With_Handling (&pl->socket, &sl); |
1203 | pl->socket->send_packet (sl); |
1220 | sl.free (); |
|
|
1221 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1204 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1222 | } |
1205 | } |
1223 | |
1206 | |
1224 | /** |
1207 | /** |
1225 | * Need to send an animation sequence to the client. |
1208 | * Need to send an animation sequence to the client. |
… | |
… | |
1227 | * sent them the face yet (this can become quite costly in terms of |
1210 | * sent them the face yet (this can become quite costly in terms of |
1228 | * how much we are sending - on the other hand, this should only happen |
1211 | * how much we are sending - on the other hand, this should only happen |
1229 | * when the player logs in and picks stuff up. |
1212 | * when the player logs in and picks stuff up. |
1230 | */ |
1213 | */ |
1231 | void |
1214 | void |
1232 | esrv_send_animation (NewSocket * ns, short anim_num) |
1215 | esrv_send_animation (client * ns, short anim_num) |
1233 | { |
1216 | { |
1234 | int i; |
1217 | int i; |
1235 | |
1218 | |
1236 | /* Do some checking on the anim_num we got. Note that the animations |
1219 | /* Do some checking on the anim_num we got. Note that the animations |
1237 | * are added in contigous order, so if the number is in the valid |
1220 | * are added in contigous order, so if the number is in the valid |
… | |
… | |
1241 | { |
1224 | { |
1242 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1225 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1243 | return; |
1226 | return; |
1244 | } |
1227 | } |
1245 | |
1228 | |
1246 | SockList sl (MAXSOCKBUF); |
1229 | packet sl; |
1247 | |
1230 | |
1248 | sl << "anim " |
1231 | sl << "anim " |
1249 | << uint16 (anim_num) |
1232 | << uint16 (anim_num) |
1250 | << uint16 (0); /* flags - not used right now */ |
1233 | << uint16 (0); /* flags - not used right now */ |
1251 | |
1234 | |
… | |
… | |
1257 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1240 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1258 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1241 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1259 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1242 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1260 | } |
1243 | } |
1261 | |
1244 | |
1262 | Send_With_Handling (ns, &sl); |
1245 | ns->send_packet (sl); |
1263 | sl.free (); |
|
|
1264 | |
1246 | |
1265 | ns->anims_sent[anim_num] = 1; |
1247 | ns->anims_sent[anim_num] = 1; |
1266 | } |
1248 | } |
1267 | |
1249 | |
1268 | |
1250 | |
… | |
… | |
1275 | /** |
1257 | /** |
1276 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1258 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1277 | * the face yet, we will also send it. |
1259 | * the face yet, we will also send it. |
1278 | */ |
1260 | */ |
1279 | static void |
1261 | static void |
1280 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
1262 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1281 | { |
1263 | { |
1282 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1264 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1283 | { |
1265 | { |
1284 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1266 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1285 | return; |
1267 | return; |
… | |
… | |
1305 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1287 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1306 | }; |
1288 | }; |
1307 | |
1289 | |
1308 | /** Checkes if map cells have changed */ |
1290 | /** Checkes if map cells have changed */ |
1309 | static int |
1291 | static int |
1310 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
1292 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
1311 | { |
1293 | { |
1312 | int k; |
1294 | int k; |
1313 | |
1295 | |
1314 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1296 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1315 | return 1; |
1297 | return 1; |
… | |
… | |
1328 | * cnum is the client number, cur is the the buffer we put all of |
1310 | * cnum is the client number, cur is the the buffer we put all of |
1329 | * this data into. we return the end of the data. layers is |
1311 | * this data into. we return the end of the data. layers is |
1330 | * how many layers of data we should back. |
1312 | * how many layers of data we should back. |
1331 | */ |
1313 | */ |
1332 | static uint8 * |
1314 | static uint8 * |
1333 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1315 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1334 | { |
1316 | { |
1335 | int x, y, k; |
1317 | int x, y, k; |
1336 | int face; |
1318 | int face; |
1337 | unsigned char *fcur; |
1319 | unsigned char *fcur; |
1338 | struct MapLayer layers[MAP_LAYERS]; |
1320 | struct MapLayer layers[MAP_LAYERS]; |
… | |
… | |
1398 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1380 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1399 | } |
1381 | } |
1400 | return cur; |
1382 | return cur; |
1401 | } |
1383 | } |
1402 | |
1384 | |
1403 | static void |
|
|
1404 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1405 | { |
|
|
1406 | static long frames, bytes, tbytes, tframes; |
|
|
1407 | char *cur; |
|
|
1408 | |
|
|
1409 | SockList sl (MAXSOCKBUF); |
|
|
1410 | sl << "map "; |
|
|
1411 | |
|
|
1412 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1413 | sl.len = cur - (char *) sl.buf; |
|
|
1414 | |
|
|
1415 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1416 | |
|
|
1417 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1418 | { |
|
|
1419 | /* All of this is just accounting stuff */ |
|
|
1420 | if (tframes > 100) |
|
|
1421 | tframes = tbytes = 0; |
|
|
1422 | |
|
|
1423 | tframes++; |
|
|
1424 | frames++; |
|
|
1425 | tbytes += sl.len; |
|
|
1426 | bytes += sl.len; |
|
|
1427 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1428 | Send_With_Handling (ns, &sl); |
|
|
1429 | ns->sent_scroll = 0; |
|
|
1430 | } |
|
|
1431 | |
|
|
1432 | sl.free (); |
|
|
1433 | } |
|
|
1434 | |
|
|
1435 | |
|
|
1436 | /** Clears a map cell */ |
1385 | /** Clears a map cell */ |
1437 | static void |
1386 | static void |
1438 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1387 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1439 | { |
1388 | { |
1440 | cell->faces[0] = face0; |
1389 | cell->faces[0] = face0; |
… | |
… | |
1479 | * needs to get sent - if so, it adds the data, sending the head |
1428 | * needs to get sent - if so, it adds the data, sending the head |
1480 | * if needed, and returning 1. If this no data needs to get |
1429 | * if needed, and returning 1. If this no data needs to get |
1481 | * sent, it returns zero. |
1430 | * sent, it returns zero. |
1482 | */ |
1431 | */ |
1483 | static int |
1432 | static int |
1484 | check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) |
1433 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1485 | { |
1434 | { |
1486 | short face_num; |
1435 | short face_num; |
1487 | |
1436 | |
1488 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1437 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1489 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1438 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1523 | * the case, it seems to make more sense to have these layer values |
1472 | * the case, it seems to make more sense to have these layer values |
1524 | * actually match. |
1473 | * actually match. |
1525 | */ |
1474 | */ |
1526 | |
1475 | |
1527 | static int |
1476 | static int |
1528 | update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1477 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1529 | { |
1478 | { |
1530 | object *ob, *head; |
1479 | object *ob, *head; |
1531 | uint16 face_num; |
1480 | uint16 face_num; |
1532 | int bx, by, i; |
1481 | int bx, by, i; |
1533 | |
1482 | |
… | |
… | |
1746 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1695 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1747 | * take. |
1696 | * take. |
1748 | */ |
1697 | */ |
1749 | |
1698 | |
1750 | static inline int |
1699 | static inline int |
1751 | update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1700 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1752 | { |
1701 | { |
1753 | object *ob; |
1702 | object *ob; |
1754 | int smoothlevel; /* old face_num; */ |
1703 | int smoothlevel; /* old face_num; */ |
1755 | |
1704 | |
1756 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1705 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1790 | * Returns the size of a data for a map square as returned by |
1739 | * Returns the size of a data for a map square as returned by |
1791 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1740 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1792 | * available. |
1741 | * available. |
1793 | */ |
1742 | */ |
1794 | int |
1743 | int |
1795 | getExtendedMapInfoSize (NewSocket * ns) |
1744 | getExtendedMapInfoSize (client * ns) |
1796 | { |
1745 | { |
1797 | int result = 0; |
1746 | int result = 0; |
1798 | |
1747 | |
1799 | if (ns->ext_mapinfos) |
1748 | if (ns->ext_mapinfos) |
1800 | { |
1749 | { |
… | |
… | |
1836 | uint8 eentrysize; |
1785 | uint8 eentrysize; |
1837 | uint16 ewhatstart, ewhatflag; |
1786 | uint16 ewhatstart, ewhatflag; |
1838 | uint8 extendedinfos; |
1787 | uint8 extendedinfos; |
1839 | maptile *m; |
1788 | maptile *m; |
1840 | |
1789 | |
1841 | NewSocket &socket = pl->contr->socket; |
1790 | client &socket = *pl->contr->socket; |
1842 | |
1791 | |
1843 | check_map_change (pl->contr); |
1792 | check_map_change (pl->contr); |
1844 | |
1793 | |
1845 | SockList sl (MAXSOCKBUF); |
1794 | packet sl; |
1846 | SockList esl (MAXSOCKBUF); |
1795 | packet esl; |
1847 | |
1796 | |
1848 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1797 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1849 | startlen = sl.len; |
1798 | startlen = sl.length (); |
1850 | |
1799 | |
1851 | /*Extendedmapinfo structure initialisation */ |
1800 | /*Extendedmapinfo structure initialisation */ |
1852 | if (socket.ext_mapinfos) |
1801 | if (socket.ext_mapinfos) |
1853 | { |
1802 | { |
1854 | extendedinfos = EMI_NOREDRAW; |
1803 | extendedinfos = EMI_NOREDRAW; |
1855 | |
1804 | |
1856 | if (socket.EMI_smooth) |
1805 | if (socket.EMI_smooth) |
1857 | extendedinfos |= EMI_SMOOTH; |
1806 | extendedinfos |= EMI_SMOOTH; |
1858 | |
1807 | |
1859 | ewhatstart = esl.len; |
1808 | ewhatstart = esl.length (); |
1860 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1809 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1861 | could need to be taken away */ |
1810 | could need to be taken away */ |
1862 | eentrysize = getExtendedMapInfoSize (&socket); |
1811 | eentrysize = getExtendedMapInfoSize (&socket); |
1863 | esl << "mapextended " |
1812 | esl << "mapextended " |
1864 | << uint8 (extendedinfos) |
1813 | << uint8 (extendedinfos) |
1865 | << uint8 (eentrysize); |
1814 | << uint8 (eentrysize); |
|
|
1815 | |
1866 | estartlen = esl.len; |
1816 | estartlen = esl.length (); |
1867 | } |
1817 | } |
1868 | else |
1818 | else |
1869 | { |
1819 | { |
1870 | /* suppress compiler warnings */ |
1820 | /* suppress compiler warnings */ |
1871 | ewhatstart = 0; |
1821 | ewhatstart = 0; |
… | |
… | |
1909 | */ |
1859 | */ |
1910 | if (ax >= socket.mapx || ay >= socket.mapy) |
1860 | if (ax >= socket.mapx || ay >= socket.mapy) |
1911 | { |
1861 | { |
1912 | int i, got_one; |
1862 | int i, got_one; |
1913 | |
1863 | |
1914 | oldlen = sl.len; |
1864 | oldlen = sl.length (); |
1915 | |
1865 | |
1916 | sl << uint16 (mask); |
1866 | sl << uint16 (mask); |
1917 | |
1867 | |
1918 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1868 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1919 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1869 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
… | |
… | |
1923 | * actually need to send that - just the coordinates |
1873 | * actually need to send that - just the coordinates |
1924 | * with no faces tells the client to blank out the |
1874 | * with no faces tells the client to blank out the |
1925 | * space. |
1875 | * space. |
1926 | */ |
1876 | */ |
1927 | got_one = 0; |
1877 | got_one = 0; |
1928 | for (i = oldlen + 2; i < sl.len; i++) |
1878 | for (i = oldlen + 2; i < sl.length (); i++) |
1929 | if (sl.buf[i]) |
1879 | if (sl[i]) |
1930 | got_one = 1; |
1880 | got_one = 1; |
1931 | |
1881 | |
1932 | if (got_one && (mask & 0xf)) |
1882 | if (got_one && (mask & 0xf)) |
1933 | sl.buf[oldlen + 1] = mask & 0xff; |
1883 | sl[oldlen + 1] = mask & 0xff; |
1934 | else |
1884 | else |
1935 | { /*either all faces blank, either no face at all */ |
1885 | { /*either all faces blank, either no face at all */ |
1936 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1886 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1937 | sl.len = oldlen + 2; |
1887 | sl.reset (oldlen + 2); |
1938 | else |
1888 | else |
1939 | sl.len = oldlen; |
1889 | sl.reset (oldlen); |
1940 | } |
1890 | } |
1941 | |
1891 | |
1942 | /*What concerns extendinfos, nothing to be done for now |
1892 | /*What concerns extendinfos, nothing to be done for now |
1943 | * (perhaps effects layer later) |
1893 | * (perhaps effects layer later) |
1944 | */ |
1894 | */ |
… | |
… | |
1974 | |
1924 | |
1975 | /* This block deals with spaces that are not visible for whatever |
1925 | /* This block deals with spaces that are not visible for whatever |
1976 | * reason. Still may need to send the head for this space. |
1926 | * reason. Still may need to send the head for this space. |
1977 | */ |
1927 | */ |
1978 | |
1928 | |
1979 | oldlen = sl.len; |
1929 | oldlen = sl.length (); |
1980 | |
1930 | |
1981 | sl << uint16 (mask); |
1931 | sl << uint16 (mask); |
1982 | |
1932 | |
1983 | if (lastcell.count != -1) |
1933 | if (lastcell.count != -1) |
1984 | need_send = 1; |
1934 | need_send = 1; |
… | |
… | |
2004 | |
1954 | |
2005 | map_clearcell (&lastcell, 0, 0, 0, count); |
1955 | map_clearcell (&lastcell, 0, 0, 0, count); |
2006 | } |
1956 | } |
2007 | |
1957 | |
2008 | if ((mask & 0xf) || need_send) |
1958 | if ((mask & 0xf) || need_send) |
2009 | sl.buf[oldlen + 1] = mask & 0xff; |
1959 | sl[oldlen + 1] = mask & 0xff; |
2010 | else |
1960 | else |
2011 | sl.len = oldlen; |
1961 | sl.reset (oldlen); |
2012 | } |
1962 | } |
2013 | else |
1963 | else |
2014 | { |
1964 | { |
2015 | /* In this block, the space is visible or there are head objects |
1965 | /* In this block, the space is visible or there are head objects |
2016 | * we need to send. |
1966 | * we need to send. |
… | |
… | |
2018 | |
1968 | |
2019 | /* Rather than try to figure out what everything that we might |
1969 | /* Rather than try to figure out what everything that we might |
2020 | * need to send is, then form the packet after that, |
1970 | * need to send is, then form the packet after that, |
2021 | * we presume that we will in fact form a packet, and update |
1971 | * we presume that we will in fact form a packet, and update |
2022 | * the bits by what we do actually send. If we send nothing, |
1972 | * the bits by what we do actually send. If we send nothing, |
2023 | * we just back out sl.len to the old value, and no harm |
1973 | * we just back out sl.length () to the old value, and no harm |
2024 | * is done. |
1974 | * is done. |
2025 | * I think this is simpler than doing a bunch of checks to see |
1975 | * I think this is simpler than doing a bunch of checks to see |
2026 | * what if anything we need to send, setting the bits, then |
1976 | * what if anything we need to send, setting the bits, then |
2027 | * doing those checks again to add the real data. |
1977 | * doing those checks again to add the real data. |
2028 | */ |
1978 | */ |
2029 | oldlen = sl.len; |
1979 | oldlen = sl.length (); |
2030 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1980 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2031 | eoldlen = esl.len; |
1981 | eoldlen = esl.length (); |
2032 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1982 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2033 | sl << uint16 (mask); |
1983 | sl << uint16 (mask); |
2034 | |
1984 | |
2035 | if (socket.ext_mapinfos) |
1985 | if (socket.ext_mapinfos) |
2036 | esl << uint16 (emask); |
1986 | esl << uint16 (emask); |
… | |
… | |
2044 | mask |= 0x8; |
1994 | mask |= 0x8; |
2045 | |
1995 | |
2046 | if (socket.extmap) |
1996 | if (socket.extmap) |
2047 | { |
1997 | { |
2048 | *last_ext |= 0x80; |
1998 | *last_ext |= 0x80; |
2049 | last_ext = sl.buf + sl.len; |
1999 | last_ext = &sl[sl.length ()]; |
2050 | sl << uint8 (d); |
2000 | sl << uint8 (d); |
2051 | } |
2001 | } |
2052 | else |
2002 | else |
2053 | sl << uint8 (255 - 64 * d); |
2003 | sl << uint8 (255 - 64 * d); |
2054 | } |
2004 | } |
… | |
… | |
2088 | { |
2038 | { |
2089 | lastcell.stat_hp = stat_hp; |
2039 | lastcell.stat_hp = stat_hp; |
2090 | |
2040 | |
2091 | mask |= 0x8; |
2041 | mask |= 0x8; |
2092 | *last_ext |= 0x80; |
2042 | *last_ext |= 0x80; |
2093 | last_ext = sl.buf + sl.len; |
2043 | last_ext = &sl[sl.length ()]; |
2094 | |
2044 | |
2095 | sl << uint8 (5) << uint8 (stat_hp); |
2045 | sl << uint8 (5) << uint8 (stat_hp); |
2096 | |
2046 | |
2097 | if (stat_width > 1) |
2047 | if (stat_width > 1) |
2098 | { |
2048 | { |
2099 | *last_ext |= 0x80; |
2049 | *last_ext |= 0x80; |
2100 | last_ext = sl.buf + sl.len; |
2050 | last_ext = &sl[sl.length ()]; |
2101 | |
2051 | |
2102 | sl << uint8 (6) << uint8 (stat_width); |
2052 | sl << uint8 (6) << uint8 (stat_width); |
2103 | } |
2053 | } |
2104 | } |
2054 | } |
2105 | |
2055 | |
… | |
… | |
2107 | { |
2057 | { |
2108 | lastcell.player = player; |
2058 | lastcell.player = player; |
2109 | |
2059 | |
2110 | mask |= 0x8; |
2060 | mask |= 0x8; |
2111 | *last_ext |= 0x80; |
2061 | *last_ext |= 0x80; |
2112 | last_ext = sl.buf + sl.len; |
2062 | last_ext = &sl[sl.length ()]; |
2113 | |
2063 | |
2114 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2064 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2115 | } |
2065 | } |
2116 | |
2066 | |
2117 | if (lastcell.flags != flags) |
2067 | if (lastcell.flags != flags) |
2118 | { |
2068 | { |
2119 | lastcell.flags = flags; |
2069 | lastcell.flags = flags; |
2120 | |
2070 | |
2121 | mask |= 0x8; |
2071 | mask |= 0x8; |
2122 | *last_ext |= 0x80; |
2072 | *last_ext |= 0x80; |
2123 | last_ext = sl.buf + sl.len; |
2073 | last_ext = &sl[sl.length ()]; |
2124 | |
2074 | |
2125 | sl << uint8 (8) << uint8 (flags); |
2075 | sl << uint8 (8) << uint8 (flags); |
2126 | } |
2076 | } |
2127 | } |
2077 | } |
2128 | |
2078 | |
… | |
… | |
2170 | * space by checking the mask. If so, update the mask. |
2120 | * space by checking the mask. If so, update the mask. |
2171 | * if not, reset the len to that from before adding the mask |
2121 | * if not, reset the len to that from before adding the mask |
2172 | * value, so we don't send those bits. |
2122 | * value, so we don't send those bits. |
2173 | */ |
2123 | */ |
2174 | if (mask & 0xf) |
2124 | if (mask & 0xf) |
2175 | sl.buf[oldlen + 1] = mask & 0xff; |
2125 | sl[oldlen + 1] = mask & 0xff; |
2176 | else |
2126 | else |
2177 | sl.len = oldlen; |
2127 | sl.reset (oldlen); |
2178 | |
2128 | |
2179 | if (emask & 0xf) |
2129 | if (emask & 0xf) |
2180 | esl.buf[eoldlen + 1] = emask & 0xff; |
2130 | esl[eoldlen + 1] = emask & 0xff; |
2181 | else |
2131 | else |
2182 | esl.len = eoldlen; |
2132 | esl.reset (eoldlen); |
2183 | } /* else this is a viewable space */ |
2133 | } /* else this is a viewable space */ |
2184 | } /* for x loop */ |
2134 | } /* for x loop */ |
2185 | } /* for y loop */ |
2135 | } /* for y loop */ |
2186 | |
2136 | |
2187 | /* Verify that we in fact do need to send this */ |
2137 | /* Verify that we in fact do need to send this */ |
2188 | if (socket.ext_mapinfos) |
2138 | if (socket.ext_mapinfos) |
2189 | { |
2139 | { |
2190 | if (!(sl.len > startlen || socket.sent_scroll)) |
2140 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2191 | { |
2141 | { |
2192 | /* No map data will follow, so don't say the client |
2142 | /* No map data will follow, so don't say the client |
2193 | * it doesn't need draw! |
2143 | * it doesn't need draw! |
2194 | */ |
2144 | */ |
2195 | ewhatflag &= (~EMI_NOREDRAW); |
2145 | ewhatflag &= (~EMI_NOREDRAW); |
2196 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2146 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2197 | } |
2147 | } |
2198 | |
2148 | |
2199 | if (esl.len > estartlen) |
2149 | if (esl.length () > estartlen) |
2200 | Send_With_Handling (&socket, &esl); |
2150 | socket.send_packet (esl); |
2201 | } |
2151 | } |
2202 | |
2152 | |
2203 | if (sl.len > startlen || socket.sent_scroll) |
2153 | if (sl.length () > startlen || socket.sent_scroll) |
2204 | { |
2154 | { |
2205 | Send_With_Handling (&socket, &sl); |
2155 | socket.send_packet (sl); |
2206 | socket.sent_scroll = 0; |
2156 | socket.sent_scroll = 0; |
2207 | } |
2157 | } |
2208 | |
|
|
2209 | sl.free (); |
|
|
2210 | esl.free (); |
|
|
2211 | } |
2158 | } |
2212 | |
2159 | |
2213 | /** |
2160 | /** |
2214 | * Draws client map. |
2161 | * Draws client map. |
2215 | */ |
2162 | */ |
… | |
… | |
2239 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2186 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2240 | return; |
2187 | return; |
2241 | |
2188 | |
2242 | memset (&newmap, 0, sizeof (struct Map)); |
2189 | memset (&newmap, 0, sizeof (struct Map)); |
2243 | |
2190 | |
2244 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2191 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2245 | { |
2192 | { |
2246 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2193 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2247 | { |
2194 | { |
2248 | ax = i; |
2195 | ax = i; |
2249 | ay = j; |
2196 | ay = j; |
2250 | m = pm; |
2197 | m = pm; |
2251 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2198 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2266 | { |
2213 | { |
2267 | update_los (pl); |
2214 | update_los (pl); |
2268 | pl->contr->do_los = 0; |
2215 | pl->contr->do_los = 0; |
2269 | } |
2216 | } |
2270 | |
2217 | |
2271 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2272 | { |
|
|
2273 | /* Big maps need a different drawing mechanism to work */ |
2218 | /* Big maps need a different drawing mechanism to work */ |
2274 | draw_client_map1 (pl); |
2219 | draw_client_map1 (pl); |
2275 | return; |
|
|
2276 | } |
|
|
2277 | |
|
|
2278 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2279 | { |
|
|
2280 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2281 | } |
|
|
2282 | |
|
|
2283 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2284 | * basically some number of spaces around the player) |
|
|
2285 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2286 | * left corner) and are thus disconnected from the map values. |
|
|
2287 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2288 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2289 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2290 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2291 | * odd, this still works fine. |
|
|
2292 | */ |
|
|
2293 | ay = 0; |
|
|
2294 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2295 | { |
|
|
2296 | ax = 0; |
|
|
2297 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2298 | { |
|
|
2299 | |
|
|
2300 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2301 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2302 | * negation check. |
|
|
2303 | */ |
|
|
2304 | nx = i; |
|
|
2305 | ny = j; |
|
|
2306 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2307 | if (m && d < 4) |
|
|
2308 | { |
|
|
2309 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2310 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2311 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2312 | |
|
|
2313 | /* If all is blank, send a blank face. */ |
|
|
2314 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2315 | { |
|
|
2316 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2317 | } |
|
|
2318 | else |
|
|
2319 | { /* actually have something interesting */ |
|
|
2320 | /* send the darkness mask, if any. */ |
|
|
2321 | if (d && pl->contr->socket.darkness) |
|
|
2322 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2323 | |
|
|
2324 | if (face && face != blank_face) |
|
|
2325 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2326 | if (floor2 && floor2 != blank_face) |
|
|
2327 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2328 | if (floor && floor != blank_face) |
|
|
2329 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2330 | } |
|
|
2331 | } /* Is a valid space */ |
|
|
2332 | } |
|
|
2333 | } |
|
|
2334 | |
|
|
2335 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2336 | |
|
|
2337 | check_map_change (pl->contr); |
|
|
2338 | } |
2220 | } |
2339 | |
2221 | |
2340 | |
2222 | |
2341 | /*****************************************************************************/ |
2223 | /*****************************************************************************/ |
2342 | |
2224 | |
… | |
… | |
2348 | |
2230 | |
2349 | /*****************************************************************************/ |
2231 | /*****************************************************************************/ |
2350 | void |
2232 | void |
2351 | send_plugin_custom_message (object *pl, char *buf) |
2233 | send_plugin_custom_message (object *pl, char *buf) |
2352 | { |
2234 | { |
2353 | pl->contr->socket.send_packet (buf); |
2235 | pl->contr->socket->send_packet (buf); |
2354 | } |
2236 | } |
2355 | |
2237 | |
2356 | /** |
2238 | /** |
2357 | * This sends the skill number to name mapping. We ignore |
2239 | * This sends the skill number to name mapping. We ignore |
2358 | * the params - we always send the same info no matter what. |
2240 | * the params - we always send the same info no matter what. |
2359 | */ |
2241 | */ |
2360 | void |
2242 | void |
2361 | send_skill_info (NewSocket *ns, char *params) |
2243 | send_skill_info (client *ns, char *params) |
2362 | { |
2244 | { |
2363 | SockList sl (MAXSOCKBUF); |
2245 | packet sl; |
2364 | sl << "replyinfo skill_info\n"; |
2246 | sl << "replyinfo skill_info\n"; |
2365 | |
2247 | |
2366 | for (int i = 1; i < NUM_SKILLS; i++) |
2248 | for (int i = 1; i < NUM_SKILLS; i++) |
2367 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2249 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2368 | |
2250 | |
2369 | if (sl.len >= MAXSOCKBUF) |
2251 | if (sl.length () >= MAXSOCKBUF) |
2370 | { |
2252 | { |
2371 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2253 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2372 | fatal (0); |
2254 | fatal (0); |
2373 | } |
2255 | } |
2374 | |
2256 | |
2375 | Send_With_Handling (ns, &sl); |
2257 | ns->send_packet (sl); |
2376 | sl.free (); |
|
|
2377 | } |
2258 | } |
2378 | |
2259 | |
2379 | /** |
2260 | /** |
2380 | * This sends the spell path to name mapping. We ignore |
2261 | * This sends the spell path to name mapping. We ignore |
2381 | * the params - we always send the same info no matter what. |
2262 | * the params - we always send the same info no matter what. |
2382 | */ |
2263 | */ |
2383 | void |
2264 | void |
2384 | send_spell_paths (NewSocket * ns, char *params) |
2265 | send_spell_paths (client * ns, char *params) |
2385 | { |
2266 | { |
2386 | SockList sl (MAXSOCKBUF); |
2267 | packet sl; |
2387 | |
2268 | |
2388 | sl << "replyinfo spell_paths\n"; |
2269 | sl << "replyinfo spell_paths\n"; |
2389 | |
2270 | |
2390 | for (int i = 0; i < NRSPELLPATHS; i++) |
2271 | for (int i = 0; i < NRSPELLPATHS; i++) |
2391 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2272 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2392 | |
2273 | |
2393 | if (sl.len >= MAXSOCKBUF) |
2274 | if (sl.length () >= MAXSOCKBUF) |
2394 | { |
2275 | { |
2395 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2276 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2396 | fatal (0); |
2277 | fatal (0); |
2397 | } |
2278 | } |
2398 | |
2279 | |
2399 | Send_With_Handling (ns, &sl); |
2280 | ns->send_packet (sl); |
2400 | sl.free (); |
|
|
2401 | } |
2281 | } |
2402 | |
2282 | |
2403 | /** |
2283 | /** |
2404 | * This looks for any spells the player may have that have changed their stats. |
2284 | * This looks for any spells the player may have that have changed their stats. |
2405 | * it then sends an updspell packet for each spell that has changed in this way |
2285 | * it then sends an updspell packet for each spell that has changed in this way |
2406 | */ |
2286 | */ |
2407 | void |
2287 | void |
2408 | esrv_update_spells (player *pl) |
2288 | esrv_update_spells (player *pl) |
2409 | { |
2289 | { |
2410 | if (!pl->socket.monitor_spells) |
2290 | if (!pl->socket->monitor_spells) |
2411 | return; |
2291 | return; |
2412 | |
2292 | |
2413 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2293 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2414 | { |
2294 | { |
2415 | if (spell->type == SPELL) |
2295 | if (spell->type == SPELL) |
… | |
… | |
2435 | flags |= UPD_SP_DAMAGE; |
2315 | flags |= UPD_SP_DAMAGE; |
2436 | } |
2316 | } |
2437 | |
2317 | |
2438 | if (flags) |
2318 | if (flags) |
2439 | { |
2319 | { |
2440 | SockList sl (MAXSOCKBUF); |
2320 | packet sl; |
2441 | |
2321 | |
2442 | sl << "updspell " |
2322 | sl << "updspell " |
2443 | << uint8 (flags) |
2323 | << uint8 (flags) |
2444 | << uint32 (spell->count); |
2324 | << uint32 (spell->count); |
2445 | |
2325 | |
2446 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2326 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2447 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2327 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2448 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2328 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2449 | |
2329 | |
2450 | Send_With_Handling (&pl->socket, &sl); |
2330 | pl->socket->send_packet (sl); |
2451 | sl.free (); |
|
|
2452 | } |
2331 | } |
2453 | } |
2332 | } |
2454 | } |
2333 | } |
2455 | } |
2334 | } |
2456 | |
2335 | |
2457 | void |
2336 | void |
2458 | esrv_remove_spell (player *pl, object *spell) |
2337 | esrv_remove_spell (player *pl, object *spell) |
2459 | { |
2338 | { |
2460 | if (!pl->socket.monitor_spells) |
2339 | if (!pl->socket->monitor_spells) |
2461 | return; |
2340 | return; |
2462 | |
2341 | |
2463 | if (!pl || !spell || spell->env != pl->ob) |
2342 | if (!pl || !spell || spell->env != pl->ob) |
2464 | { |
2343 | { |
2465 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2344 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2466 | return; |
2345 | return; |
2467 | } |
2346 | } |
2468 | |
2347 | |
2469 | SockList sl (MAXSOCKBUF); |
2348 | packet sl; |
2470 | |
2349 | |
2471 | sl << "delspell " |
2350 | sl << "delspell " |
2472 | << uint32 (spell->count); |
2351 | << uint32 (spell->count); |
2473 | |
2352 | |
2474 | Send_With_Handling (&pl->socket, &sl); |
2353 | pl->socket->send_packet (sl); |
2475 | sl.free (); |
|
|
2476 | } |
2354 | } |
2477 | |
2355 | |
2478 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2356 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2479 | static void |
2357 | static void |
2480 | append_spell (player *pl, SockList &sl, object *spell) |
2358 | append_spell (player *pl, packet &sl, object *spell) |
2481 | { |
2359 | { |
2482 | int len, i, skill = 0; |
2360 | int len, i, skill = 0; |
2483 | |
2361 | |
2484 | if (!(spell->name)) |
2362 | if (!(spell->name)) |
2485 | { |
2363 | { |
… | |
… | |
2528 | { |
2406 | { |
2529 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2407 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2530 | return; |
2408 | return; |
2531 | } |
2409 | } |
2532 | |
2410 | |
2533 | if (!pl->socket.monitor_spells) |
2411 | if (!pl->socket->monitor_spells) |
2534 | return; |
2412 | return; |
2535 | |
2413 | |
2536 | SockList sl (MAXSOCKBUF); |
2414 | packet sl; |
2537 | |
2415 | |
2538 | sl << "addspell "; |
2416 | sl << "addspell "; |
2539 | |
2417 | |
2540 | if (!spell) |
2418 | if (!spell) |
2541 | { |
2419 | { |
… | |
… | |
2555 | * like it will fix this |
2433 | * like it will fix this |
2556 | */ |
2434 | */ |
2557 | if (spell->type != SPELL) |
2435 | if (spell->type != SPELL) |
2558 | continue; |
2436 | continue; |
2559 | |
2437 | |
2560 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2438 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2561 | { |
2439 | { |
2562 | Send_With_Handling (&pl->socket, &sl); |
2440 | pl->socket->send_packet (sl); |
2563 | strcpy ((char *) sl.buf, "addspell "); |
2441 | |
2564 | sl.len = strlen ((char *) sl.buf); |
2442 | sl.reset (); |
|
|
2443 | sl << "addspell "; |
2565 | } |
2444 | } |
2566 | |
2445 | |
2567 | append_spell (pl, sl, spell); |
2446 | append_spell (pl, sl, spell); |
2568 | } |
2447 | } |
2569 | } |
2448 | } |
… | |
… | |
2580 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2459 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2581 | fatal (0); |
2460 | fatal (0); |
2582 | } |
2461 | } |
2583 | |
2462 | |
2584 | /* finally, we can send the packet */ |
2463 | /* finally, we can send the packet */ |
2585 | Send_With_Handling (&pl->socket, &sl); |
2464 | pl->socket->send_packet (sl); |
2586 | |
|
|
2587 | sl.free (); |
|
|
2588 | } |
2465 | } |
2589 | |
2466 | |