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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.46 by root, Tue Dec 19 05:12:52 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
… …
141} 138}
142 139
143static void 140static void
144clear_map (player *pl) 141clear_map (player *pl)
145{ 142{
146 client &socket = *pl->socket;
147
148 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
149 144
150 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
151 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
152 147
153 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
154 socket.look_position = 0;
155} 149}
156 150
157/** check for map change and send new map data */ 151/** check for map change and send new map data */
158static void 152static void
159check_map_change (player *pl) 153check_map_change (player *pl)
… …
200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
202 else 196 else
203 { 197 {
204 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
205 socket.update_look = 1; 199 socket.floorbox_reset ();
206 socket.look_position = 0;
207 } 200 }
208 } 201 }
209 202
210 socket.current_x = ob->x; 203 socket.current_x = ob->x;
211 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
257 250
258void 251void
259ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
260{ 253{
261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
262} 261}
263 262
264void 263void
265MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
266{ 265{
… …
700 * a piece of data from us that we know the client wants. So 699 * a piece of data from us that we know the client wants. So
701 * if we know the client wants it, might as well push it to the 700 * if we know the client wants it, might as well push it to the
702 * client. 701 * client.
703 */ 702 */
704static void 703static void
705SendSmooth (client * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
706{ 705{
707 uint16 smoothface; 706 uint16 smoothface;
708 707
709 /* If we can't find a face, return and set it so we won't try to send this 708 /* If we can't find a face, return and set it so we won't try to send this
710 * again. 709 * again.
… …
734 /** 733 /**
735 * Tells client the picture it has to use 734 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 735 * to smooth a picture number given as argument.
737 */ 736 */
738void 737void
739AskSmooth (char *buf, int len, client * ns) 738AskSmooth (char *buf, int len, client *ns)
740{ 739{
741 uint16 facenbr; 740 SendSmooth (ns, atoi (buf));
742
743 facenbr = atoi (buf);
744 SendSmooth (ns, facenbr);
745} 741}
746 742
747/** 743/**
748 * This handles the general commands from the client (ie, north, fire, cast, 744 * This handles the general commands from the client (ie, north, fire, cast,
749 * etc.) 745 * etc.)
750 */ 746 */
751void 747void
752PlayerCmd (char *buf, int len, player *pl) 748PlayerCmd (char *buf, int len, player *pl)
753{ 749{
754
755 /* The following should never happen with a proper or honest client.
756 * Therefore, the error message doesn't have to be too clear - if
757 * someone is playing with a hacked/non working client, this gives them
758 * an idea of the problem, but they deserve what they get
759 */
760 if (pl->state != ST_PLAYING)
761 {
762 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
763 return;
764 }
765 /* Check if there is a count. In theory, a zero count could also be 750 /* Check if there is a count. In theory, a zero count could also be
766 * sent, so check for that also. 751 * sent, so check for that also.
767 */ 752 */
768 if (atoi (buf) || buf[0] == '0') 753 if (atoi (buf) || buf[0] == '0')
769 { 754 {
770 pl->count = atoi ((char *) buf); 755 pl->count = atoi ((char *) buf);
756
771 buf = strchr (buf, ' '); /* advance beyond the numbers */ 757 buf = strchr (buf, ' '); /* advance beyond the numbers */
772 if (!buf) 758 if (!buf)
773 {
774#ifdef ESRV_DEBUG
775 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776#endif
777 return; 759 return;
778 } 760
779 buf++; 761 buf++;
780 } 762 }
781 /* This should not happen anymore. */ 763
782 if (pl->ob->speed_left < -1.0)
783 {
784 LOG (llevError, "Player has negative time - shouldn't do command.\n");
785 }
786 /* In c_new.c */
787 execute_newserver_command (pl->ob, (char *) buf); 764 execute_newserver_command (pl->ob, (char *) buf);
765
788 /* Perhaps something better should be done with a left over count. 766 /* Perhaps something better should be done with a left over count.
789 * Cleaning up the input should probably be done first - all actions 767 * Cleaning up the input should probably be done first - all actions
790 * for the command that issued the count should be done before any other 768 * for the command that issued the count should be done before any other
791 * commands. 769 * commands.
792 */ 770 */
793
794 pl->count = 0; 771 pl->count = 0;
795
796} 772}
797 773
798 774
799/** 775/**
800 * This handles the general commands from the client (ie, north, fire, cast, 776 * This handles the general commands from the client (ie, north, fire, cast,
… …
803 * can throttle. 779 * can throttle.
804 */ 780 */
805void 781void
806NewPlayerCmd (char *buf, int len, player *pl) 782NewPlayerCmd (char *buf, int len, player *pl)
807{ 783{
808 int time, repeat;
809 char command[MAX_BUF];
810 int pktlen;
811
812 if (len < 7) 784 if (len <= 6)
813 { 785 {
814 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 786 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
815 return; 787 return;
816 } 788 }
817 789
818 pktlen = net_uint16 ((uint8 *)buf); 790 uint16 cmdid = net_uint16 ((uint8 *)buf);
819 repeat = net_uint32 ((uint8 *)buf + 2); 791 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
820 792
821 /* -1 is special - no repeat, but don't update */ 793 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 794 if (repeat != -1)
823 pl->count = repeat; 795 pl->count = repeat;
824 796
825 if ((len - 4) >= MAX_BUF) 797 buf += 6; //len -= 6;
826 len = MAX_BUF - 5;
827 798
828 strncpy ((char *) command, (char *) buf + 6, len - 4);
829 command[len - 4] = 0;
830
831 /* This should not happen anymore. */
832 if (pl->ob->speed_left < -1.0)
833 LOG (llevError, "Player has negative time - shouldn't do command.\n");
834
835 /* In c_new.c */
836 execute_newserver_command (pl->ob, (char *) command); 799 execute_newserver_command (pl->ob, buf);
800
837 /* Perhaps something better should be done with a left over count. 801 /* Perhaps something better should be done with a left over count.
838 * Cleaning up the input should probably be done first - all actions 802 * Cleaning up the input should probably be done first - all actions
839 * for the command that issued the count should be done before any other 803 * for the command that issued the count should be done before any other
840 * commands. 804 * commands.
841 */ 805 */
842 pl->count = 0; 806 pl->count = 0;
843 807
808 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
844 if (FABS (pl->ob->speed) < 0.001) 809 int time = FABS (pl->ob->speed) < 0.001
845 time = MAX_TIME * 100; 810 ? time = MAX_TIME * 100
846 else
847 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 811 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
848 812
849 /* Send confirmation of command execution now */ 813 /* Send confirmation of command execution now */
850
851 packet sl; 814 packet sl;
852 sl << "comc " << uint16 (pktlen) << uint32 (time); 815 sl << "comc " << uint16 (cmdid) << uint32 (time);
853 pl->socket->send_packet (sl); 816 pl->socket->send_packet (sl);
854} 817}
855 818
856 819
857/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
858void 821void
859ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, player *pl)
860{ 823{
861 /* This is to synthesize how the data would be stored if it 824 /* This is to synthesize how the data would be stored if it
862 * was normally entered. A bit of a hack, and should be cleaned up 825 * was normally entered. A bit of a hack, and should be cleaned up
863 * once all the X11 code is removed from the server. 826 * once all the X11 code is removed from the server.
864 * 827 *
865 * We pass 13 to many of the functions because this way they 828 * We pass 13 to many of the functions because this way they
866 * think it was the carriage return that was entered, and the 829 * think it was the carriage return that was entered, and the
867 * function then does not try to do additional input. 830 * function then does not try to do additional input.
… …
870 833
871 /* this avoids any hacking here */ 834 /* this avoids any hacking here */
872 835
873 switch (pl->state) 836 switch (pl->state)
874 { 837 {
875 case ST_PLAYING: 838 case ST_PLAYING:
876 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 839 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
877 break; 840 break;
878 841
879 case ST_PLAY_AGAIN: 842 case ST_PLAY_AGAIN:
880 /* We can check this for return value (2==quit). Maybe we 843 /* We can check this for return value (2==quit). Maybe we
881 * should, and do something appropriate? 844 * should, and do something appropriate?
882 */ 845 */
883 receive_play_again (pl->ob, buf[0]); 846 receive_play_again (pl->ob, buf[0]);
884 break; 847 break;
885 848
886 case ST_ROLL_STAT: 849 case ST_ROLL_STAT:
887 key_roll_stat (pl->ob, buf[0]); 850 key_roll_stat (pl->ob, buf[0]);
888 break; 851 break;
889 852
890 case ST_CHANGE_CLASS: 853 case ST_CHANGE_CLASS:
891 854
892 key_change_class (pl->ob, buf[0]); 855 key_change_class (pl->ob, buf[0]);
893 break; 856 break;
894 857
895 case ST_CONFIRM_QUIT: 858 case ST_CONFIRM_QUIT:
896 key_confirm_quit (pl->ob, buf[0]); 859 key_confirm_quit (pl->ob, buf[0]);
897 break; 860 break;
898 861
899 case ST_CONFIGURE: 862 case ST_CONFIGURE:
900 LOG (llevError, "In client input handling, but into configure state\n"); 863 LOG (llevError, "In client input handling, but into configure state\n");
901 pl->state = ST_PLAYING; 864 pl->state = ST_PLAYING;
902 break; 865 break;
903 866
904 case ST_GET_NAME: 867 case ST_GET_NAME:
905 receive_player_name (pl->ob, 13); 868 receive_player_name (pl->ob, 13);
906 break; 869 break;
907 870
908 case ST_GET_PASSWORD: 871 case ST_GET_PASSWORD:
909 case ST_CONFIRM_PASSWORD: 872 case ST_CONFIRM_PASSWORD:
910 receive_player_password (pl->ob, 13); 873 receive_player_password (pl->ob, 13);
911 break; 874 break;
912 875
913 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 876 case ST_GET_PARTY_PASSWORD: /* Get password for party */
914 receive_party_password (pl->ob, 13); 877 receive_party_password (pl->ob, 13);
915 break; 878 break;
916 879
917 default: 880 default:
918 LOG (llevError, "Unknown input state: %d\n", pl->state); 881 LOG (llevError, "Unknown input state: %d\n", pl->state);
919 } 882 }
920} 883}
921 884
922/** 885/**
923 * Client tells its version. If there is a mismatch, we close the 886 * Client tells its version. If there is a mismatch, we close the
… …
927 * problem. 890 * problem.
928 */ 891 */
929void 892void
930VersionCmd (char *buf, int len, client * ns) 893VersionCmd (char *buf, int len, client * ns)
931{ 894{
932 char *cp;
933 char version_warning[256];
934
935 if (!buf) 895 if (!buf)
936 { 896 {
937 LOG (llevError, "CS: received corrupted version command\n"); 897 LOG (llevError, "CS: received corrupted version command\n");
938 return; 898 return;
939 } 899 }
940 900
941 ns->cs_version = atoi (buf); 901 ns->cs_version = atoi (buf);
942 ns->sc_version = ns->cs_version; 902 ns->sc_version = ns->cs_version;
903
904 LOG (llevDebug, "connection from client <%s>\n", buf);
905
906
907 //TODO: should log here just for statistics
908
943 if (VERSION_CS != ns->cs_version) 909 //if (VERSION_CS != ns->cs_version)
944 { 910 // unchecked;
945#ifdef ESRV_DEBUG 911
946 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
947#endif
948 }
949 cp = strchr (buf + 1, ' '); 912 char *cp = strchr (buf + 1, ' ');
950 if (!cp) 913 if (!cp)
951 return; 914 return;
915
952 ns->sc_version = atoi (cp); 916 ns->sc_version = atoi (cp);
917
953 if (VERSION_SC != ns->sc_version) 918 //if (VERSION_SC != ns->sc_version)
954 { 919 // unchecked;
955#ifdef ESRV_DEBUG 920
956 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
957#endif
958 }
959 cp = strchr (cp + 1, ' '); 921 cp = strchr (cp + 1, ' ');
922
960 if (cp) 923 if (cp)
961 { 924 {
962 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
963
964 assign (ns->version, cp + 1); 925 assign (ns->version, cp + 1);
965 926
966 if (ns->sc_version < 1026) 927 if (ns->sc_version < 1026)
967 { 928 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 929 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 ns->send_packet (version_warning);
971 }
972
973 } 930 }
974} 931}
975 932
976/** sound related functions. */ 933/** sound related functions. */
977void 934void
… …
983/** client wants the map resent */ 940/** client wants the map resent */
984 941
985void 942void
986MapRedrawCmd (char *buf, int len, player *pl) 943MapRedrawCmd (char *buf, int len, player *pl)
987{ 944{
988
989/* This function is currently disabled; just clearing the map state results in 945/* This function is currently disabled; just clearing the map state results in
990 * display errors. It should clear the cache and send a newmap command. 946 * display errors. It should clear the cache and send a newmap command.
991 * Unfortunately this solution does not work because some client versions send 947 * Unfortunately this solution does not work because some client versions send
992 * a mapredraw command after receiving a newmap command. 948 * a mapredraw command after receiving a newmap command.
993 */ 949 */
994#if 0
995 /* Okay, this is MAJOR UGLY. but the only way I know how to
996 * clear the "cache"
997 */
998 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
999 draw_client_map (pl->ob);
1000#endif
1001} 950}
1002 951
1003/** 952/**
1004 * Moves an object (typically, container to inventory). 953 * Moves an object (typically, container to inventory).
1005 * syntax is: move (to) (tag) (nrof) 954 * syntax is: move (to) (tag) (nrof)
… …
1008MoveCmd (char *buf, int len, player *pl) 957MoveCmd (char *buf, int len, player *pl)
1009{ 958{
1010 int vals[3], i; 959 int vals[3], i;
1011 960
1012 /* A little funky here. We only cycle for 2 records, because 961 /* A little funky here. We only cycle for 2 records, because
1013 * we obviously am not going to find a space after the third 962 * we obviously are not going to find a space after the third
1014 * record. Perhaps we should just replace this with a 963 * record. Perhaps we should just replace this with a
1015 * sscanf? 964 * sscanf?
1016 */ 965 */
1017 for (i = 0; i < 2; i++) 966 for (i = 0; i < 2; i++)
1018 { 967 {
1019 vals[i] = atoi (buf); 968 vals[i] = atoi (buf);
969
1020 if (!(buf = strchr (buf, ' '))) 970 if (!(buf = strchr (buf, ' ')))
1021 { 971 {
1022 LOG (llevError, "Incomplete move command: %s\n", buf); 972 LOG (llevError, "Incomplete move command: %s\n", buf);
1023 return; 973 return;
1024 } 974 }
975
1025 buf++; 976 buf++;
1026 } 977 }
978
1027 vals[2] = atoi (buf); 979 vals[2] = atoi (buf);
1028 980
1029/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 981/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1030 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 982 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1031} 983}
1032
1033
1034 984
1035/****************************************************************************** 985/******************************************************************************
1036 * 986 *
1037 * Start of commands the server sends to the client. 987 * Start of commands the server sends to the client.
1038 * 988 *
… …
1041/** 991/**
1042 * Asks the client to query the user. This way, the client knows 992 * Asks the client to query the user. This way, the client knows
1043 * it needs to send something back (vs just printing out a message) 993 * it needs to send something back (vs just printing out a message)
1044 */ 994 */
1045void 995void
1046send_query (client * ns, uint8 flags, char *text) 996send_query (client *ns, uint8 flags, char *text)
1047{ 997{
1048 char buf[MAX_BUF];
1049
1050 sprintf (buf, "query %d %s", flags, text ? text : ""); 998 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1051 ns->send_packet (buf);
1052} 999}
1053 1000
1054#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1001#define AddIfInt64(Old,New,Type) if (Old != New) {\
1055 Old = New; \ 1002 Old = New; \
1056 sl << uint8 (Type) << uint64 (New); \ 1003 sl << uint8 (Type) << uint64 (New); \
… …
1089 uint16 flags; 1036 uint16 flags;
1090 1037
1091 packet sl; 1038 packet sl;
1092 sl << "stats "; 1039 sl << "stats ";
1093 1040
1094 if (pl->ob != NULL) 1041 if (pl->ob)
1095 { 1042 {
1096 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1043 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1097 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1044 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1098 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1045 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1099 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1046 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1107 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1054 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1108 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1055 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1109 } 1056 }
1110 1057
1111 if (pl->socket->exp64) 1058 if (pl->socket->exp64)
1112 {
1113 uint8 s;
1114
1115 for (s = 0; s < NUM_SKILLS; s++) 1059 for (int s = 0; s < NUM_SKILLS; s++)
1116 {
1117 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1060 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1118 { 1061 {
1119 /* Always send along the level if exp changes. This is only 1062 /* Always send along the level if exp changes. This is only
1120 * 1 extra byte, but keeps processing simpler. 1063 * 1 extra byte, but keeps processing simpler.
1121 */ 1064 */
1122 sl << uint8 (s + CS_STAT_SKILLINFO) 1065 sl << uint8 (s + CS_STAT_SKILLINFO)
1123 << uint8 (pl->last_skill_ob[s]->level) 1066 << uint8 (pl->last_skill_ob[s]->level)
1124 << uint64 (pl->last_skill_ob[s]->stats.exp); 1067 << uint64 (pl->last_skill_ob[s]->stats.exp);
1125 1068
1126 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1069 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1127 } 1070 }
1128 }
1129 }
1130 1071
1131 if (pl->socket->exp64) 1072 if (pl->socket->exp64)
1132 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1073 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1133 else 1074 else
1134 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1075 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
… …
1152 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1093 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1153 1094
1154 if (pl->socket->sc_version < 1025) 1095 if (pl->socket->sc_version < 1025)
1155 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1096 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1156 else 1097 else
1157 {
1158 int i;
1159
1160 for (i = 0; i < NROFATTACKS; i++) 1098 for (int i = 0; i < NROFATTACKS; i++)
1161 { 1099 {
1162 /* Skip ones we won't send */ 1100 /* Skip ones we won't send */
1163 if (atnr_cs_stat[i] == -1) 1101 if (atnr_cs_stat[i] == -1)
1164 continue; 1102 continue;
1165 1103
1166 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1104 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1167 } 1105 }
1168 }
1169 1106
1170 if (pl->socket->monitor_spells) 1107 if (pl->socket->monitor_spells)
1171 { 1108 {
1172 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1109 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1173 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1110 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
1212 * when the player logs in and picks stuff up. 1149 * when the player logs in and picks stuff up.
1213 */ 1150 */
1214void 1151void
1215esrv_send_animation (client * ns, short anim_num) 1152esrv_send_animation (client * ns, short anim_num)
1216{ 1153{
1217 int i;
1218
1219 /* Do some checking on the anim_num we got. Note that the animations 1154 /* Do some checking on the anim_num we got. Note that the animations
1220 * are added in contigous order, so if the number is in the valid 1155 * are added in contigous order, so if the number is in the valid
1221 * range, it must be a valid animation. 1156 * range, it must be a valid animation.
1222 */ 1157 */
1223 if (anim_num < 0 || anim_num > num_animations) 1158 if (anim_num < 0 || anim_num > num_animations)
… …
1233 << uint16 (0); /* flags - not used right now */ 1168 << uint16 (0); /* flags - not used right now */
1234 1169
1235 /* Build up the list of faces. Also, send any information (ie, the 1170 /* Build up the list of faces. Also, send any information (ie, the
1236 * the face itself) down to the client. 1171 * the face itself) down to the client.
1237 */ 1172 */
1238 for (i = 0; i < animations[anim_num].num_animations; i++) 1173 for (int i = 0; i < animations[anim_num].num_animations; i++)
1239 { 1174 {
1240 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1175 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1241 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1176 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1177
1242 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1178 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1243 } 1179 }
1244 1180
1245 ns->send_packet (sl); 1181 ns->send_packet (sl);
1246 1182
… …
1261static void 1197static void
1262esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1198esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1263{ 1199{
1264 if (newmap->cells[x][y].count >= MAP_LAYERS) 1200 if (newmap->cells[x][y].count >= MAP_LAYERS)
1265 { 1201 {
1202 //TODO: one or the other, can't both have abort and return, verify and act
1266 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1203 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1267 return; 1204 return;
1268 abort (); 1205 abort ();
1269 } 1206 }
1270 1207
1271 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1208 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1272 newmap->cells[x][y].count++; 1209 newmap->cells[x][y].count++;
1273 1210
1274 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1211 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1275 esrv_send_face (ns, face_num, 0); 1212 esrv_send_face (ns, face_num, 0);
1276}
1277
1278struct LayerCell
1279{
1280 uint16 xy;
1281 short face;
1282};
1283
1284struct MapLayer
1285{
1286 int count;
1287 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1288};
1289
1290/** Checkes if map cells have changed */
1291static int
1292mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1293{
1294 int k;
1295
1296 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1297 return 1;
1298 for (k = 0; k < newmap->cells[i][j].count; k++)
1299 {
1300 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1301 {
1302 return 1;
1303 }
1304 }
1305 return 0;
1306}
1307
1308/**
1309 * Basically, what this does is pack the data into layers.
1310 * cnum is the client number, cur is the the buffer we put all of
1311 * this data into. we return the end of the data. layers is
1312 * how many layers of data we should back.
1313 */
1314static uint8 *
1315compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1316{
1317 int x, y, k;
1318 int face;
1319 unsigned char *fcur;
1320 struct MapLayer layers[MAP_LAYERS];
1321
1322 for (k = 0; k < MAP_LAYERS; k++)
1323 layers[k].count = 0;
1324 fcur = cur;
1325 for (x = 0; x < ns->mapx; x++)
1326 {
1327 for (y = 0; y < ns->mapy; y++)
1328 {
1329 if (!mapcellchanged (ns, x, y, newmap))
1330 continue;
1331 if (newmap->cells[x][y].count == 0)
1332 {
1333 *cur = x * ns->mapy + y; /* mark empty space */
1334 cur++;
1335 continue;
1336 }
1337 for (k = 0; k < newmap->cells[x][y].count; k++)
1338 {
1339 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1340 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1341 layers[k].count++;
1342 }
1343 }
1344 }
1345 /* If no data, return now. */
1346 if (fcur == cur && layers[0].count == 0)
1347 return cur;
1348 *cur = 255; /* mark end of explicitly cleared cells */
1349 cur++;
1350 /* First pack by layers. */
1351 for (k = 0; k < numlayers; k++)
1352 {
1353 if (layers[k].count == 0)
1354 break; /* once a layer is entirely empty, no layer below it can
1355 have anything in it either */
1356 /* Pack by entries in thie layer */
1357 for (x = 0; x < layers[k].count;)
1358 {
1359 fcur = cur;
1360 *cur = layers[k].lcells[x].face >> 8;
1361 cur++;
1362 *cur = layers[k].lcells[x].face & 0xFF;
1363 cur++;
1364 face = layers[k].lcells[x].face;
1365 /* Now, we back the redundant data into 1 byte xy pairings */
1366 for (y = x; y < layers[k].count; y++)
1367 {
1368 if (layers[k].lcells[y].face == face)
1369 {
1370 *cur = (uint8) layers[k].lcells[y].xy;
1371 cur++;
1372 layers[k].lcells[y].face = -1;
1373 }
1374 }
1375 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1376 /* forward over the now redundant data */
1377 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1378 x++;
1379 }
1380 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1381 }
1382 return cur;
1383} 1213}
1384 1214
1385/** Clears a map cell */ 1215/** Clears a map cell */
1386static void 1216static void
1387map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1217map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1399#define MAX_LAYERS 3 1229#define MAX_LAYERS 3
1400 1230
1401/* Using a global really isn't a good approach, but saves the over head of 1231/* Using a global really isn't a good approach, but saves the over head of
1402 * allocating and deallocating such a block of data each time run through, 1232 * allocating and deallocating such a block of data each time run through,
1403 * and saves the space of allocating this in the socket object when we only 1233 * and saves the space of allocating this in the socket object when we only
1404 * need it for this cycle. If the serve is ever threaded, this needs to be 1234 * need it for this cycle. If the server is ever threaded, this needs to be
1405 * re-examined. 1235 * re-examined.
1406 */ 1236 */
1407
1408static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1237static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1409 1238
1410/** 1239/**
1411 * Returns true if any of the heads for this 1240 * Returns true if any of the heads for this
1412 * space is set. Returns false if all are blank - this is used 1241 * space is set. Returns false if all are blank - this is used
1413 * for empty space checking. 1242 * for empty space checking.
1414 */ 1243 */
1415static inline int 1244static inline int
1416have_head (int ax, int ay) 1245have_head (int ax, int ay)
1417{ 1246{
1418
1419 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1247 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1420 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1248 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1421 return 1; 1249 return 1;
1250
1422 return 0; 1251 return 0;
1423} 1252}
1424 1253
1425/** 1254/**
1426 * check_head is a bit simplistic version of update_space below. 1255 * check_head is a bit simplistic version of update_space below.
1427 * basically, it only checks the that the head on space ax,ay at layer 1256 * basically, it only checks the that the head on space ax,ay at layer
1428 * needs to get sent - if so, it adds the data, sending the head 1257 * needs to get sent - if so, it adds the data, sending the head
1429 * if needed, and returning 1. If this no data needs to get 1258 * if needed, and returning 1. If this no data needs to get
1430 * sent, it returns zero. 1259 * sent, it returns zero.
1431 */ 1260 */
1432static int 1261static int
1433check_head (packet &sl, client &ns, int ax, int ay, int layer) 1262check_head (packet &sl, client &ns, int ax, int ay, int layer)
1434{ 1263{
… …
1470 * numbers the spaces differently - I think this was a leftover from 1299 * numbers the spaces differently - I think this was a leftover from
1471 * the map command, where the faces stack up. Sinces that is no longer 1300 * the map command, where the faces stack up. Sinces that is no longer
1472 * the case, it seems to make more sense to have these layer values 1301 * the case, it seems to make more sense to have these layer values
1473 * actually match. 1302 * actually match.
1474 */ 1303 */
1475
1476static int 1304static int
1477update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1305update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1478{ 1306{
1479 object *ob, *head; 1307 object *ob, *head;
1480 uint16 face_num; 1308 uint16 face_num;
… …
1748 if (ns->ext_mapinfos) 1576 if (ns->ext_mapinfos)
1749 { 1577 {
1750 if (ns->EMI_smooth) 1578 if (ns->EMI_smooth)
1751 result += 1; /*One byte for smoothlevel */ 1579 result += 1; /*One byte for smoothlevel */
1752 } 1580 }
1581
1753 return result; 1582 return result;
1754} 1583}
1755 1584
1756/** 1585/**
1757 * This function uses the new map1 protocol command to send the map 1586 * This function uses the new map1 protocol command to send the map
… …
2194 { 2023 {
2195 ax = i; 2024 ax = i;
2196 ay = j; 2025 ay = j;
2197 m = pm; 2026 m = pm;
2198 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028
2199 if (mflags & P_OUT_OF_MAP) 2029 if (mflags & P_OUT_OF_MAP)
2200 continue; 2030 continue;
2031
2201 if (mflags & P_NEED_UPDATE) 2032 if (mflags & P_NEED_UPDATE)
2202 update_position (m, ax, ay); 2033 update_position (m, ax, ay);
2034
2203 /* If a map is visible to the player, we don't want to swap it out 2035 /* If a map is visible to the player, we don't want to swap it out
2204 * just to reload it. This should really call something like 2036 * just to reload it. This should really call something like
2205 * swap_map, but this is much more efficient and 'good enough' 2037 * swap_map, but this is much more efficient and 'good enough'
2206 */ 2038 */
2207 if (mflags & P_NEW_MAP) 2039 if (mflags & P_NEW_MAP)
… …
2410 2242
2411 if (!pl->socket->monitor_spells) 2243 if (!pl->socket->monitor_spells)
2412 return; 2244 return;
2413 2245
2414 packet sl; 2246 packet sl;
2415
2416 sl << "addspell "; 2247 sl << "addspell ";
2417 2248
2418 if (!spell) 2249 if (!spell)
2419 { 2250 {
2420 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2251 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)

Diff Legend

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