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.44 by root, Sat Dec 16 21:40:26 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 43 */
47 44
48#include <global.h> 45#include <global.h>
49#include <sproto.h> 46#include <sproto.h>
50 47
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 52 * it should work here.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket; 143 client &socket = *pl->socket;
154 144
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 145 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
156 146
157 if (socket.newmapcmd == 1) 147 if (socket.newmapcmd == 1)
158 socket.send_packet ("newmap"); 148 socket.send_packet ("newmap");
… …
163 153
164/** check for map change and send new map data */ 154/** check for map change and send new map data */
165static void 155static void
166check_map_change (player *pl) 156check_map_change (player *pl)
167{ 157{
168 client_socket &socket = *pl->socket; 158 client &socket = *pl->socket;
169 object *ob = pl->ob; 159 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 160 char buf[MAX_BUF]; /* eauugggh */
171 161
172 if (socket.current_map != ob->map) 162 if (socket.current_map != ob->map)
173 { 163 {
… …
222 * RequestInfo is sort of a meta command. There is some specific 212 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 213 * request of information, but we call other functions to provide
224 * that information. 214 * that information.
225 */ 215 */
226void 216void
227RequestInfo (char *buf, int len, client_socket * ns) 217RequestInfo (char *buf, int len, client * ns)
228{ 218{
229 char *params = NULL, *cp; 219 char *params = NULL, *cp;
230 220
231 /* No match */ 221 /* No match */
232 char bigbuf[MAX_BUF]; 222 char bigbuf[MAX_BUF];
… …
355 pl->socket->send_packet (bigbuf); 345 pl->socket->send_packet (bigbuf);
356} 346}
357 347
358/** This is the Setup cmd - easy first implementation */ 348/** This is the Setup cmd - easy first implementation */
359void 349void
360SetUp (char *buf, int len, client_socket * ns) 350SetUp (char *buf, int len, client * ns)
361{ 351{
362 int s, slen; 352 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 353 char *cmd, *param, cmdback[HUGE_BUF];
364 354
365 /* run through the cmds of setup 355 /* run through the cmds of setup
… …
575 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
576 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
577 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
578 */ 568 */
579void 569void
580AddMeCmd (char *buf, int len, client_socket * ns) 570AddMeCmd (char *buf, int len, client * ns)
581{ 571{
582 Settings oldsettings;
583
584 oldsettings = settings;
585 if (ns->status != Ns_Add || add_player (ns)) 572 if (ns->status != Ns_Add || add_player (ns))
586 ns->send_packet ("addme_failed"); 573 ns->send_packet ("addme_failed");
587 else 574 else
588 ns->send_packet ("addme_success"); 575 ns->send_packet ("addme_success");
589
590 settings = oldsettings;
591} 576}
592 577
593/** Reply to ExtendedInfos command */ 578/** Reply to ExtendedInfos command */
594void 579void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 580ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 581{
597 char cmdback[MAX_BUF]; 582 char cmdback[MAX_BUF];
598 char command[50]; 583 char command[50];
599 int info, nextinfo; 584 int info, nextinfo;
600 585
… …
651#define MSG_TYPE_MONUMENT 5 636#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 637#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 638
654/** Reply to ExtendedInfos command */ 639/** Reply to ExtendedInfos command */
655void 640void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 641ToggleExtendedText (char *buf, int len, client * ns)
657{ 642{
658 char cmdback[MAX_BUF]; 643 char cmdback[MAX_BUF];
659 char temp[10]; 644 char temp[10];
660 char command[50]; 645 char command[50];
661 int info, nextinfo, i, flag; 646 int info, nextinfo, i, flag;
… …
712 * a piece of data from us that we know the client wants. So 697 * a piece of data from us that we know the client wants. So
713 * if we know the client wants it, might as well push it to the 698 * if we know the client wants it, might as well push it to the
714 * client. 699 * client.
715 */ 700 */
716static void 701static void
717SendSmooth (client_socket * ns, uint16 face) 702SendSmooth (client *ns, uint16 face)
718{ 703{
719 uint16 smoothface; 704 uint16 smoothface;
720 705
721 /* If we can't find a face, return and set it so we won't try to send this 706 /* If we can't find a face, return and set it so we won't try to send this
722 * again. 707 * again.
… …
746 /** 731 /**
747 * Tells client the picture it has to use 732 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
749 */ 734 */
750void 735void
751AskSmooth (char *buf, int len, client_socket * ns) 736AskSmooth (char *buf, int len, client *ns)
752{ 737{
753 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 739}
758 740
759/** 741/**
760 * This handles the general commands from the client (ie, north, fire, cast, 742 * This handles the general commands from the client (ie, north, fire, cast,
761 * etc.) 743 * etc.)
762 */ 744 */
763void 745void
764PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
765{ 747{
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 748 /* Check if there is a count. In theory, a zero count could also be
778 * sent, so check for that also. 749 * sent, so check for that also.
779 */ 750 */
780 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
781 { 752 {
782 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 756 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 757 return;
790 } 758
791 buf++; 759 buf++;
792 } 760 }
793 /* This should not happen anymore. */ 761
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); 762 execute_newserver_command (pl->ob, (char *) buf);
763
800 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
801 * Cleaning up the input should probably be done first - all actions 765 * 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 766 * for the command that issued the count should be done before any other
803 * commands. 767 * commands.
804 */ 768 */
805
806 pl->count = 0; 769 pl->count = 0;
807
808} 770}
809 771
810 772
811/** 773/**
812 * This handles the general commands from the client (ie, north, fire, cast, 774 * This handles the general commands from the client (ie, north, fire, cast,
… …
815 * can throttle. 777 * can throttle.
816 */ 778 */
817void 779void
818NewPlayerCmd (char *buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
819{ 781{
820 int time, repeat;
821 char command[MAX_BUF];
822 int pktlen;
823
824 if (len < 7) 782 if (len <= 6)
825 { 783 {
826 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
827 return; 785 return;
828 } 786 }
829 787
830 pktlen = net_uint16 ((uint8 *)buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
831 repeat = net_uint32 ((uint8 *)buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832 790
833 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
834 if (repeat != -1) 792 if (repeat != -1)
835 pl->count = repeat; 793 pl->count = repeat;
836 794
837 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
838 len = MAX_BUF - 5;
839 796
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); 797 execute_newserver_command (pl->ob, buf);
798
849 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 800 * 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 801 * for the command that issued the count should be done before any other
852 * commands. 802 * commands.
853 */ 803 */
854 pl->count = 0; 804 pl->count = 0;
855 805
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
856 if (FABS (pl->ob->speed) < 0.001) 807 int time = FABS (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
860 810
861 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
862
863 packet sl; 812 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << "comc " << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 814 pl->socket->send_packet (sl);
866} 815}
867 816
868 817
869/** This is a reply to a previous query. */ 818/** This is a reply to a previous query. */
870void 819void
871ReplyCmd (char *buf, int len, player *pl) 820ReplyCmd (char *buf, int len, player *pl)
872{ 821{
873 /* This is to synthesize how the data would be stored if it 822 /* This is to synthesize how the data would be stored if it
874 * was normally entered. A bit of a hack, and should be cleaned up 823 * was normally entered. A bit of a hack, and should be cleaned up
875 * once all the X11 code is removed from the server. 824 * once all the X11 code is removed from the server.
876 * 825 *
877 * We pass 13 to many of the functions because this way they 826 * We pass 13 to many of the functions because this way they
878 * think it was the carriage return that was entered, and the 827 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 828 * function then does not try to do additional input.
… …
882 831
883 /* this avoids any hacking here */ 832 /* this avoids any hacking here */
884 833
885 switch (pl->state) 834 switch (pl->state)
886 { 835 {
887 case ST_PLAYING: 836 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 837 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 838 break;
890 839
891 case ST_PLAY_AGAIN: 840 case ST_PLAY_AGAIN:
892 /* We can check this for return value (2==quit). Maybe we 841 /* We can check this for return value (2==quit). Maybe we
893 * should, and do something appropriate? 842 * should, and do something appropriate?
894 */ 843 */
895 receive_play_again (pl->ob, buf[0]); 844 receive_play_again (pl->ob, buf[0]);
896 break; 845 break;
897 846
898 case ST_ROLL_STAT: 847 case ST_ROLL_STAT:
899 key_roll_stat (pl->ob, buf[0]); 848 key_roll_stat (pl->ob, buf[0]);
900 break; 849 break;
901 850
902 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
903 852
904 key_change_class (pl->ob, buf[0]); 853 key_change_class (pl->ob, buf[0]);
905 break; 854 break;
906 855
907 case ST_CONFIRM_QUIT: 856 case ST_CONFIRM_QUIT:
908 key_confirm_quit (pl->ob, buf[0]); 857 key_confirm_quit (pl->ob, buf[0]);
909 break; 858 break;
910 859
911 case ST_CONFIGURE: 860 case ST_CONFIGURE:
912 LOG (llevError, "In client input handling, but into configure state\n"); 861 LOG (llevError, "In client input handling, but into configure state\n");
913 pl->state = ST_PLAYING; 862 pl->state = ST_PLAYING;
914 break; 863 break;
915 864
916 case ST_GET_NAME: 865 case ST_GET_NAME:
917 receive_player_name (pl->ob, 13); 866 receive_player_name (pl->ob, 13);
918 break; 867 break;
919 868
920 case ST_GET_PASSWORD: 869 case ST_GET_PASSWORD:
921 case ST_CONFIRM_PASSWORD: 870 case ST_CONFIRM_PASSWORD:
922 receive_player_password (pl->ob, 13); 871 receive_player_password (pl->ob, 13);
923 break; 872 break;
924 873
925 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 874 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 875 receive_party_password (pl->ob, 13);
927 break; 876 break;
928 877
929 default: 878 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 879 LOG (llevError, "Unknown input state: %d\n", pl->state);
931 } 880 }
932} 881}
933 882
934/** 883/**
935 * Client tells its version. If there is a mismatch, we close the 884 * Client tells its version. If there is a mismatch, we close the
… …
937 * something older than the server. If we assume the client will be 886 * something older than the server. If we assume the client will be
938 * backwards compatible, having it be a later version should not be a 887 * backwards compatible, having it be a later version should not be a
939 * problem. 888 * problem.
940 */ 889 */
941void 890void
942VersionCmd (char *buf, int len, client_socket * ns) 891VersionCmd (char *buf, int len, client * ns)
943{ 892{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 893 if (!buf)
948 { 894 {
949 LOG (llevError, "CS: received corrupted version command\n"); 895 LOG (llevError, "CS: received corrupted version command\n");
950 return; 896 return;
951 } 897 }
952 898
953 ns->cs_version = atoi (buf); 899 ns->cs_version = atoi (buf);
954 ns->sc_version = ns->cs_version; 900 ns->sc_version = ns->cs_version;
901
902 LOG (llevDebug, "connection from client <%s>\n", buf);
903
904
905 //TODO: should log here just for statistics
906
955 if (VERSION_CS != ns->cs_version) 907 //if (VERSION_CS != ns->cs_version)
956 { 908 // unchecked;
957#ifdef ESRV_DEBUG 909
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 910 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 911 if (!cp)
963 return; 912 return;
913
964 ns->sc_version = atoi (cp); 914 ns->sc_version = atoi (cp);
915
965 if (VERSION_SC != ns->sc_version) 916 //if (VERSION_SC != ns->sc_version)
966 { 917 // unchecked;
967#ifdef ESRV_DEBUG 918
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 919 cp = strchr (cp + 1, ' ');
920
972 if (cp) 921 if (cp)
973 { 922 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 923 assign (ns->version, cp + 1);
975 924
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) 925 if (ns->sc_version < 1026)
988 { 926 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!! ****"); 927 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 928 }
995} 929}
996 930
997/** sound related functions. */ 931/** sound related functions. */
998
999void 932void
1000SetSound (char *buf, int len, client_socket * ns) 933SetSound (char *buf, int len, client * ns)
1001{ 934{
1002 ns->sound = atoi (buf); 935 ns->sound = atoi (buf);
1003} 936}
1004 937
1005/** client wants the map resent */ 938/** client wants the map resent */
1006 939
1007void 940void
1008MapRedrawCmd (char *buf, int len, player *pl) 941MapRedrawCmd (char *buf, int len, player *pl)
1009{ 942{
1010
1011/* This function is currently disabled; just clearing the map state results in 943/* This function is currently disabled; just clearing the map state results in
1012 * display errors. It should clear the cache and send a newmap command. 944 * display errors. It should clear the cache and send a newmap command.
1013 * Unfortunately this solution does not work because some client versions send 945 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 946 * a mapredraw command after receiving a newmap command.
1015 */ 947 */
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} 948}
1024 949
1025/** 950/**
1026 * Moves an object (typically, container to inventory). 951 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 952 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 955MoveCmd (char *buf, int len, player *pl)
1031{ 956{
1032 int vals[3], i; 957 int vals[3], i;
1033 958
1034 /* A little funky here. We only cycle for 2 records, because 959 /* A little funky here. We only cycle for 2 records, because
1035 * we obviously am not going to find a space after the third 960 * we obviously are not going to find a space after the third
1036 * record. Perhaps we should just replace this with a 961 * record. Perhaps we should just replace this with a
1037 * sscanf? 962 * sscanf?
1038 */ 963 */
1039 for (i = 0; i < 2; i++) 964 for (i = 0; i < 2; i++)
1040 { 965 {
1041 vals[i] = atoi (buf); 966 vals[i] = atoi (buf);
967
1042 if (!(buf = strchr (buf, ' '))) 968 if (!(buf = strchr (buf, ' ')))
1043 { 969 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 970 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 971 return;
1046 } 972 }
973
1047 buf++; 974 buf++;
1048 } 975 }
976
1049 vals[2] = atoi (buf); 977 vals[2] = atoi (buf);
1050 978
1051/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 979/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 980 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 981}
1054
1055
1056 982
1057/****************************************************************************** 983/******************************************************************************
1058 * 984 *
1059 * Start of commands the server sends to the client. 985 * Start of commands the server sends to the client.
1060 * 986 *
… …
1063/** 989/**
1064 * Asks the client to query the user. This way, the client knows 990 * Asks the client to query the user. This way, the client knows
1065 * it needs to send something back (vs just printing out a message) 991 * it needs to send something back (vs just printing out a message)
1066 */ 992 */
1067void 993void
1068send_query (client_socket * ns, uint8 flags, char *text) 994send_query (client *ns, uint8 flags, char *text)
1069{ 995{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 996 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 997}
1075 998
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 999#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1000 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 1001 sl << uint8 (Type) << uint64 (New); \
… …
1111 uint16 flags; 1034 uint16 flags;
1112 1035
1113 packet sl; 1036 packet sl;
1114 sl << "stats "; 1037 sl << "stats ";
1115 1038
1116 if (pl->ob != NULL) 1039 if (pl->ob)
1117 { 1040 {
1118 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1119 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1120 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1121 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1129 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1131 } 1054 }
1132 1055
1133 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1057 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) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1140 { 1059 {
1141 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1143 */ 1062 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1147 1066
1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149 } 1068 }
1150 }
1151 }
1152 1069
1153 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1155 else 1072 else
1156 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
… …
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1175 1092
1176 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1177 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1178 else 1095 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1097 {
1184 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1186 continue; 1100 continue;
1187 1101
1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1189 } 1103 }
1190 }
1191 1104
1192 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1193 { 1106 {
1194 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1195 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
1232 * sent them the face yet (this can become quite costly in terms of 1145 * sent them the face yet (this can become quite costly in terms of
1233 * how much we are sending - on the other hand, this should only happen 1146 * how much we are sending - on the other hand, this should only happen
1234 * when the player logs in and picks stuff up. 1147 * when the player logs in and picks stuff up.
1235 */ 1148 */
1236void 1149void
1237esrv_send_animation (client_socket * ns, short anim_num) 1150esrv_send_animation (client * ns, short anim_num)
1238{ 1151{
1239 int i;
1240
1241 /* Do some checking on the anim_num we got. Note that the animations 1152 /* Do some checking on the anim_num we got. Note that the animations
1242 * are added in contigous order, so if the number is in the valid 1153 * are added in contigous order, so if the number is in the valid
1243 * range, it must be a valid animation. 1154 * range, it must be a valid animation.
1244 */ 1155 */
1245 if (anim_num < 0 || anim_num > num_animations) 1156 if (anim_num < 0 || anim_num > num_animations)
… …
1255 << uint16 (0); /* flags - not used right now */ 1166 << uint16 (0); /* flags - not used right now */
1256 1167
1257 /* Build up the list of faces. Also, send any information (ie, the 1168 /* Build up the list of faces. Also, send any information (ie, the
1258 * the face itself) down to the client. 1169 * the face itself) down to the client.
1259 */ 1170 */
1260 for (i = 0; i < animations[anim_num].num_animations; i++) 1171 for (int i = 0; i < animations[anim_num].num_animations; i++)
1261 { 1172 {
1262 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1173 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1263 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1174 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1175
1264 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1176 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1265 } 1177 }
1266 1178
1267 ns->send_packet (sl); 1179 ns->send_packet (sl);
1268 1180
… …
1279/** 1191/**
1280 * This adds face_num to a map cell at x,y. If the client doesn't have 1192 * This adds face_num to a map cell at x,y. If the client doesn't have
1281 * the face yet, we will also send it. 1193 * the face yet, we will also send it.
1282 */ 1194 */
1283static void 1195static void
1284esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1196esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1285{ 1197{
1286 if (newmap->cells[x][y].count >= MAP_LAYERS) 1198 if (newmap->cells[x][y].count >= MAP_LAYERS)
1287 { 1199 {
1200 //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); 1201 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1289 return; 1202 return;
1290 abort (); 1203 abort ();
1291 } 1204 }
1292 1205
1293 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1206 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1294 newmap->cells[x][y].count++; 1207 newmap->cells[x][y].count++;
1295 1208
1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1209 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297 esrv_send_face (ns, face_num, 0); 1210 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} 1211}
1406 1212
1407/** Clears a map cell */ 1213/** Clears a map cell */
1408static void 1214static void
1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1215map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1421#define MAX_LAYERS 3 1227#define MAX_LAYERS 3
1422 1228
1423/* Using a global really isn't a good approach, but saves the over head of 1229/* Using a global really isn't a good approach, but saves the over head of
1424 * allocating and deallocating such a block of data each time run through, 1230 * allocating and deallocating such a block of data each time run through,
1425 * and saves the space of allocating this in the socket object when we only 1231 * and saves the space of allocating this in the socket object when we only
1426 * need it for this cycle. If the serve is ever threaded, this needs to be 1232 * need it for this cycle. If the server is ever threaded, this needs to be
1427 * re-examined. 1233 * re-examined.
1428 */ 1234 */
1429
1430static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1235static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431 1236
1432/** 1237/**
1433 * Returns true if any of the heads for this 1238 * Returns true if any of the heads for this
1434 * space is set. Returns false if all are blank - this is used 1239 * space is set. Returns false if all are blank - this is used
1435 * for empty space checking. 1240 * for empty space checking.
1436 */ 1241 */
1437static inline int 1242static inline int
1438have_head (int ax, int ay) 1243have_head (int ax, int ay)
1439{ 1244{
1440
1441 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1245 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]) 1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1443 return 1; 1247 return 1;
1248
1444 return 0; 1249 return 0;
1445} 1250}
1446 1251
1447/** 1252/**
1448 * check_head is a bit simplistic version of update_space below. 1253 * 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 1254 * 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 1255 * 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 1256 * if needed, and returning 1. If this no data needs to get
1452 * sent, it returns zero. 1257 * sent, it returns zero.
1453 */ 1258 */
1454static int 1259static int
1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1260check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456{ 1261{
1457 short face_num; 1262 short face_num;
1458 1263
1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1264 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1265 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1492 * numbers the spaces differently - I think this was a leftover from 1297 * 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 1298 * 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 1299 * the case, it seems to make more sense to have these layer values
1495 * actually match. 1300 * actually match.
1496 */ 1301 */
1497
1498static int 1302static int
1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1303update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1500{ 1304{
1501 object *ob, *head; 1305 object *ob, *head;
1502 uint16 face_num; 1306 uint16 face_num;
1503 int bx, by, i; 1307 int bx, by, i;
1504 1308
… …
1717 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1521 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1718 * take. 1522 * take.
1719 */ 1523 */
1720 1524
1721static inline int 1525static inline int
1722update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1526update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1723{ 1527{
1724 object *ob; 1528 object *ob;
1725 int smoothlevel; /* old face_num; */ 1529 int smoothlevel; /* old face_num; */
1726 1530
1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1761 * Returns the size of a data for a map square as returned by 1565 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1566 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1567 * available.
1764 */ 1568 */
1765int 1569int
1766getExtendedMapInfoSize (client_socket * ns) 1570getExtendedMapInfoSize (client * ns)
1767{ 1571{
1768 int result = 0; 1572 int result = 0;
1769 1573
1770 if (ns->ext_mapinfos) 1574 if (ns->ext_mapinfos)
1771 { 1575 {
1772 if (ns->EMI_smooth) 1576 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1577 result += 1; /*One byte for smoothlevel */
1774 } 1578 }
1579
1775 return result; 1580 return result;
1776} 1581}
1777 1582
1778/** 1583/**
1779 * This function uses the new map1 protocol command to send the map 1584 * This function uses the new map1 protocol command to send the map
… …
1807 uint8 eentrysize; 1612 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1613 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1614 uint8 extendedinfos;
1810 maptile *m; 1615 maptile *m;
1811 1616
1812 client_socket &socket = *pl->contr->socket; 1617 client &socket = *pl->contr->socket;
1813 1618
1814 check_map_change (pl->contr); 1619 check_map_change (pl->contr);
1815 1620
1816 packet sl; 1621 packet sl;
1817 packet esl; 1622 packet esl;
… …
2216 { 2021 {
2217 ax = i; 2022 ax = i;
2218 ay = j; 2023 ay = j;
2219 m = pm; 2024 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026
2221 if (mflags & P_OUT_OF_MAP) 2027 if (mflags & P_OUT_OF_MAP)
2222 continue; 2028 continue;
2029
2223 if (mflags & P_NEED_UPDATE) 2030 if (mflags & P_NEED_UPDATE)
2224 update_position (m, ax, ay); 2031 update_position (m, ax, ay);
2032
2225 /* If a map is visible to the player, we don't want to swap it out 2033 /* If a map is visible to the player, we don't want to swap it out
2226 * just to reload it. This should really call something like 2034 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 2035 * swap_map, but this is much more efficient and 'good enough'
2228 */ 2036 */
2229 if (mflags & P_NEW_MAP) 2037 if (mflags & P_NEW_MAP)
… …
2260/** 2068/**
2261 * This sends the skill number to name mapping. We ignore 2069 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2263 */ 2071 */
2264void 2072void
2265send_skill_info (client_socket *ns, char *params) 2073send_skill_info (client *ns, char *params)
2266{ 2074{
2267 packet sl; 2075 packet sl;
2268 sl << "replyinfo skill_info\n"; 2076 sl << "replyinfo skill_info\n";
2269 2077
2270 for (int i = 1; i < NUM_SKILLS; i++) 2078 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 2090/**
2283 * This sends the spell path to name mapping. We ignore 2091 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 2092 * the params - we always send the same info no matter what.
2285 */ 2093 */
2286void 2094void
2287send_spell_paths (client_socket * ns, char *params) 2095send_spell_paths (client * ns, char *params)
2288{ 2096{
2289 packet sl; 2097 packet sl;
2290 2098
2291 sl << "replyinfo spell_paths\n"; 2099 sl << "replyinfo spell_paths\n";
2292 2100
… …
2432 2240
2433 if (!pl->socket->monitor_spells) 2241 if (!pl->socket->monitor_spells)
2434 return; 2242 return;
2435 2243
2436 packet sl; 2244 packet sl;
2437
2438 sl << "addspell "; 2245 sl << "addspell ";
2439 2246
2440 if (!spell) 2247 if (!spell)
2441 { 2248 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)

Diff Legend

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