… | |
… | |
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 | |
… | |
… | |
96 | -1, /* life stealing */ |
93 | -1, /* life stealing */ |
97 | -1 /* Disease - not fully done yet */ |
94 | -1 /* Disease - not fully done yet */ |
98 | }; |
95 | }; |
99 | |
96 | |
100 | static void |
97 | static void |
101 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
98 | socket_map_scroll (client_socket * ns, int dx, int dy) |
102 | { |
99 | { |
103 | struct Map newmap; |
100 | struct Map newmap; |
104 | int x, y, mx, my; |
101 | int x, y, mx, my; |
105 | |
102 | |
106 | { |
103 | { |
107 | char buf[MAXSOCKBUF]; |
104 | packet sl; |
108 | |
105 | |
109 | sprintf (buf, "map_scroll %d %d", dx, dy); |
106 | sl.printf ("map_scroll %d %d", dx, dy); |
110 | Write_String_To_Socket (ns, buf, strlen (buf)); |
107 | ns->send_packet (sl); |
111 | } |
108 | } |
112 | |
109 | |
113 | /* If we are using the Map1aCmd, we may in fact send |
110 | /* If we are using the Map1aCmd, we may in fact send |
114 | * head information that is outside the viewable map. |
111 | * head information that is outside the viewable map. |
115 | * So set the mx,my to the max value we want to |
112 | * So set the mx,my to the max value we want to |
… | |
… | |
156 | } |
153 | } |
157 | |
154 | |
158 | static void |
155 | static void |
159 | clear_map (player *pl) |
156 | clear_map (player *pl) |
160 | { |
157 | { |
161 | NewSocket & socket = pl->socket; |
158 | client_socket &socket = *pl->socket; |
162 | |
159 | |
163 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
160 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
164 | |
161 | |
165 | if (socket.newmapcmd == 1) |
162 | if (socket.newmapcmd == 1) |
166 | Write_String_To_Socket (&socket, "newmap", 6); |
163 | socket.send_packet ("newmap"); |
167 | |
164 | |
168 | socket.update_look = 1; |
165 | socket.update_look = 1; |
169 | socket.look_position = 0; |
166 | socket.look_position = 0; |
170 | } |
167 | } |
171 | |
168 | |
172 | /** check for map change and send new map data */ |
169 | /** check for map change and send new map data */ |
173 | static void |
170 | static void |
174 | check_map_change (player *pl) |
171 | check_map_change (player *pl) |
175 | { |
172 | { |
176 | NewSocket & socket = pl->socket; |
173 | client_socket &socket = *pl->socket; |
177 | object *ob = pl->ob; |
174 | object *ob = pl->ob; |
178 | char buf[MAX_BUF]; /* eauugggh */ |
175 | char buf[MAX_BUF]; /* eauugggh */ |
179 | |
176 | |
180 | if (socket.current_map != ob->map) |
177 | if (socket.current_map != ob->map) |
181 | { |
178 | { |
… | |
… | |
202 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
199 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
203 | } |
200 | } |
204 | else |
201 | else |
205 | snprintf (buf, MAX_BUF, "mapinfo current"); |
202 | snprintf (buf, MAX_BUF, "mapinfo current"); |
206 | |
203 | |
207 | Write_String_To_Socket (&socket, buf, strlen (buf)); |
204 | socket.send_packet (buf); |
208 | } |
205 | } |
209 | } |
206 | } |
210 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
207 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
211 | { |
208 | { |
212 | int dx = ob->x - socket.current_x; |
209 | int dx = ob->x - socket.current_x; |
… | |
… | |
252 | buf += 8; |
249 | buf += 8; |
253 | |
250 | |
254 | // initial map and its origin |
251 | // initial map and its origin |
255 | maptile *map = pl->ob->map; |
252 | maptile *map = pl->ob->map; |
256 | sint16 dx, dy; |
253 | sint16 dx, dy; |
257 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
254 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
258 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
255 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
259 | int max_distance = 8; // limit maximum path length to something generous |
256 | int max_distance = 8; // limit maximum path length to something generous |
260 | |
257 | |
261 | while (*buf && map && max_distance) |
258 | while (*buf && map && max_distance) |
262 | { |
259 | { |
263 | int dir = *buf++; |
260 | int dir = *buf++; |
… | |
… | |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
315 | } |
312 | } |
316 | else |
313 | else |
317 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
318 | |
315 | |
319 | Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); |
316 | pl->socket->send_packet (bigbuf); |
320 | } |
317 | } |
321 | |
318 | |
322 | /** This is the Setup cmd - easy first implementation */ |
319 | /** This is the Setup cmd - easy first implementation */ |
323 | void |
320 | void |
324 | SetUp (char *buf, int len, NewSocket * ns) |
321 | SetUp (char *buf, int len, client_socket * ns) |
325 | { |
322 | { |
326 | int s, slen; |
323 | int s, slen; |
327 | char *cmd, *param, cmdback[HUGE_BUF]; |
324 | char *cmd, *param, cmdback[HUGE_BUF]; |
328 | |
325 | |
329 | /* run through the cmds of setup |
326 | /* run through the cmds of setup |
… | |
… | |
331 | * |
328 | * |
332 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
329 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
333 | * The client then must sort this out |
330 | * The client then must sort this out |
334 | */ |
331 | */ |
335 | |
332 | |
336 | LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
333 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
334 | |
337 | strcpy (cmdback, "setup"); |
335 | strcpy (cmdback, "setup"); |
338 | for (s = 0; s < len;) |
336 | for (s = 0; s < len; ) |
339 | { |
337 | { |
340 | |
|
|
341 | cmd = &buf[s]; |
338 | cmd = &buf[s]; |
342 | |
339 | |
343 | /* find the next space, and put a null there */ |
340 | /* find the next space, and put a null there */ |
344 | for (; buf[s] && buf[s] != ' '; s++); |
341 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
342 | ; |
|
|
343 | |
345 | buf[s++] = 0; |
344 | buf[s++] = 0; |
|
|
345 | |
346 | while (buf[s] == ' ') |
346 | while (buf[s] == ' ') |
347 | s++; |
347 | s++; |
348 | |
348 | |
349 | if (s >= len) |
349 | if (s >= len) |
350 | break; |
350 | break; |
351 | |
351 | |
352 | param = &buf[s]; |
352 | param = &buf[s]; |
353 | |
353 | |
354 | for (; buf[s] && buf[s] != ' '; s++); |
354 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
355 | ; |
|
|
356 | |
355 | buf[s++] = 0; |
357 | buf[s++] = 0; |
|
|
358 | |
356 | while (buf[s] == ' ') |
359 | while (buf[s] == ' ') |
357 | s++; |
360 | s++; |
358 | |
361 | |
359 | slen = strlen (cmdback); |
362 | slen = strlen (cmdback); |
360 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
363 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
… | |
… | |
521 | * report a failure to the client. |
524 | * report a failure to the client. |
522 | */ |
525 | */ |
523 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
526 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
524 | } |
527 | } |
525 | } /* for processing all the setup commands */ |
528 | } /* for processing all the setup commands */ |
|
|
529 | |
526 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
530 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
527 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
531 | ns->send_packet (cmdback); |
528 | } |
532 | } |
529 | |
533 | |
530 | /** |
534 | /** |
531 | * The client has requested to be added to the game. |
535 | * The client has requested to be added to the game. |
532 | * This is what takes care of it. We tell the client how things worked out. |
536 | * This is what takes care of it. We tell the client how things worked out. |
533 | * I am not sure if this file is the best place for this function. however, |
537 | * I am not sure if this file is the best place for this function. however, |
534 | * it either has to be here or init_sockets needs to be exported. |
538 | * it either has to be here or init_sockets needs to be exported. |
535 | */ |
539 | */ |
536 | void |
540 | void |
537 | AddMeCmd (char *buf, int len, NewSocket * ns) |
541 | AddMeCmd (char *buf, int len, client_socket * ns) |
538 | { |
542 | { |
539 | Settings oldsettings; |
543 | Settings oldsettings; |
540 | |
544 | |
541 | oldsettings = settings; |
545 | oldsettings = settings; |
542 | if (ns->status != Ns_Add || add_player (ns)) |
546 | if (ns->status != Ns_Add || add_player (ns)) |
543 | { |
547 | ns->send_packet ("addme_failed"); |
544 | Write_String_To_Socket (ns, "addme_failed", 12); |
|
|
545 | } |
|
|
546 | else |
548 | else |
547 | { |
549 | ns->send_packet ("addme_success"); |
548 | /* Basically, the add_player copies the socket structure into |
550 | |
549 | * the player structure, so this one (which is from init_sockets) |
|
|
550 | * is not needed anymore. The write below should still work, as the |
|
|
551 | * stuff in ns is still relevant. |
|
|
552 | */ |
|
|
553 | Write_String_To_Socket (ns, "addme_success", 13); |
|
|
554 | socket_info.nconns--; |
|
|
555 | ns->status = Ns_Avail; |
|
|
556 | } |
|
|
557 | settings = oldsettings; |
551 | settings = oldsettings; |
558 | } |
552 | } |
559 | |
553 | |
560 | /** Reply to ExtendedInfos command */ |
554 | /** Reply to ExtendedInfos command */ |
561 | void |
555 | void |
562 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
556 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
563 | { |
557 | { |
564 | char cmdback[MAX_BUF]; |
558 | char cmdback[MAX_BUF]; |
565 | char command[50]; |
559 | char command[50]; |
566 | int info, nextinfo; |
560 | int info, nextinfo; |
567 | |
561 | |
… | |
… | |
605 | { |
599 | { |
606 | strcat (cmdback, " "); |
600 | strcat (cmdback, " "); |
607 | strcat (cmdback, "smoothing"); |
601 | strcat (cmdback, "smoothing"); |
608 | } |
602 | } |
609 | |
603 | |
610 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
604 | ns->send_packet (cmdback); |
611 | } |
605 | } |
612 | |
606 | |
613 | /* |
607 | /* |
614 | #define MSG_TYPE_BOOK 1 |
608 | #define MSG_TYPE_BOOK 1 |
615 | #define MSG_TYPE_CARD 2 |
609 | #define MSG_TYPE_CARD 2 |
… | |
… | |
618 | #define MSG_TYPE_MONUMENT 5 |
612 | #define MSG_TYPE_MONUMENT 5 |
619 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
613 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
620 | |
614 | |
621 | /** Reply to ExtendedInfos command */ |
615 | /** Reply to ExtendedInfos command */ |
622 | void |
616 | void |
623 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
617 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
624 | { |
618 | { |
625 | char cmdback[MAX_BUF]; |
619 | char cmdback[MAX_BUF]; |
626 | char temp[10]; |
620 | char temp[10]; |
627 | char command[50]; |
621 | char command[50]; |
628 | int info, nextinfo, i, flag; |
622 | int info, nextinfo, i, flag; |
… | |
… | |
668 | strcat (cmdback, " "); |
662 | strcat (cmdback, " "); |
669 | snprintf (temp, sizeof (temp), "%d", i); |
663 | snprintf (temp, sizeof (temp), "%d", i); |
670 | strcat (cmdback, temp); |
664 | strcat (cmdback, temp); |
671 | } |
665 | } |
672 | |
666 | |
673 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
667 | ns->send_packet (cmdback); |
674 | } |
668 | } |
675 | |
669 | |
676 | /** |
670 | /** |
677 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
671 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
678 | * Basically, it makes no sense to wait for the client to request a |
672 | * Basically, it makes no sense to wait for the client to request a |
679 | * a piece of data from us that we know the client wants. So |
673 | * a piece of data from us that we know the client wants. So |
680 | * if we know the client wants it, might as well push it to the |
674 | * if we know the client wants it, might as well push it to the |
681 | * client. |
675 | * client. |
682 | */ |
676 | */ |
683 | static void |
677 | static void |
684 | SendSmooth (NewSocket * ns, uint16 face) |
678 | SendSmooth (client_socket * ns, uint16 face) |
685 | { |
679 | { |
686 | uint16 smoothface; |
680 | uint16 smoothface; |
687 | |
681 | |
688 | /* If we can't find a face, return and set it so we won't try to send this |
682 | /* If we can't find a face, return and set it so we won't try to send this |
689 | * again. |
683 | * again. |
… | |
… | |
699 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
693 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
700 | esrv_send_face (ns, smoothface, 0); |
694 | esrv_send_face (ns, smoothface, 0); |
701 | |
695 | |
702 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
696 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
703 | |
697 | |
704 | SockList sl (MAXSOCKBUF); |
698 | packet sl; |
705 | |
699 | |
706 | sl << "smooth " |
700 | sl << "smooth " |
707 | << uint16 (face) |
701 | << uint16 (face) |
708 | << uint16 (smoothface); |
702 | << uint16 (smoothface); |
709 | |
703 | |
710 | Send_With_Handling (ns, &sl); |
704 | ns->send_packet (sl); |
711 | sl.free (); |
|
|
712 | } |
705 | } |
713 | |
706 | |
714 | /** |
707 | /** |
715 | * Tells client the picture it has to use |
708 | * Tells client the picture it has to use |
716 | * to smooth a picture number given as argument. |
709 | * to smooth a picture number given as argument. |
717 | */ |
710 | */ |
718 | void |
711 | void |
719 | AskSmooth (char *buf, int len, NewSocket * ns) |
712 | AskSmooth (char *buf, int len, client_socket * ns) |
720 | { |
713 | { |
721 | uint16 facenbr; |
714 | uint16 facenbr; |
722 | |
715 | |
723 | facenbr = atoi (buf); |
716 | facenbr = atoi (buf); |
724 | SendSmooth (ns, facenbr); |
717 | SendSmooth (ns, facenbr); |
… | |
… | |
785 | void |
778 | void |
786 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
779 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
787 | { |
780 | { |
788 | int time, repeat; |
781 | int time, repeat; |
789 | char command[MAX_BUF]; |
782 | char command[MAX_BUF]; |
790 | short packet; |
783 | int pktlen; |
791 | |
784 | |
792 | if (len < 7) |
785 | if (len < 7) |
793 | { |
786 | { |
794 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
787 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
795 | return; |
788 | return; |
796 | } |
789 | } |
797 | |
790 | |
798 | packet = net_uint16 (buf); |
791 | pktlen = net_uint16 (buf); |
799 | repeat = net_uint32 (buf + 2); |
792 | repeat = net_uint32 (buf + 2); |
800 | |
793 | |
801 | /* -1 is special - no repeat, but don't update */ |
794 | /* -1 is special - no repeat, but don't update */ |
802 | if (repeat != -1) |
795 | if (repeat != -1) |
803 | pl->count = repeat; |
796 | pl->count = repeat; |
… | |
… | |
837 | else |
830 | else |
838 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
831 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
839 | |
832 | |
840 | /* Send confirmation of command execution now */ |
833 | /* Send confirmation of command execution now */ |
841 | |
834 | |
842 | SockList sl (MAXSOCKBUF); |
835 | packet sl; |
843 | sl << "comc " << uint16 (packet) << uint32 (time); |
836 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
844 | Send_With_Handling (&pl->socket, &sl); |
837 | pl->socket->send_packet (sl); |
845 | sl.free (); |
|
|
846 | } |
838 | } |
847 | |
839 | |
848 | |
840 | |
849 | /** This is a reply to a previous query. */ |
841 | /** This is a reply to a previous query. */ |
850 | void |
842 | void |
… | |
… | |
917 | * something older than the server. If we assume the client will be |
909 | * something older than the server. If we assume the client will be |
918 | * backwards compatible, having it be a later version should not be a |
910 | * backwards compatible, having it be a later version should not be a |
919 | * problem. |
911 | * problem. |
920 | */ |
912 | */ |
921 | void |
913 | void |
922 | VersionCmd (char *buf, int len, NewSocket * ns) |
914 | VersionCmd (char *buf, int len, client_socket * ns) |
923 | { |
915 | { |
924 | char *cp; |
916 | char *cp; |
925 | char version_warning[256]; |
917 | char version_warning[256]; |
926 | |
918 | |
927 | if (!buf) |
919 | if (!buf) |
… | |
… | |
966 | */ |
958 | */ |
967 | if (ns->sc_version < 1026) |
959 | if (ns->sc_version < 1026) |
968 | { |
960 | { |
969 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
961 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
970 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
962 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
971 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
963 | ns->send_packet (version_warning); |
972 | } |
964 | } |
973 | |
965 | |
974 | } |
966 | } |
975 | } |
967 | } |
976 | |
968 | |
977 | /** sound related functions. */ |
969 | /** sound related functions. */ |
978 | |
970 | |
979 | void |
971 | void |
980 | SetSound (char *buf, int len, NewSocket * ns) |
972 | SetSound (char *buf, int len, client_socket * ns) |
981 | { |
973 | { |
982 | ns->sound = atoi (buf); |
974 | ns->sound = atoi (buf); |
983 | } |
975 | } |
984 | |
976 | |
985 | /** client wants the map resent */ |
977 | /** client wants the map resent */ |
… | |
… | |
995 | */ |
987 | */ |
996 | #if 0 |
988 | #if 0 |
997 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
989 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
998 | * clear the "cache" |
990 | * clear the "cache" |
999 | */ |
991 | */ |
1000 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
992 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
1001 | draw_client_map (pl->ob); |
993 | draw_client_map (pl->ob); |
1002 | #endif |
994 | #endif |
1003 | } |
995 | } |
1004 | |
996 | |
1005 | /** |
997 | /** |
… | |
… | |
1043 | /** |
1035 | /** |
1044 | * Asks the client to query the user. This way, the client knows |
1036 | * Asks the client to query the user. This way, the client knows |
1045 | * it needs to send something back (vs just printing out a message) |
1037 | * it needs to send something back (vs just printing out a message) |
1046 | */ |
1038 | */ |
1047 | void |
1039 | void |
1048 | send_query (NewSocket * ns, uint8 flags, char *text) |
1040 | send_query (client_socket * ns, uint8 flags, char *text) |
1049 | { |
1041 | { |
1050 | char buf[MAX_BUF]; |
1042 | char buf[MAX_BUF]; |
1051 | |
1043 | |
1052 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1044 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1053 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1045 | ns->send_packet (buf); |
1054 | } |
1046 | } |
1055 | |
1047 | |
1056 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1048 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1057 | Old = New; \ |
1049 | Old = New; \ |
1058 | sl << uint8 (Type) << uint64 (New); \ |
1050 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1088 | esrv_update_stats (player *pl) |
1080 | esrv_update_stats (player *pl) |
1089 | { |
1081 | { |
1090 | char buf[MAX_BUF]; |
1082 | char buf[MAX_BUF]; |
1091 | uint16 flags; |
1083 | uint16 flags; |
1092 | |
1084 | |
1093 | SockList sl (MAXSOCKBUF); |
1085 | packet sl; |
1094 | sl << "stats "; |
1086 | sl << "stats "; |
1095 | |
1087 | |
1096 | if (pl->ob != NULL) |
1088 | if (pl->ob != NULL) |
1097 | { |
1089 | { |
1098 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1090 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
… | |
… | |
1108 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1100 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1109 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1101 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1110 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1102 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1111 | } |
1103 | } |
1112 | |
1104 | |
1113 | if (pl->socket.exp64) |
1105 | if (pl->socket->exp64) |
1114 | { |
1106 | { |
1115 | uint8 s; |
1107 | uint8 s; |
1116 | |
1108 | |
1117 | for (s = 0; s < NUM_SKILLS; s++) |
1109 | for (s = 0; s < NUM_SKILLS; s++) |
1118 | { |
1110 | { |
… | |
… | |
1128 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1120 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1129 | } |
1121 | } |
1130 | } |
1122 | } |
1131 | } |
1123 | } |
1132 | |
1124 | |
1133 | if (pl->socket.exp64) |
1125 | if (pl->socket->exp64) |
1134 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1126 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1135 | else |
1127 | else |
1136 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1128 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1137 | |
1129 | |
1138 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1130 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1151 | if (pl->run_on) |
1143 | if (pl->run_on) |
1152 | flags |= SF_RUNON; |
1144 | flags |= SF_RUNON; |
1153 | |
1145 | |
1154 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1146 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1155 | |
1147 | |
1156 | if (pl->socket.sc_version < 1025) |
1148 | if (pl->socket->sc_version < 1025) |
1157 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1149 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1158 | else |
1150 | else |
1159 | { |
1151 | { |
1160 | int i; |
1152 | int i; |
1161 | |
1153 | |
… | |
… | |
1167 | |
1159 | |
1168 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1160 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1169 | } |
1161 | } |
1170 | } |
1162 | } |
1171 | |
1163 | |
1172 | if (pl->socket.monitor_spells) |
1164 | if (pl->socket->monitor_spells) |
1173 | { |
1165 | { |
1174 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1166 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1175 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1167 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1176 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1168 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1177 | } |
1169 | } |
1178 | |
1170 | |
1179 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1171 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1180 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1172 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1181 | set_title (pl->ob, buf); |
1173 | set_title (pl->ob, buf); |
1182 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1174 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1183 | |
1175 | |
1184 | /* Only send it away if we have some actual data */ |
1176 | /* Only send it away if we have some actual data */ |
1185 | if (sl.len > 6) |
1177 | if (sl.length () > 6) |
1186 | { |
1178 | pl->socket->send_packet (sl); |
1187 | #ifdef ESRV_DEBUG |
|
|
1188 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1189 | #endif |
|
|
1190 | Send_With_Handling (&pl->socket, &sl); |
|
|
1191 | } |
|
|
1192 | |
|
|
1193 | sl.free (); |
|
|
1194 | } |
1179 | } |
1195 | |
1180 | |
1196 | /** |
1181 | /** |
1197 | * Tells the client that here is a player it should start using. |
1182 | * Tells the client that here is a player it should start using. |
1198 | */ |
1183 | */ |
1199 | void |
1184 | void |
1200 | esrv_new_player (player *pl, uint32 weight) |
1185 | esrv_new_player (player *pl, uint32 weight) |
1201 | { |
1186 | { |
1202 | pl->last_weight = weight; |
1187 | pl->last_weight = weight; |
1203 | |
1188 | |
1204 | SockList sl (MAXSOCKBUF); |
1189 | packet sl; |
1205 | sl << "player "; |
1190 | sl << "player "; |
1206 | |
1191 | |
1207 | sl << uint32 (pl->ob->count) |
1192 | sl << uint32 (pl->ob->count) |
1208 | << uint32 (weight) |
1193 | << uint32 (weight) |
1209 | << uint32 (pl->ob->face->number) |
1194 | << uint32 (pl->ob->face->number) |
1210 | << data8 (pl->ob->name); |
1195 | << data8 (pl->ob->name); |
1211 | |
1196 | |
1212 | Send_With_Handling (&pl->socket, &sl); |
1197 | pl->socket->send_packet (sl); |
1213 | sl.free (); |
|
|
1214 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1198 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1215 | } |
1199 | } |
1216 | |
1200 | |
1217 | /** |
1201 | /** |
1218 | * Need to send an animation sequence to the client. |
1202 | * Need to send an animation sequence to the client. |
… | |
… | |
1220 | * sent them the face yet (this can become quite costly in terms of |
1204 | * sent them the face yet (this can become quite costly in terms of |
1221 | * how much we are sending - on the other hand, this should only happen |
1205 | * how much we are sending - on the other hand, this should only happen |
1222 | * when the player logs in and picks stuff up. |
1206 | * when the player logs in and picks stuff up. |
1223 | */ |
1207 | */ |
1224 | void |
1208 | void |
1225 | esrv_send_animation (NewSocket * ns, short anim_num) |
1209 | esrv_send_animation (client_socket * ns, short anim_num) |
1226 | { |
1210 | { |
1227 | int i; |
1211 | int i; |
1228 | |
1212 | |
1229 | /* Do some checking on the anim_num we got. Note that the animations |
1213 | /* Do some checking on the anim_num we got. Note that the animations |
1230 | * are added in contigous order, so if the number is in the valid |
1214 | * are added in contigous order, so if the number is in the valid |
… | |
… | |
1234 | { |
1218 | { |
1235 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1219 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1236 | return; |
1220 | return; |
1237 | } |
1221 | } |
1238 | |
1222 | |
1239 | SockList sl (MAXSOCKBUF); |
1223 | packet sl; |
1240 | |
1224 | |
1241 | sl << "anim " |
1225 | sl << "anim " |
1242 | << uint16 (anim_num) |
1226 | << uint16 (anim_num) |
1243 | << uint16 (0); /* flags - not used right now */ |
1227 | << uint16 (0); /* flags - not used right now */ |
1244 | |
1228 | |
… | |
… | |
1250 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1234 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1251 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1235 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1252 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1236 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1253 | } |
1237 | } |
1254 | |
1238 | |
1255 | Send_With_Handling (ns, &sl); |
1239 | ns->send_packet (sl); |
1256 | sl.free (); |
|
|
1257 | |
1240 | |
1258 | ns->anims_sent[anim_num] = 1; |
1241 | ns->anims_sent[anim_num] = 1; |
1259 | } |
1242 | } |
1260 | |
1243 | |
1261 | |
1244 | |
… | |
… | |
1268 | /** |
1251 | /** |
1269 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1252 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1270 | * the face yet, we will also send it. |
1253 | * the face yet, we will also send it. |
1271 | */ |
1254 | */ |
1272 | static void |
1255 | static void |
1273 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
1256 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1274 | { |
1257 | { |
1275 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1258 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1276 | { |
1259 | { |
1277 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1260 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1278 | return; |
1261 | return; |
… | |
… | |
1298 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1281 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1299 | }; |
1282 | }; |
1300 | |
1283 | |
1301 | /** Checkes if map cells have changed */ |
1284 | /** Checkes if map cells have changed */ |
1302 | static int |
1285 | static int |
1303 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
1286 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
1304 | { |
1287 | { |
1305 | int k; |
1288 | int k; |
1306 | |
1289 | |
1307 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1290 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1308 | return 1; |
1291 | return 1; |
… | |
… | |
1321 | * cnum is the client number, cur is the the buffer we put all of |
1304 | * cnum is the client number, cur is the the buffer we put all of |
1322 | * this data into. we return the end of the data. layers is |
1305 | * this data into. we return the end of the data. layers is |
1323 | * how many layers of data we should back. |
1306 | * how many layers of data we should back. |
1324 | */ |
1307 | */ |
1325 | static uint8 * |
1308 | static uint8 * |
1326 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1309 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1327 | { |
1310 | { |
1328 | int x, y, k; |
1311 | int x, y, k; |
1329 | int face; |
1312 | int face; |
1330 | unsigned char *fcur; |
1313 | unsigned char *fcur; |
1331 | struct MapLayer layers[MAP_LAYERS]; |
1314 | struct MapLayer layers[MAP_LAYERS]; |
… | |
… | |
1391 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1374 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1392 | } |
1375 | } |
1393 | return cur; |
1376 | return cur; |
1394 | } |
1377 | } |
1395 | |
1378 | |
1396 | static void |
|
|
1397 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1398 | { |
|
|
1399 | static long frames, bytes, tbytes, tframes; |
|
|
1400 | char *cur; |
|
|
1401 | |
|
|
1402 | SockList sl (MAXSOCKBUF); |
|
|
1403 | sl << "map "; |
|
|
1404 | |
|
|
1405 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1406 | sl.len = cur - (char *) sl.buf; |
|
|
1407 | |
|
|
1408 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1409 | |
|
|
1410 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1411 | { |
|
|
1412 | /* All of this is just accounting stuff */ |
|
|
1413 | if (tframes > 100) |
|
|
1414 | tframes = tbytes = 0; |
|
|
1415 | |
|
|
1416 | tframes++; |
|
|
1417 | frames++; |
|
|
1418 | tbytes += sl.len; |
|
|
1419 | bytes += sl.len; |
|
|
1420 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1421 | Send_With_Handling (ns, &sl); |
|
|
1422 | ns->sent_scroll = 0; |
|
|
1423 | } |
|
|
1424 | |
|
|
1425 | sl.free (); |
|
|
1426 | } |
|
|
1427 | |
|
|
1428 | |
|
|
1429 | /** Clears a map cell */ |
1379 | /** Clears a map cell */ |
1430 | static void |
1380 | static void |
1431 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1381 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1432 | { |
1382 | { |
1433 | cell->faces[0] = face0; |
1383 | cell->faces[0] = face0; |
… | |
… | |
1472 | * needs to get sent - if so, it adds the data, sending the head |
1422 | * needs to get sent - if so, it adds the data, sending the head |
1473 | * if needed, and returning 1. If this no data needs to get |
1423 | * if needed, and returning 1. If this no data needs to get |
1474 | * sent, it returns zero. |
1424 | * sent, it returns zero. |
1475 | */ |
1425 | */ |
1476 | static int |
1426 | static int |
1477 | check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) |
1427 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1478 | { |
1428 | { |
1479 | short face_num; |
1429 | short face_num; |
1480 | |
1430 | |
1481 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1431 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1482 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1432 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1483 | else |
1433 | else |
1484 | face_num = 0; |
1434 | face_num = 0; |
1485 | |
1435 | |
1486 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1436 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1487 | { |
1437 | { |
1488 | SockList_AddShort (&sl, face_num); |
1438 | sl << uint16 (face_num); |
1489 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1439 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1490 | esrv_send_face (&ns, face_num, 0); |
1440 | esrv_send_face (&ns, face_num, 0); |
1491 | |
1441 | |
1492 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1442 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1493 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1443 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
… | |
… | |
1516 | * the case, it seems to make more sense to have these layer values |
1466 | * the case, it seems to make more sense to have these layer values |
1517 | * actually match. |
1467 | * actually match. |
1518 | */ |
1468 | */ |
1519 | |
1469 | |
1520 | static int |
1470 | static int |
1521 | update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1471 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1522 | { |
1472 | { |
1523 | object *ob, *head; |
1473 | object *ob, *head; |
1524 | uint16 face_num; |
1474 | uint16 face_num; |
1525 | int bx, by, i; |
1475 | int bx, by, i; |
1526 | |
1476 | |
… | |
… | |
1739 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1689 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1740 | * take. |
1690 | * take. |
1741 | */ |
1691 | */ |
1742 | |
1692 | |
1743 | static inline int |
1693 | static inline int |
1744 | update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1694 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1745 | { |
1695 | { |
1746 | object *ob; |
1696 | object *ob; |
1747 | int smoothlevel; /* old face_num; */ |
1697 | int smoothlevel; /* old face_num; */ |
1748 | |
1698 | |
1749 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1699 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1783 | * Returns the size of a data for a map square as returned by |
1733 | * Returns the size of a data for a map square as returned by |
1784 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1734 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1785 | * available. |
1735 | * available. |
1786 | */ |
1736 | */ |
1787 | int |
1737 | int |
1788 | getExtendedMapInfoSize (NewSocket * ns) |
1738 | getExtendedMapInfoSize (client_socket * ns) |
1789 | { |
1739 | { |
1790 | int result = 0; |
1740 | int result = 0; |
1791 | |
1741 | |
1792 | if (ns->ext_mapinfos) |
1742 | if (ns->ext_mapinfos) |
1793 | { |
1743 | { |
… | |
… | |
1829 | uint8 eentrysize; |
1779 | uint8 eentrysize; |
1830 | uint16 ewhatstart, ewhatflag; |
1780 | uint16 ewhatstart, ewhatflag; |
1831 | uint8 extendedinfos; |
1781 | uint8 extendedinfos; |
1832 | maptile *m; |
1782 | maptile *m; |
1833 | |
1783 | |
1834 | NewSocket &socket = pl->contr->socket; |
1784 | client_socket &socket = *pl->contr->socket; |
1835 | |
1785 | |
1836 | check_map_change (pl->contr); |
1786 | check_map_change (pl->contr); |
1837 | |
1787 | |
1838 | SockList sl (MAXSOCKBUF); |
1788 | packet sl; |
1839 | SockList esl (MAXSOCKBUF); |
1789 | packet esl; |
1840 | |
1790 | |
1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1791 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1842 | startlen = sl.len; |
1792 | startlen = sl.length (); |
1843 | |
1793 | |
1844 | /*Extendedmapinfo structure initialisation */ |
1794 | /*Extendedmapinfo structure initialisation */ |
1845 | if (socket.ext_mapinfos) |
1795 | if (socket.ext_mapinfos) |
1846 | { |
1796 | { |
1847 | extendedinfos = EMI_NOREDRAW; |
1797 | extendedinfos = EMI_NOREDRAW; |
1848 | |
1798 | |
1849 | if (socket.EMI_smooth) |
1799 | if (socket.EMI_smooth) |
1850 | extendedinfos |= EMI_SMOOTH; |
1800 | extendedinfos |= EMI_SMOOTH; |
1851 | |
1801 | |
1852 | ewhatstart = esl.len; |
1802 | ewhatstart = esl.length (); |
1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1803 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1854 | could need to be taken away */ |
1804 | could need to be taken away */ |
1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1805 | eentrysize = getExtendedMapInfoSize (&socket); |
1856 | esl << "mapextended " |
1806 | esl << "mapextended " |
1857 | << uint8 (extendedinfos) |
1807 | << uint8 (extendedinfos) |
1858 | << uint8 (eentrysize); |
1808 | << uint8 (eentrysize); |
|
|
1809 | |
1859 | estartlen = esl.len; |
1810 | estartlen = esl.length (); |
1860 | } |
1811 | } |
1861 | else |
1812 | else |
1862 | { |
1813 | { |
1863 | /* suppress compiler warnings */ |
1814 | /* suppress compiler warnings */ |
1864 | ewhatstart = 0; |
1815 | ewhatstart = 0; |
… | |
… | |
1902 | */ |
1853 | */ |
1903 | if (ax >= socket.mapx || ay >= socket.mapy) |
1854 | if (ax >= socket.mapx || ay >= socket.mapy) |
1904 | { |
1855 | { |
1905 | int i, got_one; |
1856 | int i, got_one; |
1906 | |
1857 | |
1907 | oldlen = sl.len; |
1858 | oldlen = sl.length (); |
1908 | |
1859 | |
1909 | sl << uint16 (mask); |
1860 | sl << uint16 (mask); |
1910 | |
1861 | |
1911 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1862 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1912 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1863 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
… | |
… | |
1916 | * actually need to send that - just the coordinates |
1867 | * actually need to send that - just the coordinates |
1917 | * with no faces tells the client to blank out the |
1868 | * with no faces tells the client to blank out the |
1918 | * space. |
1869 | * space. |
1919 | */ |
1870 | */ |
1920 | got_one = 0; |
1871 | got_one = 0; |
1921 | for (i = oldlen + 2; i < sl.len; i++) |
1872 | for (i = oldlen + 2; i < sl.length (); i++) |
1922 | if (sl.buf[i]) |
1873 | if (sl[i]) |
1923 | got_one = 1; |
1874 | got_one = 1; |
1924 | |
1875 | |
1925 | if (got_one && (mask & 0xf)) |
1876 | if (got_one && (mask & 0xf)) |
1926 | sl.buf[oldlen + 1] = mask & 0xff; |
1877 | sl[oldlen + 1] = mask & 0xff; |
1927 | else |
1878 | else |
1928 | { /*either all faces blank, either no face at all */ |
1879 | { /*either all faces blank, either no face at all */ |
1929 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1880 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1930 | sl.len = oldlen + 2; |
1881 | sl.reset (oldlen + 2); |
1931 | else |
1882 | else |
1932 | sl.len = oldlen; |
1883 | sl.reset (oldlen); |
1933 | } |
1884 | } |
1934 | |
1885 | |
1935 | /*What concerns extendinfos, nothing to be done for now |
1886 | /*What concerns extendinfos, nothing to be done for now |
1936 | * (perhaps effects layer later) |
1887 | * (perhaps effects layer later) |
1937 | */ |
1888 | */ |
… | |
… | |
1967 | |
1918 | |
1968 | /* This block deals with spaces that are not visible for whatever |
1919 | /* This block deals with spaces that are not visible for whatever |
1969 | * reason. Still may need to send the head for this space. |
1920 | * reason. Still may need to send the head for this space. |
1970 | */ |
1921 | */ |
1971 | |
1922 | |
1972 | oldlen = sl.len; |
1923 | oldlen = sl.length (); |
1973 | |
1924 | |
1974 | sl << uint16 (mask); |
1925 | sl << uint16 (mask); |
1975 | |
1926 | |
1976 | if (lastcell.count != -1) |
1927 | if (lastcell.count != -1) |
1977 | need_send = 1; |
1928 | need_send = 1; |
… | |
… | |
1997 | |
1948 | |
1998 | map_clearcell (&lastcell, 0, 0, 0, count); |
1949 | map_clearcell (&lastcell, 0, 0, 0, count); |
1999 | } |
1950 | } |
2000 | |
1951 | |
2001 | if ((mask & 0xf) || need_send) |
1952 | if ((mask & 0xf) || need_send) |
2002 | sl.buf[oldlen + 1] = mask & 0xff; |
1953 | sl[oldlen + 1] = mask & 0xff; |
2003 | else |
1954 | else |
2004 | sl.len = oldlen; |
1955 | sl.reset (oldlen); |
2005 | } |
1956 | } |
2006 | else |
1957 | else |
2007 | { |
1958 | { |
2008 | /* In this block, the space is visible or there are head objects |
1959 | /* In this block, the space is visible or there are head objects |
2009 | * we need to send. |
1960 | * we need to send. |
… | |
… | |
2011 | |
1962 | |
2012 | /* Rather than try to figure out what everything that we might |
1963 | /* Rather than try to figure out what everything that we might |
2013 | * need to send is, then form the packet after that, |
1964 | * need to send is, then form the packet after that, |
2014 | * we presume that we will in fact form a packet, and update |
1965 | * we presume that we will in fact form a packet, and update |
2015 | * the bits by what we do actually send. If we send nothing, |
1966 | * the bits by what we do actually send. If we send nothing, |
2016 | * we just back out sl.len to the old value, and no harm |
1967 | * we just back out sl.length () to the old value, and no harm |
2017 | * is done. |
1968 | * is done. |
2018 | * I think this is simpler than doing a bunch of checks to see |
1969 | * I think this is simpler than doing a bunch of checks to see |
2019 | * what if anything we need to send, setting the bits, then |
1970 | * what if anything we need to send, setting the bits, then |
2020 | * doing those checks again to add the real data. |
1971 | * doing those checks again to add the real data. |
2021 | */ |
1972 | */ |
2022 | oldlen = sl.len; |
1973 | oldlen = sl.length (); |
2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1974 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2024 | eoldlen = esl.len; |
1975 | eoldlen = esl.length (); |
2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1976 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2026 | sl << uint16 (mask); |
1977 | sl << uint16 (mask); |
2027 | |
1978 | |
2028 | if (socket.ext_mapinfos) |
1979 | if (socket.ext_mapinfos) |
2029 | esl << uint16 (emask); |
1980 | esl << uint16 (emask); |
… | |
… | |
2037 | mask |= 0x8; |
1988 | mask |= 0x8; |
2038 | |
1989 | |
2039 | if (socket.extmap) |
1990 | if (socket.extmap) |
2040 | { |
1991 | { |
2041 | *last_ext |= 0x80; |
1992 | *last_ext |= 0x80; |
2042 | last_ext = sl.buf + sl.len; |
1993 | last_ext = &sl[sl.length ()]; |
2043 | sl << uint8 (d); |
1994 | sl << uint8 (d); |
2044 | } |
1995 | } |
2045 | else |
1996 | else |
2046 | sl << uint8 (255 - 64 * d); |
1997 | sl << uint8 (255 - 64 * d); |
2047 | } |
1998 | } |
… | |
… | |
2081 | { |
2032 | { |
2082 | lastcell.stat_hp = stat_hp; |
2033 | lastcell.stat_hp = stat_hp; |
2083 | |
2034 | |
2084 | mask |= 0x8; |
2035 | mask |= 0x8; |
2085 | *last_ext |= 0x80; |
2036 | *last_ext |= 0x80; |
2086 | last_ext = sl.buf + sl.len; |
2037 | last_ext = &sl[sl.length ()]; |
2087 | |
2038 | |
2088 | sl << uint8 (5) << uint8 (stat_hp); |
2039 | sl << uint8 (5) << uint8 (stat_hp); |
2089 | |
2040 | |
2090 | if (stat_width > 1) |
2041 | if (stat_width > 1) |
2091 | { |
2042 | { |
2092 | *last_ext |= 0x80; |
2043 | *last_ext |= 0x80; |
2093 | last_ext = sl.buf + sl.len; |
2044 | last_ext = &sl[sl.length ()]; |
2094 | |
2045 | |
2095 | sl << uint8 (6) << uint8 (stat_width); |
2046 | sl << uint8 (6) << uint8 (stat_width); |
2096 | } |
2047 | } |
2097 | } |
2048 | } |
2098 | |
2049 | |
… | |
… | |
2100 | { |
2051 | { |
2101 | lastcell.player = player; |
2052 | lastcell.player = player; |
2102 | |
2053 | |
2103 | mask |= 0x8; |
2054 | mask |= 0x8; |
2104 | *last_ext |= 0x80; |
2055 | *last_ext |= 0x80; |
2105 | last_ext = sl.buf + sl.len; |
2056 | last_ext = &sl[sl.length ()]; |
2106 | |
2057 | |
2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2058 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2108 | } |
2059 | } |
2109 | |
2060 | |
2110 | if (lastcell.flags != flags) |
2061 | if (lastcell.flags != flags) |
2111 | { |
2062 | { |
2112 | lastcell.flags = flags; |
2063 | lastcell.flags = flags; |
2113 | |
2064 | |
2114 | mask |= 0x8; |
2065 | mask |= 0x8; |
2115 | *last_ext |= 0x80; |
2066 | *last_ext |= 0x80; |
2116 | last_ext = sl.buf + sl.len; |
2067 | last_ext = &sl[sl.length ()]; |
2117 | |
2068 | |
2118 | sl << uint8 (8) << uint8 (flags); |
2069 | sl << uint8 (8) << uint8 (flags); |
2119 | } |
2070 | } |
2120 | } |
2071 | } |
2121 | |
2072 | |
… | |
… | |
2163 | * space by checking the mask. If so, update the mask. |
2114 | * space by checking the mask. If so, update the mask. |
2164 | * if not, reset the len to that from before adding the mask |
2115 | * if not, reset the len to that from before adding the mask |
2165 | * value, so we don't send those bits. |
2116 | * value, so we don't send those bits. |
2166 | */ |
2117 | */ |
2167 | if (mask & 0xf) |
2118 | if (mask & 0xf) |
2168 | sl.buf[oldlen + 1] = mask & 0xff; |
2119 | sl[oldlen + 1] = mask & 0xff; |
2169 | else |
2120 | else |
2170 | sl.len = oldlen; |
2121 | sl.reset (oldlen); |
2171 | |
2122 | |
2172 | if (emask & 0xf) |
2123 | if (emask & 0xf) |
2173 | esl.buf[eoldlen + 1] = emask & 0xff; |
2124 | esl[eoldlen + 1] = emask & 0xff; |
2174 | else |
2125 | else |
2175 | esl.len = eoldlen; |
2126 | esl.reset (eoldlen); |
2176 | } /* else this is a viewable space */ |
2127 | } /* else this is a viewable space */ |
2177 | } /* for x loop */ |
2128 | } /* for x loop */ |
2178 | } /* for y loop */ |
2129 | } /* for y loop */ |
2179 | |
2130 | |
2180 | /* Verify that we in fact do need to send this */ |
2131 | /* Verify that we in fact do need to send this */ |
2181 | if (socket.ext_mapinfos) |
2132 | if (socket.ext_mapinfos) |
2182 | { |
2133 | { |
2183 | if (!(sl.len > startlen || socket.sent_scroll)) |
2134 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2184 | { |
2135 | { |
2185 | /* No map data will follow, so don't say the client |
2136 | /* No map data will follow, so don't say the client |
2186 | * it doesn't need draw! |
2137 | * it doesn't need draw! |
2187 | */ |
2138 | */ |
2188 | ewhatflag &= (~EMI_NOREDRAW); |
2139 | ewhatflag &= (~EMI_NOREDRAW); |
2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2140 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2190 | } |
2141 | } |
2191 | |
2142 | |
2192 | if (esl.len > estartlen) |
2143 | if (esl.length () > estartlen) |
2193 | Send_With_Handling (&socket, &esl); |
2144 | socket.send_packet (esl); |
2194 | } |
2145 | } |
2195 | |
2146 | |
2196 | if (sl.len > startlen || socket.sent_scroll) |
2147 | if (sl.length () > startlen || socket.sent_scroll) |
2197 | { |
2148 | { |
2198 | Send_With_Handling (&socket, &sl); |
2149 | socket.send_packet (sl); |
2199 | socket.sent_scroll = 0; |
2150 | socket.sent_scroll = 0; |
2200 | } |
2151 | } |
2201 | |
|
|
2202 | sl.free (); |
|
|
2203 | esl.free (); |
|
|
2204 | } |
2152 | } |
2205 | |
2153 | |
2206 | /** |
2154 | /** |
2207 | * Draws client map. |
2155 | * Draws client map. |
2208 | */ |
2156 | */ |
… | |
… | |
2232 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2180 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2233 | return; |
2181 | return; |
2234 | |
2182 | |
2235 | memset (&newmap, 0, sizeof (struct Map)); |
2183 | memset (&newmap, 0, sizeof (struct Map)); |
2236 | |
2184 | |
2237 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2185 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2238 | { |
2186 | { |
2239 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2187 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2240 | { |
2188 | { |
2241 | ax = i; |
2189 | ax = i; |
2242 | ay = j; |
2190 | ay = j; |
2243 | m = pm; |
2191 | m = pm; |
2244 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2192 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2259 | { |
2207 | { |
2260 | update_los (pl); |
2208 | update_los (pl); |
2261 | pl->contr->do_los = 0; |
2209 | pl->contr->do_los = 0; |
2262 | } |
2210 | } |
2263 | |
2211 | |
2264 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2265 | { |
|
|
2266 | /* Big maps need a different drawing mechanism to work */ |
2212 | /* Big maps need a different drawing mechanism to work */ |
2267 | draw_client_map1 (pl); |
2213 | draw_client_map1 (pl); |
2268 | return; |
|
|
2269 | } |
|
|
2270 | |
|
|
2271 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2272 | { |
|
|
2273 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2274 | } |
|
|
2275 | |
|
|
2276 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2277 | * basically some number of spaces around the player) |
|
|
2278 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2279 | * left corner) and are thus disconnected from the map values. |
|
|
2280 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2281 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2282 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2283 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2284 | * odd, this still works fine. |
|
|
2285 | */ |
|
|
2286 | ay = 0; |
|
|
2287 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2288 | { |
|
|
2289 | ax = 0; |
|
|
2290 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2291 | { |
|
|
2292 | |
|
|
2293 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2294 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2295 | * negation check. |
|
|
2296 | */ |
|
|
2297 | nx = i; |
|
|
2298 | ny = j; |
|
|
2299 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2300 | if (m && d < 4) |
|
|
2301 | { |
|
|
2302 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2303 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2304 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2305 | |
|
|
2306 | /* If all is blank, send a blank face. */ |
|
|
2307 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2308 | { |
|
|
2309 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2310 | } |
|
|
2311 | else |
|
|
2312 | { /* actually have something interesting */ |
|
|
2313 | /* send the darkness mask, if any. */ |
|
|
2314 | if (d && pl->contr->socket.darkness) |
|
|
2315 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2316 | |
|
|
2317 | if (face && face != blank_face) |
|
|
2318 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2319 | if (floor2 && floor2 != blank_face) |
|
|
2320 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2321 | if (floor && floor != blank_face) |
|
|
2322 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2323 | } |
|
|
2324 | } /* Is a valid space */ |
|
|
2325 | } |
|
|
2326 | } |
|
|
2327 | |
|
|
2328 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2329 | |
|
|
2330 | check_map_change (pl->contr); |
|
|
2331 | } |
2214 | } |
2332 | |
2215 | |
2333 | |
2216 | |
2334 | /*****************************************************************************/ |
2217 | /*****************************************************************************/ |
2335 | |
2218 | |
… | |
… | |
2341 | |
2224 | |
2342 | /*****************************************************************************/ |
2225 | /*****************************************************************************/ |
2343 | void |
2226 | void |
2344 | send_plugin_custom_message (object *pl, char *buf) |
2227 | send_plugin_custom_message (object *pl, char *buf) |
2345 | { |
2228 | { |
2346 | cs_write_string (&pl->contr->socket, buf, strlen (buf)); |
2229 | pl->contr->socket->send_packet (buf); |
2347 | } |
2230 | } |
2348 | |
2231 | |
2349 | /** |
2232 | /** |
2350 | * This sends the skill number to name mapping. We ignore |
2233 | * This sends the skill number to name mapping. We ignore |
2351 | * the params - we always send the same info no matter what. |
2234 | * the params - we always send the same info no matter what. |
2352 | */ |
2235 | */ |
2353 | void |
2236 | void |
2354 | send_skill_info (NewSocket *ns, char *params) |
2237 | send_skill_info (client_socket *ns, char *params) |
2355 | { |
2238 | { |
2356 | SockList sl (MAXSOCKBUF); |
2239 | packet sl; |
2357 | sl << "replyinfo skill_info\n"; |
2240 | sl << "replyinfo skill_info\n"; |
2358 | |
2241 | |
2359 | for (int i = 1; i < NUM_SKILLS; i++) |
2242 | for (int i = 1; i < NUM_SKILLS; i++) |
2360 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2243 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2361 | |
2244 | |
2362 | if (sl.len >= MAXSOCKBUF) |
2245 | if (sl.length () >= MAXSOCKBUF) |
2363 | { |
2246 | { |
2364 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2247 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2365 | fatal (0); |
2248 | fatal (0); |
2366 | } |
2249 | } |
2367 | |
2250 | |
2368 | Send_With_Handling (ns, &sl); |
2251 | ns->send_packet (sl); |
2369 | sl.free (); |
|
|
2370 | } |
2252 | } |
2371 | |
2253 | |
2372 | /** |
2254 | /** |
2373 | * This sends the spell path to name mapping. We ignore |
2255 | * This sends the spell path to name mapping. We ignore |
2374 | * the params - we always send the same info no matter what. |
2256 | * the params - we always send the same info no matter what. |
2375 | */ |
2257 | */ |
2376 | void |
2258 | void |
2377 | send_spell_paths (NewSocket * ns, char *params) |
2259 | send_spell_paths (client_socket * ns, char *params) |
2378 | { |
2260 | { |
2379 | SockList sl (MAXSOCKBUF); |
2261 | packet sl; |
2380 | |
2262 | |
2381 | sl << "replyinfo spell_paths\n"; |
2263 | sl << "replyinfo spell_paths\n"; |
2382 | |
2264 | |
2383 | for (int i = 0; i < NRSPELLPATHS; i++) |
2265 | for (int i = 0; i < NRSPELLPATHS; i++) |
2384 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2266 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2385 | |
2267 | |
2386 | if (sl.len >= MAXSOCKBUF) |
2268 | if (sl.length () >= MAXSOCKBUF) |
2387 | { |
2269 | { |
2388 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2270 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2389 | fatal (0); |
2271 | fatal (0); |
2390 | } |
2272 | } |
2391 | |
2273 | |
2392 | Send_With_Handling (ns, &sl); |
2274 | ns->send_packet (sl); |
2393 | sl.free (); |
|
|
2394 | } |
2275 | } |
2395 | |
2276 | |
2396 | /** |
2277 | /** |
2397 | * This looks for any spells the player may have that have changed their stats. |
2278 | * This looks for any spells the player may have that have changed their stats. |
2398 | * it then sends an updspell packet for each spell that has changed in this way |
2279 | * it then sends an updspell packet for each spell that has changed in this way |
2399 | */ |
2280 | */ |
2400 | void |
2281 | void |
2401 | esrv_update_spells (player *pl) |
2282 | esrv_update_spells (player *pl) |
2402 | { |
2283 | { |
2403 | if (!pl->socket.monitor_spells) |
2284 | if (!pl->socket->monitor_spells) |
2404 | return; |
2285 | return; |
2405 | |
2286 | |
2406 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2287 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2407 | { |
2288 | { |
2408 | if (spell->type == SPELL) |
2289 | if (spell->type == SPELL) |
… | |
… | |
2428 | flags |= UPD_SP_DAMAGE; |
2309 | flags |= UPD_SP_DAMAGE; |
2429 | } |
2310 | } |
2430 | |
2311 | |
2431 | if (flags) |
2312 | if (flags) |
2432 | { |
2313 | { |
2433 | SockList sl (MAXSOCKBUF); |
2314 | packet sl; |
2434 | |
2315 | |
2435 | sl << "updspell " |
2316 | sl << "updspell " |
2436 | << uint8 (flags) |
2317 | << uint8 (flags) |
2437 | << uint32 (spell->count); |
2318 | << uint32 (spell->count); |
2438 | |
2319 | |
2439 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2320 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2440 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2321 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2441 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2322 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2442 | |
2323 | |
2443 | Send_With_Handling (&pl->socket, &sl); |
2324 | pl->socket->send_packet (sl); |
2444 | sl.free (); |
|
|
2445 | } |
2325 | } |
2446 | } |
2326 | } |
2447 | } |
2327 | } |
2448 | } |
2328 | } |
2449 | |
2329 | |
2450 | void |
2330 | void |
2451 | esrv_remove_spell (player *pl, object *spell) |
2331 | esrv_remove_spell (player *pl, object *spell) |
2452 | { |
2332 | { |
2453 | if (!pl->socket.monitor_spells) |
2333 | if (!pl->socket->monitor_spells) |
2454 | return; |
2334 | return; |
2455 | |
2335 | |
2456 | if (!pl || !spell || spell->env != pl->ob) |
2336 | if (!pl || !spell || spell->env != pl->ob) |
2457 | { |
2337 | { |
2458 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2338 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2459 | return; |
2339 | return; |
2460 | } |
2340 | } |
2461 | |
2341 | |
2462 | SockList sl (MAXSOCKBUF); |
2342 | packet sl; |
2463 | |
2343 | |
2464 | sl << "delspell " |
2344 | sl << "delspell " |
2465 | << uint32 (spell->count); |
2345 | << uint32 (spell->count); |
2466 | |
2346 | |
2467 | Send_With_Handling (&pl->socket, &sl); |
2347 | pl->socket->send_packet (sl); |
2468 | sl.free (); |
|
|
2469 | } |
2348 | } |
2470 | |
2349 | |
2471 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2350 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2472 | static void |
2351 | static void |
2473 | append_spell (player *pl, SockList &sl, object *spell) |
2352 | append_spell (player *pl, packet &sl, object *spell) |
2474 | { |
2353 | { |
2475 | int len, i, skill = 0; |
2354 | int len, i, skill = 0; |
2476 | |
2355 | |
2477 | if (!(spell->name)) |
2356 | if (!(spell->name)) |
2478 | { |
2357 | { |
… | |
… | |
2521 | { |
2400 | { |
2522 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2401 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2523 | return; |
2402 | return; |
2524 | } |
2403 | } |
2525 | |
2404 | |
2526 | if (!pl->socket.monitor_spells) |
2405 | if (!pl->socket->monitor_spells) |
2527 | return; |
2406 | return; |
2528 | |
2407 | |
2529 | SockList sl (MAXSOCKBUF); |
2408 | packet sl; |
2530 | |
2409 | |
2531 | sl << "addspell "; |
2410 | sl << "addspell "; |
2532 | |
2411 | |
2533 | if (!spell) |
2412 | if (!spell) |
2534 | { |
2413 | { |
… | |
… | |
2548 | * like it will fix this |
2427 | * like it will fix this |
2549 | */ |
2428 | */ |
2550 | if (spell->type != SPELL) |
2429 | if (spell->type != SPELL) |
2551 | continue; |
2430 | continue; |
2552 | |
2431 | |
2553 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2432 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2554 | { |
2433 | { |
2555 | Send_With_Handling (&pl->socket, &sl); |
2434 | pl->socket->send_packet (sl); |
2556 | strcpy ((char *) sl.buf, "addspell "); |
2435 | |
2557 | sl.len = strlen ((char *) sl.buf); |
2436 | sl.reset (); |
|
|
2437 | sl << "addspell "; |
2558 | } |
2438 | } |
2559 | |
2439 | |
2560 | append_spell (pl, sl, spell); |
2440 | append_spell (pl, sl, spell); |
2561 | } |
2441 | } |
2562 | } |
2442 | } |
… | |
… | |
2573 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2453 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2574 | fatal (0); |
2454 | fatal (0); |
2575 | } |
2455 | } |
2576 | |
2456 | |
2577 | /* finally, we can send the packet */ |
2457 | /* finally, we can send the packet */ |
2578 | Send_With_Handling (&pl->socket, &sl); |
2458 | pl->socket->send_packet (sl); |
2579 | |
|
|
2580 | sl.free (); |
|
|
2581 | } |
2459 | } |
2582 | |
2460 | |