ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.38 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 43 */
47 44
48#include <global.h> 45#include <global.h>
49#include <sproto.h> 46#include <sproto.h>
50 47
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 52 * it should work here.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket; 143 client &socket = *pl->socket;
154 144
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 145 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
156 146
157 if (socket.newmapcmd == 1) 147 if (socket.newmapcmd == 1)
158 socket.send_packet ("newmap"); 148 socket.send_packet ("newmap");
… …
163 153
164/** check for map change and send new map data */ 154/** check for map change and send new map data */
165static void 155static void
166check_map_change (player *pl) 156check_map_change (player *pl)
167{ 157{
168 client_socket &socket = *pl->socket; 158 client &socket = *pl->socket;
169 object *ob = pl->ob; 159 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 160 char buf[MAX_BUF]; /* eauugggh */
171 161
172 if (socket.current_map != ob->map) 162 if (socket.current_map != ob->map)
173 { 163 {
… …
214 } 204 }
215 } 205 }
216 206
217 socket.current_x = ob->x; 207 socket.current_x = ob->x;
218 socket.current_y = ob->y; 208 socket.current_y = ob->y;
209}
210
211/**
212 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide
214 * that information.
215 */
216void
217RequestInfo (char *buf, int len, client * ns)
218{
219 char *params = NULL, *cp;
220
221 /* No match */
222 char bigbuf[MAX_BUF];
223 int slen;
224
225 /* Set up replyinfo before we modify any of the buffers - this is used
226 * if we don't find a match.
227 */
228 strcpy (bigbuf, "replyinfo ");
229 slen = strlen (bigbuf);
230 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
231
232 /* find the first space, make it null, and update the
233 * params pointer.
234 */
235 for (cp = buf; *cp != '\0'; cp++)
236 if (*cp == ' ')
237 {
238 *cp = '\0';
239 params = cp + 1;
240 break;
241 }
242
243 if (!strcmp (buf, "image_info"))
244 send_image_info (ns, params);
245 else if (!strcmp (buf, "image_sums"))
246 send_image_sums (ns, params);
247 else if (!strcmp (buf, "skill_info"))
248 send_skill_info (ns, params);
249 else if (!strcmp (buf, "spell_paths"))
250 send_spell_paths (ns, params);
251 else
252 ns->send_packet (bigbuf, len);
219} 253}
220 254
221void 255void
222ExtCmd (char *buf, int len, player *pl) 256ExtCmd (char *buf, int len, player *pl)
223{ 257{
… …
311 pl->socket->send_packet (bigbuf); 345 pl->socket->send_packet (bigbuf);
312} 346}
313 347
314/** This is the Setup cmd - easy first implementation */ 348/** This is the Setup cmd - easy first implementation */
315void 349void
316SetUp (char *buf, int len, client_socket * ns) 350SetUp (char *buf, int len, client * ns)
317{ 351{
318 int s, slen; 352 int s, slen;
319 char *cmd, *param, cmdback[HUGE_BUF]; 353 char *cmd, *param, cmdback[HUGE_BUF];
320 354
321 /* run through the cmds of setup 355 /* run through the cmds of setup
… …
531 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
532 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
533 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
534 */ 568 */
535void 569void
536AddMeCmd (char *buf, int len, client_socket * ns) 570AddMeCmd (char *buf, int len, client * ns)
537{ 571{
538 Settings oldsettings;
539
540 oldsettings = settings;
541 if (ns->status != Ns_Add || add_player (ns)) 572 if (ns->status != Ns_Add || add_player (ns))
542 ns->send_packet ("addme_failed"); 573 ns->send_packet ("addme_failed");
543 else 574 else
544 ns->send_packet ("addme_success"); 575 ns->send_packet ("addme_success");
545
546 settings = oldsettings;
547} 576}
548 577
549/** Reply to ExtendedInfos command */ 578/** Reply to ExtendedInfos command */
550void 579void
551ToggleExtendedInfos (char *buf, int len, client_socket * ns) 580ToggleExtendedInfos (char *buf, int len, client * ns)
552{ 581{
553 char cmdback[MAX_BUF]; 582 char cmdback[MAX_BUF];
554 char command[50]; 583 char command[50];
555 int info, nextinfo; 584 int info, nextinfo;
556 585
… …
607#define MSG_TYPE_MONUMENT 5 636#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 637#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609 638
610/** Reply to ExtendedInfos command */ 639/** Reply to ExtendedInfos command */
611void 640void
612ToggleExtendedText (char *buf, int len, client_socket * ns) 641ToggleExtendedText (char *buf, int len, client * ns)
613{ 642{
614 char cmdback[MAX_BUF]; 643 char cmdback[MAX_BUF];
615 char temp[10]; 644 char temp[10];
616 char command[50]; 645 char command[50];
617 int info, nextinfo, i, flag; 646 int info, nextinfo, i, flag;
… …
668 * a piece of data from us that we know the client wants. So 697 * a piece of data from us that we know the client wants. So
669 * if we know the client wants it, might as well push it to the 698 * if we know the client wants it, might as well push it to the
670 * client. 699 * client.
671 */ 700 */
672static void 701static void
673SendSmooth (client_socket * ns, uint16 face) 702SendSmooth (client *ns, uint16 face)
674{ 703{
675 uint16 smoothface; 704 uint16 smoothface;
676 705
677 /* If we can't find a face, return and set it so we won't try to send this 706 /* If we can't find a face, return and set it so we won't try to send this
678 * again. 707 * again.
… …
702 /** 731 /**
703 * Tells client the picture it has to use 732 * Tells client the picture it has to use
704 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
705 */ 734 */
706void 735void
707AskSmooth (char *buf, int len, client_socket * ns) 736AskSmooth (char *buf, int len, client *ns)
708{ 737{
709 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
710
711 facenbr = atoi (buf);
712 SendSmooth (ns, facenbr);
713} 739}
714 740
715/** 741/**
716 * This handles the general commands from the client (ie, north, fire, cast, 742 * This handles the general commands from the client (ie, north, fire, cast,
717 * etc.) 743 * etc.)
718 */ 744 */
719void 745void
720PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
721{ 747{
722
723 /* The following should never happen with a proper or honest client.
724 * Therefore, the error message doesn't have to be too clear - if
725 * someone is playing with a hacked/non working client, this gives them
726 * an idea of the problem, but they deserve what they get
727 */
728 if (pl->state != ST_PLAYING)
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731 return;
732 }
733 /* Check if there is a count. In theory, a zero count could also be 748 /* Check if there is a count. In theory, a zero count could also be
734 * sent, so check for that also. 749 * sent, so check for that also.
735 */ 750 */
736 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
737 { 752 {
738 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 756 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 757 return;
746 } 758
747 buf++; 759 buf++;
748 } 760 }
749 /* This should not happen anymore. */ 761
750 if (pl->ob->speed_left < -1.0)
751 {
752 LOG (llevError, "Player has negative time - shouldn't do command.\n");
753 }
754 /* In c_new.c */
755 execute_newserver_command (pl->ob, (char *) buf); 762 execute_newserver_command (pl->ob, (char *) buf);
763
756 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
757 * Cleaning up the input should probably be done first - all actions 765 * Cleaning up the input should probably be done first - all actions
758 * for the command that issued the count should be done before any other 766 * for the command that issued the count should be done before any other
759 * commands. 767 * commands.
760 */ 768 */
761
762 pl->count = 0; 769 pl->count = 0;
763
764} 770}
765 771
766 772
767/** 773/**
768 * This handles the general commands from the client (ie, north, fire, cast, 774 * This handles the general commands from the client (ie, north, fire, cast,
769 * etc.). It is a lot like PlayerCmd above, but is called with the 775 * etc.). It is a lot like PlayerCmd above, but is called with the
770 * 'ncom' method which gives more information back to the client so it 776 * 'ncom' method which gives more information back to the client so it
771 * can throttle. 777 * can throttle.
772 */ 778 */
773void 779void
774NewPlayerCmd (uint8 * buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
775{ 781{
776 int time, repeat;
777 char command[MAX_BUF];
778 int pktlen;
779
780 if (len < 7) 782 if (len <= 6)
781 { 783 {
782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
783 return; 785 return;
784 } 786 }
785 787
786 pktlen = net_uint16 (buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
787 repeat = net_uint32 (buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788 790
789 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
790 if (repeat != -1) 792 if (repeat != -1)
791 pl->count = repeat; 793 pl->count = repeat;
792 794
793 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
794 len = MAX_BUF - 5;
795 796
796 strncpy ((char *) command, (char *) buf + 6, len - 4);
797 command[len - 4] = '\0';
798
799 /* The following should never happen with a proper or honest client.
800 * Therefore, the error message doesn't have to be too clear - if
801 * someone is playing with a hacked/non working client, this gives them
802 * an idea of the problem, but they deserve what they get
803 */
804 if (pl->state != ST_PLAYING)
805 {
806 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
807 return;
808 }
809
810 /* This should not happen anymore. */
811 if (pl->ob->speed_left < -1.0)
812 LOG (llevError, "Player has negative time - shouldn't do command.\n");
813
814 /* In c_new.c */
815 execute_newserver_command (pl->ob, (char *) command); 797 execute_newserver_command (pl->ob, buf);
798
816 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
817 * Cleaning up the input should probably be done first - all actions 800 * Cleaning up the input should probably be done first - all actions
818 * for the command that issued the count should be done before any other 801 * for the command that issued the count should be done before any other
819 * commands. 802 * commands.
820 */ 803 */
821 pl->count = 0; 804 pl->count = 0;
822 805
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
823 if (FABS (pl->ob->speed) < 0.001) 807 int time = FABS (pl->ob->speed) < 0.001
824 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
825 else
826 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
827 810
828 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
829
830 packet sl; 812 packet sl;
831 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << "comc " << uint16 (cmdid) << uint32 (time);
832 pl->socket->send_packet (sl); 814 pl->socket->send_packet (sl);
833} 815}
834 816
835 817
836/** This is a reply to a previous query. */ 818/** This is a reply to a previous query. */
837void 819void
838ReplyCmd (char *buf, int len, player *pl) 820ReplyCmd (char *buf, int len, player *pl)
839{ 821{
840 /* This is to synthesize how the data would be stored if it 822 /* This is to synthesize how the data would be stored if it
841 * was normally entered. A bit of a hack, and should be cleaned up 823 * was normally entered. A bit of a hack, and should be cleaned up
842 * once all the X11 code is removed from the server. 824 * once all the X11 code is removed from the server.
843 * 825 *
844 * We pass 13 to many of the functions because this way they 826 * We pass 13 to many of the functions because this way they
845 * think it was the carriage return that was entered, and the 827 * think it was the carriage return that was entered, and the
846 * function then does not try to do additional input. 828 * function then does not try to do additional input.
… …
849 831
850 /* this avoids any hacking here */ 832 /* this avoids any hacking here */
851 833
852 switch (pl->state) 834 switch (pl->state)
853 { 835 {
854 case ST_PLAYING: 836 case ST_PLAYING:
855 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 837 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
856 break; 838 break;
857 839
858 case ST_PLAY_AGAIN: 840 case ST_PLAY_AGAIN:
859 /* We can check this for return value (2==quit). Maybe we 841 /* We can check this for return value (2==quit). Maybe we
860 * should, and do something appropriate? 842 * should, and do something appropriate?
861 */ 843 */
862 receive_play_again (pl->ob, buf[0]); 844 receive_play_again (pl->ob, buf[0]);
863 break; 845 break;
864 846
865 case ST_ROLL_STAT: 847 case ST_ROLL_STAT:
866 key_roll_stat (pl->ob, buf[0]); 848 key_roll_stat (pl->ob, buf[0]);
867 break; 849 break;
868 850
869 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
870 852
871 key_change_class (pl->ob, buf[0]); 853 key_change_class (pl->ob, buf[0]);
872 break; 854 break;
873 855
874 case ST_CONFIRM_QUIT: 856 case ST_CONFIRM_QUIT:
875 key_confirm_quit (pl->ob, buf[0]); 857 key_confirm_quit (pl->ob, buf[0]);
876 break; 858 break;
877 859
878 case ST_CONFIGURE: 860 case ST_CONFIGURE:
879 LOG (llevError, "In client input handling, but into configure state\n"); 861 LOG (llevError, "In client input handling, but into configure state\n");
880 pl->state = ST_PLAYING; 862 pl->state = ST_PLAYING;
881 break; 863 break;
882 864
883 case ST_GET_NAME: 865 case ST_GET_NAME:
884 receive_player_name (pl->ob, 13); 866 receive_player_name (pl->ob, 13);
885 break; 867 break;
886 868
887 case ST_GET_PASSWORD: 869 case ST_GET_PASSWORD:
888 case ST_CONFIRM_PASSWORD: 870 case ST_CONFIRM_PASSWORD:
889 receive_player_password (pl->ob, 13); 871 receive_player_password (pl->ob, 13);
890 break; 872 break;
891 873
892 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 874 case ST_GET_PARTY_PASSWORD: /* Get password for party */
893 receive_party_password (pl->ob, 13); 875 receive_party_password (pl->ob, 13);
894 break; 876 break;
895 877
896 default: 878 default:
897 LOG (llevError, "Unknown input state: %d\n", pl->state); 879 LOG (llevError, "Unknown input state: %d\n", pl->state);
898 } 880 }
899} 881}
900 882
901/** 883/**
902 * Client tells its version. If there is a mismatch, we close the 884 * Client tells its version. If there is a mismatch, we close the
… …
904 * something older than the server. If we assume the client will be 886 * something older than the server. If we assume the client will be
905 * backwards compatible, having it be a later version should not be a 887 * backwards compatible, having it be a later version should not be a
906 * problem. 888 * problem.
907 */ 889 */
908void 890void
909VersionCmd (char *buf, int len, client_socket * ns) 891VersionCmd (char *buf, int len, client * ns)
910{ 892{
911 char *cp;
912 char version_warning[256];
913
914 if (!buf) 893 if (!buf)
915 { 894 {
916 LOG (llevError, "CS: received corrupted version command\n"); 895 LOG (llevError, "CS: received corrupted version command\n");
917 return; 896 return;
918 } 897 }
919 898
920 ns->cs_version = atoi (buf); 899 ns->cs_version = atoi (buf);
921 ns->sc_version = ns->cs_version; 900 ns->sc_version = ns->cs_version;
901
902 LOG (llevDebug, "connection from client <%s>\n", buf);
903
904
905 //TODO: should log here just for statistics
906
922 if (VERSION_CS != ns->cs_version) 907 //if (VERSION_CS != ns->cs_version)
923 { 908 // unchecked;
924#ifdef ESRV_DEBUG 909
925 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
926#endif
927 }
928 cp = strchr (buf + 1, ' '); 910 char *cp = strchr (buf + 1, ' ');
929 if (!cp) 911 if (!cp)
930 return; 912 return;
913
931 ns->sc_version = atoi (cp); 914 ns->sc_version = atoi (cp);
915
932 if (VERSION_SC != ns->sc_version) 916 //if (VERSION_SC != ns->sc_version)
933 { 917 // unchecked;
934#ifdef ESRV_DEBUG 918
935 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
936#endif
937 }
938 cp = strchr (cp + 1, ' '); 919 cp = strchr (cp + 1, ' ');
920
939 if (cp) 921 if (cp)
940 { 922 {
941 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 923 assign (ns->version, cp + 1);
942 924
943 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
944
945 /* This is first implementation - i skip all beta DX clients with it
946 * Add later stuff here for other clients
947 */
948
949 /* these are old dxclients */
950 /* Version 1024 added support for singular + plural name values -
951 * requiing this minimal value reduces complexity of that code, and it
952 * has been around for a long time.
953 */
954 if (ns->sc_version < 1026) 925 if (ns->sc_version < 1026)
955 { 926 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
956 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
957 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 927 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
958 ns->send_packet (version_warning);
959 }
960
961 } 928 }
962} 929}
963 930
964/** sound related functions. */ 931/** sound related functions. */
965
966void 932void
967SetSound (char *buf, int len, client_socket * ns) 933SetSound (char *buf, int len, client * ns)
968{ 934{
969 ns->sound = atoi (buf); 935 ns->sound = atoi (buf);
970} 936}
971 937
972/** client wants the map resent */ 938/** client wants the map resent */
973 939
974void 940void
975MapRedrawCmd (char *buf, int len, player *pl) 941MapRedrawCmd (char *buf, int len, player *pl)
976{ 942{
977
978/* This function is currently disabled; just clearing the map state results in 943/* This function is currently disabled; just clearing the map state results in
979 * display errors. It should clear the cache and send a newmap command. 944 * display errors. It should clear the cache and send a newmap command.
980 * Unfortunately this solution does not work because some client versions send 945 * Unfortunately this solution does not work because some client versions send
981 * a mapredraw command after receiving a newmap command. 946 * a mapredraw command after receiving a newmap command.
982 */ 947 */
983#if 0
984 /* Okay, this is MAJOR UGLY. but the only way I know how to
985 * clear the "cache"
986 */
987 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
988 draw_client_map (pl->ob);
989#endif
990} 948}
991 949
992/** 950/**
993 * Moves an object (typically, container to inventory). 951 * Moves an object (typically, container to inventory).
994 * syntax is: move (to) (tag) (nrof) 952 * syntax is: move (to) (tag) (nrof)
… …
997MoveCmd (char *buf, int len, player *pl) 955MoveCmd (char *buf, int len, player *pl)
998{ 956{
999 int vals[3], i; 957 int vals[3], i;
1000 958
1001 /* A little funky here. We only cycle for 2 records, because 959 /* A little funky here. We only cycle for 2 records, because
1002 * we obviously am not going to find a space after the third 960 * we obviously are not going to find a space after the third
1003 * record. Perhaps we should just replace this with a 961 * record. Perhaps we should just replace this with a
1004 * sscanf? 962 * sscanf?
1005 */ 963 */
1006 for (i = 0; i < 2; i++) 964 for (i = 0; i < 2; i++)
1007 { 965 {
1008 vals[i] = atoi (buf); 966 vals[i] = atoi (buf);
967
1009 if (!(buf = strchr (buf, ' '))) 968 if (!(buf = strchr (buf, ' ')))
1010 { 969 {
1011 LOG (llevError, "Incomplete move command: %s\n", buf); 970 LOG (llevError, "Incomplete move command: %s\n", buf);
1012 return; 971 return;
1013 } 972 }
973
1014 buf++; 974 buf++;
1015 } 975 }
976
1016 vals[2] = atoi (buf); 977 vals[2] = atoi (buf);
1017 978
1018/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 979/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1019 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 980 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1020} 981}
1021
1022
1023 982
1024/****************************************************************************** 983/******************************************************************************
1025 * 984 *
1026 * Start of commands the server sends to the client. 985 * Start of commands the server sends to the client.
1027 * 986 *
… …
1030/** 989/**
1031 * Asks the client to query the user. This way, the client knows 990 * Asks the client to query the user. This way, the client knows
1032 * it needs to send something back (vs just printing out a message) 991 * it needs to send something back (vs just printing out a message)
1033 */ 992 */
1034void 993void
1035send_query (client_socket * ns, uint8 flags, char *text) 994send_query (client *ns, uint8 flags, char *text)
1036{ 995{
1037 char buf[MAX_BUF];
1038
1039 sprintf (buf, "query %d %s", flags, text ? text : ""); 996 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1040 ns->send_packet (buf);
1041} 997}
1042 998
1043#define AddIfInt64(Old,New,Type) if (Old != New) {\ 999#define AddIfInt64(Old,New,Type) if (Old != New) {\
1044 Old = New; \ 1000 Old = New; \
1045 sl << uint8 (Type) << uint64 (New); \ 1001 sl << uint8 (Type) << uint64 (New); \
… …
1078 uint16 flags; 1034 uint16 flags;
1079 1035
1080 packet sl; 1036 packet sl;
1081 sl << "stats "; 1037 sl << "stats ";
1082 1038
1083 if (pl->ob != NULL) 1039 if (pl->ob)
1084 { 1040 {
1085 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1086 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1087 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1088 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1096 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1097 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1098 } 1054 }
1099 1055
1100 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1101 {
1102 uint8 s;
1103
1104 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1105 {
1106 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1107 { 1059 {
1108 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1109 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1110 */ 1062 */
1111 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1112 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1113 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1114 1066
1115 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1116 } 1068 }
1117 }
1118 }
1119 1069
1120 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1121 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1122 else 1072 else
1123 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
… …
1141 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1142 1092
1143 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1144 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1145 else 1095 else
1146 {
1147 int i;
1148
1149 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1150 { 1097 {
1151 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1152 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1153 continue; 1100 continue;
1154 1101
1155 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1156 } 1103 }
1157 }
1158 1104
1159 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1160 { 1106 {
1161 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1162 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
1199 * sent them the face yet (this can become quite costly in terms of 1145 * sent them the face yet (this can become quite costly in terms of
1200 * how much we are sending - on the other hand, this should only happen 1146 * how much we are sending - on the other hand, this should only happen
1201 * when the player logs in and picks stuff up. 1147 * when the player logs in and picks stuff up.
1202 */ 1148 */
1203void 1149void
1204esrv_send_animation (client_socket * ns, short anim_num) 1150esrv_send_animation (client * ns, short anim_num)
1205{ 1151{
1206 int i;
1207
1208 /* Do some checking on the anim_num we got. Note that the animations 1152 /* Do some checking on the anim_num we got. Note that the animations
1209 * are added in contigous order, so if the number is in the valid 1153 * are added in contigous order, so if the number is in the valid
1210 * range, it must be a valid animation. 1154 * range, it must be a valid animation.
1211 */ 1155 */
1212 if (anim_num < 0 || anim_num > num_animations) 1156 if (anim_num < 0 || anim_num > num_animations)
… …
1222 << uint16 (0); /* flags - not used right now */ 1166 << uint16 (0); /* flags - not used right now */
1223 1167
1224 /* Build up the list of faces. Also, send any information (ie, the 1168 /* Build up the list of faces. Also, send any information (ie, the
1225 * the face itself) down to the client. 1169 * the face itself) down to the client.
1226 */ 1170 */
1227 for (i = 0; i < animations[anim_num].num_animations; i++) 1171 for (int i = 0; i < animations[anim_num].num_animations; i++)
1228 { 1172 {
1229 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1173 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1230 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1174 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1175
1231 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1176 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1232 } 1177 }
1233 1178
1234 ns->send_packet (sl); 1179 ns->send_packet (sl);
1235 1180
… …
1246/** 1191/**
1247 * This adds face_num to a map cell at x,y. If the client doesn't have 1192 * This adds face_num to a map cell at x,y. If the client doesn't have
1248 * the face yet, we will also send it. 1193 * the face yet, we will also send it.
1249 */ 1194 */
1250static void 1195static void
1251esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1196esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1252{ 1197{
1253 if (newmap->cells[x][y].count >= MAP_LAYERS) 1198 if (newmap->cells[x][y].count >= MAP_LAYERS)
1254 { 1199 {
1200 //TODO: one or the other, can't both have abort and return, verify and act
1255 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1201 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1256 return; 1202 return;
1257 abort (); 1203 abort ();
1258 } 1204 }
1259 1205
1260 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1206 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1261 newmap->cells[x][y].count++; 1207 newmap->cells[x][y].count++;
1262 1208
1263 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1209 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1264 esrv_send_face (ns, face_num, 0); 1210 esrv_send_face (ns, face_num, 0);
1265}
1266
1267struct LayerCell
1268{
1269 uint16 xy;
1270 short face;
1271};
1272
1273struct MapLayer
1274{
1275 int count;
1276 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1277};
1278
1279/** Checkes if map cells have changed */
1280static int
1281mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1282{
1283 int k;
1284
1285 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1286 return 1;
1287 for (k = 0; k < newmap->cells[i][j].count; k++)
1288 {
1289 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1290 {
1291 return 1;
1292 }
1293 }
1294 return 0;
1295}
1296
1297/**
1298 * Basically, what this does is pack the data into layers.
1299 * cnum is the client number, cur is the the buffer we put all of
1300 * this data into. we return the end of the data. layers is
1301 * how many layers of data we should back.
1302 */
1303static uint8 *
1304compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1305{
1306 int x, y, k;
1307 int face;
1308 unsigned char *fcur;
1309 struct MapLayer layers[MAP_LAYERS];
1310
1311 for (k = 0; k < MAP_LAYERS; k++)
1312 layers[k].count = 0;
1313 fcur = cur;
1314 for (x = 0; x < ns->mapx; x++)
1315 {
1316 for (y = 0; y < ns->mapy; y++)
1317 {
1318 if (!mapcellchanged (ns, x, y, newmap))
1319 continue;
1320 if (newmap->cells[x][y].count == 0)
1321 {
1322 *cur = x * ns->mapy + y; /* mark empty space */
1323 cur++;
1324 continue;
1325 }
1326 for (k = 0; k < newmap->cells[x][y].count; k++)
1327 {
1328 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1329 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1330 layers[k].count++;
1331 }
1332 }
1333 }
1334 /* If no data, return now. */
1335 if (fcur == cur && layers[0].count == 0)
1336 return cur;
1337 *cur = 255; /* mark end of explicitly cleared cells */
1338 cur++;
1339 /* First pack by layers. */
1340 for (k = 0; k < numlayers; k++)
1341 {
1342 if (layers[k].count == 0)
1343 break; /* once a layer is entirely empty, no layer below it can
1344 have anything in it either */
1345 /* Pack by entries in thie layer */
1346 for (x = 0; x < layers[k].count;)
1347 {
1348 fcur = cur;
1349 *cur = layers[k].lcells[x].face >> 8;
1350 cur++;
1351 *cur = layers[k].lcells[x].face & 0xFF;
1352 cur++;
1353 face = layers[k].lcells[x].face;
1354 /* Now, we back the redundant data into 1 byte xy pairings */
1355 for (y = x; y < layers[k].count; y++)
1356 {
1357 if (layers[k].lcells[y].face == face)
1358 {
1359 *cur = (uint8) layers[k].lcells[y].xy;
1360 cur++;
1361 layers[k].lcells[y].face = -1;
1362 }
1363 }
1364 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1365 /* forward over the now redundant data */
1366 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1367 x++;
1368 }
1369 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1370 }
1371 return cur;
1372} 1211}
1373 1212
1374/** Clears a map cell */ 1213/** Clears a map cell */
1375static void 1214static void
1376map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1215map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1388#define MAX_LAYERS 3 1227#define MAX_LAYERS 3
1389 1228
1390/* Using a global really isn't a good approach, but saves the over head of 1229/* Using a global really isn't a good approach, but saves the over head of
1391 * allocating and deallocating such a block of data each time run through, 1230 * allocating and deallocating such a block of data each time run through,
1392 * and saves the space of allocating this in the socket object when we only 1231 * and saves the space of allocating this in the socket object when we only
1393 * need it for this cycle. If the serve is ever threaded, this needs to be 1232 * need it for this cycle. If the server is ever threaded, this needs to be
1394 * re-examined. 1233 * re-examined.
1395 */ 1234 */
1396
1397static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1235static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1398 1236
1399/** 1237/**
1400 * Returns true if any of the heads for this 1238 * Returns true if any of the heads for this
1401 * space is set. Returns false if all are blank - this is used 1239 * space is set. Returns false if all are blank - this is used
1402 * for empty space checking. 1240 * for empty space checking.
1403 */ 1241 */
1404static inline int 1242static inline int
1405have_head (int ax, int ay) 1243have_head (int ax, int ay)
1406{ 1244{
1407
1408 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1409 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1410 return 1; 1247 return 1;
1248
1411 return 0; 1249 return 0;
1412} 1250}
1413 1251
1414/** 1252/**
1415 * check_head is a bit simplistic version of update_space below. 1253 * check_head is a bit simplistic version of update_space below.
1416 * basically, it only checks the that the head on space ax,ay at layer 1254 * basically, it only checks the that the head on space ax,ay at layer
1417 * needs to get sent - if so, it adds the data, sending the head 1255 * needs to get sent - if so, it adds the data, sending the head
1418 * if needed, and returning 1. If this no data needs to get 1256 * if needed, and returning 1. If this no data needs to get
1419 * sent, it returns zero. 1257 * sent, it returns zero.
1420 */ 1258 */
1421static int 1259static int
1422check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1260check_head (packet &sl, client &ns, int ax, int ay, int layer)
1423{ 1261{
1424 short face_num; 1262 short face_num;
1425 1263
1426 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1264 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1427 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1265 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1459 * numbers the spaces differently - I think this was a leftover from 1297 * numbers the spaces differently - I think this was a leftover from
1460 * the map command, where the faces stack up. Sinces that is no longer 1298 * the map command, where the faces stack up. Sinces that is no longer
1461 * the case, it seems to make more sense to have these layer values 1299 * the case, it seems to make more sense to have these layer values
1462 * actually match. 1300 * actually match.
1463 */ 1301 */
1464
1465static int 1302static int
1466update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1303update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1467{ 1304{
1468 object *ob, *head; 1305 object *ob, *head;
1469 uint16 face_num; 1306 uint16 face_num;
1470 int bx, by, i; 1307 int bx, by, i;
1471 1308
… …
1684 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1521 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1685 * take. 1522 * take.
1686 */ 1523 */
1687 1524
1688static inline int 1525static inline int
1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1526update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1690{ 1527{
1691 object *ob; 1528 object *ob;
1692 int smoothlevel; /* old face_num; */ 1529 int smoothlevel; /* old face_num; */
1693 1530
1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1728 * Returns the size of a data for a map square as returned by 1565 * Returns the size of a data for a map square as returned by
1729 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1566 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1730 * available. 1567 * available.
1731 */ 1568 */
1732int 1569int
1733getExtendedMapInfoSize (client_socket * ns) 1570getExtendedMapInfoSize (client * ns)
1734{ 1571{
1735 int result = 0; 1572 int result = 0;
1736 1573
1737 if (ns->ext_mapinfos) 1574 if (ns->ext_mapinfos)
1738 { 1575 {
1739 if (ns->EMI_smooth) 1576 if (ns->EMI_smooth)
1740 result += 1; /*One byte for smoothlevel */ 1577 result += 1; /*One byte for smoothlevel */
1741 } 1578 }
1579
1742 return result; 1580 return result;
1743} 1581}
1744 1582
1745/** 1583/**
1746 * This function uses the new map1 protocol command to send the map 1584 * This function uses the new map1 protocol command to send the map
… …
1774 uint8 eentrysize; 1612 uint8 eentrysize;
1775 uint16 ewhatstart, ewhatflag; 1613 uint16 ewhatstart, ewhatflag;
1776 uint8 extendedinfos; 1614 uint8 extendedinfos;
1777 maptile *m; 1615 maptile *m;
1778 1616
1779 client_socket &socket = *pl->contr->socket; 1617 client &socket = *pl->contr->socket;
1780 1618
1781 check_map_change (pl->contr); 1619 check_map_change (pl->contr);
1782 1620
1783 packet sl; 1621 packet sl;
1784 packet esl; 1622 packet esl;
… …
2183 { 2021 {
2184 ax = i; 2022 ax = i;
2185 ay = j; 2023 ay = j;
2186 m = pm; 2024 m = pm;
2187 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026
2188 if (mflags & P_OUT_OF_MAP) 2027 if (mflags & P_OUT_OF_MAP)
2189 continue; 2028 continue;
2029
2190 if (mflags & P_NEED_UPDATE) 2030 if (mflags & P_NEED_UPDATE)
2191 update_position (m, ax, ay); 2031 update_position (m, ax, ay);
2032
2192 /* If a map is visible to the player, we don't want to swap it out 2033 /* If a map is visible to the player, we don't want to swap it out
2193 * just to reload it. This should really call something like 2034 * just to reload it. This should really call something like
2194 * swap_map, but this is much more efficient and 'good enough' 2035 * swap_map, but this is much more efficient and 'good enough'
2195 */ 2036 */
2196 if (mflags & P_NEW_MAP) 2037 if (mflags & P_NEW_MAP)
… …
2227/** 2068/**
2228 * This sends the skill number to name mapping. We ignore 2069 * This sends the skill number to name mapping. We ignore
2229 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2230 */ 2071 */
2231void 2072void
2232send_skill_info (client_socket *ns, char *params) 2073send_skill_info (client *ns, char *params)
2233{ 2074{
2234 packet sl; 2075 packet sl;
2235 sl << "replyinfo skill_info\n"; 2076 sl << "replyinfo skill_info\n";
2236 2077
2237 for (int i = 1; i < NUM_SKILLS; i++) 2078 for (int i = 1; i < NUM_SKILLS; i++)
… …
2249/** 2090/**
2250 * This sends the spell path to name mapping. We ignore 2091 * This sends the spell path to name mapping. We ignore
2251 * the params - we always send the same info no matter what. 2092 * the params - we always send the same info no matter what.
2252 */ 2093 */
2253void 2094void
2254send_spell_paths (client_socket * ns, char *params) 2095send_spell_paths (client * ns, char *params)
2255{ 2096{
2256 packet sl; 2097 packet sl;
2257 2098
2258 sl << "replyinfo spell_paths\n"; 2099 sl << "replyinfo spell_paths\n";
2259 2100
… …
2399 2240
2400 if (!pl->socket->monitor_spells) 2241 if (!pl->socket->monitor_spells)
2401 return; 2242 return;
2402 2243
2403 packet sl; 2244 packet sl;
2404
2405 sl << "addspell "; 2245 sl << "addspell ";
2406 2246
2407 if (!spell) 2247 if (!spell)
2408 { 2248 {
2409 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines