ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.42 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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