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.49 by root, Thu Dec 21 06:12:37 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{
… …
570 * 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.
571 */ 570 */
572void 571void
573AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
574{ 573{
574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
576
575 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
576 ns->send_packet ("addme_failed"); 578 ns->send_packet ("addme_failed");
577 else 579 else
578 ns->send_packet ("addme_success"); 580 ns->send_packet ("addme_success");
579} 581}
580 582
… …
700 * a piece of data from us that we know the client wants. So 702 * 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 703 * if we know the client wants it, might as well push it to the
702 * client. 704 * client.
703 */ 705 */
704static void 706static void
705SendSmooth (client * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
706{ 708{
707 uint16 smoothface; 709 uint16 smoothface;
708 710
709 /* If we can't find a face, return and set it so we won't try to send this 711 /* If we can't find a face, return and set it so we won't try to send this
710 * again. 712 * again.
… …
720 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
721 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
722 724
723 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
724 726
725 packet sl; 727 packet sl ("smooth");
726 728
727 sl << "smooth "
728 << uint16 (face) 729 sl << uint16 (face)
729 << uint16 (smoothface); 730 << uint16 (smoothface);
730 731
731 ns->send_packet (sl); 732 ns->send_packet (sl);
732} 733}
733 734
734 /** 735 /**
735 * Tells client the picture it has to use 736 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
737 */ 738 */
738void 739void
739AskSmooth (char *buf, int len, client * ns) 740AskSmooth (char *buf, int len, client *ns)
740{ 741{
741 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
742
743 facenbr = atoi (buf);
744 SendSmooth (ns, facenbr);
745} 743}
746 744
747/** 745/**
748 * This handles the general commands from the client (ie, north, fire, cast, 746 * This handles the general commands from the client (ie, north, fire, cast,
749 * etc.) 747 * etc.)
750 */ 748 */
751void 749void
752PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
753{ 751{
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 752 /* Check if there is a count. In theory, a zero count could also be
766 * sent, so check for that also. 753 * sent, so check for that also.
767 */ 754 */
768 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
769 { 756 {
770 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
771 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
772 if (!buf) 760 if (!buf)
773 {
774#ifdef ESRV_DEBUG
775 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776#endif
777 return; 761 return;
778 } 762
779 buf++; 763 buf++;
780 } 764 }
781 /* This should not happen anymore. */ 765
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); 766 execute_newserver_command (pl->ob, (char *) buf);
767
788 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
789 * Cleaning up the input should probably be done first - all actions 769 * 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 770 * for the command that issued the count should be done before any other
791 * commands. 771 * commands.
792 */ 772 */
793
794 pl->count = 0; 773 pl->count = 0;
795
796} 774}
797 775
798 776
799/** 777/**
800 * This handles the general commands from the client (ie, north, fire, cast, 778 * This handles the general commands from the client (ie, north, fire, cast,
… …
803 * can throttle. 781 * can throttle.
804 */ 782 */
805void 783void
806NewPlayerCmd (char *buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
807{ 785{
808 int time, repeat;
809 char command[MAX_BUF];
810 int pktlen;
811
812 if (len < 7) 786 if (len <= 6)
813 { 787 {
814 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 788 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
815 return; 789 return;
816 } 790 }
817 791
818 pktlen = net_uint16 ((uint8 *)buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
819 repeat = net_uint32 ((uint8 *)buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
820 794
821 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 796 if (repeat != -1)
823 pl->count = repeat; 797 pl->count = repeat;
824 798
825 if ((len - 4) >= MAX_BUF) 799 buf += 6; //len -= 6;
826 len = MAX_BUF - 5;
827 800
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); 801 execute_newserver_command (pl->ob, buf);
802
837 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
838 * Cleaning up the input should probably be done first - all actions 804 * 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 805 * for the command that issued the count should be done before any other
840 * commands. 806 * commands.
841 */ 807 */
842 pl->count = 0; 808 pl->count = 0;
843 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
844 if (FABS (pl->ob->speed) < 0.001) 811 int time = FABS (pl->ob->speed) < 0.001
845 time = MAX_TIME * 100; 812 ? time = MAX_TIME * 100
846 else
847 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
848 814
849 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
850 816 packet sl ("comc");
851 packet sl;
852 sl << "comc " << uint16 (pktlen) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
853 pl->socket->send_packet (sl); 818 pl->socket->send_packet (sl);
854} 819}
855 820
856
857/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
858void 822void
859ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
860{ 824{
825 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl
828
829 player *pl = ns->pl;
830
861 /* This is to synthesize how the data would be stored if it 831 /* This is to synthesize how the data would be stored if it
862 * was normally entered. A bit of a hack, and should be cleaned up 832 * was normally entered. A bit of a hack, and should be cleaned up
863 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
864 * 834 *
865 * We pass 13 to many of the functions because this way they 835 * We pass 13 to many of the functions because this way they
866 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
867 * function then does not try to do additional input. 837 * function then does not try to do additional input.
… …
870 840
871 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
872 842
873 switch (pl->state) 843 switch (pl->state)
874 { 844 {
875 case ST_PLAYING: 845 case ST_PLAYING:
876 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
877 break; 847 break;
878 848
879 case ST_PLAY_AGAIN: 849 case ST_PLAY_AGAIN:
880 /* We can check this for return value (2==quit). Maybe we 850 /* We can check this for return value (2==quit). Maybe we
881 * should, and do something appropriate? 851 * should, and do something appropriate?
882 */ 852 */
883 receive_play_again (pl->ob, buf[0]); 853 receive_play_again (pl->ob, buf[0]);
884 break; 854 break;
885 855
886 case ST_ROLL_STAT: 856 case ST_ROLL_STAT:
887 key_roll_stat (pl->ob, buf[0]); 857 key_roll_stat (pl->ob, buf[0]);
888 break; 858 break;
889 859
890 case ST_CHANGE_CLASS: 860 case ST_CHANGE_CLASS:
891
892 key_change_class (pl->ob, buf[0]); 861 key_change_class (pl->ob, buf[0]);
893 break; 862 break;
894 863
895 case ST_CONFIRM_QUIT: 864 case ST_CONFIRM_QUIT:
896 key_confirm_quit (pl->ob, buf[0]); 865 key_confirm_quit (pl->ob, buf[0]);
897 break; 866 break;
898 867
899 case ST_CONFIGURE: 868 case ST_CONFIGURE:
900 LOG (llevError, "In client input handling, but into configure state\n"); 869 LOG (llevError, "In client input handling, but into configure state\n");
901 pl->state = ST_PLAYING; 870 pl->state = ST_PLAYING;
902 break; 871 break;
903 872
904 case ST_GET_NAME: 873 case ST_GET_NAME:
905 receive_player_name (pl->ob, 13); 874 receive_player_name (pl->ob, 13);
906 break; 875 break;
907 876
908 case ST_GET_PASSWORD: 877 case ST_GET_PASSWORD:
909 case ST_CONFIRM_PASSWORD: 878 case ST_CONFIRM_PASSWORD:
910 receive_player_password (pl->ob, 13); 879 receive_player_password (pl->ob, 13);
911 break; 880 break;
912 881
913 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 882 case ST_GET_PARTY_PASSWORD: /* Get password for party */
914 receive_party_password (pl->ob, 13); 883 receive_party_password (pl->ob, 13);
915 break; 884 break;
916 885
917 default: 886 default:
918 LOG (llevError, "Unknown input state: %d\n", pl->state); 887 LOG (llevError, "Unknown input state: %d\n", pl->state);
919 } 888 }
920} 889}
921 890
922/** 891/**
923 * Client tells its version. If there is a mismatch, we close the 892 * Client tells its version. If there is a mismatch, we close the
… …
927 * problem. 896 * problem.
928 */ 897 */
929void 898void
930VersionCmd (char *buf, int len, client * ns) 899VersionCmd (char *buf, int len, client * ns)
931{ 900{
932 char *cp;
933 char version_warning[256];
934
935 if (!buf) 901 if (!buf)
936 { 902 {
937 LOG (llevError, "CS: received corrupted version command\n"); 903 LOG (llevError, "CS: received corrupted version command\n");
938 return; 904 return;
939 } 905 }
940 906
941 ns->cs_version = atoi (buf); 907 ns->cs_version = atoi (buf);
942 ns->sc_version = ns->cs_version; 908 ns->sc_version = ns->cs_version;
909
910 LOG (llevDebug, "connection from client <%s>\n", buf);
911
912
913 //TODO: should log here just for statistics
914
943 if (VERSION_CS != ns->cs_version) 915 //if (VERSION_CS != ns->cs_version)
944 { 916 // unchecked;
945#ifdef ESRV_DEBUG 917
946 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
947#endif
948 }
949 cp = strchr (buf + 1, ' '); 918 char *cp = strchr (buf + 1, ' ');
950 if (!cp) 919 if (!cp)
951 return; 920 return;
921
952 ns->sc_version = atoi (cp); 922 ns->sc_version = atoi (cp);
923
953 if (VERSION_SC != ns->sc_version) 924 //if (VERSION_SC != ns->sc_version)
954 { 925 // unchecked;
955#ifdef ESRV_DEBUG 926
956 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
957#endif
958 }
959 cp = strchr (cp + 1, ' '); 927 cp = strchr (cp + 1, ' ');
928
960 if (cp) 929 if (cp)
961 { 930 {
962 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
963
964 assign (ns->version, cp + 1); 931 assign (ns->version, cp + 1);
965 932
966 if (ns->sc_version < 1026) 933 if (ns->sc_version < 1026)
967 { 934 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!! ****"); 935 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 ns->send_packet (version_warning);
971 }
972
973 } 936 }
974} 937}
975 938
976/** sound related functions. */ 939/** sound related functions. */
977void 940void
… …
983/** client wants the map resent */ 946/** client wants the map resent */
984 947
985void 948void
986MapRedrawCmd (char *buf, int len, player *pl) 949MapRedrawCmd (char *buf, int len, player *pl)
987{ 950{
988
989/* This function is currently disabled; just clearing the map state results in 951/* 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. 952 * display errors. It should clear the cache and send a newmap command.
991 * Unfortunately this solution does not work because some client versions send 953 * Unfortunately this solution does not work because some client versions send
992 * a mapredraw command after receiving a newmap command. 954 * a mapredraw command after receiving a newmap command.
993 */ 955 */
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} 956}
1002 957
1003/** 958/**
1004 * Moves an object (typically, container to inventory). 959 * Moves an object (typically, container to inventory).
1005 * syntax is: move (to) (tag) (nrof) 960 * syntax is: move (to) (tag) (nrof)
… …
1008MoveCmd (char *buf, int len, player *pl) 963MoveCmd (char *buf, int len, player *pl)
1009{ 964{
1010 int vals[3], i; 965 int vals[3], i;
1011 966
1012 /* A little funky here. We only cycle for 2 records, because 967 /* A little funky here. We only cycle for 2 records, because
1013 * we obviously am not going to find a space after the third 968 * we obviously are not going to find a space after the third
1014 * record. Perhaps we should just replace this with a 969 * record. Perhaps we should just replace this with a
1015 * sscanf? 970 * sscanf?
1016 */ 971 */
1017 for (i = 0; i < 2; i++) 972 for (i = 0; i < 2; i++)
1018 { 973 {
1019 vals[i] = atoi (buf); 974 vals[i] = atoi (buf);
975
1020 if (!(buf = strchr (buf, ' '))) 976 if (!(buf = strchr (buf, ' ')))
1021 { 977 {
1022 LOG (llevError, "Incomplete move command: %s\n", buf); 978 LOG (llevError, "Incomplete move command: %s\n", buf);
1023 return; 979 return;
1024 } 980 }
981
1025 buf++; 982 buf++;
1026 } 983 }
984
1027 vals[2] = atoi (buf); 985 vals[2] = atoi (buf);
1028 986
1029/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 987/* 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]); 988 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1031} 989}
1032
1033
1034 990
1035/****************************************************************************** 991/******************************************************************************
1036 * 992 *
1037 * Start of commands the server sends to the client. 993 * Start of commands the server sends to the client.
1038 * 994 *
… …
1041/** 997/**
1042 * Asks the client to query the user. This way, the client knows 998 * 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) 999 * it needs to send something back (vs just printing out a message)
1044 */ 1000 */
1045void 1001void
1046send_query (client * ns, uint8 flags, char *text) 1002send_query (client *ns, uint8 flags, char *text)
1047{ 1003{
1048 char buf[MAX_BUF];
1049
1050 sprintf (buf, "query %d %s", flags, text ? text : ""); 1004 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1051 ns->send_packet (buf);
1052} 1005}
1053 1006
1054#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1007#define AddIfInt64(Old,New,Type) if (Old != New) {\
1055 Old = New; \ 1008 Old = New; \
1056 sl << uint8 (Type) << uint64 (New); \ 1009 sl << uint8 (Type) << uint64 (New); \
… …
1086esrv_update_stats (player *pl) 1039esrv_update_stats (player *pl)
1087{ 1040{
1088 char buf[MAX_BUF]; 1041 char buf[MAX_BUF];
1089 uint16 flags; 1042 uint16 flags;
1090 1043
1091 packet sl; 1044 packet sl ("stats");
1092 sl << "stats ";
1093 1045
1094 if (pl->ob != NULL) 1046 if (pl->ob)
1095 { 1047 {
1096 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1048 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); 1049 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); 1050 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); 1051 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); 1059 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); 1060 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1109 } 1061 }
1110 1062
1111 if (pl->socket->exp64) 1063 if (pl->socket->exp64)
1112 {
1113 uint8 s;
1114
1115 for (s = 0; s < NUM_SKILLS; s++) 1064 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) 1065 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1118 { 1066 {
1119 /* Always send along the level if exp changes. This is only 1067 /* Always send along the level if exp changes. This is only
1120 * 1 extra byte, but keeps processing simpler. 1068 * 1 extra byte, but keeps processing simpler.
1121 */ 1069 */
1122 sl << uint8 (s + CS_STAT_SKILLINFO) 1070 sl << uint8 (s + CS_STAT_SKILLINFO)
1123 << uint8 (pl->last_skill_ob[s]->level) 1071 << uint8 (pl->last_skill_ob[s]->level)
1124 << uint64 (pl->last_skill_ob[s]->stats.exp); 1072 << uint64 (pl->last_skill_ob[s]->stats.exp);
1125 1073
1126 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1074 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1127 } 1075 }
1128 }
1129 }
1130 1076
1131 if (pl->socket->exp64) 1077 if (pl->socket->exp64)
1132 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1078 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1133 else 1079 else
1134 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1080 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
… …
1152 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1153 1099
1154 if (pl->socket->sc_version < 1025) 1100 if (pl->socket->sc_version < 1025)
1155 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1101 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1156 else 1102 else
1157 {
1158 int i;
1159
1160 for (i = 0; i < NROFATTACKS; i++) 1103 for (int i = 0; i < NROFATTACKS; i++)
1161 { 1104 {
1162 /* Skip ones we won't send */ 1105 /* Skip ones we won't send */
1163 if (atnr_cs_stat[i] == -1) 1106 if (atnr_cs_stat[i] == -1)
1164 continue; 1107 continue;
1165 1108
1166 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1109 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1167 } 1110 }
1168 }
1169 1111
1170 if (pl->socket->monitor_spells) 1112 if (pl->socket->monitor_spells)
1171 { 1113 {
1172 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1114 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); 1115 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
1190void 1132void
1191esrv_new_player (player *pl, uint32 weight) 1133esrv_new_player (player *pl, uint32 weight)
1192{ 1134{
1193 pl->last_weight = weight; 1135 pl->last_weight = weight;
1194 1136
1195 packet sl; 1137 packet sl ("player");
1196 sl << "player ";
1197 1138
1198 sl << uint32 (pl->ob->count) 1139 sl << uint32 (pl->ob->count)
1199 << uint32 (weight) 1140 << uint32 (weight)
1200 << uint32 (pl->ob->face->number) 1141 << uint32 (pl->ob->face->number)
1201 << data8 (pl->ob->name); 1142 << data8 (pl->ob->name);
… …
1212 * when the player logs in and picks stuff up. 1153 * when the player logs in and picks stuff up.
1213 */ 1154 */
1214void 1155void
1215esrv_send_animation (client * ns, short anim_num) 1156esrv_send_animation (client * ns, short anim_num)
1216{ 1157{
1217 int i;
1218
1219 /* 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
1220 * 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
1221 * range, it must be a valid animation. 1160 * range, it must be a valid animation.
1222 */ 1161 */
1223 if (anim_num < 0 || anim_num > num_animations) 1162 if (anim_num < 0 || anim_num > num_animations)
1224 { 1163 {
1225 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1164 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1226 return; 1165 return;
1227 } 1166 }
1228 1167
1229 packet sl; 1168 packet sl ("anim");
1230 1169
1231 sl << "anim "
1232 << uint16 (anim_num) 1170 sl << uint16 (anim_num)
1233 << uint16 (0); /* flags - not used right now */ 1171 << uint16 (0); /* flags - not used right now */
1234 1172
1235 /* Build up the list of faces. Also, send any information (ie, the 1173 /* Build up the list of faces. Also, send any information (ie, the
1236 * the face itself) down to the client. 1174 * the face itself) down to the client.
1237 */ 1175 */
1238 for (i = 0; i < animations[anim_num].num_animations; i++) 1176 for (int i = 0; i < animations[anim_num].num_animations; i++)
1239 { 1177 {
1240 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1178 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1241 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1179 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1180
1242 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1181 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1243 } 1182 }
1244 1183
1245 ns->send_packet (sl); 1184 ns->send_packet (sl);
1246 1185
… …
1261static void 1200static void
1262esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1201esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1263{ 1202{
1264 if (newmap->cells[x][y].count >= MAP_LAYERS) 1203 if (newmap->cells[x][y].count >= MAP_LAYERS)
1265 { 1204 {
1205 //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); 1206 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1267 return; 1207 return;
1268 abort (); 1208 abort ();
1269 } 1209 }
1270 1210
1271 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1211 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1272 newmap->cells[x][y].count++; 1212 newmap->cells[x][y].count++;
1273 1213
1274 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1214 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1275 esrv_send_face (ns, face_num, 0); 1215 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} 1216}
1384 1217
1385/** Clears a map cell */ 1218/** Clears a map cell */
1386static void 1219static void
1387map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1220map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1399#define MAX_LAYERS 3 1232#define MAX_LAYERS 3
1400 1233
1401/* Using a global really isn't a good approach, but saves the over head of 1234/* 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, 1235 * 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 1236 * 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 1237 * need it for this cycle. If the server is ever threaded, this needs to be
1405 * re-examined. 1238 * re-examined.
1406 */ 1239 */
1407
1408static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1240static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1409 1241
1410/** 1242/**
1411 * Returns true if any of the heads for this 1243 * Returns true if any of the heads for this
1412 * space is set. Returns false if all are blank - this is used 1244 * space is set. Returns false if all are blank - this is used
1413 * for empty space checking. 1245 * for empty space checking.
1414 */ 1246 */
1415static inline int 1247static inline int
1416have_head (int ax, int ay) 1248have_head (int ax, int ay)
1417{ 1249{
1418
1419 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1250 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]) 1251 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1421 return 1; 1252 return 1;
1253
1422 return 0; 1254 return 0;
1423} 1255}
1424 1256
1425/** 1257/**
1426 * check_head is a bit simplistic version of update_space below. 1258 * 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 1259 * 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 1260 * 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 1261 * if needed, and returning 1. If this no data needs to get
1430 * sent, it returns zero. 1262 * sent, it returns zero.
1431 */ 1263 */
1432static int 1264static int
1433check_head (packet &sl, client &ns, int ax, int ay, int layer) 1265check_head (packet &sl, client &ns, int ax, int ay, int layer)
1434{ 1266{
… …
1470 * numbers the spaces differently - I think this was a leftover from 1302 * 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 1303 * 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 1304 * the case, it seems to make more sense to have these layer values
1473 * actually match. 1305 * actually match.
1474 */ 1306 */
1475
1476static int 1307static int
1477update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1308update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1478{ 1309{
1479 object *ob, *head; 1310 object *ob, *head;
1480 uint16 face_num; 1311 uint16 face_num;
… …
1748 if (ns->ext_mapinfos) 1579 if (ns->ext_mapinfos)
1749 { 1580 {
1750 if (ns->EMI_smooth) 1581 if (ns->EMI_smooth)
1751 result += 1; /*One byte for smoothlevel */ 1582 result += 1; /*One byte for smoothlevel */
1752 } 1583 }
1584
1753 return result; 1585 return result;
1754} 1586}
1755 1587
1756/** 1588/**
1757 * This function uses the new map1 protocol command to send the map 1589 * This function uses the new map1 protocol command to send the map
… …
1789 1621
1790 client &socket = *pl->contr->socket; 1622 client &socket = *pl->contr->socket;
1791 1623
1792 check_map_change (pl->contr); 1624 check_map_change (pl->contr);
1793 1625
1794 packet sl; 1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1795 packet esl; 1627 packet esl;
1796 1628
1797 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1798 startlen = sl.length (); 1629 startlen = sl.length ();
1799 1630
1800 /*Extendedmapinfo structure initialisation */ 1631 /*Extendedmapinfo structure initialisation */
1801 if (socket.ext_mapinfos) 1632 if (socket.ext_mapinfos)
1802 { 1633 {
… …
1846 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1677 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1847 { 1678 {
1848 ax = 0; 1679 ax = 0;
1849 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1680 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1850 { 1681 {
1851
1852 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1682 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1853 1683
1854 /* If this space is out of the normal viewable area, we only check 1684 /* If this space is out of the normal viewable area, we only check
1855 * the heads value ax or ay will only be greater than what 1685 * the heads value ax or ay will only be greater than what
1856 * the client wants if using the map1a command - this is because 1686 * the client wants if using the map1a command - this is because
… …
2187 return; 2017 return;
2188 2018
2189 memset (&newmap, 0, sizeof (struct Map)); 2019 memset (&newmap, 0, sizeof (struct Map));
2190 2020
2191 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2021 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2192 {
2193 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
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;
2201 if (mflags & P_NEED_UPDATE) 2031
2202 update_position (m, ax, ay);
2203 /* If a map is visible to the player, we don't want to swap it out 2032 /* 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 2033 * just to reload it. This should really call something like
2205 * swap_map, but this is much more efficient and 'good enough' 2034 * swap_map, but this is much more efficient and 'good enough'
2206 */ 2035 */
2207 if (mflags & P_NEW_MAP) 2036 if (mflags & P_NEW_MAP)
2208 m->timeout = 50; 2037 m->timeout = 50;
2209 } 2038 }
2210 } 2039
2211 /* do LOS after calls to update_position */ 2040 /* do LOS after calls to update_position */
2212 if (pl->contr->do_los) 2041 if (pl->contr->do_los)
2213 { 2042 {
2214 update_los (pl); 2043 update_los (pl);
2215 pl->contr->do_los = 0; 2044 pl->contr->do_los = 0;
… …
2343 { 2172 {
2344 LOG (llevError, "Invalid call to esrv_remove_spell"); 2173 LOG (llevError, "Invalid call to esrv_remove_spell");
2345 return; 2174 return;
2346 } 2175 }
2347 2176
2348 packet sl; 2177 packet sl ("delspell");
2349 2178
2350 sl << "delspell "
2351 << uint32 (spell->count); 2179 sl << uint32 (spell->count);
2352 2180
2353 pl->socket->send_packet (sl); 2181 pl->socket->send_packet (sl);
2354} 2182}
2355 2183
2356/* appends the spell *spell to the Socklist we will send the data to. */ 2184/* appends the spell *spell to the Socklist we will send the data to. */
… …
2409 } 2237 }
2410 2238
2411 if (!pl->socket->monitor_spells) 2239 if (!pl->socket->monitor_spells)
2412 return; 2240 return;
2413 2241
2414 packet sl; 2242 packet sl ("addspell");
2415
2416 sl << "addspell ";
2417 2243
2418 if (!spell) 2244 if (!spell)
2419 { 2245 {
2420 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2246 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2421 { 2247 {

Diff Legend

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