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.41 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 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 {
97 packet sl;
98
99 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
100 ns->send_packet (sl);
101 }
102 94
103 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
104 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
105 * 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
106 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
146} 138}
147 139
148static void 140static void
149clear_map (player *pl) 141clear_map (player *pl)
150{ 142{
151 client &socket = *pl->socket;
152
153 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
154 144
155 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
156 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
157 147
158 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
159 socket.look_position = 0;
160} 149}
161 150
162/** check for map change and send new map data */ 151/** check for map change and send new map data */
163static void 152static void
164check_map_change (player *pl) 153check_map_change (player *pl)
165{ 154{
166 client &socket = *pl->socket; 155 client &socket = *pl->ns;
167 object *ob = pl->ob; 156 object *ob = pl->ob;
168 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
169 158
170 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
171 { 160 {
… …
205 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
206 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
207 else 196 else
208 { 197 {
209 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);
210 socket.update_look = 1; 199 socket.floorbox_reset ();
211 socket.look_position = 0;
212 } 200 }
213 } 201 }
214 202
215 socket.current_x = ob->x; 203 socket.current_x = ob->x;
216 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
265{ 253{
266 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
267} 255}
268 256
269void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
270MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
271{ 265{
272 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
273 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
274 268
… …
286 buf += 8; 280 buf += 8;
287 281
288 // initial map and its origin 282 // initial map and its origin
289 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
290 sint16 dx, dy; 284 sint16 dx, dy;
291 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
292 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
293 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
294 288
295 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
296 { 290 {
297 int dir = *buf++; 291 int dir = *buf++;
… …
348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
349 } 343 }
350 else 344 else
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
352 346
353 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
354} 348}
355 349
356/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
357void 351void
358SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
575 * 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.
576 */ 570 */
577void 571void
578AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
579{ 573{
580 Settings oldsettings; 574 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
581
582 oldsettings = settings;
583 if (ns->status != Ns_Add || add_player (ns))
584 ns->send_packet ("addme_failed");
585 else
586 ns->send_packet ("addme_success");
587
588 settings = oldsettings;
589} 575}
590 576
591/** Reply to ExtendedInfos command */ 577/** Reply to ExtendedInfos command */
592void 578void
593ToggleExtendedInfos (char *buf, int len, client * ns) 579ToggleExtendedInfos (char *buf, int len, client * ns)
… …
710 * a piece of data from us that we know the client wants. So 696 * a piece of data from us that we know the client wants. So
711 * if we know the client wants it, might as well push it to the 697 * if we know the client wants it, might as well push it to the
712 * client. 698 * client.
713 */ 699 */
714static void 700static void
715SendSmooth (client * ns, uint16 face) 701SendSmooth (client *ns, uint16 face)
716{ 702{
717 uint16 smoothface; 703 uint16 smoothface;
718 704
719 /* If we can't find a face, return and set it so we won't try to send this 705 /* If we can't find a face, return and set it so we won't try to send this
720 * again. 706 * again.
… …
730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
731 esrv_send_face (ns, smoothface, 0); 717 esrv_send_face (ns, smoothface, 0);
732 718
733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
734 720
735 packet sl; 721 packet sl ("smooth");
736 722
737 sl << "smooth "
738 << uint16 (face) 723 sl << uint16 (face)
739 << uint16 (smoothface); 724 << uint16 (smoothface);
740 725
741 ns->send_packet (sl); 726 ns->send_packet (sl);
742} 727}
743 728
744 /** 729 /**
745 * Tells client the picture it has to use 730 * Tells client the picture it has to use
746 * to smooth a picture number given as argument. 731 * to smooth a picture number given as argument.
747 */ 732 */
748void 733void
749AskSmooth (char *buf, int len, client * ns) 734AskSmooth (char *buf, int len, client *ns)
750{ 735{
751 uint16 facenbr; 736 SendSmooth (ns, atoi (buf));
752
753 facenbr = atoi (buf);
754 SendSmooth (ns, facenbr);
755} 737}
756 738
757/** 739/**
758 * This handles the general commands from the client (ie, north, fire, cast, 740 * This handles the general commands from the client (ie, north, fire, cast,
759 * etc.) 741 * etc.)
760 */ 742 */
761void 743void
762PlayerCmd (char *buf, int len, player *pl) 744PlayerCmd (char *buf, int len, player *pl)
763{ 745{
764
765 /* The following should never happen with a proper or honest client.
766 * Therefore, the error message doesn't have to be too clear - if
767 * someone is playing with a hacked/non working client, this gives them
768 * an idea of the problem, but they deserve what they get
769 */
770 if (pl->state != ST_PLAYING)
771 {
772 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
773 return;
774 }
775 /* Check if there is a count. In theory, a zero count could also be 746 /* Check if there is a count. In theory, a zero count could also be
776 * sent, so check for that also. 747 * sent, so check for that also.
777 */ 748 */
778 if (atoi (buf) || buf[0] == '0') 749 if (atoi (buf) || buf[0] == '0')
779 { 750 {
780 pl->count = atoi ((char *) buf); 751 pl->count = atoi ((char *) buf);
752
781 buf = strchr (buf, ' '); /* advance beyond the numbers */ 753 buf = strchr (buf, ' '); /* advance beyond the numbers */
782 if (!buf) 754 if (!buf)
783 {
784#ifdef ESRV_DEBUG
785 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
786#endif
787 return; 755 return;
788 } 756
789 buf++; 757 buf++;
790 } 758 }
791 /* This should not happen anymore. */ 759
792 if (pl->ob->speed_left < -1.0)
793 {
794 LOG (llevError, "Player has negative time - shouldn't do command.\n");
795 }
796 /* In c_new.c */
797 execute_newserver_command (pl->ob, (char *) buf); 760 execute_newserver_command (pl->ob, (char *) buf);
761
798 /* Perhaps something better should be done with a left over count. 762 /* Perhaps something better should be done with a left over count.
799 * Cleaning up the input should probably be done first - all actions 763 * Cleaning up the input should probably be done first - all actions
800 * for the command that issued the count should be done before any other 764 * for the command that issued the count should be done before any other
801 * commands. 765 * commands.
802 */ 766 */
803
804 pl->count = 0; 767 pl->count = 0;
805
806} 768}
807 769
808 770
809/** 771/**
810 * This handles the general commands from the client (ie, north, fire, cast, 772 * This handles the general commands from the client (ie, north, fire, cast,
… …
813 * can throttle. 775 * can throttle.
814 */ 776 */
815void 777void
816NewPlayerCmd (char *buf, int len, player *pl) 778NewPlayerCmd (char *buf, int len, player *pl)
817{ 779{
818 int time, repeat;
819 char command[MAX_BUF];
820 int pktlen;
821
822 if (len < 7) 780 if (len <= 6)
823 { 781 {
824 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
825 return; 783 return;
826 } 784 }
827 785
828 pktlen = net_uint16 ((uint8 *)buf); 786 uint16 cmdid = net_uint16 ((uint8 *)buf);
829 repeat = net_uint32 ((uint8 *)buf + 2); 787 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
830 788
831 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
832 if (repeat != -1) 790 if (repeat != -1)
833 pl->count = repeat; 791 pl->count = repeat;
834 792
835 if ((len - 4) >= MAX_BUF) 793 buf += 6; //len -= 6;
836 len = MAX_BUF - 5;
837 794
838 strncpy ((char *) command, (char *) buf + 6, len - 4);
839 command[len - 4] = 0;
840
841 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0)
843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
844
845 /* In c_new.c */
846 execute_newserver_command (pl->ob, (char *) command); 795 execute_newserver_command (pl->ob, buf);
796
847 /* Perhaps something better should be done with a left over count. 797 /* Perhaps something better should be done with a left over count.
848 * Cleaning up the input should probably be done first - all actions 798 * Cleaning up the input should probably be done first - all actions
849 * for the command that issued the count should be done before any other 799 * for the command that issued the count should be done before any other
850 * commands. 800 * commands.
851 */ 801 */
852 pl->count = 0; 802 pl->count = 0;
853 803
804 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
854 if (FABS (pl->ob->speed) < 0.001) 805 int time = FABS (pl->ob->speed) < 0.001
855 time = MAX_TIME * 100; 806 ? time = MAX_TIME * 100
856 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 807 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 808
859 /* Send confirmation of command execution now */ 809 /* Send confirmation of command execution now */
860 810 packet sl ("comc");
861 packet sl;
862 sl << "comc " << uint16 (pktlen) << uint32 (time); 811 sl << uint16 (cmdid) << uint32 (time);
863 pl->socket->send_packet (sl); 812 pl->ns->send_packet (sl);
864} 813}
865
866 814
867/** This is a reply to a previous query. */ 815/** This is a reply to a previous query. */
868void 816void
869ReplyCmd (char *buf, int len, player *pl) 817ReplyCmd (char *buf, int len, client *ns)
870{ 818{
819 if (ns->state == ST_CUSTOM)
820 {
821 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
822 return;
823 }
824
825 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl
828
829 player *pl = ns->pl;
830
871 /* This is to synthesize how the data would be stored if it 831 /* This is to synthesize how the data would be stored if it
872 * was normally entered. A bit of a hack, and should be cleaned up 832 * was normally entered. A bit of a hack, and should be cleaned up
873 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
874 * 834 *
875 * We pass 13 to many of the functions because this way they 835 * We pass 13 to many of the functions because this way they
876 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
877 * function then does not try to do additional input. 837 * function then does not try to do additional input.
878 */ 838 */
879 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
880 840
881 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
882 842
883 switch (pl->state) 843 switch (ns->state)
884 { 844 {
885 case ST_PLAYING: 845 case ST_PLAYING:
886 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
887 break; 847 break;
888 848
889 case ST_PLAY_AGAIN:
890 /* We can check this for return value (2==quit). Maybe we
891 * should, and do something appropriate?
892 */
893 receive_play_again (pl->ob, buf[0]);
894 break;
895
896 case ST_ROLL_STAT:
897 key_roll_stat (pl->ob, buf[0]);
898 break;
899
900 case ST_CHANGE_CLASS: 849 case ST_CHANGE_CLASS:
901
902 key_change_class (pl->ob, buf[0]); 850 key_change_class (pl->ob, buf[0]);
903 break; 851 break;
904 852
905 case ST_CONFIRM_QUIT: 853 case ST_CONFIRM_QUIT:
906 key_confirm_quit (pl->ob, buf[0]); 854 key_confirm_quit (pl->ob, buf[0]);
907 break; 855 break;
908 856
909 case ST_CONFIGURE:
910 LOG (llevError, "In client input handling, but into configure state\n");
911 pl->state = ST_PLAYING;
912 break;
913
914 case ST_GET_NAME:
915 receive_player_name (pl->ob, 13);
916 break;
917
918 case ST_GET_PASSWORD:
919 case ST_CONFIRM_PASSWORD:
920 receive_player_password (pl->ob, 13);
921 break;
922
923 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 857 case ST_GET_PARTY_PASSWORD: /* Get password for party */
924 receive_party_password (pl->ob, 13); 858 receive_party_password (pl->ob, 13);
925 break; 859 break;
926 860
927 default: 861 default:
928 LOG (llevError, "Unknown input state: %d\n", pl->state); 862 LOG (llevError, "Unknown input state: %d\n", ns->state);
929 } 863 }
930} 864}
931 865
932/** 866/**
933 * Client tells its version. If there is a mismatch, we close the 867 * Client tells its version. If there is a mismatch, we close the
… …
937 * problem. 871 * problem.
938 */ 872 */
939void 873void
940VersionCmd (char *buf, int len, client * ns) 874VersionCmd (char *buf, int len, client * ns)
941{ 875{
942 char *cp;
943 char version_warning[256];
944
945 if (!buf) 876 if (!buf)
946 { 877 {
947 LOG (llevError, "CS: received corrupted version command\n"); 878 LOG (llevError, "CS: received corrupted version command\n");
948 return; 879 return;
949 } 880 }
950 881
951 ns->cs_version = atoi (buf); 882 ns->cs_version = atoi (buf);
952 ns->sc_version = ns->cs_version; 883 ns->sc_version = ns->cs_version;
884
885 LOG (llevDebug, "connection from client <%s>\n", buf);
886
887
888 //TODO: should log here just for statistics
889
953 if (VERSION_CS != ns->cs_version) 890 //if (VERSION_CS != ns->cs_version)
954 { 891 // unchecked;
955#ifdef ESRV_DEBUG 892
956 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
957#endif
958 }
959 cp = strchr (buf + 1, ' '); 893 char *cp = strchr (buf + 1, ' ');
960 if (!cp) 894 if (!cp)
961 return; 895 return;
896
962 ns->sc_version = atoi (cp); 897 ns->sc_version = atoi (cp);
898
963 if (VERSION_SC != ns->sc_version) 899 //if (VERSION_SC != ns->sc_version)
964 { 900 // unchecked;
965#ifdef ESRV_DEBUG 901
966 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
967#endif
968 }
969 cp = strchr (cp + 1, ' '); 902 cp = strchr (cp + 1, ' ');
903
970 if (cp) 904 if (cp)
971 { 905 {
972 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
973
974 assign (ns->version, cp + 1); 906 assign (ns->version, cp + 1);
975 907
976 if (ns->sc_version < 1026) 908 if (ns->sc_version < 1026)
977 { 909 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 910 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
980 ns->send_packet (version_warning);
981 }
982
983 } 911 }
984} 912}
985 913
986/** sound related functions. */ 914/** sound related functions. */
987void 915void
… …
993/** client wants the map resent */ 921/** client wants the map resent */
994 922
995void 923void
996MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
997{ 925{
998
999/* This function is currently disabled; just clearing the map state results in 926/* This function is currently disabled; just clearing the map state results in
1000 * display errors. It should clear the cache and send a newmap command. 927 * display errors. It should clear the cache and send a newmap command.
1001 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
1002 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
1003 */ 930 */
1004#if 0
1005 /* Okay, this is MAJOR UGLY. but the only way I know how to
1006 * clear the "cache"
1007 */
1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009 draw_client_map (pl->ob);
1010#endif
1011} 931}
1012 932
1013/** 933/**
1014 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
1015 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
1018MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
1019{ 939{
1020 int vals[3], i; 940 int vals[3], i;
1021 941
1022 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
1023 * we obviously am not going to find a space after the third 943 * we obviously are not going to find a space after the third
1024 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
1025 * sscanf? 945 * sscanf?
1026 */ 946 */
1027 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
1028 { 948 {
1029 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
1030 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
1031 { 952 {
1032 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1033 return; 954 return;
1034 } 955 }
956
1035 buf++; 957 buf++;
1036 } 958 }
959
1037 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1038 961
1039/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 962/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1040 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1041} 964}
1042
1043
1044 965
1045/****************************************************************************** 966/******************************************************************************
1046 * 967 *
1047 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1048 * 969 *
… …
1051/** 972/**
1052 * Asks the client to query the user. This way, the client knows 973 * Asks the client to query the user. This way, the client knows
1053 * it needs to send something back (vs just printing out a message) 974 * it needs to send something back (vs just printing out a message)
1054 */ 975 */
1055void 976void
1056send_query (client * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1057{ 978{
1058 char buf[MAX_BUF];
1059
1060 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1061 ns->send_packet (buf);
1062} 980}
1063 981
1064#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065 Old = New; \ 983 Old = New; \
1066 sl << uint8 (Type) << uint64 (New); \ 984 sl << uint8 (Type) << uint64 (New); \
… …
1096esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1097{ 1015{
1098 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1099 uint16 flags; 1017 uint16 flags;
1100 1018
1101 packet sl; 1019 packet sl ("stats");
1102 sl << "stats ";
1103 1020
1104 if (pl->ob != NULL) 1021 if (pl->ob)
1105 { 1022 {
1106 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1107 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1108 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1109 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1110 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1111 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1112 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1113 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1114 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1115 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1116 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1117 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1118 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1119 } 1036 }
1120 1037
1121 if (pl->socket->exp64) 1038 if (pl->ns->exp64)
1122 {
1123 uint8 s;
1124
1125 for (s = 0; s < NUM_SKILLS; s++) 1039 for (int s = 0; s < NUM_SKILLS; s++)
1126 {
1127 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1128 { 1041 {
1129 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1130 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1131 */ 1044 */
1132 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1133 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (pl->last_skill_ob[s]->level)
1134 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (pl->last_skill_ob[s]->stats.exp);
1135 1048
1136 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1137 } 1050 }
1138 }
1139 }
1140 1051
1141 if (pl->socket->exp64) 1052 if (pl->ns->exp64)
1142 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1143 else 1054 else
1144 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1145 1056
1146 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1159 if (pl->run_on) 1070 if (pl->run_on)
1160 flags |= SF_RUNON; 1071 flags |= SF_RUNON;
1161 1072
1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1163 1074
1164 if (pl->socket->sc_version < 1025) 1075 if (pl->ns->sc_version < 1025)
1165 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1076 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1166 else 1077 else
1167 {
1168 int i;
1169
1170 for (i = 0; i < NROFATTACKS; i++) 1078 for (int i = 0; i < NROFATTACKS; i++)
1171 { 1079 {
1172 /* Skip ones we won't send */ 1080 /* Skip ones we won't send */
1173 if (atnr_cs_stat[i] == -1) 1081 if (atnr_cs_stat[i] == -1)
1174 continue; 1082 continue;
1175 1083
1176 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1084 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1177 } 1085 }
1178 }
1179 1086
1180 if (pl->socket->monitor_spells) 1087 if (pl->ns->monitor_spells)
1181 { 1088 {
1182 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1089 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1183 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1090 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1184 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1091 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1185 } 1092 }
1186 1093
1187 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1094 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1188 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1189 set_title (pl->ob, buf); 1096 set_title (pl->ob, buf);
1190 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1191 1098
1192 /* Only send it away if we have some actual data */ 1099 /* Only send it away if we have some actual data */
1193 if (sl.length () > 6) 1100 if (sl.length () > 6)
1194 pl->socket->send_packet (sl); 1101 pl->ns->send_packet (sl);
1195} 1102}
1196 1103
1197/** 1104/**
1198 * Tells the client that here is a player it should start using. 1105 * Tells the client that here is a player it should start using.
1199 */ 1106 */
1200void 1107void
1201esrv_new_player (player *pl, uint32 weight) 1108esrv_new_player (player *pl, uint32 weight)
1202{ 1109{
1203 pl->last_weight = weight; 1110 pl->last_weight = weight;
1204 1111
1205 packet sl; 1112 packet sl ("player");
1206 sl << "player ";
1207 1113
1208 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1209 << uint32 (weight) 1115 << uint32 (weight)
1210 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1211 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1212 1118
1213 pl->socket->send_packet (sl); 1119 pl->ns->send_packet (sl);
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 1121}
1216 1122
1217/** 1123/**
1218 * Need to send an animation sequence to the client. 1124 * Need to send an animation sequence to the client.
… …
1222 * when the player logs in and picks stuff up. 1128 * when the player logs in and picks stuff up.
1223 */ 1129 */
1224void 1130void
1225esrv_send_animation (client * ns, short anim_num) 1131esrv_send_animation (client * ns, short anim_num)
1226{ 1132{
1227 int i;
1228
1229 /* Do some checking on the anim_num we got. Note that the animations 1133 /* 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 1134 * are added in contigous order, so if the number is in the valid
1231 * range, it must be a valid animation. 1135 * range, it must be a valid animation.
1232 */ 1136 */
1233 if (anim_num < 0 || anim_num > num_animations) 1137 if (anim_num < 0 || anim_num > num_animations)
1234 { 1138 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1139 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return; 1140 return;
1237 } 1141 }
1238 1142
1239 packet sl; 1143 packet sl ("anim");
1240 1144
1241 sl << "anim "
1242 << uint16 (anim_num) 1145 sl << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */ 1146 << uint16 (0); /* flags - not used right now */
1244 1147
1245 /* Build up the list of faces. Also, send any information (ie, the 1148 /* Build up the list of faces. Also, send any information (ie, the
1246 * the face itself) down to the client. 1149 * the face itself) down to the client.
1247 */ 1150 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++) 1151 for (int i = 0; i < animations[anim_num].num_animations; i++)
1249 { 1152 {
1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1153 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1154 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1156 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 } 1157 }
1254 1158
1255 ns->send_packet (sl); 1159 ns->send_packet (sl);
1256 1160
… …
1271static void 1175static void
1272esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1176esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1273{ 1177{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1178 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1179 {
1180 //TODO: one or the other, can't both have abort and return, verify and act
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1181 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return; 1182 return;
1278 abort (); 1183 abort ();
1279 } 1184 }
1280 1185
1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1186 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1282 newmap->cells[x][y].count++; 1187 newmap->cells[x][y].count++;
1283 1188
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0); 1190 esrv_send_face (ns, face_num, 0);
1286}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393} 1191}
1394 1192
1395/** Clears a map cell */ 1193/** Clears a map cell */
1396static void 1194static void
1397map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1195map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1409#define MAX_LAYERS 3 1207#define MAX_LAYERS 3
1410 1208
1411/* Using a global really isn't a good approach, but saves the over head of 1209/* Using a global really isn't a good approach, but saves the over head of
1412 * allocating and deallocating such a block of data each time run through, 1210 * allocating and deallocating such a block of data each time run through,
1413 * and saves the space of allocating this in the socket object when we only 1211 * and saves the space of allocating this in the socket object when we only
1414 * need it for this cycle. If the serve is ever threaded, this needs to be 1212 * need it for this cycle. If the server is ever threaded, this needs to be
1415 * re-examined. 1213 * re-examined.
1416 */ 1214 */
1417
1418static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1215static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1419 1216
1420/** 1217/**
1421 * Returns true if any of the heads for this 1218 * Returns true if any of the heads for this
1422 * space is set. Returns false if all are blank - this is used 1219 * space is set. Returns false if all are blank - this is used
1423 * for empty space checking. 1220 * for empty space checking.
1424 */ 1221 */
1425static inline int 1222static inline int
1426have_head (int ax, int ay) 1223have_head (int ax, int ay)
1427{ 1224{
1428
1429 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1225 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1430 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1226 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1431 return 1; 1227 return 1;
1228
1432 return 0; 1229 return 0;
1433} 1230}
1434 1231
1435/** 1232/**
1436 * check_head is a bit simplistic version of update_space below. 1233 * check_head is a bit simplistic version of update_space below.
1437 * basically, it only checks the that the head on space ax,ay at layer 1234 * basically, it only checks the that the head on space ax,ay at layer
1438 * needs to get sent - if so, it adds the data, sending the head 1235 * needs to get sent - if so, it adds the data, sending the head
1439 * if needed, and returning 1. If this no data needs to get 1236 * if needed, and returning 1. If this no data needs to get
1440 * sent, it returns zero. 1237 * sent, it returns zero.
1441 */ 1238 */
1442static int 1239static int
1443check_head (packet &sl, client &ns, int ax, int ay, int layer) 1240check_head (packet &sl, client &ns, int ax, int ay, int layer)
1444{ 1241{
… …
1480 * numbers the spaces differently - I think this was a leftover from 1277 * numbers the spaces differently - I think this was a leftover from
1481 * the map command, where the faces stack up. Sinces that is no longer 1278 * the map command, where the faces stack up. Sinces that is no longer
1482 * the case, it seems to make more sense to have these layer values 1279 * the case, it seems to make more sense to have these layer values
1483 * actually match. 1280 * actually match.
1484 */ 1281 */
1485
1486static int 1282static int
1487update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1283update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1488{ 1284{
1489 object *ob, *head; 1285 object *ob, *head;
1490 uint16 face_num; 1286 uint16 face_num;
… …
1758 if (ns->ext_mapinfos) 1554 if (ns->ext_mapinfos)
1759 { 1555 {
1760 if (ns->EMI_smooth) 1556 if (ns->EMI_smooth)
1761 result += 1; /*One byte for smoothlevel */ 1557 result += 1; /*One byte for smoothlevel */
1762 } 1558 }
1559
1763 return result; 1560 return result;
1764} 1561}
1765 1562
1766/** 1563/**
1767 * This function uses the new map1 protocol command to send the map 1564 * This function uses the new map1 protocol command to send the map
… …
1774 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1571 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1775 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1572 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1776 * and use the other 4 bits for other informatiion. For full documentation 1573 * and use the other 4 bits for other informatiion. For full documentation
1777 * of what we send, see the doc/Protocol file. 1574 * of what we send, see the doc/Protocol file.
1778 * I will describe internally what we do: 1575 * I will describe internally what we do:
1779 * the socket->lastmap shows how the map last looked when sent to the client. 1576 * the ns->lastmap shows how the map last looked when sent to the client.
1780 * in the lastmap structure, there is a cells array, which is set to the 1577 * in the lastmap structure, there is a cells array, which is set to the
1781 * maximum viewable size (As set in config.h). 1578 * maximum viewable size (As set in config.h).
1782 * in the cells, there are faces and a count value. 1579 * in the cells, there are faces and a count value.
1783 * we use the count value to hold the darkness value. If -1, then this space 1580 * we use the count value to hold the darkness value. If -1, then this space
1784 * is not viewable. 1581 * is not viewable.
… …
1795 uint8 eentrysize; 1592 uint8 eentrysize;
1796 uint16 ewhatstart, ewhatflag; 1593 uint16 ewhatstart, ewhatflag;
1797 uint8 extendedinfos; 1594 uint8 extendedinfos;
1798 maptile *m; 1595 maptile *m;
1799 1596
1800 client &socket = *pl->contr->socket; 1597 client &socket = *pl->contr->ns;
1801 1598
1802 check_map_change (pl->contr); 1599 check_map_change (pl->contr);
1803 1600
1804 packet sl; 1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1805 packet esl; 1602 packet esl;
1806 1603
1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1808 startlen = sl.length (); 1604 startlen = sl.length ();
1809 1605
1810 /*Extendedmapinfo structure initialisation */ 1606 /*Extendedmapinfo structure initialisation */
1811 if (socket.ext_mapinfos) 1607 if (socket.ext_mapinfos)
1812 { 1608 {
… …
1856 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1652 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1857 { 1653 {
1858 ax = 0; 1654 ax = 0;
1859 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1655 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1860 { 1656 {
1861
1862 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1863 1658
1864 /* If this space is out of the normal viewable area, we only check 1659 /* If this space is out of the normal viewable area, we only check
1865 * the heads value ax or ay will only be greater than what 1660 * the heads value ax or ay will only be greater than what
1866 * the client wants if using the map1a command - this is because 1661 * the client wants if using the map1a command - this is because
… …
2196 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1991 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2197 return; 1992 return;
2198 1993
2199 memset (&newmap, 0, sizeof (struct Map)); 1994 memset (&newmap, 0, sizeof (struct Map));
2200 1995
2201 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1996 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2202 {
2203 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1997 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2204 { 1998 {
2205 ax = i; 1999 ax = i;
2206 ay = j; 2000 ay = j;
2207 m = pm; 2001 m = pm;
2208 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2002 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2003
2209 if (mflags & P_OUT_OF_MAP) 2004 if (mflags & P_OUT_OF_MAP)
2210 continue; 2005 continue;
2211 if (mflags & P_NEED_UPDATE) 2006
2212 update_position (m, ax, ay);
2213 /* If a map is visible to the player, we don't want to swap it out 2007 /* If a map is visible to the player, we don't want to swap it out
2214 * just to reload it. This should really call something like 2008 * just to reload it. This should really call something like
2215 * swap_map, but this is much more efficient and 'good enough' 2009 * swap_map, but this is much more efficient and 'good enough'
2216 */ 2010 */
2217 if (mflags & P_NEW_MAP) 2011 if (mflags & P_NEW_MAP)
2218 m->timeout = 50; 2012 m->timeout = 50;
2219 } 2013 }
2220 } 2014
2221 /* do LOS after calls to update_position */ 2015 /* do LOS after calls to update_position */
2222 if (pl->contr->do_los) 2016 if (pl->contr->do_los)
2223 { 2017 {
2224 update_los (pl); 2018 update_los (pl);
2225 pl->contr->do_los = 0; 2019 pl->contr->do_los = 0;
… …
2240 2034
2241/*****************************************************************************/ 2035/*****************************************************************************/
2242void 2036void
2243send_plugin_custom_message (object *pl, char *buf) 2037send_plugin_custom_message (object *pl, char *buf)
2244{ 2038{
2245 pl->contr->socket->send_packet (buf); 2039 pl->contr->ns->send_packet (buf);
2246} 2040}
2247 2041
2248/** 2042/**
2249 * This sends the skill number to name mapping. We ignore 2043 * This sends the skill number to name mapping. We ignore
2250 * the params - we always send the same info no matter what. 2044 * the params - we always send the same info no matter what.
… …
2295 * it then sends an updspell packet for each spell that has changed in this way 2089 * it then sends an updspell packet for each spell that has changed in this way
2296 */ 2090 */
2297void 2091void
2298esrv_update_spells (player *pl) 2092esrv_update_spells (player *pl)
2299{ 2093{
2300 if (!pl->socket->monitor_spells) 2094 if (!pl->ns->monitor_spells)
2301 return; 2095 return;
2302 2096
2303 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2097 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2304 { 2098 {
2305 if (spell->type == SPELL) 2099 if (spell->type == SPELL)
… …
2335 2129
2336 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2130 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2337 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2131 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2338 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2132 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2339 2133
2340 pl->socket->send_packet (sl); 2134 pl->ns->send_packet (sl);
2341 } 2135 }
2342 } 2136 }
2343 } 2137 }
2344} 2138}
2345 2139
2346void 2140void
2347esrv_remove_spell (player *pl, object *spell) 2141esrv_remove_spell (player *pl, object *spell)
2348{ 2142{
2349 if (!pl->socket->monitor_spells) 2143 if (!pl->ns->monitor_spells)
2350 return; 2144 return;
2351 2145
2352 if (!pl || !spell || spell->env != pl->ob) 2146 if (!pl || !spell || spell->env != pl->ob)
2353 { 2147 {
2354 LOG (llevError, "Invalid call to esrv_remove_spell"); 2148 LOG (llevError, "Invalid call to esrv_remove_spell");
2355 return; 2149 return;
2356 } 2150 }
2357 2151
2358 packet sl; 2152 packet sl ("delspell");
2359 2153
2360 sl << "delspell "
2361 << uint32 (spell->count); 2154 sl << uint32 (spell->count);
2362 2155
2363 pl->socket->send_packet (sl); 2156 pl->ns->send_packet (sl);
2364} 2157}
2365 2158
2366/* appends the spell *spell to the Socklist we will send the data to. */ 2159/* appends the spell *spell to the Socklist we will send the data to. */
2367static void 2160static void
2368append_spell (player *pl, packet &sl, object *spell) 2161append_spell (player *pl, packet &sl, object *spell)
… …
2416 { 2209 {
2417 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2210 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2418 return; 2211 return;
2419 } 2212 }
2420 2213
2421 if (!pl->socket->monitor_spells) 2214 if (!pl->ns->monitor_spells)
2422 return; 2215 return;
2423 2216
2424 packet sl; 2217 packet sl ("addspell");
2425
2426 sl << "addspell ";
2427 2218
2428 if (!spell) 2219 if (!spell)
2429 { 2220 {
2430 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2431 { 2222 {
… …
2445 if (spell->type != SPELL) 2236 if (spell->type != SPELL)
2446 continue; 2237 continue;
2447 2238
2448 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2239 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2449 { 2240 {
2450 pl->socket->send_packet (sl); 2241 pl->ns->send_packet (sl);
2451 2242
2452 sl.reset (); 2243 sl.reset ();
2453 sl << "addspell "; 2244 sl << "addspell ";
2454 } 2245 }
2455 2246
… …
2469 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2260 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2470 fatal (0); 2261 fatal (0);
2471 } 2262 }
2472 2263
2473 /* finally, we can send the packet */ 2264 /* finally, we can send the packet */
2474 pl->socket->send_packet (sl); 2265 pl->ns->send_packet (sl);
2475} 2266}
2476 2267

Diff Legend

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