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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.41 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 43 */
47 44
48#include <global.h> 45#include <global.h>
49#include <sproto.h> 46#include <sproto.h>
50 47
… …
86 -1, /* life stealing */ 83 -1, /* life stealing */
87 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
88}; 85};
89 86
90static void 87static void
91socket_map_scroll (client * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
92{ 89{
93 struct Map newmap; 90 struct Map newmap;
94 int x, y, mx, my; 91 int x, y, mx, my;
95 92
96 {
97 packet sl;
98
99 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
100 ns->send_packet (sl);
101 }
102 94
103 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
104 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
105 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
106 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
146} 138}
147 139
148static void 140static void
149clear_map (player *pl) 141clear_map (player *pl)
150{ 142{
151 client &socket = *pl->socket;
152
153 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
154 144
155 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
156 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
157 147
158 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
159 socket.look_position = 0;
160} 149}
161 150
162/** check for map change and send new map data */ 151/** check for map change and send new map data */
163static void 152static void
164check_map_change (player *pl) 153check_map_change (player *pl)
… …
205 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
206 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
207 else 196 else
208 { 197 {
209 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
210 socket.update_look = 1; 199 socket.floorbox_reset ();
211 socket.look_position = 0;
212 } 200 }
213 } 201 }
214 202
215 socket.current_x = ob->x; 203 socket.current_x = ob->x;
216 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
262 250
263void 251void
264ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
265{ 253{
266 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));
267} 261}
268 262
269void 263void
270MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
271{ 265{
… …
575 * it either has to be here or init_sockets needs to be exported. 569 * it either has to be here or init_sockets needs to be exported.
576 */ 570 */
577void 571void
578AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
579{ 573{
580 Settings oldsettings;
581
582 oldsettings = settings;
583 if (ns->status != Ns_Add || add_player (ns)) 574 if (ns->status != Ns_Add || add_player (ns))
584 ns->send_packet ("addme_failed"); 575 ns->send_packet ("addme_failed");
585 else 576 else
586 ns->send_packet ("addme_success"); 577 ns->send_packet ("addme_success");
587
588 settings = oldsettings;
589} 578}
590 579
591/** Reply to ExtendedInfos command */ 580/** Reply to ExtendedInfos command */
592void 581void
593ToggleExtendedInfos (char *buf, int len, client * ns) 582ToggleExtendedInfos (char *buf, int len, client * ns)
… …
710 * 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
711 * 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
712 * client. 701 * client.
713 */ 702 */
714static void 703static void
715SendSmooth (client * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
716{ 705{
717 uint16 smoothface; 706 uint16 smoothface;
718 707
719 /* 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
720 * again. 709 * again.
… …
730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
731 esrv_send_face (ns, smoothface, 0); 720 esrv_send_face (ns, smoothface, 0);
732 721
733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
734 723
735 packet sl; 724 packet sl ("smooth");
736 725
737 sl << "smooth "
738 << uint16 (face) 726 sl << uint16 (face)
739 << uint16 (smoothface); 727 << uint16 (smoothface);
740 728
741 ns->send_packet (sl); 729 ns->send_packet (sl);
742} 730}
743 731
744 /** 732 /**
745 * Tells client the picture it has to use 733 * Tells client the picture it has to use
746 * to smooth a picture number given as argument. 734 * to smooth a picture number given as argument.
747 */ 735 */
748void 736void
749AskSmooth (char *buf, int len, client * ns) 737AskSmooth (char *buf, int len, client *ns)
750{ 738{
751 uint16 facenbr; 739 SendSmooth (ns, atoi (buf));
752
753 facenbr = atoi (buf);
754 SendSmooth (ns, facenbr);
755} 740}
756 741
757/** 742/**
758 * This handles the general commands from the client (ie, north, fire, cast, 743 * This handles the general commands from the client (ie, north, fire, cast,
759 * etc.) 744 * etc.)
760 */ 745 */
761void 746void
762PlayerCmd (char *buf, int len, player *pl) 747PlayerCmd (char *buf, int len, player *pl)
763{ 748{
764
765 /* The following should never happen with a proper or honest client.
766 * Therefore, the error message doesn't have to be too clear - if
767 * someone is playing with a hacked/non working client, this gives them
768 * an idea of the problem, but they deserve what they get
769 */
770 if (pl->state != ST_PLAYING)
771 {
772 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
773 return;
774 }
775 /* Check if there is a count. In theory, a zero count could also be 749 /* Check if there is a count. In theory, a zero count could also be
776 * sent, so check for that also. 750 * sent, so check for that also.
777 */ 751 */
778 if (atoi (buf) || buf[0] == '0') 752 if (atoi (buf) || buf[0] == '0')
779 { 753 {
780 pl->count = atoi ((char *) buf); 754 pl->count = atoi ((char *) buf);
755
781 buf = strchr (buf, ' '); /* advance beyond the numbers */ 756 buf = strchr (buf, ' '); /* advance beyond the numbers */
782 if (!buf) 757 if (!buf)
783 {
784#ifdef ESRV_DEBUG
785 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
786#endif
787 return; 758 return;
788 } 759
789 buf++; 760 buf++;
790 } 761 }
791 /* This should not happen anymore. */ 762
792 if (pl->ob->speed_left < -1.0)
793 {
794 LOG (llevError, "Player has negative time - shouldn't do command.\n");
795 }
796 /* In c_new.c */
797 execute_newserver_command (pl->ob, (char *) buf); 763 execute_newserver_command (pl->ob, (char *) buf);
764
798 /* Perhaps something better should be done with a left over count. 765 /* Perhaps something better should be done with a left over count.
799 * Cleaning up the input should probably be done first - all actions 766 * Cleaning up the input should probably be done first - all actions
800 * for the command that issued the count should be done before any other 767 * for the command that issued the count should be done before any other
801 * commands. 768 * commands.
802 */ 769 */
803
804 pl->count = 0; 770 pl->count = 0;
805
806} 771}
807 772
808 773
809/** 774/**
810 * This handles the general commands from the client (ie, north, fire, cast, 775 * This handles the general commands from the client (ie, north, fire, cast,
… …
813 * can throttle. 778 * can throttle.
814 */ 779 */
815void 780void
816NewPlayerCmd (char *buf, int len, player *pl) 781NewPlayerCmd (char *buf, int len, player *pl)
817{ 782{
818 int time, repeat;
819 char command[MAX_BUF];
820 int pktlen;
821
822 if (len < 7) 783 if (len <= 6)
823 { 784 {
824 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 785 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
825 return; 786 return;
826 } 787 }
827 788
828 pktlen = net_uint16 ((uint8 *)buf); 789 uint16 cmdid = net_uint16 ((uint8 *)buf);
829 repeat = net_uint32 ((uint8 *)buf + 2); 790 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
830 791
831 /* -1 is special - no repeat, but don't update */ 792 /* -1 is special - no repeat, but don't update */
832 if (repeat != -1) 793 if (repeat != -1)
833 pl->count = repeat; 794 pl->count = repeat;
834 795
835 if ((len - 4) >= MAX_BUF) 796 buf += 6; //len -= 6;
836 len = MAX_BUF - 5;
837 797
838 strncpy ((char *) command, (char *) buf + 6, len - 4);
839 command[len - 4] = 0;
840
841 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0)
843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
844
845 /* In c_new.c */
846 execute_newserver_command (pl->ob, (char *) command); 798 execute_newserver_command (pl->ob, buf);
799
847 /* Perhaps something better should be done with a left over count. 800 /* Perhaps something better should be done with a left over count.
848 * Cleaning up the input should probably be done first - all actions 801 * Cleaning up the input should probably be done first - all actions
849 * for the command that issued the count should be done before any other 802 * for the command that issued the count should be done before any other
850 * commands. 803 * commands.
851 */ 804 */
852 pl->count = 0; 805 pl->count = 0;
853 806
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
854 if (FABS (pl->ob->speed) < 0.001) 808 int time = FABS (pl->ob->speed) < 0.001
855 time = MAX_TIME * 100; 809 ? time = MAX_TIME * 100
856 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 810 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 811
859 /* Send confirmation of command execution now */ 812 /* Send confirmation of command execution now */
860 813 packet sl ("comc");
861 packet sl;
862 sl << "comc " << uint16 (pktlen) << uint32 (time); 814 sl << uint16 (cmdid) << uint32 (time);
863 pl->socket->send_packet (sl); 815 pl->socket->send_packet (sl);
864} 816}
865 817
866 818
867/** This is a reply to a previous query. */ 819/** This is a reply to a previous query. */
868void 820void
869ReplyCmd (char *buf, int len, player *pl) 821ReplyCmd (char *buf, int len, player *pl)
870{ 822{
871 /* This is to synthesize how the data would be stored if it 823 /* This is to synthesize how the data would be stored if it
872 * was normally entered. A bit of a hack, and should be cleaned up 824 * was normally entered. A bit of a hack, and should be cleaned up
873 * once all the X11 code is removed from the server. 825 * once all the X11 code is removed from the server.
874 * 826 *
875 * We pass 13 to many of the functions because this way they 827 * We pass 13 to many of the functions because this way they
876 * think it was the carriage return that was entered, and the 828 * think it was the carriage return that was entered, and the
877 * function then does not try to do additional input. 829 * function then does not try to do additional input.
… …
880 832
881 /* this avoids any hacking here */ 833 /* this avoids any hacking here */
882 834
883 switch (pl->state) 835 switch (pl->state)
884 { 836 {
885 case ST_PLAYING: 837 case ST_PLAYING:
886 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 838 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
887 break; 839 break;
888 840
889 case ST_PLAY_AGAIN: 841 case ST_PLAY_AGAIN:
890 /* We can check this for return value (2==quit). Maybe we 842 /* We can check this for return value (2==quit). Maybe we
891 * should, and do something appropriate? 843 * should, and do something appropriate?
892 */ 844 */
893 receive_play_again (pl->ob, buf[0]); 845 receive_play_again (pl->ob, buf[0]);
894 break; 846 break;
895 847
896 case ST_ROLL_STAT: 848 case ST_ROLL_STAT:
897 key_roll_stat (pl->ob, buf[0]); 849 key_roll_stat (pl->ob, buf[0]);
898 break; 850 break;
899 851
900 case ST_CHANGE_CLASS: 852 case ST_CHANGE_CLASS:
901 853
902 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
903 break; 855 break;
904 856
905 case ST_CONFIRM_QUIT: 857 case ST_CONFIRM_QUIT:
906 key_confirm_quit (pl->ob, buf[0]); 858 key_confirm_quit (pl->ob, buf[0]);
907 break; 859 break;
908 860
909 case ST_CONFIGURE: 861 case ST_CONFIGURE:
910 LOG (llevError, "In client input handling, but into configure state\n"); 862 LOG (llevError, "In client input handling, but into configure state\n");
911 pl->state = ST_PLAYING; 863 pl->state = ST_PLAYING;
912 break; 864 break;
913 865
914 case ST_GET_NAME: 866 case ST_GET_NAME:
915 receive_player_name (pl->ob, 13); 867 receive_player_name (pl->ob, 13);
916 break; 868 break;
917 869
918 case ST_GET_PASSWORD: 870 case ST_GET_PASSWORD:
919 case ST_CONFIRM_PASSWORD: 871 case ST_CONFIRM_PASSWORD:
920 receive_player_password (pl->ob, 13); 872 receive_player_password (pl->ob, 13);
921 break; 873 break;
922 874
923 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 875 case ST_GET_PARTY_PASSWORD: /* Get password for party */
924 receive_party_password (pl->ob, 13); 876 receive_party_password (pl->ob, 13);
925 break; 877 break;
926 878
927 default: 879 default:
928 LOG (llevError, "Unknown input state: %d\n", pl->state); 880 LOG (llevError, "Unknown input state: %d\n", pl->state);
929 } 881 }
930} 882}
931 883
932/** 884/**
933 * Client tells its version. If there is a mismatch, we close the 885 * Client tells its version. If there is a mismatch, we close the
… …
937 * problem. 889 * problem.
938 */ 890 */
939void 891void
940VersionCmd (char *buf, int len, client * ns) 892VersionCmd (char *buf, int len, client * ns)
941{ 893{
942 char *cp;
943 char version_warning[256];
944
945 if (!buf) 894 if (!buf)
946 { 895 {
947 LOG (llevError, "CS: received corrupted version command\n"); 896 LOG (llevError, "CS: received corrupted version command\n");
948 return; 897 return;
949 } 898 }
950 899
951 ns->cs_version = atoi (buf); 900 ns->cs_version = atoi (buf);
952 ns->sc_version = ns->cs_version; 901 ns->sc_version = ns->cs_version;
902
903 LOG (llevDebug, "connection from client <%s>\n", buf);
904
905
906 //TODO: should log here just for statistics
907
953 if (VERSION_CS != ns->cs_version) 908 //if (VERSION_CS != ns->cs_version)
954 { 909 // unchecked;
955#ifdef ESRV_DEBUG 910
956 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
957#endif
958 }
959 cp = strchr (buf + 1, ' '); 911 char *cp = strchr (buf + 1, ' ');
960 if (!cp) 912 if (!cp)
961 return; 913 return;
914
962 ns->sc_version = atoi (cp); 915 ns->sc_version = atoi (cp);
916
963 if (VERSION_SC != ns->sc_version) 917 //if (VERSION_SC != ns->sc_version)
964 { 918 // unchecked;
965#ifdef ESRV_DEBUG 919
966 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
967#endif
968 }
969 cp = strchr (cp + 1, ' '); 920 cp = strchr (cp + 1, ' ');
921
970 if (cp) 922 if (cp)
971 { 923 {
972 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
973
974 assign (ns->version, cp + 1); 924 assign (ns->version, cp + 1);
975 925
976 if (ns->sc_version < 1026) 926 if (ns->sc_version < 1026)
977 { 927 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
980 ns->send_packet (version_warning);
981 }
982
983 } 929 }
984} 930}
985 931
986/** sound related functions. */ 932/** sound related functions. */
987void 933void
… …
993/** client wants the map resent */ 939/** client wants the map resent */
994 940
995void 941void
996MapRedrawCmd (char *buf, int len, player *pl) 942MapRedrawCmd (char *buf, int len, player *pl)
997{ 943{
998
999/* This function is currently disabled; just clearing the map state results in 944/* This function is currently disabled; just clearing the map state results in
1000 * display errors. It should clear the cache and send a newmap command. 945 * display errors. It should clear the cache and send a newmap command.
1001 * Unfortunately this solution does not work because some client versions send 946 * Unfortunately this solution does not work because some client versions send
1002 * a mapredraw command after receiving a newmap command. 947 * a mapredraw command after receiving a newmap command.
1003 */ 948 */
1004#if 0
1005 /* Okay, this is MAJOR UGLY. but the only way I know how to
1006 * clear the "cache"
1007 */
1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009 draw_client_map (pl->ob);
1010#endif
1011} 949}
1012 950
1013/** 951/**
1014 * Moves an object (typically, container to inventory). 952 * Moves an object (typically, container to inventory).
1015 * syntax is: move (to) (tag) (nrof) 953 * syntax is: move (to) (tag) (nrof)
… …
1018MoveCmd (char *buf, int len, player *pl) 956MoveCmd (char *buf, int len, player *pl)
1019{ 957{
1020 int vals[3], i; 958 int vals[3], i;
1021 959
1022 /* A little funky here. We only cycle for 2 records, because 960 /* A little funky here. We only cycle for 2 records, because
1023 * we obviously am not going to find a space after the third 961 * we obviously are not going to find a space after the third
1024 * record. Perhaps we should just replace this with a 962 * record. Perhaps we should just replace this with a
1025 * sscanf? 963 * sscanf?
1026 */ 964 */
1027 for (i = 0; i < 2; i++) 965 for (i = 0; i < 2; i++)
1028 { 966 {
1029 vals[i] = atoi (buf); 967 vals[i] = atoi (buf);
968
1030 if (!(buf = strchr (buf, ' '))) 969 if (!(buf = strchr (buf, ' ')))
1031 { 970 {
1032 LOG (llevError, "Incomplete move command: %s\n", buf); 971 LOG (llevError, "Incomplete move command: %s\n", buf);
1033 return; 972 return;
1034 } 973 }
974
1035 buf++; 975 buf++;
1036 } 976 }
977
1037 vals[2] = atoi (buf); 978 vals[2] = atoi (buf);
1038 979
1039/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 980/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1040 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1041} 982}
1042
1043
1044 983
1045/****************************************************************************** 984/******************************************************************************
1046 * 985 *
1047 * Start of commands the server sends to the client. 986 * Start of commands the server sends to the client.
1048 * 987 *
… …
1051/** 990/**
1052 * Asks the client to query the user. This way, the client knows 991 * Asks the client to query the user. This way, the client knows
1053 * it needs to send something back (vs just printing out a message) 992 * it needs to send something back (vs just printing out a message)
1054 */ 993 */
1055void 994void
1056send_query (client * ns, uint8 flags, char *text) 995send_query (client *ns, uint8 flags, char *text)
1057{ 996{
1058 char buf[MAX_BUF];
1059
1060 sprintf (buf, "query %d %s", flags, text ? text : ""); 997 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1061 ns->send_packet (buf);
1062} 998}
1063 999
1064#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1000#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065 Old = New; \ 1001 Old = New; \
1066 sl << uint8 (Type) << uint64 (New); \ 1002 sl << uint8 (Type) << uint64 (New); \
… …
1096esrv_update_stats (player *pl) 1032esrv_update_stats (player *pl)
1097{ 1033{
1098 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1099 uint16 flags; 1035 uint16 flags;
1100 1036
1101 packet sl; 1037 packet sl ("stats");
1102 sl << "stats ";
1103 1038
1104 if (pl->ob != NULL) 1039 if (pl->ob)
1105 { 1040 {
1106 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);
1107 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);
1108 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);
1109 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);
… …
1117 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);
1118 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);
1119 } 1054 }
1120 1055
1121 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1122 {
1123 uint8 s;
1124
1125 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1126 {
1127 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1128 { 1059 {
1129 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1130 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1131 */ 1062 */
1132 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1133 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1134 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1135 1066
1136 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;
1137 } 1068 }
1138 }
1139 }
1140 1069
1141 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1142 { 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) }
1143 else 1072 else
1144 { 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) }
… …
1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1163 1092
1164 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1165 { 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) }
1166 else 1095 else
1167 {
1168 int i;
1169
1170 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1171 { 1097 {
1172 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1173 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1174 continue; 1100 continue;
1175 1101
1176 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]);
1177 } 1103 }
1178 }
1179 1104
1180 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1181 { 1106 {
1182 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);
1183 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);
… …
1200void 1125void
1201esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1202{ 1127{
1203 pl->last_weight = weight; 1128 pl->last_weight = weight;
1204 1129
1205 packet sl; 1130 packet sl ("player");
1206 sl << "player ";
1207 1131
1208 sl << uint32 (pl->ob->count) 1132 sl << uint32 (pl->ob->count)
1209 << uint32 (weight) 1133 << uint32 (weight)
1210 << uint32 (pl->ob->face->number) 1134 << uint32 (pl->ob->face->number)
1211 << data8 (pl->ob->name); 1135 << data8 (pl->ob->name);
… …
1222 * when the player logs in and picks stuff up. 1146 * when the player logs in and picks stuff up.
1223 */ 1147 */
1224void 1148void
1225esrv_send_animation (client * ns, short anim_num) 1149esrv_send_animation (client * ns, short anim_num)
1226{ 1150{
1227 int i;
1228
1229 /* Do some checking on the anim_num we got. Note that the animations 1151 /* Do some checking on the anim_num we got. Note that the animations
1230 * are added in contigous order, so if the number is in the valid 1152 * are added in contigous order, so if the number is in the valid
1231 * range, it must be a valid animation. 1153 * range, it must be a valid animation.
1232 */ 1154 */
1233 if (anim_num < 0 || anim_num > num_animations) 1155 if (anim_num < 0 || anim_num > num_animations)
1234 { 1156 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1157 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return; 1158 return;
1237 } 1159 }
1238 1160
1239 packet sl; 1161 packet sl ("anim");
1240 1162
1241 sl << "anim "
1242 << uint16 (anim_num) 1163 sl << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */ 1164 << uint16 (0); /* flags - not used right now */
1244 1165
1245 /* Build up the list of faces. Also, send any information (ie, the 1166 /* Build up the list of faces. Also, send any information (ie, the
1246 * the face itself) down to the client. 1167 * the face itself) down to the client.
1247 */ 1168 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++) 1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1249 { 1170 {
1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1171 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1174 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 } 1175 }
1254 1176
1255 ns->send_packet (sl); 1177 ns->send_packet (sl);
1256 1178
… …
1271static void 1193static void
1272esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1194esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1273{ 1195{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1197 {
1198 //TODO: one or the other, can't both have abort and return, verify and act
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1199 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return; 1200 return;
1278 abort (); 1201 abort ();
1279 } 1202 }
1280 1203
1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1204 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1282 newmap->cells[x][y].count++; 1205 newmap->cells[x][y].count++;
1283 1206
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0); 1208 esrv_send_face (ns, face_num, 0);
1286}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393} 1209}
1394 1210
1395/** Clears a map cell */ 1211/** Clears a map cell */
1396static void 1212static void
1397map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1213map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1409#define MAX_LAYERS 3 1225#define MAX_LAYERS 3
1410 1226
1411/* Using a global really isn't a good approach, but saves the over head of 1227/* Using a global really isn't a good approach, but saves the over head of
1412 * allocating and deallocating such a block of data each time run through, 1228 * allocating and deallocating such a block of data each time run through,
1413 * and saves the space of allocating this in the socket object when we only 1229 * and saves the space of allocating this in the socket object when we only
1414 * need it for this cycle. If the serve is ever threaded, this needs to be 1230 * need it for this cycle. If the server is ever threaded, this needs to be
1415 * re-examined. 1231 * re-examined.
1416 */ 1232 */
1417
1418static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1419 1234
1420/** 1235/**
1421 * Returns true if any of the heads for this 1236 * Returns true if any of the heads for this
1422 * space is set. Returns false if all are blank - this is used 1237 * space is set. Returns false if all are blank - this is used
1423 * for empty space checking. 1238 * for empty space checking.
1424 */ 1239 */
1425static inline int 1240static inline int
1426have_head (int ax, int ay) 1241have_head (int ax, int ay)
1427{ 1242{
1428
1429 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1243 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1430 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1244 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1431 return 1; 1245 return 1;
1246
1432 return 0; 1247 return 0;
1433} 1248}
1434 1249
1435/** 1250/**
1436 * check_head is a bit simplistic version of update_space below. 1251 * check_head is a bit simplistic version of update_space below.
1437 * basically, it only checks the that the head on space ax,ay at layer 1252 * basically, it only checks the that the head on space ax,ay at layer
1438 * needs to get sent - if so, it adds the data, sending the head 1253 * needs to get sent - if so, it adds the data, sending the head
1439 * if needed, and returning 1. If this no data needs to get 1254 * if needed, and returning 1. If this no data needs to get
1440 * sent, it returns zero. 1255 * sent, it returns zero.
1441 */ 1256 */
1442static int 1257static int
1443check_head (packet &sl, client &ns, int ax, int ay, int layer) 1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1444{ 1259{
… …
1480 * numbers the spaces differently - I think this was a leftover from 1295 * numbers the spaces differently - I think this was a leftover from
1481 * the map command, where the faces stack up. Sinces that is no longer 1296 * the map command, where the faces stack up. Sinces that is no longer
1482 * the case, it seems to make more sense to have these layer values 1297 * the case, it seems to make more sense to have these layer values
1483 * actually match. 1298 * actually match.
1484 */ 1299 */
1485
1486static int 1300static int
1487update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1301update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1488{ 1302{
1489 object *ob, *head; 1303 object *ob, *head;
1490 uint16 face_num; 1304 uint16 face_num;
… …
1758 if (ns->ext_mapinfos) 1572 if (ns->ext_mapinfos)
1759 { 1573 {
1760 if (ns->EMI_smooth) 1574 if (ns->EMI_smooth)
1761 result += 1; /*One byte for smoothlevel */ 1575 result += 1; /*One byte for smoothlevel */
1762 } 1576 }
1577
1763 return result; 1578 return result;
1764} 1579}
1765 1580
1766/** 1581/**
1767 * This function uses the new map1 protocol command to send the map 1582 * This function uses the new map1 protocol command to send the map
… …
1799 1614
1800 client &socket = *pl->contr->socket; 1615 client &socket = *pl->contr->socket;
1801 1616
1802 check_map_change (pl->contr); 1617 check_map_change (pl->contr);
1803 1618
1804 packet sl; 1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1805 packet esl; 1620 packet esl;
1806 1621
1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1808 startlen = sl.length (); 1622 startlen = sl.length ();
1809 1623
1810 /*Extendedmapinfo structure initialisation */ 1624 /*Extendedmapinfo structure initialisation */
1811 if (socket.ext_mapinfos) 1625 if (socket.ext_mapinfos)
1812 { 1626 {
… …
1856 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1670 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1857 { 1671 {
1858 ax = 0; 1672 ax = 0;
1859 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1673 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1860 { 1674 {
1861
1862 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1675 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1863 1676
1864 /* If this space is out of the normal viewable area, we only check 1677 /* If this space is out of the normal viewable area, we only check
1865 * the heads value ax or ay will only be greater than what 1678 * the heads value ax or ay will only be greater than what
1866 * the client wants if using the map1a command - this is because 1679 * the client wants if using the map1a command - this is because
… …
2197 return; 2010 return;
2198 2011
2199 memset (&newmap, 0, sizeof (struct Map)); 2012 memset (&newmap, 0, sizeof (struct Map));
2200 2013
2201 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2014 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2202 {
2203 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2015 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2204 { 2016 {
2205 ax = i; 2017 ax = i;
2206 ay = j; 2018 ay = j;
2207 m = pm; 2019 m = pm;
2208 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2020 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2021
2209 if (mflags & P_OUT_OF_MAP) 2022 if (mflags & P_OUT_OF_MAP)
2210 continue; 2023 continue;
2211 if (mflags & P_NEED_UPDATE) 2024
2212 update_position (m, ax, ay);
2213 /* If a map is visible to the player, we don't want to swap it out 2025 /* If a map is visible to the player, we don't want to swap it out
2214 * just to reload it. This should really call something like 2026 * just to reload it. This should really call something like
2215 * swap_map, but this is much more efficient and 'good enough' 2027 * swap_map, but this is much more efficient and 'good enough'
2216 */ 2028 */
2217 if (mflags & P_NEW_MAP) 2029 if (mflags & P_NEW_MAP)
2218 m->timeout = 50; 2030 m->timeout = 50;
2219 } 2031 }
2220 } 2032
2221 /* do LOS after calls to update_position */ 2033 /* do LOS after calls to update_position */
2222 if (pl->contr->do_los) 2034 if (pl->contr->do_los)
2223 { 2035 {
2224 update_los (pl); 2036 update_los (pl);
2225 pl->contr->do_los = 0; 2037 pl->contr->do_los = 0;
… …
2353 { 2165 {
2354 LOG (llevError, "Invalid call to esrv_remove_spell"); 2166 LOG (llevError, "Invalid call to esrv_remove_spell");
2355 return; 2167 return;
2356 } 2168 }
2357 2169
2358 packet sl; 2170 packet sl ("delspell");
2359 2171
2360 sl << "delspell "
2361 << uint32 (spell->count); 2172 sl << uint32 (spell->count);
2362 2173
2363 pl->socket->send_packet (sl); 2174 pl->socket->send_packet (sl);
2364} 2175}
2365 2176
2366/* appends the spell *spell to the Socklist we will send the data to. */ 2177/* appends the spell *spell to the Socklist we will send the data to. */
… …
2419 } 2230 }
2420 2231
2421 if (!pl->socket->monitor_spells) 2232 if (!pl->socket->monitor_spells)
2422 return; 2233 return;
2423 2234
2424 packet sl; 2235 packet sl ("addspell");
2425
2426 sl << "addspell ";
2427 2236
2428 if (!spell) 2237 if (!spell)
2429 { 2238 {
2430 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2239 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2431 { 2240 {

Diff Legend

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