… | |
… | |
46 | */ |
46 | */ |
47 | |
47 | |
48 | #include <global.h> |
48 | #include <global.h> |
49 | #include <sproto.h> |
49 | #include <sproto.h> |
50 | |
50 | |
51 | #include <newclient.h> |
|
|
52 | #include <newserver.h> |
|
|
53 | #include <living.h> |
51 | #include <living.h> |
54 | #include <commands.h> |
52 | #include <commands.h> |
55 | |
53 | |
56 | /* 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, |
57 | * it should work here. |
55 | * it should work here. |
… | |
… | |
60 | #include <sys/time.h> |
58 | #include <sys/time.h> |
61 | #include <sys/socket.h> |
59 | #include <sys/socket.h> |
62 | #include <netinet/in.h> |
60 | #include <netinet/in.h> |
63 | #include <netdb.h> |
61 | #include <netdb.h> |
64 | |
62 | |
65 | #ifdef HAVE_UNISTD_H |
|
|
66 | # include <unistd.h> |
63 | #include <unistd.h> |
67 | #endif |
|
|
68 | |
|
|
69 | #ifdef HAVE_SYS_TIME_H |
|
|
70 | # include <sys/time.h> |
64 | #include <sys/time.h> |
71 | #endif |
|
|
72 | |
65 | |
73 | #include "sounds.h" |
66 | #include "sounds.h" |
74 | |
67 | |
75 | /** |
68 | /** |
76 | * This table translates the attack numbers as used within the |
69 | * This table translates the attack numbers as used within the |
… | |
… | |
93 | -1, /* life stealing */ |
86 | -1, /* life stealing */ |
94 | -1 /* Disease - not fully done yet */ |
87 | -1 /* Disease - not fully done yet */ |
95 | }; |
88 | }; |
96 | |
89 | |
97 | static void |
90 | static void |
98 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
91 | socket_map_scroll (client *ns, int dx, int dy) |
99 | { |
92 | { |
100 | struct Map newmap; |
93 | struct Map newmap; |
101 | int x, y, mx, my; |
94 | int x, y, mx, my; |
102 | |
95 | |
103 | { |
|
|
104 | packet sl; |
|
|
105 | |
|
|
106 | sl.printf ("map_scroll %d %d", dx, dy); |
96 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
107 | ns->send_packet (sl); |
|
|
108 | } |
|
|
109 | |
97 | |
110 | /* If we are using the Map1aCmd, we may in fact send |
98 | /* If we are using the Map1aCmd, we may in fact send |
111 | * head information that is outside the viewable map. |
99 | * head information that is outside the viewable map. |
112 | * 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 |
113 | * look for. Removed code to do so - it caused extra |
101 | * look for. Removed code to do so - it caused extra |
… | |
… | |
153 | } |
141 | } |
154 | |
142 | |
155 | static void |
143 | static void |
156 | clear_map (player *pl) |
144 | clear_map (player *pl) |
157 | { |
145 | { |
158 | NewSocket & socket = pl->socket; |
146 | client &socket = *pl->socket; |
159 | |
147 | |
160 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
148 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
161 | |
149 | |
162 | if (socket.newmapcmd == 1) |
150 | if (socket.newmapcmd == 1) |
163 | socket.send_packet ("newmap"); |
151 | socket.send_packet ("newmap"); |
… | |
… | |
168 | |
156 | |
169 | /** check for map change and send new map data */ |
157 | /** check for map change and send new map data */ |
170 | static void |
158 | static void |
171 | check_map_change (player *pl) |
159 | check_map_change (player *pl) |
172 | { |
160 | { |
173 | NewSocket & socket = pl->socket; |
161 | client &socket = *pl->socket; |
174 | object *ob = pl->ob; |
162 | object *ob = pl->ob; |
175 | char buf[MAX_BUF]; /* eauugggh */ |
163 | char buf[MAX_BUF]; /* eauugggh */ |
176 | |
164 | |
177 | if (socket.current_map != ob->map) |
165 | if (socket.current_map != ob->map) |
178 | { |
166 | { |
… | |
… | |
221 | |
209 | |
222 | socket.current_x = ob->x; |
210 | socket.current_x = ob->x; |
223 | socket.current_y = ob->y; |
211 | socket.current_y = ob->y; |
224 | } |
212 | } |
225 | |
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 | |
226 | void |
258 | void |
227 | ExtCmd (char *buf, int len, player *pl) |
259 | ExtCmd (char *buf, int len, player *pl) |
228 | { |
260 | { |
229 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
261 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
230 | } |
262 | } |
… | |
… | |
249 | buf += 8; |
281 | buf += 8; |
250 | |
282 | |
251 | // initial map and its origin |
283 | // initial map and its origin |
252 | maptile *map = pl->ob->map; |
284 | maptile *map = pl->ob->map; |
253 | sint16 dx, dy; |
285 | sint16 dx, dy; |
254 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
286 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
255 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
287 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
256 | int max_distance = 8; // limit maximum path length to something generous |
288 | int max_distance = 8; // limit maximum path length to something generous |
257 | |
289 | |
258 | while (*buf && map && max_distance) |
290 | while (*buf && map && max_distance) |
259 | { |
291 | { |
260 | int dir = *buf++; |
292 | int dir = *buf++; |
… | |
… | |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
312 | } |
344 | } |
313 | else |
345 | else |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
315 | |
347 | |
316 | pl->socket.send_packet (bigbuf); |
348 | pl->socket->send_packet (bigbuf); |
317 | } |
349 | } |
318 | |
350 | |
319 | /** This is the Setup cmd - easy first implementation */ |
351 | /** This is the Setup cmd - easy first implementation */ |
320 | void |
352 | void |
321 | SetUp (char *buf, int len, NewSocket * ns) |
353 | SetUp (char *buf, int len, client * ns) |
322 | { |
354 | { |
323 | int s, slen; |
355 | int s, slen; |
324 | char *cmd, *param, cmdback[HUGE_BUF]; |
356 | char *cmd, *param, cmdback[HUGE_BUF]; |
325 | |
357 | |
326 | /* run through the cmds of setup |
358 | /* run through the cmds of setup |
… | |
… | |
536 | * 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. |
537 | * 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, |
538 | * 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. |
539 | */ |
571 | */ |
540 | void |
572 | void |
541 | AddMeCmd (char *buf, int len, NewSocket * ns) |
573 | AddMeCmd (char *buf, int len, client * ns) |
542 | { |
574 | { |
543 | Settings oldsettings; |
|
|
544 | |
|
|
545 | oldsettings = settings; |
|
|
546 | if (ns->status != Ns_Add || add_player (ns)) |
575 | if (ns->status != Ns_Add || add_player (ns)) |
547 | ns->send_packet ("addme_failed"); |
576 | ns->send_packet ("addme_failed"); |
548 | else |
577 | else |
549 | { |
|
|
550 | /* Basically, the add_player copies the socket structure into |
|
|
551 | * the player structure, so this one (which is from init_sockets) |
|
|
552 | * is not needed anymore. The write below should still work, as the |
|
|
553 | * stuff in ns is still relevant. |
|
|
554 | */ |
|
|
555 | ns->send_packet ("addme_success"); |
578 | ns->send_packet ("addme_success"); |
556 | socket_info.nconns--; |
|
|
557 | ns->status = Ns_Avail; |
|
|
558 | } |
|
|
559 | |
|
|
560 | settings = oldsettings; |
|
|
561 | } |
579 | } |
562 | |
580 | |
563 | /** Reply to ExtendedInfos command */ |
581 | /** Reply to ExtendedInfos command */ |
564 | void |
582 | void |
565 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
583 | ToggleExtendedInfos (char *buf, int len, client * ns) |
566 | { |
584 | { |
567 | char cmdback[MAX_BUF]; |
585 | char cmdback[MAX_BUF]; |
568 | char command[50]; |
586 | char command[50]; |
569 | int info, nextinfo; |
587 | int info, nextinfo; |
570 | |
588 | |
… | |
… | |
621 | #define MSG_TYPE_MONUMENT 5 |
639 | #define MSG_TYPE_MONUMENT 5 |
622 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
640 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
623 | |
641 | |
624 | /** Reply to ExtendedInfos command */ |
642 | /** Reply to ExtendedInfos command */ |
625 | void |
643 | void |
626 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
644 | ToggleExtendedText (char *buf, int len, client * ns) |
627 | { |
645 | { |
628 | char cmdback[MAX_BUF]; |
646 | char cmdback[MAX_BUF]; |
629 | char temp[10]; |
647 | char temp[10]; |
630 | char command[50]; |
648 | char command[50]; |
631 | int info, nextinfo, i, flag; |
649 | int info, nextinfo, i, flag; |
… | |
… | |
682 | * 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 |
683 | * 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 |
684 | * client. |
702 | * client. |
685 | */ |
703 | */ |
686 | static void |
704 | static void |
687 | SendSmooth (NewSocket * ns, uint16 face) |
705 | SendSmooth (client * ns, uint16 face) |
688 | { |
706 | { |
689 | uint16 smoothface; |
707 | uint16 smoothface; |
690 | |
708 | |
691 | /* 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 |
692 | * again. |
710 | * again. |
… | |
… | |
708 | |
726 | |
709 | sl << "smooth " |
727 | sl << "smooth " |
710 | << uint16 (face) |
728 | << uint16 (face) |
711 | << uint16 (smoothface); |
729 | << uint16 (smoothface); |
712 | |
730 | |
713 | Send_With_Handling (ns, &sl); |
731 | ns->send_packet (sl); |
714 | } |
732 | } |
715 | |
733 | |
716 | /** |
734 | /** |
717 | * Tells client the picture it has to use |
735 | * Tells client the picture it has to use |
718 | * to smooth a picture number given as argument. |
736 | * to smooth a picture number given as argument. |
719 | */ |
737 | */ |
720 | void |
738 | void |
721 | AskSmooth (char *buf, int len, NewSocket * ns) |
739 | AskSmooth (char *buf, int len, client * ns) |
722 | { |
740 | { |
723 | uint16 facenbr; |
741 | uint16 facenbr; |
724 | |
742 | |
725 | facenbr = atoi (buf); |
743 | facenbr = atoi (buf); |
726 | SendSmooth (ns, facenbr); |
744 | SendSmooth (ns, facenbr); |
… | |
… | |
783 | * 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 |
784 | * '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 |
785 | * can throttle. |
803 | * can throttle. |
786 | */ |
804 | */ |
787 | void |
805 | void |
788 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
806 | NewPlayerCmd (char *buf, int len, player *pl) |
789 | { |
807 | { |
790 | int time, repeat; |
808 | int time, repeat; |
791 | char command[MAX_BUF]; |
809 | char command[MAX_BUF]; |
792 | int pktlen; |
810 | int pktlen; |
793 | |
811 | |
… | |
… | |
795 | { |
813 | { |
796 | 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); |
797 | return; |
815 | return; |
798 | } |
816 | } |
799 | |
817 | |
800 | pktlen = net_uint16 (buf); |
818 | pktlen = net_uint16 ((uint8 *)buf); |
801 | repeat = net_uint32 (buf + 2); |
819 | repeat = net_uint32 ((uint8 *)buf + 2); |
802 | |
820 | |
803 | /* -1 is special - no repeat, but don't update */ |
821 | /* -1 is special - no repeat, but don't update */ |
804 | if (repeat != -1) |
822 | if (repeat != -1) |
805 | pl->count = repeat; |
823 | pl->count = repeat; |
806 | |
824 | |
807 | if ((len - 4) >= MAX_BUF) |
825 | if ((len - 4) >= MAX_BUF) |
808 | len = MAX_BUF - 5; |
826 | len = MAX_BUF - 5; |
809 | |
827 | |
810 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
828 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
811 | command[len - 4] = '\0'; |
829 | command[len - 4] = 0; |
812 | |
|
|
813 | /* The following should never happen with a proper or honest client. |
|
|
814 | * Therefore, the error message doesn't have to be too clear - if |
|
|
815 | * someone is playing with a hacked/non working client, this gives them |
|
|
816 | * an idea of the problem, but they deserve what they get |
|
|
817 | */ |
|
|
818 | if (pl->state != ST_PLAYING) |
|
|
819 | { |
|
|
820 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
821 | return; |
|
|
822 | } |
|
|
823 | |
830 | |
824 | /* This should not happen anymore. */ |
831 | /* This should not happen anymore. */ |
825 | if (pl->ob->speed_left < -1.0) |
832 | if (pl->ob->speed_left < -1.0) |
826 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
833 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
827 | |
834 | |
… | |
… | |
841 | |
848 | |
842 | /* Send confirmation of command execution now */ |
849 | /* Send confirmation of command execution now */ |
843 | |
850 | |
844 | packet sl; |
851 | packet sl; |
845 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
852 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
846 | Send_With_Handling (&pl->socket, &sl); |
853 | pl->socket->send_packet (sl); |
847 | } |
854 | } |
848 | |
855 | |
849 | |
856 | |
850 | /** This is a reply to a previous query. */ |
857 | /** This is a reply to a previous query. */ |
851 | void |
858 | void |
… | |
… | |
918 | * 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 |
919 | * 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 |
920 | * problem. |
927 | * problem. |
921 | */ |
928 | */ |
922 | void |
929 | void |
923 | VersionCmd (char *buf, int len, NewSocket * ns) |
930 | VersionCmd (char *buf, int len, client * ns) |
924 | { |
931 | { |
925 | char *cp; |
932 | char *cp; |
926 | char version_warning[256]; |
933 | char version_warning[256]; |
927 | |
934 | |
928 | if (!buf) |
935 | if (!buf) |
… | |
… | |
952 | cp = strchr (cp + 1, ' '); |
959 | cp = strchr (cp + 1, ' '); |
953 | if (cp) |
960 | if (cp) |
954 | { |
961 | { |
955 | 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); |
956 | |
963 | |
957 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
964 | assign (ns->version, cp + 1); |
958 | |
965 | |
959 | /* This is first implementation - i skip all beta DX clients with it |
|
|
960 | * Add later stuff here for other clients |
|
|
961 | */ |
|
|
962 | |
|
|
963 | /* these are old dxclients */ |
|
|
964 | /* Version 1024 added support for singular + plural name values - |
|
|
965 | * requiing this minimal value reduces complexity of that code, and it |
|
|
966 | * has been around for a long time. |
|
|
967 | */ |
|
|
968 | if (ns->sc_version < 1026) |
966 | if (ns->sc_version < 1026) |
969 | { |
967 | { |
970 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
968 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
971 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
969 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
972 | ns->send_packet (version_warning); |
970 | ns->send_packet (version_warning); |
… | |
… | |
974 | |
972 | |
975 | } |
973 | } |
976 | } |
974 | } |
977 | |
975 | |
978 | /** sound related functions. */ |
976 | /** sound related functions. */ |
979 | |
|
|
980 | void |
977 | void |
981 | SetSound (char *buf, int len, NewSocket * ns) |
978 | SetSound (char *buf, int len, client * ns) |
982 | { |
979 | { |
983 | ns->sound = atoi (buf); |
980 | ns->sound = atoi (buf); |
984 | } |
981 | } |
985 | |
982 | |
986 | /** client wants the map resent */ |
983 | /** client wants the map resent */ |
… | |
… | |
996 | */ |
993 | */ |
997 | #if 0 |
994 | #if 0 |
998 | /* 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 |
999 | * clear the "cache" |
996 | * clear the "cache" |
1000 | */ |
997 | */ |
1001 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
998 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
1002 | draw_client_map (pl->ob); |
999 | draw_client_map (pl->ob); |
1003 | #endif |
1000 | #endif |
1004 | } |
1001 | } |
1005 | |
1002 | |
1006 | /** |
1003 | /** |
… | |
… | |
1044 | /** |
1041 | /** |
1045 | * 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 |
1046 | * 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) |
1047 | */ |
1044 | */ |
1048 | void |
1045 | void |
1049 | send_query (NewSocket * ns, uint8 flags, char *text) |
1046 | send_query (client * ns, uint8 flags, char *text) |
1050 | { |
1047 | { |
1051 | char buf[MAX_BUF]; |
1048 | char buf[MAX_BUF]; |
1052 | |
1049 | |
1053 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1050 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1054 | ns->send_packet (buf); |
1051 | ns->send_packet (buf); |
… | |
… | |
1109 | 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); |
1110 | 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); |
1111 | 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); |
1112 | } |
1109 | } |
1113 | |
1110 | |
1114 | if (pl->socket.exp64) |
1111 | if (pl->socket->exp64) |
1115 | { |
1112 | { |
1116 | uint8 s; |
1113 | uint8 s; |
1117 | |
1114 | |
1118 | for (s = 0; s < NUM_SKILLS; s++) |
1115 | for (s = 0; s < NUM_SKILLS; s++) |
1119 | { |
1116 | { |
… | |
… | |
1129 | 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; |
1130 | } |
1127 | } |
1131 | } |
1128 | } |
1132 | } |
1129 | } |
1133 | |
1130 | |
1134 | if (pl->socket.exp64) |
1131 | if (pl->socket->exp64) |
1135 | { 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) } |
1136 | else |
1133 | else |
1137 | { 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) } |
1138 | |
1135 | |
1139 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1136 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1152 | if (pl->run_on) |
1149 | if (pl->run_on) |
1153 | flags |= SF_RUNON; |
1150 | flags |= SF_RUNON; |
1154 | |
1151 | |
1155 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1152 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1156 | |
1153 | |
1157 | if (pl->socket.sc_version < 1025) |
1154 | if (pl->socket->sc_version < 1025) |
1158 | { 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) } |
1159 | else |
1156 | else |
1160 | { |
1157 | { |
1161 | int i; |
1158 | int i; |
1162 | |
1159 | |
… | |
… | |
1168 | |
1165 | |
1169 | 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]); |
1170 | } |
1167 | } |
1171 | } |
1168 | } |
1172 | |
1169 | |
1173 | if (pl->socket.monitor_spells) |
1170 | if (pl->socket->monitor_spells) |
1174 | { |
1171 | { |
1175 | 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); |
1176 | 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); |
1177 | 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); |
1178 | } |
1175 | } |
1179 | |
1176 | |
1180 | 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 */ |
1181 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1178 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1182 | set_title (pl->ob, buf); |
1179 | set_title (pl->ob, buf); |
1183 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1180 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1184 | |
1181 | |
1185 | /* Only send it away if we have some actual data */ |
1182 | /* Only send it away if we have some actual data */ |
1186 | if (sl.length () > 6) |
1183 | if (sl.length () > 6) |
1187 | Send_With_Handling (&pl->socket, &sl); |
1184 | pl->socket->send_packet (sl); |
1188 | } |
1185 | } |
1189 | |
1186 | |
1190 | /** |
1187 | /** |
1191 | * 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. |
1192 | */ |
1189 | */ |
… | |
… | |
1201 | sl << uint32 (pl->ob->count) |
1198 | sl << uint32 (pl->ob->count) |
1202 | << uint32 (weight) |
1199 | << uint32 (weight) |
1203 | << uint32 (pl->ob->face->number) |
1200 | << uint32 (pl->ob->face->number) |
1204 | << data8 (pl->ob->name); |
1201 | << data8 (pl->ob->name); |
1205 | |
1202 | |
1206 | Send_With_Handling (&pl->socket, &sl); |
1203 | pl->socket->send_packet (sl); |
1207 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1204 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1208 | } |
1205 | } |
1209 | |
1206 | |
1210 | /** |
1207 | /** |
1211 | * Need to send an animation sequence to the client. |
1208 | * Need to send an animation sequence to the client. |
… | |
… | |
1213 | * 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 |
1214 | * 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 |
1215 | * when the player logs in and picks stuff up. |
1212 | * when the player logs in and picks stuff up. |
1216 | */ |
1213 | */ |
1217 | void |
1214 | void |
1218 | esrv_send_animation (NewSocket * ns, short anim_num) |
1215 | esrv_send_animation (client * ns, short anim_num) |
1219 | { |
1216 | { |
1220 | int i; |
1217 | int i; |
1221 | |
1218 | |
1222 | /* 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 |
1223 | * 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 |
… | |
… | |
1243 | 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)) |
1244 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1241 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1245 | 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 */ |
1246 | } |
1243 | } |
1247 | |
1244 | |
1248 | Send_With_Handling (ns, &sl); |
1245 | ns->send_packet (sl); |
1249 | |
1246 | |
1250 | ns->anims_sent[anim_num] = 1; |
1247 | ns->anims_sent[anim_num] = 1; |
1251 | } |
1248 | } |
1252 | |
1249 | |
1253 | |
1250 | |
… | |
… | |
1260 | /** |
1257 | /** |
1261 | * 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 |
1262 | * the face yet, we will also send it. |
1259 | * the face yet, we will also send it. |
1263 | */ |
1260 | */ |
1264 | static void |
1261 | static void |
1265 | 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) |
1266 | { |
1263 | { |
1267 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1264 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1268 | { |
1265 | { |
1269 | 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); |
1270 | return; |
1267 | return; |
… | |
… | |
1290 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1287 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1291 | }; |
1288 | }; |
1292 | |
1289 | |
1293 | /** Checkes if map cells have changed */ |
1290 | /** Checkes if map cells have changed */ |
1294 | static int |
1291 | static int |
1295 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
1292 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
1296 | { |
1293 | { |
1297 | int k; |
1294 | int k; |
1298 | |
1295 | |
1299 | 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) |
1300 | return 1; |
1297 | return 1; |
… | |
… | |
1313 | * 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 |
1314 | * 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 |
1315 | * how many layers of data we should back. |
1312 | * how many layers of data we should back. |
1316 | */ |
1313 | */ |
1317 | static uint8 * |
1314 | static uint8 * |
1318 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1315 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1319 | { |
1316 | { |
1320 | int x, y, k; |
1317 | int x, y, k; |
1321 | int face; |
1318 | int face; |
1322 | unsigned char *fcur; |
1319 | unsigned char *fcur; |
1323 | struct MapLayer layers[MAP_LAYERS]; |
1320 | struct MapLayer layers[MAP_LAYERS]; |
… | |
… | |
1431 | * 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 |
1432 | * 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 |
1433 | * sent, it returns zero. |
1430 | * sent, it returns zero. |
1434 | */ |
1431 | */ |
1435 | static int |
1432 | static int |
1436 | check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) |
1433 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1437 | { |
1434 | { |
1438 | short face_num; |
1435 | short face_num; |
1439 | |
1436 | |
1440 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1437 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1441 | 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; |
… | |
… | |
1475 | * 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 |
1476 | * actually match. |
1473 | * actually match. |
1477 | */ |
1474 | */ |
1478 | |
1475 | |
1479 | static int |
1476 | static int |
1480 | update_space (packet &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) |
1481 | { |
1478 | { |
1482 | object *ob, *head; |
1479 | object *ob, *head; |
1483 | uint16 face_num; |
1480 | uint16 face_num; |
1484 | int bx, by, i; |
1481 | int bx, by, i; |
1485 | |
1482 | |
… | |
… | |
1698 | * 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 |
1699 | * take. |
1696 | * take. |
1700 | */ |
1697 | */ |
1701 | |
1698 | |
1702 | static inline int |
1699 | static inline int |
1703 | update_smooth (packet &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) |
1704 | { |
1701 | { |
1705 | object *ob; |
1702 | object *ob; |
1706 | int smoothlevel; /* old face_num; */ |
1703 | int smoothlevel; /* old face_num; */ |
1707 | |
1704 | |
1708 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1705 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1742 | * 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 |
1743 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1740 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1744 | * available. |
1741 | * available. |
1745 | */ |
1742 | */ |
1746 | int |
1743 | int |
1747 | getExtendedMapInfoSize (NewSocket * ns) |
1744 | getExtendedMapInfoSize (client * ns) |
1748 | { |
1745 | { |
1749 | int result = 0; |
1746 | int result = 0; |
1750 | |
1747 | |
1751 | if (ns->ext_mapinfos) |
1748 | if (ns->ext_mapinfos) |
1752 | { |
1749 | { |
… | |
… | |
1788 | uint8 eentrysize; |
1785 | uint8 eentrysize; |
1789 | uint16 ewhatstart, ewhatflag; |
1786 | uint16 ewhatstart, ewhatflag; |
1790 | uint8 extendedinfos; |
1787 | uint8 extendedinfos; |
1791 | maptile *m; |
1788 | maptile *m; |
1792 | |
1789 | |
1793 | NewSocket &socket = pl->contr->socket; |
1790 | client &socket = *pl->contr->socket; |
1794 | |
1791 | |
1795 | check_map_change (pl->contr); |
1792 | check_map_change (pl->contr); |
1796 | |
1793 | |
1797 | packet sl; |
1794 | packet sl; |
1798 | packet esl; |
1795 | packet esl; |
… | |
… | |
1877 | * with no faces tells the client to blank out the |
1874 | * with no faces tells the client to blank out the |
1878 | * space. |
1875 | * space. |
1879 | */ |
1876 | */ |
1880 | got_one = 0; |
1877 | got_one = 0; |
1881 | for (i = oldlen + 2; i < sl.length (); i++) |
1878 | for (i = oldlen + 2; i < sl.length (); i++) |
1882 | if (sl.buf[i]) |
1879 | if (sl[i]) |
1883 | got_one = 1; |
1880 | got_one = 1; |
1884 | |
1881 | |
1885 | if (got_one && (mask & 0xf)) |
1882 | if (got_one && (mask & 0xf)) |
1886 | sl.buf[oldlen + 1] = mask & 0xff; |
1883 | sl[oldlen + 1] = mask & 0xff; |
1887 | else |
1884 | else |
1888 | { /*either all faces blank, either no face at all */ |
1885 | { /*either all faces blank, either no face at all */ |
1889 | 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 */ |
1890 | sl.reset (oldlen + 2); |
1887 | sl.reset (oldlen + 2); |
1891 | else |
1888 | else |
… | |
… | |
1957 | |
1954 | |
1958 | map_clearcell (&lastcell, 0, 0, 0, count); |
1955 | map_clearcell (&lastcell, 0, 0, 0, count); |
1959 | } |
1956 | } |
1960 | |
1957 | |
1961 | if ((mask & 0xf) || need_send) |
1958 | if ((mask & 0xf) || need_send) |
1962 | sl.buf[oldlen + 1] = mask & 0xff; |
1959 | sl[oldlen + 1] = mask & 0xff; |
1963 | else |
1960 | else |
1964 | sl.reset (oldlen); |
1961 | sl.reset (oldlen); |
1965 | } |
1962 | } |
1966 | else |
1963 | else |
1967 | { |
1964 | { |
… | |
… | |
1997 | mask |= 0x8; |
1994 | mask |= 0x8; |
1998 | |
1995 | |
1999 | if (socket.extmap) |
1996 | if (socket.extmap) |
2000 | { |
1997 | { |
2001 | *last_ext |= 0x80; |
1998 | *last_ext |= 0x80; |
2002 | last_ext = sl.buf + sl.length (); |
1999 | last_ext = &sl[sl.length ()]; |
2003 | sl << uint8 (d); |
2000 | sl << uint8 (d); |
2004 | } |
2001 | } |
2005 | else |
2002 | else |
2006 | sl << uint8 (255 - 64 * d); |
2003 | sl << uint8 (255 - 64 * d); |
2007 | } |
2004 | } |
… | |
… | |
2041 | { |
2038 | { |
2042 | lastcell.stat_hp = stat_hp; |
2039 | lastcell.stat_hp = stat_hp; |
2043 | |
2040 | |
2044 | mask |= 0x8; |
2041 | mask |= 0x8; |
2045 | *last_ext |= 0x80; |
2042 | *last_ext |= 0x80; |
2046 | last_ext = sl.buf + sl.length (); |
2043 | last_ext = &sl[sl.length ()]; |
2047 | |
2044 | |
2048 | sl << uint8 (5) << uint8 (stat_hp); |
2045 | sl << uint8 (5) << uint8 (stat_hp); |
2049 | |
2046 | |
2050 | if (stat_width > 1) |
2047 | if (stat_width > 1) |
2051 | { |
2048 | { |
2052 | *last_ext |= 0x80; |
2049 | *last_ext |= 0x80; |
2053 | last_ext = sl.buf + sl.length (); |
2050 | last_ext = &sl[sl.length ()]; |
2054 | |
2051 | |
2055 | sl << uint8 (6) << uint8 (stat_width); |
2052 | sl << uint8 (6) << uint8 (stat_width); |
2056 | } |
2053 | } |
2057 | } |
2054 | } |
2058 | |
2055 | |
… | |
… | |
2060 | { |
2057 | { |
2061 | lastcell.player = player; |
2058 | lastcell.player = player; |
2062 | |
2059 | |
2063 | mask |= 0x8; |
2060 | mask |= 0x8; |
2064 | *last_ext |= 0x80; |
2061 | *last_ext |= 0x80; |
2065 | last_ext = sl.buf + sl.length (); |
2062 | last_ext = &sl[sl.length ()]; |
2066 | |
2063 | |
2067 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2064 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2068 | } |
2065 | } |
2069 | |
2066 | |
2070 | if (lastcell.flags != flags) |
2067 | if (lastcell.flags != flags) |
2071 | { |
2068 | { |
2072 | lastcell.flags = flags; |
2069 | lastcell.flags = flags; |
2073 | |
2070 | |
2074 | mask |= 0x8; |
2071 | mask |= 0x8; |
2075 | *last_ext |= 0x80; |
2072 | *last_ext |= 0x80; |
2076 | last_ext = sl.buf + sl.length (); |
2073 | last_ext = &sl[sl.length ()]; |
2077 | |
2074 | |
2078 | sl << uint8 (8) << uint8 (flags); |
2075 | sl << uint8 (8) << uint8 (flags); |
2079 | } |
2076 | } |
2080 | } |
2077 | } |
2081 | |
2078 | |
… | |
… | |
2123 | * space by checking the mask. If so, update the mask. |
2120 | * space by checking the mask. If so, update the mask. |
2124 | * 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 |
2125 | * value, so we don't send those bits. |
2122 | * value, so we don't send those bits. |
2126 | */ |
2123 | */ |
2127 | if (mask & 0xf) |
2124 | if (mask & 0xf) |
2128 | sl.buf[oldlen + 1] = mask & 0xff; |
2125 | sl[oldlen + 1] = mask & 0xff; |
2129 | else |
2126 | else |
2130 | sl.reset (oldlen); |
2127 | sl.reset (oldlen); |
2131 | |
2128 | |
2132 | if (emask & 0xf) |
2129 | if (emask & 0xf) |
2133 | esl.buf[eoldlen + 1] = emask & 0xff; |
2130 | esl[eoldlen + 1] = emask & 0xff; |
2134 | else |
2131 | else |
2135 | esl.reset (eoldlen); |
2132 | esl.reset (eoldlen); |
2136 | } /* else this is a viewable space */ |
2133 | } /* else this is a viewable space */ |
2137 | } /* for x loop */ |
2134 | } /* for x loop */ |
2138 | } /* for y loop */ |
2135 | } /* for y loop */ |
… | |
… | |
2144 | { |
2141 | { |
2145 | /* No map data will follow, so don't say the client |
2142 | /* No map data will follow, so don't say the client |
2146 | * it doesn't need draw! |
2143 | * it doesn't need draw! |
2147 | */ |
2144 | */ |
2148 | ewhatflag &= (~EMI_NOREDRAW); |
2145 | ewhatflag &= (~EMI_NOREDRAW); |
2149 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2146 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2150 | } |
2147 | } |
2151 | |
2148 | |
2152 | if (esl.length () > estartlen) |
2149 | if (esl.length () > estartlen) |
2153 | Send_With_Handling (&socket, &esl); |
2150 | socket.send_packet (esl); |
2154 | } |
2151 | } |
2155 | |
2152 | |
2156 | if (sl.length () > startlen || socket.sent_scroll) |
2153 | if (sl.length () > startlen || socket.sent_scroll) |
2157 | { |
2154 | { |
2158 | Send_With_Handling (&socket, &sl); |
2155 | socket.send_packet (sl); |
2159 | socket.sent_scroll = 0; |
2156 | socket.sent_scroll = 0; |
2160 | } |
2157 | } |
2161 | } |
2158 | } |
2162 | |
2159 | |
2163 | /** |
2160 | /** |
… | |
… | |
2189 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2186 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2190 | return; |
2187 | return; |
2191 | |
2188 | |
2192 | memset (&newmap, 0, sizeof (struct Map)); |
2189 | memset (&newmap, 0, sizeof (struct Map)); |
2193 | |
2190 | |
2194 | 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++) |
2195 | { |
2192 | { |
2196 | 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++) |
2197 | { |
2194 | { |
2198 | ax = i; |
2195 | ax = i; |
2199 | ay = j; |
2196 | ay = j; |
2200 | m = pm; |
2197 | m = pm; |
2201 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2198 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2233 | |
2230 | |
2234 | /*****************************************************************************/ |
2231 | /*****************************************************************************/ |
2235 | void |
2232 | void |
2236 | send_plugin_custom_message (object *pl, char *buf) |
2233 | send_plugin_custom_message (object *pl, char *buf) |
2237 | { |
2234 | { |
2238 | pl->contr->socket.send_packet (buf); |
2235 | pl->contr->socket->send_packet (buf); |
2239 | } |
2236 | } |
2240 | |
2237 | |
2241 | /** |
2238 | /** |
2242 | * This sends the skill number to name mapping. We ignore |
2239 | * This sends the skill number to name mapping. We ignore |
2243 | * the params - we always send the same info no matter what. |
2240 | * the params - we always send the same info no matter what. |
2244 | */ |
2241 | */ |
2245 | void |
2242 | void |
2246 | send_skill_info (NewSocket *ns, char *params) |
2243 | send_skill_info (client *ns, char *params) |
2247 | { |
2244 | { |
2248 | packet sl; |
2245 | packet sl; |
2249 | sl << "replyinfo skill_info\n"; |
2246 | sl << "replyinfo skill_info\n"; |
2250 | |
2247 | |
2251 | for (int i = 1; i < NUM_SKILLS; i++) |
2248 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2255 | { |
2252 | { |
2256 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2253 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2257 | fatal (0); |
2254 | fatal (0); |
2258 | } |
2255 | } |
2259 | |
2256 | |
2260 | Send_With_Handling (ns, &sl); |
2257 | ns->send_packet (sl); |
2261 | } |
2258 | } |
2262 | |
2259 | |
2263 | /** |
2260 | /** |
2264 | * This sends the spell path to name mapping. We ignore |
2261 | * This sends the spell path to name mapping. We ignore |
2265 | * the params - we always send the same info no matter what. |
2262 | * the params - we always send the same info no matter what. |
2266 | */ |
2263 | */ |
2267 | void |
2264 | void |
2268 | send_spell_paths (NewSocket * ns, char *params) |
2265 | send_spell_paths (client * ns, char *params) |
2269 | { |
2266 | { |
2270 | packet sl; |
2267 | packet sl; |
2271 | |
2268 | |
2272 | sl << "replyinfo spell_paths\n"; |
2269 | sl << "replyinfo spell_paths\n"; |
2273 | |
2270 | |
… | |
… | |
2278 | { |
2275 | { |
2279 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2276 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2280 | fatal (0); |
2277 | fatal (0); |
2281 | } |
2278 | } |
2282 | |
2279 | |
2283 | Send_With_Handling (ns, &sl); |
2280 | ns->send_packet (sl); |
2284 | } |
2281 | } |
2285 | |
2282 | |
2286 | /** |
2283 | /** |
2287 | * 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. |
2288 | * 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 |
2289 | */ |
2286 | */ |
2290 | void |
2287 | void |
2291 | esrv_update_spells (player *pl) |
2288 | esrv_update_spells (player *pl) |
2292 | { |
2289 | { |
2293 | if (!pl->socket.monitor_spells) |
2290 | if (!pl->socket->monitor_spells) |
2294 | return; |
2291 | return; |
2295 | |
2292 | |
2296 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2293 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2297 | { |
2294 | { |
2298 | if (spell->type == SPELL) |
2295 | if (spell->type == SPELL) |
… | |
… | |
2328 | |
2325 | |
2329 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2326 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2330 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2327 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2331 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2328 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2332 | |
2329 | |
2333 | Send_With_Handling (&pl->socket, &sl); |
2330 | pl->socket->send_packet (sl); |
2334 | } |
2331 | } |
2335 | } |
2332 | } |
2336 | } |
2333 | } |
2337 | } |
2334 | } |
2338 | |
2335 | |
2339 | void |
2336 | void |
2340 | esrv_remove_spell (player *pl, object *spell) |
2337 | esrv_remove_spell (player *pl, object *spell) |
2341 | { |
2338 | { |
2342 | if (!pl->socket.monitor_spells) |
2339 | if (!pl->socket->monitor_spells) |
2343 | return; |
2340 | return; |
2344 | |
2341 | |
2345 | if (!pl || !spell || spell->env != pl->ob) |
2342 | if (!pl || !spell || spell->env != pl->ob) |
2346 | { |
2343 | { |
2347 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2344 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
… | |
… | |
2351 | packet sl; |
2348 | packet sl; |
2352 | |
2349 | |
2353 | sl << "delspell " |
2350 | sl << "delspell " |
2354 | << uint32 (spell->count); |
2351 | << uint32 (spell->count); |
2355 | |
2352 | |
2356 | Send_With_Handling (&pl->socket, &sl); |
2353 | pl->socket->send_packet (sl); |
2357 | } |
2354 | } |
2358 | |
2355 | |
2359 | /* 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. */ |
2360 | static void |
2357 | static void |
2361 | append_spell (player *pl, packet &sl, object *spell) |
2358 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2409 | { |
2406 | { |
2410 | 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"); |
2411 | return; |
2408 | return; |
2412 | } |
2409 | } |
2413 | |
2410 | |
2414 | if (!pl->socket.monitor_spells) |
2411 | if (!pl->socket->monitor_spells) |
2415 | return; |
2412 | return; |
2416 | |
2413 | |
2417 | packet sl; |
2414 | packet sl; |
2418 | |
2415 | |
2419 | sl << "addspell "; |
2416 | sl << "addspell "; |
… | |
… | |
2438 | if (spell->type != SPELL) |
2435 | if (spell->type != SPELL) |
2439 | continue; |
2436 | continue; |
2440 | |
2437 | |
2441 | if (sl.length () >= (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)))) |
2442 | { |
2439 | { |
2443 | Send_With_Handling (&pl->socket, &sl); |
2440 | pl->socket->send_packet (sl); |
2444 | |
2441 | |
2445 | sl.reset (); |
2442 | sl.reset (); |
2446 | sl << "addspell "; |
2443 | sl << "addspell "; |
2447 | } |
2444 | } |
2448 | |
2445 | |
… | |
… | |
2462 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2459 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2463 | fatal (0); |
2460 | fatal (0); |
2464 | } |
2461 | } |
2465 | |
2462 | |
2466 | /* finally, we can send the packet */ |
2463 | /* finally, we can send the packet */ |
2467 | Send_With_Handling (&pl->socket, &sl); |
2464 | pl->socket->send_packet (sl); |
2468 | |
|
|
2469 | } |
2465 | } |
2470 | |
2466 | |