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.40 by root, Fri Dec 15 04:21:29 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
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 52 * it should work here.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 144
157 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
159 147
160 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 149}
163 150
164/** check for map change and send new map data */ 151/** check for map change and send new map data */
165static void 152static void
166check_map_change (player *pl) 153check_map_change (player *pl)
167{ 154{
168 client_socket &socket = *pl->socket; 155 client &socket = *pl->ns;
169 object *ob = pl->ob; 156 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
171 158
172 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
173 { 160 {
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 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
209 else 196 else
210 { 197 {
211 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);
212 socket.update_look = 1; 199 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 200 }
215 } 201 }
216 202
217 socket.current_x = ob->x; 203 socket.current_x = ob->x;
218 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
222 * RequestInfo is sort of a meta command. There is some specific 208 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 209 * request of information, but we call other functions to provide
224 * that information. 210 * that information.
225 */ 211 */
226void 212void
227RequestInfo (char *buf, int len, client_socket * ns) 213RequestInfo (char *buf, int len, client * ns)
228{ 214{
229 char *params = NULL, *cp; 215 char *params = NULL, *cp;
230 216
231 /* No match */ 217 /* No match */
232 char bigbuf[MAX_BUF]; 218 char bigbuf[MAX_BUF];
… …
267{ 253{
268 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
269} 255}
270 256
271void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
272MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
273{ 265{
274 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
276 268
… …
288 buf += 8; 280 buf += 8;
289 281
290 // initial map and its origin 282 // initial map and its origin
291 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
292 sint16 dx, dy; 284 sint16 dx, dy;
293 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
294 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
295 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
296 288
297 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
298 { 290 {
299 int dir = *buf++; 291 int dir = *buf++;
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
351 } 343 }
352 else 344 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354 346
355 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
356} 348}
357 349
358/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
359void 351void
360SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
361{ 353{
362 int s, slen; 354 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
364 356
365 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
575 * This is what takes care of it. We tell the client how things worked out. 567 * This is what takes care of it. We tell the client how things worked out.
576 * I am not sure if this file is the best place for this function. however, 568 * I am not sure if this file is the best place for this function. however,
577 * 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.
578 */ 570 */
579void 571void
580AddMeCmd (char *buf, int len, client_socket * ns) 572AddMeCmd (char *buf, int len, client * ns)
581{ 573{
582 Settings oldsettings; 574 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
583
584 oldsettings = settings;
585 if (ns->status != Ns_Add || add_player (ns))
586 ns->send_packet ("addme_failed");
587 else
588 ns->send_packet ("addme_success");
589
590 settings = oldsettings;
591} 575}
592 576
593/** Reply to ExtendedInfos command */ 577/** Reply to ExtendedInfos command */
594void 578void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 579ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 580{
597 char cmdback[MAX_BUF]; 581 char cmdback[MAX_BUF];
598 char command[50]; 582 char command[50];
599 int info, nextinfo; 583 int info, nextinfo;
600 584
… …
651#define MSG_TYPE_MONUMENT 5 635#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 636#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 637
654/** Reply to ExtendedInfos command */ 638/** Reply to ExtendedInfos command */
655void 639void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 640ToggleExtendedText (char *buf, int len, client * ns)
657{ 641{
658 char cmdback[MAX_BUF]; 642 char cmdback[MAX_BUF];
659 char temp[10]; 643 char temp[10];
660 char command[50]; 644 char command[50];
661 int info, nextinfo, i, flag; 645 int info, nextinfo, i, flag;
… …
712 * 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
713 * 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
714 * client. 698 * client.
715 */ 699 */
716static void 700static void
717SendSmooth (client_socket * ns, uint16 face) 701SendSmooth (client *ns, uint16 face)
718{ 702{
719 uint16 smoothface; 703 uint16 smoothface;
720 704
721 /* 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
722 * again. 706 * again.
… …
732 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
733 esrv_send_face (ns, smoothface, 0); 717 esrv_send_face (ns, smoothface, 0);
734 718
735 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
736 720
737 packet sl; 721 packet sl ("smooth");
738 722
739 sl << "smooth "
740 << uint16 (face) 723 sl << uint16 (face)
741 << uint16 (smoothface); 724 << uint16 (smoothface);
742 725
743 ns->send_packet (sl); 726 ns->send_packet (sl);
744} 727}
745 728
746 /** 729 /**
747 * Tells client the picture it has to use 730 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 731 * to smooth a picture number given as argument.
749 */ 732 */
750void 733void
751AskSmooth (char *buf, int len, client_socket * ns) 734AskSmooth (char *buf, int len, client *ns)
752{ 735{
753 uint16 facenbr; 736 SendSmooth (ns, atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 737}
758 738
759/** 739/**
760 * 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,
761 * etc.) 741 * etc.)
762 */ 742 */
763void 743void
764PlayerCmd (char *buf, int len, player *pl) 744PlayerCmd (char *buf, int len, player *pl)
765{ 745{
766
767 /* The following should never happen with a proper or honest client.
768 * Therefore, the error message doesn't have to be too clear - if
769 * someone is playing with a hacked/non working client, this gives them
770 * an idea of the problem, but they deserve what they get
771 */
772 if (pl->state != ST_PLAYING)
773 {
774 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
775 return;
776 }
777 /* 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
778 * sent, so check for that also. 747 * sent, so check for that also.
779 */ 748 */
780 if (atoi (buf) || buf[0] == '0') 749 if (atoi (buf) || buf[0] == '0')
781 { 750 {
782 pl->count = atoi ((char *) buf); 751 pl->count = atoi ((char *) buf);
752
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 753 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 754 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 755 return;
790 } 756
791 buf++; 757 buf++;
792 } 758 }
793 /* This should not happen anymore. */ 759
794 if (pl->ob->speed_left < -1.0)
795 {
796 LOG (llevError, "Player has negative time - shouldn't do command.\n");
797 }
798 /* In c_new.c */
799 execute_newserver_command (pl->ob, (char *) buf); 760 execute_newserver_command (pl->ob, (char *) buf);
761
800 /* Perhaps something better should be done with a left over count. 762 /* Perhaps something better should be done with a left over count.
801 * Cleaning up the input should probably be done first - all actions 763 * Cleaning up the input should probably be done first - all actions
802 * 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
803 * commands. 765 * commands.
804 */ 766 */
805
806 pl->count = 0; 767 pl->count = 0;
807
808} 768}
809 769
810 770
811/** 771/**
812 * 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,
… …
815 * can throttle. 775 * can throttle.
816 */ 776 */
817void 777void
818NewPlayerCmd (char *buf, int len, player *pl) 778NewPlayerCmd (char *buf, int len, player *pl)
819{ 779{
820 int time, repeat;
821 char command[MAX_BUF];
822 int pktlen;
823
824 if (len < 7) 780 if (len <= 6)
825 { 781 {
826 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);
827 return; 783 return;
828 } 784 }
829 785
830 pktlen = net_uint16 ((uint8 *)buf); 786 uint16 cmdid = net_uint16 ((uint8 *)buf);
831 repeat = net_uint32 ((uint8 *)buf + 2); 787 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832 788
833 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
834 if (repeat != -1) 790 if (repeat != -1)
835 pl->count = repeat; 791 pl->count = repeat;
836 792
837 if ((len - 4) >= MAX_BUF) 793 buf += 6; //len -= 6;
838 len = MAX_BUF - 5;
839 794
840 strncpy ((char *) command, (char *) buf + 6, len - 4);
841 command[len - 4] = 0;
842
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 LOG (llevError, "Player has negative time - shouldn't do command.\n");
846
847 /* In c_new.c */
848 execute_newserver_command (pl->ob, (char *) command); 795 execute_newserver_command (pl->ob, buf);
796
849 /* Perhaps something better should be done with a left over count. 797 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 798 * Cleaning up the input should probably be done first - all actions
851 * 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
852 * commands. 800 * commands.
853 */ 801 */
854 pl->count = 0; 802 pl->count = 0;
855 803
804 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
856 if (FABS (pl->ob->speed) < 0.001) 805 int time = FABS (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 806 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 807 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
860 808
861 /* Send confirmation of command execution now */ 809 /* Send confirmation of command execution now */
862 810 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 811 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 812 pl->ns->send_packet (sl);
866} 813}
867
868 814
869/** This is a reply to a previous query. */ 815/** This is a reply to a previous query. */
870void 816void
871ReplyCmd (char *buf, int len, player *pl) 817ReplyCmd (char *buf, int len, client *ns)
872{ 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
873 /* 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
874 * 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
875 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
876 * 834 *
877 * 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
878 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 837 * function then does not try to do additional input.
880 */ 838 */
881 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882 840
883 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
884 842
885 switch (pl->state) 843 switch (ns->state)
886 { 844 {
887 case ST_PLAYING: 845 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 847 break;
890 848
891 case ST_PLAY_AGAIN:
892 /* We can check this for return value (2==quit). Maybe we
893 * should, and do something appropriate?
894 */
895 receive_play_again (pl->ob, buf[0]);
896 break;
897
898 case ST_ROLL_STAT:
899 key_roll_stat (pl->ob, buf[0]);
900 break;
901
902 case ST_CHANGE_CLASS: 849 case ST_CHANGE_CLASS:
903
904 key_change_class (pl->ob, buf[0]); 850 key_change_class (pl->ob, buf[0]);
905 break; 851 break;
906 852
907 case ST_CONFIRM_QUIT: 853 case ST_CONFIRM_QUIT:
908 key_confirm_quit (pl->ob, buf[0]); 854 key_confirm_quit (pl->ob, buf[0]);
909 break; 855 break;
910 856
911 case ST_CONFIGURE:
912 LOG (llevError, "In client input handling, but into configure state\n");
913 pl->state = ST_PLAYING;
914 break;
915
916 case ST_GET_NAME:
917 receive_player_name (pl->ob, 13);
918 break;
919
920 case ST_GET_PASSWORD:
921 case ST_CONFIRM_PASSWORD:
922 receive_player_password (pl->ob, 13);
923 break;
924
925 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 857 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 858 receive_party_password (pl->ob, 13);
927 break; 859 break;
928 860
929 default: 861 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 862 LOG (llevError, "Unknown input state: %d\n", ns->state);
931 } 863 }
932} 864}
933 865
934/** 866/**
935 * 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 * something older than the server. If we assume the client will be 869 * something older than the server. If we assume the client will be
938 * backwards compatible, having it be a later version should not be a 870 * backwards compatible, having it be a later version should not be a
939 * problem. 871 * problem.
940 */ 872 */
941void 873void
942VersionCmd (char *buf, int len, client_socket * ns) 874VersionCmd (char *buf, int len, client * ns)
943{ 875{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 876 if (!buf)
948 { 877 {
949 LOG (llevError, "CS: received corrupted version command\n"); 878 LOG (llevError, "CS: received corrupted version command\n");
950 return; 879 return;
951 } 880 }
952 881
953 ns->cs_version = atoi (buf); 882 ns->cs_version = atoi (buf);
954 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
955 if (VERSION_CS != ns->cs_version) 890 //if (VERSION_CS != ns->cs_version)
956 { 891 // unchecked;
957#ifdef ESRV_DEBUG 892
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 893 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 894 if (!cp)
963 return; 895 return;
896
964 ns->sc_version = atoi (cp); 897 ns->sc_version = atoi (cp);
898
965 if (VERSION_SC != ns->sc_version) 899 //if (VERSION_SC != ns->sc_version)
966 { 900 // unchecked;
967#ifdef ESRV_DEBUG 901
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 902 cp = strchr (cp + 1, ' ');
903
972 if (cp) 904 if (cp)
973 { 905 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 906 assign (ns->version, cp + 1);
975 907
976 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
977
978 /* This is first implementation - i skip all beta DX clients with it
979 * Add later stuff here for other clients
980 */
981
982 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time.
986 */
987 if (ns->sc_version < 1026) 908 if (ns->sc_version < 1026)
988 { 909 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 910 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 911 }
995} 912}
996 913
997/** sound related functions. */ 914/** sound related functions. */
998
999void 915void
1000SetSound (char *buf, int len, client_socket * ns) 916SetSound (char *buf, int len, client * ns)
1001{ 917{
1002 ns->sound = atoi (buf); 918 ns->sound = atoi (buf);
1003} 919}
1004 920
1005/** client wants the map resent */ 921/** client wants the map resent */
1006 922
1007void 923void
1008MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
1009{ 925{
1010
1011/* 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
1012 * 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.
1013 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
1015 */ 930 */
1016#if 0
1017 /* Okay, this is MAJOR UGLY. but the only way I know how to
1018 * clear the "cache"
1019 */
1020 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021 draw_client_map (pl->ob);
1022#endif
1023} 931}
1024 932
1025/** 933/**
1026 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
1031{ 939{
1032 int vals[3], i; 940 int vals[3], i;
1033 941
1034 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
1035 * 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
1036 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
1037 * sscanf? 945 * sscanf?
1038 */ 946 */
1039 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
1040 { 948 {
1041 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
1042 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
1043 { 952 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 954 return;
1046 } 955 }
956
1047 buf++; 957 buf++;
1048 } 958 }
959
1049 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1050 961
1051/* 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]);*/
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 964}
1054
1055
1056 965
1057/****************************************************************************** 966/******************************************************************************
1058 * 967 *
1059 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1060 * 969 *
… …
1063/** 972/**
1064 * 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
1065 * 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)
1066 */ 975 */
1067void 976void
1068send_query (client_socket * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1069{ 978{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 980}
1075 981
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 983 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 984 sl << uint8 (Type) << uint64 (New); \
… …
1108esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1109{ 1015{
1110 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1111 uint16 flags; 1017 uint16 flags;
1112 1018
1113 packet sl; 1019 packet sl ("stats");
1114 sl << "stats ";
1115 1020
1116 if (pl->ob != NULL) 1021 if (pl->ob)
1117 { 1022 {
1118 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);
1119 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);
1120 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);
1121 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);
1122 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);
1123 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);
1124 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);
1125 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1126 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1127 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1128 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);
1129 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);
1130 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);
1131 } 1036 }
1132 1037
1133 if (pl->socket->exp64) 1038 if (pl->ns->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1039 for (int s = 0; s < NUM_SKILLS; s++)
1138 {
1139 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)
1140 { 1041 {
1141 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1143 */ 1044 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (pl->last_skill_ob[s]->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (pl->last_skill_ob[s]->stats.exp);
1147 1048
1148 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;
1149 } 1050 }
1150 }
1151 }
1152 1051
1153 if (pl->socket->exp64) 1052 if (pl->ns->exp64)
1154 { 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) }
1155 else 1054 else
1156 { 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) }
1157 1056
1158 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1171 if (pl->run_on) 1070 if (pl->run_on)
1172 flags |= SF_RUNON; 1071 flags |= SF_RUNON;
1173 1072
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1175 1074
1176 if (pl->socket->sc_version < 1025) 1075 if (pl->ns->sc_version < 1025)
1177 { 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) }
1178 else 1077 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1078 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1079 {
1184 /* Skip ones we won't send */ 1080 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1081 if (atnr_cs_stat[i] == -1)
1186 continue; 1082 continue;
1187 1083
1188 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]);
1189 } 1085 }
1190 }
1191 1086
1192 if (pl->socket->monitor_spells) 1087 if (pl->ns->monitor_spells)
1193 { 1088 {
1194 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);
1195 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);
1196 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);
1197 } 1092 }
1198 1093
1199 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 */
1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1201 set_title (pl->ob, buf); 1096 set_title (pl->ob, buf);
1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1203 1098
1204 /* Only send it away if we have some actual data */ 1099 /* Only send it away if we have some actual data */
1205 if (sl.length () > 6) 1100 if (sl.length () > 6)
1206 pl->socket->send_packet (sl); 1101 pl->ns->send_packet (sl);
1207} 1102}
1208 1103
1209/** 1104/**
1210 * 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.
1211 */ 1106 */
1212void 1107void
1213esrv_new_player (player *pl, uint32 weight) 1108esrv_new_player (player *pl, uint32 weight)
1214{ 1109{
1215 pl->last_weight = weight; 1110 pl->last_weight = weight;
1216 1111
1217 packet sl; 1112 packet sl ("player");
1218 sl << "player ";
1219 1113
1220 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 1115 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1223 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1224 1118
1225 pl->socket->send_packet (sl); 1119 pl->ns->send_packet (sl);
1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227} 1121}
1228 1122
1229/** 1123/**
1230 * Need to send an animation sequence to the client. 1124 * Need to send an animation sequence to the client.
… …
1232 * sent them the face yet (this can become quite costly in terms of 1126 * sent them the face yet (this can become quite costly in terms of
1233 * how much we are sending - on the other hand, this should only happen 1127 * how much we are sending - on the other hand, this should only happen
1234 * when the player logs in and picks stuff up. 1128 * when the player logs in and picks stuff up.
1235 */ 1129 */
1236void 1130void
1237esrv_send_animation (client_socket * ns, short anim_num) 1131esrv_send_animation (client * ns, short anim_num)
1238{ 1132{
1239 int i;
1240
1241 /* 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
1242 * 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
1243 * range, it must be a valid animation. 1135 * range, it must be a valid animation.
1244 */ 1136 */
1245 if (anim_num < 0 || anim_num > num_animations) 1137 if (anim_num < 0 || anim_num > num_animations)
1246 { 1138 {
1247 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);
1248 return; 1140 return;
1249 } 1141 }
1250 1142
1251 packet sl; 1143 packet sl ("anim");
1252 1144
1253 sl << "anim "
1254 << uint16 (anim_num) 1145 sl << uint16 (anim_num)
1255 << uint16 (0); /* flags - not used right now */ 1146 << uint16 (0); /* flags - not used right now */
1256 1147
1257 /* 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
1258 * the face itself) down to the client. 1149 * the face itself) down to the client.
1259 */ 1150 */
1260 for (i = 0; i < animations[anim_num].num_animations; i++) 1151 for (int i = 0; i < animations[anim_num].num_animations; i++)
1261 { 1152 {
1262 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))
1263 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1154 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1264 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 */
1265 } 1157 }
1266 1158
1267 ns->send_packet (sl); 1159 ns->send_packet (sl);
1268 1160
… …
1279/** 1171/**
1280 * This adds face_num to a map cell at x,y. If the client doesn't have 1172 * This adds face_num to a map cell at x,y. If the client doesn't have
1281 * the face yet, we will also send it. 1173 * the face yet, we will also send it.
1282 */ 1174 */
1283static void 1175static void
1284esrv_map_setbelow (client_socket * 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)
1285{ 1177{
1286 if (newmap->cells[x][y].count >= MAP_LAYERS) 1178 if (newmap->cells[x][y].count >= MAP_LAYERS)
1287 { 1179 {
1180 //TODO: one or the other, can't both have abort and return, verify and act
1288 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);
1289 return; 1182 return;
1290 abort (); 1183 abort ();
1291 } 1184 }
1292 1185
1293 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;
1294 newmap->cells[x][y].count++; 1187 newmap->cells[x][y].count++;
1295 1188
1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297 esrv_send_face (ns, face_num, 0); 1190 esrv_send_face (ns, face_num, 0);
1298}
1299
1300struct LayerCell
1301{
1302 uint16 xy;
1303 short face;
1304};
1305
1306struct MapLayer
1307{
1308 int count;
1309 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1310};
1311
1312/** Checkes if map cells have changed */
1313static int
1314mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1315{
1316 int k;
1317
1318 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1319 return 1;
1320 for (k = 0; k < newmap->cells[i][j].count; k++)
1321 {
1322 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1323 {
1324 return 1;
1325 }
1326 }
1327 return 0;
1328}
1329
1330/**
1331 * Basically, what this does is pack the data into layers.
1332 * cnum is the client number, cur is the the buffer we put all of
1333 * this data into. we return the end of the data. layers is
1334 * how many layers of data we should back.
1335 */
1336static uint8 *
1337compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1338{
1339 int x, y, k;
1340 int face;
1341 unsigned char *fcur;
1342 struct MapLayer layers[MAP_LAYERS];
1343
1344 for (k = 0; k < MAP_LAYERS; k++)
1345 layers[k].count = 0;
1346 fcur = cur;
1347 for (x = 0; x < ns->mapx; x++)
1348 {
1349 for (y = 0; y < ns->mapy; y++)
1350 {
1351 if (!mapcellchanged (ns, x, y, newmap))
1352 continue;
1353 if (newmap->cells[x][y].count == 0)
1354 {
1355 *cur = x * ns->mapy + y; /* mark empty space */
1356 cur++;
1357 continue;
1358 }
1359 for (k = 0; k < newmap->cells[x][y].count; k++)
1360 {
1361 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1362 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1363 layers[k].count++;
1364 }
1365 }
1366 }
1367 /* If no data, return now. */
1368 if (fcur == cur && layers[0].count == 0)
1369 return cur;
1370 *cur = 255; /* mark end of explicitly cleared cells */
1371 cur++;
1372 /* First pack by layers. */
1373 for (k = 0; k < numlayers; k++)
1374 {
1375 if (layers[k].count == 0)
1376 break; /* once a layer is entirely empty, no layer below it can
1377 have anything in it either */
1378 /* Pack by entries in thie layer */
1379 for (x = 0; x < layers[k].count;)
1380 {
1381 fcur = cur;
1382 *cur = layers[k].lcells[x].face >> 8;
1383 cur++;
1384 *cur = layers[k].lcells[x].face & 0xFF;
1385 cur++;
1386 face = layers[k].lcells[x].face;
1387 /* Now, we back the redundant data into 1 byte xy pairings */
1388 for (y = x; y < layers[k].count; y++)
1389 {
1390 if (layers[k].lcells[y].face == face)
1391 {
1392 *cur = (uint8) layers[k].lcells[y].xy;
1393 cur++;
1394 layers[k].lcells[y].face = -1;
1395 }
1396 }
1397 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1398 /* forward over the now redundant data */
1399 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1400 x++;
1401 }
1402 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1403 }
1404 return cur;
1405} 1191}
1406 1192
1407/** Clears a map cell */ 1193/** Clears a map cell */
1408static void 1194static void
1409map_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)
… …
1421#define MAX_LAYERS 3 1207#define MAX_LAYERS 3
1422 1208
1423/* 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
1424 * 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,
1425 * 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
1426 * 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
1427 * re-examined. 1213 * re-examined.
1428 */ 1214 */
1429
1430static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1215static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431 1216
1432/** 1217/**
1433 * Returns true if any of the heads for this 1218 * Returns true if any of the heads for this
1434 * 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
1435 * for empty space checking. 1220 * for empty space checking.
1436 */ 1221 */
1437static inline int 1222static inline int
1438have_head (int ax, int ay) 1223have_head (int ax, int ay)
1439{ 1224{
1440
1441 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1225 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1442 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])
1443 return 1; 1227 return 1;
1228
1444 return 0; 1229 return 0;
1445} 1230}
1446 1231
1447/** 1232/**
1448 * check_head is a bit simplistic version of update_space below. 1233 * check_head is a bit simplistic version of update_space below.
1449 * 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
1450 * 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
1451 * 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
1452 * sent, it returns zero. 1237 * sent, it returns zero.
1453 */ 1238 */
1454static int 1239static int
1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1240check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456{ 1241{
1457 short face_num; 1242 short face_num;
1458 1243
1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1244 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1245 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1492 * numbers the spaces differently - I think this was a leftover from 1277 * numbers the spaces differently - I think this was a leftover from
1493 * 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
1494 * 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
1495 * actually match. 1280 * actually match.
1496 */ 1281 */
1497
1498static int 1282static int
1499update_space (packet &sl, client_socket &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)
1500{ 1284{
1501 object *ob, *head; 1285 object *ob, *head;
1502 uint16 face_num; 1286 uint16 face_num;
1503 int bx, by, i; 1287 int bx, by, i;
1504 1288
… …
1717 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1501 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1718 * take. 1502 * take.
1719 */ 1503 */
1720 1504
1721static inline int 1505static inline int
1722update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1506update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1723{ 1507{
1724 object *ob; 1508 object *ob;
1725 int smoothlevel; /* old face_num; */ 1509 int smoothlevel; /* old face_num; */
1726 1510
1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1511 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1761 * Returns the size of a data for a map square as returned by 1545 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1546 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1547 * available.
1764 */ 1548 */
1765int 1549int
1766getExtendedMapInfoSize (client_socket * ns) 1550getExtendedMapInfoSize (client * ns)
1767{ 1551{
1768 int result = 0; 1552 int result = 0;
1769 1553
1770 if (ns->ext_mapinfos) 1554 if (ns->ext_mapinfos)
1771 { 1555 {
1772 if (ns->EMI_smooth) 1556 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1557 result += 1; /*One byte for smoothlevel */
1774 } 1558 }
1559
1775 return result; 1560 return result;
1776} 1561}
1777 1562
1778/** 1563/**
1779 * 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
… …
1786 * 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
1787 * 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,
1788 * 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
1789 * of what we send, see the doc/Protocol file. 1574 * of what we send, see the doc/Protocol file.
1790 * I will describe internally what we do: 1575 * I will describe internally what we do:
1791 * 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.
1792 * 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
1793 * maximum viewable size (As set in config.h). 1578 * maximum viewable size (As set in config.h).
1794 * in the cells, there are faces and a count value. 1579 * in the cells, there are faces and a count value.
1795 * 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
1796 * is not viewable. 1581 * is not viewable.
… …
1807 uint8 eentrysize; 1592 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1593 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1594 uint8 extendedinfos;
1810 maptile *m; 1595 maptile *m;
1811 1596
1812 client_socket &socket = *pl->contr->socket; 1597 client &socket = *pl->contr->ns;
1813 1598
1814 check_map_change (pl->contr); 1599 check_map_change (pl->contr);
1815 1600
1816 packet sl; 1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1602 packet esl;
1818 1603
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1604 startlen = sl.length ();
1821 1605
1822 /*Extendedmapinfo structure initialisation */ 1606 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1607 if (socket.ext_mapinfos)
1824 { 1608 {
… …
1868 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++)
1869 { 1653 {
1870 ax = 0; 1654 ax = 0;
1871 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++)
1872 { 1656 {
1873
1874 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875 1658
1876 /* 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
1877 * 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
1878 * the client wants if using the map1a command - this is because 1661 * the client wants if using the map1a command - this is because
… …
2208 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1991 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2209 return; 1992 return;
2210 1993
2211 memset (&newmap, 0, sizeof (struct Map)); 1994 memset (&newmap, 0, sizeof (struct Map));
2212 1995
2213 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++)
2214 {
2215 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++)
2216 { 1998 {
2217 ax = i; 1999 ax = i;
2218 ay = j; 2000 ay = j;
2219 m = pm; 2001 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2002 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2003
2221 if (mflags & P_OUT_OF_MAP) 2004 if (mflags & P_OUT_OF_MAP)
2222 continue; 2005 continue;
2223 if (mflags & P_NEED_UPDATE) 2006
2224 update_position (m, ax, ay);
2225 /* 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
2226 * just to reload it. This should really call something like 2008 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 2009 * swap_map, but this is much more efficient and 'good enough'
2228 */ 2010 */
2229 if (mflags & P_NEW_MAP) 2011 if (mflags & P_NEW_MAP)
2230 m->timeout = 50; 2012 m->timeout = 50;
2231 } 2013 }
2232 } 2014
2233 /* do LOS after calls to update_position */ 2015 /* do LOS after calls to update_position */
2234 if (pl->contr->do_los) 2016 if (pl->contr->do_los)
2235 { 2017 {
2236 update_los (pl); 2018 update_los (pl);
2237 pl->contr->do_los = 0; 2019 pl->contr->do_los = 0;
… …
2252 2034
2253/*****************************************************************************/ 2035/*****************************************************************************/
2254void 2036void
2255send_plugin_custom_message (object *pl, char *buf) 2037send_plugin_custom_message (object *pl, char *buf)
2256{ 2038{
2257 pl->contr->socket->send_packet (buf); 2039 pl->contr->ns->send_packet (buf);
2258} 2040}
2259 2041
2260/** 2042/**
2261 * This sends the skill number to name mapping. We ignore 2043 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 2044 * the params - we always send the same info no matter what.
2263 */ 2045 */
2264void 2046void
2265send_skill_info (client_socket *ns, char *params) 2047send_skill_info (client *ns, char *params)
2266{ 2048{
2267 packet sl; 2049 packet sl;
2268 sl << "replyinfo skill_info\n"; 2050 sl << "replyinfo skill_info\n";
2269 2051
2270 for (int i = 1; i < NUM_SKILLS; i++) 2052 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 2064/**
2283 * This sends the spell path to name mapping. We ignore 2065 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 2066 * the params - we always send the same info no matter what.
2285 */ 2067 */
2286void 2068void
2287send_spell_paths (client_socket * ns, char *params) 2069send_spell_paths (client * ns, char *params)
2288{ 2070{
2289 packet sl; 2071 packet sl;
2290 2072
2291 sl << "replyinfo spell_paths\n"; 2073 sl << "replyinfo spell_paths\n";
2292 2074
… …
2307 * 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
2308 */ 2090 */
2309void 2091void
2310esrv_update_spells (player *pl) 2092esrv_update_spells (player *pl)
2311{ 2093{
2312 if (!pl->socket->monitor_spells) 2094 if (!pl->ns->monitor_spells)
2313 return; 2095 return;
2314 2096
2315 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2097 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316 { 2098 {
2317 if (spell->type == SPELL) 2099 if (spell->type == SPELL)
… …
2347 2129
2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2130 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2131 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2132 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2351 2133
2352 pl->socket->send_packet (sl); 2134 pl->ns->send_packet (sl);
2353 } 2135 }
2354 } 2136 }
2355 } 2137 }
2356} 2138}
2357 2139
2358void 2140void
2359esrv_remove_spell (player *pl, object *spell) 2141esrv_remove_spell (player *pl, object *spell)
2360{ 2142{
2361 if (!pl->socket->monitor_spells) 2143 if (!pl->ns->monitor_spells)
2362 return; 2144 return;
2363 2145
2364 if (!pl || !spell || spell->env != pl->ob) 2146 if (!pl || !spell || spell->env != pl->ob)
2365 { 2147 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 2148 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 2149 return;
2368 } 2150 }
2369 2151
2370 packet sl; 2152 packet sl ("delspell");
2371 2153
2372 sl << "delspell "
2373 << uint32 (spell->count); 2154 sl << uint32 (spell->count);
2374 2155
2375 pl->socket->send_packet (sl); 2156 pl->ns->send_packet (sl);
2376} 2157}
2377 2158
2378/* 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. */
2379static void 2160static void
2380append_spell (player *pl, packet &sl, object *spell) 2161append_spell (player *pl, packet &sl, object *spell)
… …
2428 { 2209 {
2429 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");
2430 return; 2211 return;
2431 } 2212 }
2432 2213
2433 if (!pl->socket->monitor_spells) 2214 if (!pl->ns->monitor_spells)
2434 return; 2215 return;
2435 2216
2436 packet sl; 2217 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 2218
2440 if (!spell) 2219 if (!spell)
2441 { 2220 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2443 { 2222 {
… …
2457 if (spell->type != SPELL) 2236 if (spell->type != SPELL)
2458 continue; 2237 continue;
2459 2238
2460 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))))
2461 { 2240 {
2462 pl->socket->send_packet (sl); 2241 pl->ns->send_packet (sl);
2463 2242
2464 sl.reset (); 2243 sl.reset ();
2465 sl << "addspell "; 2244 sl << "addspell ";
2466 } 2245 }
2467 2246
… …
2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2260 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482 fatal (0); 2261 fatal (0);
2483 } 2262 }
2484 2263
2485 /* finally, we can send the packet */ 2264 /* finally, we can send the packet */
2486 pl->socket->send_packet (sl); 2265 pl->ns->send_packet (sl);
2487} 2266}
2488 2267

Diff Legend

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