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.42 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.50 by root, Thu Dec 21 23:37:06 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
… …
86 -1, /* life stealing */ 83 -1, /* life stealing */
87 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
88}; 85};
89 86
90static void 87static void
91socket_map_scroll (client * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
92{ 89{
93 struct Map newmap; 90 struct Map newmap;
94 int x, y, mx, my; 91 int x, y, mx, my;
95 92
96 ns->send_packet_printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
… …
141} 138}
142 139
143static void 140static void
144clear_map (player *pl) 141clear_map (player *pl)
145{ 142{
146 client &socket = *pl->socket;
147
148 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149 144
150 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
151 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
152 147
153 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
154 socket.look_position = 0;
155} 149}
156 150
157/** check for map change and send new map data */ 151/** check for map change and send new map data */
158static void 152static void
159check_map_change (player *pl) 153check_map_change (player *pl)
160{ 154{
161 client &socket = *pl->socket; 155 client &socket = *pl->ns;
162 object *ob = pl->ob; 156 object *ob = pl->ob;
163 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
164 158
165 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
166 { 160 {
… …
200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
202 else 196 else
203 { 197 {
204 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
205 socket.update_look = 1; 199 socket.floorbox_reset ();
206 socket.look_position = 0;
207 } 200 }
208 } 201 }
209 202
210 socket.current_x = ob->x; 203 socket.current_x = ob->x;
211 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
260{ 253{
261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262} 255}
263 256
264void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
265MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
266{ 265{
267 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
269 268
… …
281 buf += 8; 280 buf += 8;
282 281
283 // initial map and its origin 282 // initial map and its origin
284 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
285 sint16 dx, dy; 284 sint16 dx, dy;
286 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
287 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
288 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
289 288
290 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
291 { 290 {
292 int dir = *buf++; 291 int dir = *buf++;
… …
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
344 } 343 }
345 else 344 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347 346
348 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
349} 348}
350 349
351/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
352void 351void
353SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
570 * it either has to be here or init_sockets needs to be exported. 569 * it either has to be here or init_sockets needs to be exported.
571 */ 570 */
572void 571void
573AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
574{ 573{
575 Settings oldsettings; 574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
576 576
577 oldsettings = settings;
578 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
579 ns->send_packet ("addme_failed"); 578 ns->send_packet ("addme_failed");
580 else 579 else
581 ns->send_packet ("addme_success"); 580 ns->send_packet ("addme_success");
582
583 settings = oldsettings;
584} 581}
585 582
586/** Reply to ExtendedInfos command */ 583/** Reply to ExtendedInfos command */
587void 584void
588ToggleExtendedInfos (char *buf, int len, client * ns) 585ToggleExtendedInfos (char *buf, int len, client * ns)
… …
705 * a piece of data from us that we know the client wants. So 702 * a piece of data from us that we know the client wants. So
706 * if we know the client wants it, might as well push it to the 703 * if we know the client wants it, might as well push it to the
707 * client. 704 * client.
708 */ 705 */
709static void 706static void
710SendSmooth (client * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
711{ 708{
712 uint16 smoothface; 709 uint16 smoothface;
713 710
714 /* If we can't find a face, return and set it so we won't try to send this 711 /* If we can't find a face, return and set it so we won't try to send this
715 * again. 712 * again.
… …
725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
726 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
727 724
728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729 726
730 packet sl; 727 packet sl ("smooth");
731 728
732 sl << "smooth "
733 << uint16 (face) 729 sl << uint16 (face)
734 << uint16 (smoothface); 730 << uint16 (smoothface);
735 731
736 ns->send_packet (sl); 732 ns->send_packet (sl);
737} 733}
738 734
739 /** 735 /**
740 * Tells client the picture it has to use 736 * Tells client the picture it has to use
741 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
742 */ 738 */
743void 739void
744AskSmooth (char *buf, int len, client * ns) 740AskSmooth (char *buf, int len, client *ns)
745{ 741{
746 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
747
748 facenbr = atoi (buf);
749 SendSmooth (ns, facenbr);
750} 743}
751 744
752/** 745/**
753 * This handles the general commands from the client (ie, north, fire, cast, 746 * This handles the general commands from the client (ie, north, fire, cast,
754 * etc.) 747 * etc.)
755 */ 748 */
756void 749void
757PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
758{ 751{
759
760 /* The following should never happen with a proper or honest client.
761 * Therefore, the error message doesn't have to be too clear - if
762 * someone is playing with a hacked/non working client, this gives them
763 * an idea of the problem, but they deserve what they get
764 */
765 if (pl->state != ST_PLAYING)
766 {
767 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
768 return;
769 }
770 /* Check if there is a count. In theory, a zero count could also be 752 /* Check if there is a count. In theory, a zero count could also be
771 * sent, so check for that also. 753 * sent, so check for that also.
772 */ 754 */
773 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
774 { 756 {
775 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
776 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
777 if (!buf) 760 if (!buf)
778 {
779#ifdef ESRV_DEBUG
780 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
781#endif
782 return; 761 return;
783 } 762
784 buf++; 763 buf++;
785 } 764 }
786 /* This should not happen anymore. */ 765
787 if (pl->ob->speed_left < -1.0)
788 {
789 LOG (llevError, "Player has negative time - shouldn't do command.\n");
790 }
791 /* In c_new.c */
792 execute_newserver_command (pl->ob, (char *) buf); 766 execute_newserver_command (pl->ob, (char *) buf);
767
793 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
794 * Cleaning up the input should probably be done first - all actions 769 * Cleaning up the input should probably be done first - all actions
795 * for the command that issued the count should be done before any other 770 * for the command that issued the count should be done before any other
796 * commands. 771 * commands.
797 */ 772 */
798
799 pl->count = 0; 773 pl->count = 0;
800
801} 774}
802 775
803 776
804/** 777/**
805 * This handles the general commands from the client (ie, north, fire, cast, 778 * This handles the general commands from the client (ie, north, fire, cast,
… …
808 * can throttle. 781 * can throttle.
809 */ 782 */
810void 783void
811NewPlayerCmd (char *buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
812{ 785{
813 int time, repeat;
814 char command[MAX_BUF];
815 int pktlen;
816
817 if (len < 7) 786 if (len <= 6)
818 { 787 {
819 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 788 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
820 return; 789 return;
821 } 790 }
822 791
823 pktlen = net_uint16 ((uint8 *)buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
824 repeat = net_uint32 ((uint8 *)buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
825 794
826 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
827 if (repeat != -1) 796 if (repeat != -1)
828 pl->count = repeat; 797 pl->count = repeat;
829 798
830 if ((len - 4) >= MAX_BUF) 799 buf += 6; //len -= 6;
831 len = MAX_BUF - 5;
832 800
833 strncpy ((char *) command, (char *) buf + 6, len - 4);
834 command[len - 4] = 0;
835
836 /* This should not happen anymore. */
837 if (pl->ob->speed_left < -1.0)
838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839
840 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command); 801 execute_newserver_command (pl->ob, buf);
802
842 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 804 * Cleaning up the input should probably be done first - all actions
844 * for the command that issued the count should be done before any other 805 * for the command that issued the count should be done before any other
845 * commands. 806 * commands.
846 */ 807 */
847 pl->count = 0; 808 pl->count = 0;
848 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
849 if (FABS (pl->ob->speed) < 0.001) 811 int time = FABS (pl->ob->speed) < 0.001
850 time = MAX_TIME * 100; 812 ? time = MAX_TIME * 100
851 else
852 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
853 814
854 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
855 816 packet sl ("comc");
856 packet sl;
857 sl << "comc " << uint16 (pktlen) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
858 pl->socket->send_packet (sl); 818 pl->ns->send_packet (sl);
859} 819}
860
861 820
862/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
863void 822void
864ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
865{ 824{
825 if (ns->state == ST_CUSTOM)
826 {
827 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
828 return;
829 }
830
831 if (!ns->pl)
832 return; //TODO: depends on the exact reply we are after
833 //TODO: but right now, we always have a ns->pl
834
835 player *pl = ns->pl;
836
866 /* This is to synthesize how the data would be stored if it 837 /* This is to synthesize how the data would be stored if it
867 * was normally entered. A bit of a hack, and should be cleaned up 838 * was normally entered. A bit of a hack, and should be cleaned up
868 * once all the X11 code is removed from the server. 839 * once all the X11 code is removed from the server.
869 * 840 *
870 * We pass 13 to many of the functions because this way they 841 * We pass 13 to many of the functions because this way they
871 * think it was the carriage return that was entered, and the 842 * think it was the carriage return that was entered, and the
872 * function then does not try to do additional input. 843 * function then does not try to do additional input.
873 */ 844 */
874 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 845 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
875 846
876 /* this avoids any hacking here */ 847 /* this avoids any hacking here */
877 848
878 switch (pl->state) 849 switch (ns->state)
879 { 850 {
880 case ST_PLAYING: 851 case ST_PLAYING:
881 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 852 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
882 break; 853 break;
883 854
884 case ST_PLAY_AGAIN: 855 case ST_PLAY_AGAIN:
885 /* We can check this for return value (2==quit). Maybe we 856 /* We can check this for return value (2==quit). Maybe we
886 * should, and do something appropriate? 857 * should, and do something appropriate?
887 */ 858 */
888 receive_play_again (pl->ob, buf[0]); 859 receive_play_again (pl->ob, buf[0]);
889 break; 860 break;
890 861
891 case ST_ROLL_STAT: 862 case ST_ROLL_STAT:
892 key_roll_stat (pl->ob, buf[0]); 863 key_roll_stat (pl->ob, buf[0]);
893 break; 864 break;
894 865
895 case ST_CHANGE_CLASS: 866 case ST_CHANGE_CLASS:
896
897 key_change_class (pl->ob, buf[0]); 867 key_change_class (pl->ob, buf[0]);
898 break; 868 break;
899 869
900 case ST_CONFIRM_QUIT: 870 case ST_CONFIRM_QUIT:
901 key_confirm_quit (pl->ob, buf[0]); 871 key_confirm_quit (pl->ob, buf[0]);
902 break; 872 break;
903 873
904 case ST_CONFIGURE: 874 case ST_CONFIGURE:
905 LOG (llevError, "In client input handling, but into configure state\n"); 875 LOG (llevError, "In client input handling, but into configure state\n");
906 pl->state = ST_PLAYING; 876 ns->state = ST_PLAYING;
907 break; 877 break;
908 878
909 case ST_GET_NAME: 879 case ST_GET_NAME:
910 receive_player_name (pl->ob, 13); 880 receive_player_name (pl->ob, 13);
911 break; 881 break;
912 882
913 case ST_GET_PASSWORD: 883 case ST_GET_PASSWORD:
914 case ST_CONFIRM_PASSWORD: 884 case ST_CONFIRM_PASSWORD:
915 receive_player_password (pl->ob, 13); 885 receive_player_password (pl->ob, 13);
916 break; 886 break;
917 887
918 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 888 case ST_GET_PARTY_PASSWORD: /* Get password for party */
919 receive_party_password (pl->ob, 13); 889 receive_party_password (pl->ob, 13);
920 break; 890 break;
921 891
922 default: 892 default:
923 LOG (llevError, "Unknown input state: %d\n", pl->state); 893 LOG (llevError, "Unknown input state: %d\n", ns->state);
924 } 894 }
925} 895}
926 896
927/** 897/**
928 * Client tells its version. If there is a mismatch, we close the 898 * Client tells its version. If there is a mismatch, we close the
… …
932 * problem. 902 * problem.
933 */ 903 */
934void 904void
935VersionCmd (char *buf, int len, client * ns) 905VersionCmd (char *buf, int len, client * ns)
936{ 906{
937 char *cp;
938 char version_warning[256];
939
940 if (!buf) 907 if (!buf)
941 { 908 {
942 LOG (llevError, "CS: received corrupted version command\n"); 909 LOG (llevError, "CS: received corrupted version command\n");
943 return; 910 return;
944 } 911 }
945 912
946 ns->cs_version = atoi (buf); 913 ns->cs_version = atoi (buf);
947 ns->sc_version = ns->cs_version; 914 ns->sc_version = ns->cs_version;
915
916 LOG (llevDebug, "connection from client <%s>\n", buf);
917
918
919 //TODO: should log here just for statistics
920
948 if (VERSION_CS != ns->cs_version) 921 //if (VERSION_CS != ns->cs_version)
949 { 922 // unchecked;
950#ifdef ESRV_DEBUG 923
951 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
952#endif
953 }
954 cp = strchr (buf + 1, ' '); 924 char *cp = strchr (buf + 1, ' ');
955 if (!cp) 925 if (!cp)
956 return; 926 return;
927
957 ns->sc_version = atoi (cp); 928 ns->sc_version = atoi (cp);
929
958 if (VERSION_SC != ns->sc_version) 930 //if (VERSION_SC != ns->sc_version)
959 { 931 // unchecked;
960#ifdef ESRV_DEBUG 932
961 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
962#endif
963 }
964 cp = strchr (cp + 1, ' '); 933 cp = strchr (cp + 1, ' ');
934
965 if (cp) 935 if (cp)
966 { 936 {
967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
968
969 assign (ns->version, cp + 1); 937 assign (ns->version, cp + 1);
970 938
971 if (ns->sc_version < 1026) 939 if (ns->sc_version < 1026)
972 { 940 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 941 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning);
976 }
977
978 } 942 }
979} 943}
980 944
981/** sound related functions. */ 945/** sound related functions. */
982void 946void
… …
988/** client wants the map resent */ 952/** client wants the map resent */
989 953
990void 954void
991MapRedrawCmd (char *buf, int len, player *pl) 955MapRedrawCmd (char *buf, int len, player *pl)
992{ 956{
993
994/* This function is currently disabled; just clearing the map state results in 957/* This function is currently disabled; just clearing the map state results in
995 * display errors. It should clear the cache and send a newmap command. 958 * display errors. It should clear the cache and send a newmap command.
996 * Unfortunately this solution does not work because some client versions send 959 * Unfortunately this solution does not work because some client versions send
997 * a mapredraw command after receiving a newmap command. 960 * a mapredraw command after receiving a newmap command.
998 */ 961 */
999#if 0
1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
1001 * clear the "cache"
1002 */
1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1004 draw_client_map (pl->ob);
1005#endif
1006} 962}
1007 963
1008/** 964/**
1009 * Moves an object (typically, container to inventory). 965 * Moves an object (typically, container to inventory).
1010 * syntax is: move (to) (tag) (nrof) 966 * syntax is: move (to) (tag) (nrof)
… …
1013MoveCmd (char *buf, int len, player *pl) 969MoveCmd (char *buf, int len, player *pl)
1014{ 970{
1015 int vals[3], i; 971 int vals[3], i;
1016 972
1017 /* A little funky here. We only cycle for 2 records, because 973 /* A little funky here. We only cycle for 2 records, because
1018 * we obviously am not going to find a space after the third 974 * we obviously are not going to find a space after the third
1019 * record. Perhaps we should just replace this with a 975 * record. Perhaps we should just replace this with a
1020 * sscanf? 976 * sscanf?
1021 */ 977 */
1022 for (i = 0; i < 2; i++) 978 for (i = 0; i < 2; i++)
1023 { 979 {
1024 vals[i] = atoi (buf); 980 vals[i] = atoi (buf);
981
1025 if (!(buf = strchr (buf, ' '))) 982 if (!(buf = strchr (buf, ' ')))
1026 { 983 {
1027 LOG (llevError, "Incomplete move command: %s\n", buf); 984 LOG (llevError, "Incomplete move command: %s\n", buf);
1028 return; 985 return;
1029 } 986 }
987
1030 buf++; 988 buf++;
1031 } 989 }
990
1032 vals[2] = atoi (buf); 991 vals[2] = atoi (buf);
1033 992
1034/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 993/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1035 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 994 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1036} 995}
1037
1038
1039 996
1040/****************************************************************************** 997/******************************************************************************
1041 * 998 *
1042 * Start of commands the server sends to the client. 999 * Start of commands the server sends to the client.
1043 * 1000 *
… …
1046/** 1003/**
1047 * Asks the client to query the user. This way, the client knows 1004 * Asks the client to query the user. This way, the client knows
1048 * it needs to send something back (vs just printing out a message) 1005 * it needs to send something back (vs just printing out a message)
1049 */ 1006 */
1050void 1007void
1051send_query (client * ns, uint8 flags, char *text) 1008send_query (client *ns, uint8 flags, char *text)
1052{ 1009{
1053 char buf[MAX_BUF];
1054
1055 sprintf (buf, "query %d %s", flags, text ? text : ""); 1010 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1056 ns->send_packet (buf);
1057} 1011}
1058 1012
1059#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1013#define AddIfInt64(Old,New,Type) if (Old != New) {\
1060 Old = New; \ 1014 Old = New; \
1061 sl << uint8 (Type) << uint64 (New); \ 1015 sl << uint8 (Type) << uint64 (New); \
… …
1091esrv_update_stats (player *pl) 1045esrv_update_stats (player *pl)
1092{ 1046{
1093 char buf[MAX_BUF]; 1047 char buf[MAX_BUF];
1094 uint16 flags; 1048 uint16 flags;
1095 1049
1096 packet sl; 1050 packet sl ("stats");
1097 sl << "stats ";
1098 1051
1099 if (pl->ob != NULL) 1052 if (pl->ob)
1100 { 1053 {
1101 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1054 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1102 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1055 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1103 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1104 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1057 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1111 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1064 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1112 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1065 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1114 } 1067 }
1115 1068
1116 if (pl->socket->exp64) 1069 if (pl->ns->exp64)
1117 {
1118 uint8 s;
1119
1120 for (s = 0; s < NUM_SKILLS; s++) 1070 for (int s = 0; s < NUM_SKILLS; s++)
1121 {
1122 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1123 { 1072 {
1124 /* Always send along the level if exp changes. This is only 1073 /* Always send along the level if exp changes. This is only
1125 * 1 extra byte, but keeps processing simpler. 1074 * 1 extra byte, but keeps processing simpler.
1126 */ 1075 */
1127 sl << uint8 (s + CS_STAT_SKILLINFO) 1076 sl << uint8 (s + CS_STAT_SKILLINFO)
1128 << uint8 (pl->last_skill_ob[s]->level) 1077 << uint8 (pl->last_skill_ob[s]->level)
1129 << uint64 (pl->last_skill_ob[s]->stats.exp); 1078 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130 1079
1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1132 } 1081 }
1133 }
1134 }
1135 1082
1136 if (pl->socket->exp64) 1083 if (pl->ns->exp64)
1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1138 else 1085 else
1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1140 1087
1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1154 if (pl->run_on) 1101 if (pl->run_on)
1155 flags |= SF_RUNON; 1102 flags |= SF_RUNON;
1156 1103
1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1104 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158 1105
1159 if (pl->socket->sc_version < 1025) 1106 if (pl->ns->sc_version < 1025)
1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1107 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1161 else 1108 else
1162 {
1163 int i;
1164
1165 for (i = 0; i < NROFATTACKS; i++) 1109 for (int i = 0; i < NROFATTACKS; i++)
1166 { 1110 {
1167 /* Skip ones we won't send */ 1111 /* Skip ones we won't send */
1168 if (atnr_cs_stat[i] == -1) 1112 if (atnr_cs_stat[i] == -1)
1169 continue; 1113 continue;
1170 1114
1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1115 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1172 } 1116 }
1173 }
1174 1117
1175 if (pl->socket->monitor_spells) 1118 if (pl->ns->monitor_spells)
1176 { 1119 {
1177 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1120 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1178 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1121 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1122 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1180 } 1123 }
1181 1124
1182 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1125 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1126 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1184 set_title (pl->ob, buf); 1127 set_title (pl->ob, buf);
1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1128 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1186 1129
1187 /* Only send it away if we have some actual data */ 1130 /* Only send it away if we have some actual data */
1188 if (sl.length () > 6) 1131 if (sl.length () > 6)
1189 pl->socket->send_packet (sl); 1132 pl->ns->send_packet (sl);
1190} 1133}
1191 1134
1192/** 1135/**
1193 * Tells the client that here is a player it should start using. 1136 * Tells the client that here is a player it should start using.
1194 */ 1137 */
1195void 1138void
1196esrv_new_player (player *pl, uint32 weight) 1139esrv_new_player (player *pl, uint32 weight)
1197{ 1140{
1198 pl->last_weight = weight; 1141 pl->last_weight = weight;
1199 1142
1200 packet sl; 1143 packet sl ("player");
1201 sl << "player ";
1202 1144
1203 sl << uint32 (pl->ob->count) 1145 sl << uint32 (pl->ob->count)
1204 << uint32 (weight) 1146 << uint32 (weight)
1205 << uint32 (pl->ob->face->number) 1147 << uint32 (pl->ob->face->number)
1206 << data8 (pl->ob->name); 1148 << data8 (pl->ob->name);
1207 1149
1208 pl->socket->send_packet (sl); 1150 pl->ns->send_packet (sl);
1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1151 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1210} 1152}
1211 1153
1212/** 1154/**
1213 * Need to send an animation sequence to the client. 1155 * Need to send an animation sequence to the client.
… …
1217 * when the player logs in and picks stuff up. 1159 * when the player logs in and picks stuff up.
1218 */ 1160 */
1219void 1161void
1220esrv_send_animation (client * ns, short anim_num) 1162esrv_send_animation (client * ns, short anim_num)
1221{ 1163{
1222 int i;
1223
1224 /* Do some checking on the anim_num we got. Note that the animations 1164 /* Do some checking on the anim_num we got. Note that the animations
1225 * are added in contigous order, so if the number is in the valid 1165 * are added in contigous order, so if the number is in the valid
1226 * range, it must be a valid animation. 1166 * range, it must be a valid animation.
1227 */ 1167 */
1228 if (anim_num < 0 || anim_num > num_animations) 1168 if (anim_num < 0 || anim_num > num_animations)
1229 { 1169 {
1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1170 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1231 return; 1171 return;
1232 } 1172 }
1233 1173
1234 packet sl; 1174 packet sl ("anim");
1235 1175
1236 sl << "anim "
1237 << uint16 (anim_num) 1176 sl << uint16 (anim_num)
1238 << uint16 (0); /* flags - not used right now */ 1177 << uint16 (0); /* flags - not used right now */
1239 1178
1240 /* Build up the list of faces. Also, send any information (ie, the 1179 /* Build up the list of faces. Also, send any information (ie, the
1241 * the face itself) down to the client. 1180 * the face itself) down to the client.
1242 */ 1181 */
1243 for (i = 0; i < animations[anim_num].num_animations; i++) 1182 for (int i = 0; i < animations[anim_num].num_animations; i++)
1244 { 1183 {
1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1246 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1185 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1186
1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1187 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1248 } 1188 }
1249 1189
1250 ns->send_packet (sl); 1190 ns->send_packet (sl);
1251 1191
… …
1266static void 1206static void
1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1207esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1268{ 1208{
1269 if (newmap->cells[x][y].count >= MAP_LAYERS) 1209 if (newmap->cells[x][y].count >= MAP_LAYERS)
1270 { 1210 {
1211 //TODO: one or the other, can't both have abort and return, verify and act
1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1212 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1272 return; 1213 return;
1273 abort (); 1214 abort ();
1274 } 1215 }
1275 1216
1276 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1217 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1277 newmap->cells[x][y].count++; 1218 newmap->cells[x][y].count++;
1278 1219
1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1220 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1280 esrv_send_face (ns, face_num, 0); 1221 esrv_send_face (ns, face_num, 0);
1281}
1282
1283struct LayerCell
1284{
1285 uint16 xy;
1286 short face;
1287};
1288
1289struct MapLayer
1290{
1291 int count;
1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1293};
1294
1295/** Checkes if map cells have changed */
1296static int
1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1298{
1299 int k;
1300
1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1302 return 1;
1303 for (k = 0; k < newmap->cells[i][j].count; k++)
1304 {
1305 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1306 {
1307 return 1;
1308 }
1309 }
1310 return 0;
1311}
1312
1313/**
1314 * Basically, what this does is pack the data into layers.
1315 * cnum is the client number, cur is the the buffer we put all of
1316 * this data into. we return the end of the data. layers is
1317 * how many layers of data we should back.
1318 */
1319static uint8 *
1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1321{
1322 int x, y, k;
1323 int face;
1324 unsigned char *fcur;
1325 struct MapLayer layers[MAP_LAYERS];
1326
1327 for (k = 0; k < MAP_LAYERS; k++)
1328 layers[k].count = 0;
1329 fcur = cur;
1330 for (x = 0; x < ns->mapx; x++)
1331 {
1332 for (y = 0; y < ns->mapy; y++)
1333 {
1334 if (!mapcellchanged (ns, x, y, newmap))
1335 continue;
1336 if (newmap->cells[x][y].count == 0)
1337 {
1338 *cur = x * ns->mapy + y; /* mark empty space */
1339 cur++;
1340 continue;
1341 }
1342 for (k = 0; k < newmap->cells[x][y].count; k++)
1343 {
1344 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1345 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1346 layers[k].count++;
1347 }
1348 }
1349 }
1350 /* If no data, return now. */
1351 if (fcur == cur && layers[0].count == 0)
1352 return cur;
1353 *cur = 255; /* mark end of explicitly cleared cells */
1354 cur++;
1355 /* First pack by layers. */
1356 for (k = 0; k < numlayers; k++)
1357 {
1358 if (layers[k].count == 0)
1359 break; /* once a layer is entirely empty, no layer below it can
1360 have anything in it either */
1361 /* Pack by entries in thie layer */
1362 for (x = 0; x < layers[k].count;)
1363 {
1364 fcur = cur;
1365 *cur = layers[k].lcells[x].face >> 8;
1366 cur++;
1367 *cur = layers[k].lcells[x].face & 0xFF;
1368 cur++;
1369 face = layers[k].lcells[x].face;
1370 /* Now, we back the redundant data into 1 byte xy pairings */
1371 for (y = x; y < layers[k].count; y++)
1372 {
1373 if (layers[k].lcells[y].face == face)
1374 {
1375 *cur = (uint8) layers[k].lcells[y].xy;
1376 cur++;
1377 layers[k].lcells[y].face = -1;
1378 }
1379 }
1380 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1381 /* forward over the now redundant data */
1382 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1383 x++;
1384 }
1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1386 }
1387 return cur;
1388} 1222}
1389 1223
1390/** Clears a map cell */ 1224/** Clears a map cell */
1391static void 1225static void
1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1226map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1404#define MAX_LAYERS 3 1238#define MAX_LAYERS 3
1405 1239
1406/* Using a global really isn't a good approach, but saves the over head of 1240/* Using a global really isn't a good approach, but saves the over head of
1407 * allocating and deallocating such a block of data each time run through, 1241 * allocating and deallocating such a block of data each time run through,
1408 * and saves the space of allocating this in the socket object when we only 1242 * and saves the space of allocating this in the socket object when we only
1409 * need it for this cycle. If the serve is ever threaded, this needs to be 1243 * need it for this cycle. If the server is ever threaded, this needs to be
1410 * re-examined. 1244 * re-examined.
1411 */ 1245 */
1412
1413static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1246static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1414 1247
1415/** 1248/**
1416 * Returns true if any of the heads for this 1249 * Returns true if any of the heads for this
1417 * space is set. Returns false if all are blank - this is used 1250 * space is set. Returns false if all are blank - this is used
1418 * for empty space checking. 1251 * for empty space checking.
1419 */ 1252 */
1420static inline int 1253static inline int
1421have_head (int ax, int ay) 1254have_head (int ax, int ay)
1422{ 1255{
1423
1424 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1256 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1425 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1257 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1426 return 1; 1258 return 1;
1259
1427 return 0; 1260 return 0;
1428} 1261}
1429 1262
1430/** 1263/**
1431 * check_head is a bit simplistic version of update_space below. 1264 * check_head is a bit simplistic version of update_space below.
1432 * basically, it only checks the that the head on space ax,ay at layer 1265 * basically, it only checks the that the head on space ax,ay at layer
1433 * needs to get sent - if so, it adds the data, sending the head 1266 * needs to get sent - if so, it adds the data, sending the head
1434 * if needed, and returning 1. If this no data needs to get 1267 * if needed, and returning 1. If this no data needs to get
1435 * sent, it returns zero. 1268 * sent, it returns zero.
1436 */ 1269 */
1437static int 1270static int
1438check_head (packet &sl, client &ns, int ax, int ay, int layer) 1271check_head (packet &sl, client &ns, int ax, int ay, int layer)
1439{ 1272{
… …
1475 * numbers the spaces differently - I think this was a leftover from 1308 * numbers the spaces differently - I think this was a leftover from
1476 * the map command, where the faces stack up. Sinces that is no longer 1309 * the map command, where the faces stack up. Sinces that is no longer
1477 * the case, it seems to make more sense to have these layer values 1310 * the case, it seems to make more sense to have these layer values
1478 * actually match. 1311 * actually match.
1479 */ 1312 */
1480
1481static int 1313static int
1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1314update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{ 1315{
1484 object *ob, *head; 1316 object *ob, *head;
1485 uint16 face_num; 1317 uint16 face_num;
… …
1753 if (ns->ext_mapinfos) 1585 if (ns->ext_mapinfos)
1754 { 1586 {
1755 if (ns->EMI_smooth) 1587 if (ns->EMI_smooth)
1756 result += 1; /*One byte for smoothlevel */ 1588 result += 1; /*One byte for smoothlevel */
1757 } 1589 }
1590
1758 return result; 1591 return result;
1759} 1592}
1760 1593
1761/** 1594/**
1762 * This function uses the new map1 protocol command to send the map 1595 * This function uses the new map1 protocol command to send the map
… …
1769 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1602 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1770 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1603 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1771 * and use the other 4 bits for other informatiion. For full documentation 1604 * and use the other 4 bits for other informatiion. For full documentation
1772 * of what we send, see the doc/Protocol file. 1605 * of what we send, see the doc/Protocol file.
1773 * I will describe internally what we do: 1606 * I will describe internally what we do:
1774 * the socket->lastmap shows how the map last looked when sent to the client. 1607 * the ns->lastmap shows how the map last looked when sent to the client.
1775 * in the lastmap structure, there is a cells array, which is set to the 1608 * in the lastmap structure, there is a cells array, which is set to the
1776 * maximum viewable size (As set in config.h). 1609 * maximum viewable size (As set in config.h).
1777 * in the cells, there are faces and a count value. 1610 * in the cells, there are faces and a count value.
1778 * we use the count value to hold the darkness value. If -1, then this space 1611 * we use the count value to hold the darkness value. If -1, then this space
1779 * is not viewable. 1612 * is not viewable.
… …
1790 uint8 eentrysize; 1623 uint8 eentrysize;
1791 uint16 ewhatstart, ewhatflag; 1624 uint16 ewhatstart, ewhatflag;
1792 uint8 extendedinfos; 1625 uint8 extendedinfos;
1793 maptile *m; 1626 maptile *m;
1794 1627
1795 client &socket = *pl->contr->socket; 1628 client &socket = *pl->contr->ns;
1796 1629
1797 check_map_change (pl->contr); 1630 check_map_change (pl->contr);
1798 1631
1799 packet sl; 1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1800 packet esl; 1633 packet esl;
1801 1634
1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1803 startlen = sl.length (); 1635 startlen = sl.length ();
1804 1636
1805 /*Extendedmapinfo structure initialisation */ 1637 /*Extendedmapinfo structure initialisation */
1806 if (socket.ext_mapinfos) 1638 if (socket.ext_mapinfos)
1807 { 1639 {
… …
1851 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1683 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1852 { 1684 {
1853 ax = 0; 1685 ax = 0;
1854 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1686 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1855 { 1687 {
1856
1857 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1688 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1858 1689
1859 /* If this space is out of the normal viewable area, we only check 1690 /* If this space is out of the normal viewable area, we only check
1860 * the heads value ax or ay will only be greater than what 1691 * the heads value ax or ay will only be greater than what
1861 * the client wants if using the map1a command - this is because 1692 * the client wants if using the map1a command - this is because
… …
2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2192 return; 2023 return;
2193 2024
2194 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2195 2026
2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2197 {
2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2199 { 2029 {
2200 ax = i; 2030 ax = i;
2201 ay = j; 2031 ay = j;
2202 m = pm; 2032 m = pm;
2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2204 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2205 continue; 2036 continue;
2206 if (mflags & P_NEED_UPDATE) 2037
2207 update_position (m, ax, ay);
2208 /* If a map is visible to the player, we don't want to swap it out 2038 /* If a map is visible to the player, we don't want to swap it out
2209 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2210 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2211 */ 2041 */
2212 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2213 m->timeout = 50; 2043 m->timeout = 50;
2214 } 2044 }
2215 } 2045
2216 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2217 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2218 { 2048 {
2219 update_los (pl); 2049 update_los (pl);
2220 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2235 2065
2236/*****************************************************************************/ 2066/*****************************************************************************/
2237void 2067void
2238send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2239{ 2069{
2240 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2241} 2071}
2242 2072
2243/** 2073/**
2244 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2245 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
… …
2290 * it then sends an updspell packet for each spell that has changed in this way 2120 * it then sends an updspell packet for each spell that has changed in this way
2291 */ 2121 */
2292void 2122void
2293esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2294{ 2124{
2295 if (!pl->socket->monitor_spells) 2125 if (!pl->ns->monitor_spells)
2296 return; 2126 return;
2297 2127
2298 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2128 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2299 { 2129 {
2300 if (spell->type == SPELL) 2130 if (spell->type == SPELL)
… …
2330 2160
2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2161 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2162 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2163 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2334 2164
2335 pl->socket->send_packet (sl); 2165 pl->ns->send_packet (sl);
2336 } 2166 }
2337 } 2167 }
2338 } 2168 }
2339} 2169}
2340 2170
2341void 2171void
2342esrv_remove_spell (player *pl, object *spell) 2172esrv_remove_spell (player *pl, object *spell)
2343{ 2173{
2344 if (!pl->socket->monitor_spells) 2174 if (!pl->ns->monitor_spells)
2345 return; 2175 return;
2346 2176
2347 if (!pl || !spell || spell->env != pl->ob) 2177 if (!pl || !spell || spell->env != pl->ob)
2348 { 2178 {
2349 LOG (llevError, "Invalid call to esrv_remove_spell"); 2179 LOG (llevError, "Invalid call to esrv_remove_spell");
2350 return; 2180 return;
2351 } 2181 }
2352 2182
2353 packet sl; 2183 packet sl ("delspell");
2354 2184
2355 sl << "delspell "
2356 << uint32 (spell->count); 2185 sl << uint32 (spell->count);
2357 2186
2358 pl->socket->send_packet (sl); 2187 pl->ns->send_packet (sl);
2359} 2188}
2360 2189
2361/* appends the spell *spell to the Socklist we will send the data to. */ 2190/* appends the spell *spell to the Socklist we will send the data to. */
2362static void 2191static void
2363append_spell (player *pl, packet &sl, object *spell) 2192append_spell (player *pl, packet &sl, object *spell)
… …
2411 { 2240 {
2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2241 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2413 return; 2242 return;
2414 } 2243 }
2415 2244
2416 if (!pl->socket->monitor_spells) 2245 if (!pl->ns->monitor_spells)
2417 return; 2246 return;
2418 2247
2419 packet sl; 2248 packet sl ("addspell");
2420
2421 sl << "addspell ";
2422 2249
2423 if (!spell) 2250 if (!spell)
2424 { 2251 {
2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2252 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2426 { 2253 {
… …
2440 if (spell->type != SPELL) 2267 if (spell->type != SPELL)
2441 continue; 2268 continue;
2442 2269
2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2270 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2444 { 2271 {
2445 pl->socket->send_packet (sl); 2272 pl->ns->send_packet (sl);
2446 2273
2447 sl.reset (); 2274 sl.reset ();
2448 sl << "addspell "; 2275 sl << "addspell ";
2449 } 2276 }
2450 2277
… …
2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2291 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2465 fatal (0); 2292 fatal (0);
2466 } 2293 }
2467 2294
2468 /* finally, we can send the packet */ 2295 /* finally, we can send the packet */
2469 pl->socket->send_packet (sl); 2296 pl->ns->send_packet (sl);
2470} 2297}
2471 2298

Diff Legend

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