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.47 by root, Wed Dec 20 01:19:11 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);
… …
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{
575 Settings oldsettings;
576
577 oldsettings = settings;
578 if (ns->status != Ns_Add || add_player (ns)) 574 if (ns->status != Ns_Add || add_player (ns))
579 ns->send_packet ("addme_failed"); 575 ns->send_packet ("addme_failed");
580 else 576 else
581 ns->send_packet ("addme_success"); 577 ns->send_packet ("addme_success");
582
583 settings = oldsettings;
584} 578}
585 579
586/** Reply to ExtendedInfos command */ 580/** Reply to ExtendedInfos command */
587void 581void
588ToggleExtendedInfos (char *buf, int len, client * ns) 582ToggleExtendedInfos (char *buf, int len, client * ns)
… …
705 * 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
706 * 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
707 * client. 701 * client.
708 */ 702 */
709static void 703static void
710SendSmooth (client * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
711{ 705{
712 uint16 smoothface; 706 uint16 smoothface;
713 707
714 /* 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
715 * again. 709 * again.
… …
725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
726 esrv_send_face (ns, smoothface, 0); 720 esrv_send_face (ns, smoothface, 0);
727 721
728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729 723
730 packet sl; 724 packet sl ("smooth");
731 725
732 sl << "smooth "
733 << uint16 (face) 726 sl << uint16 (face)
734 << uint16 (smoothface); 727 << uint16 (smoothface);
735 728
736 ns->send_packet (sl); 729 ns->send_packet (sl);
737} 730}
738 731
739 /** 732 /**
740 * Tells client the picture it has to use 733 * Tells client the picture it has to use
741 * to smooth a picture number given as argument. 734 * to smooth a picture number given as argument.
742 */ 735 */
743void 736void
744AskSmooth (char *buf, int len, client * ns) 737AskSmooth (char *buf, int len, client *ns)
745{ 738{
746 uint16 facenbr; 739 SendSmooth (ns, atoi (buf));
747
748 facenbr = atoi (buf);
749 SendSmooth (ns, facenbr);
750} 740}
751 741
752/** 742/**
753 * 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,
754 * etc.) 744 * etc.)
755 */ 745 */
756void 746void
757PlayerCmd (char *buf, int len, player *pl) 747PlayerCmd (char *buf, int len, player *pl)
758{ 748{
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 749 /* Check if there is a count. In theory, a zero count could also be
771 * sent, so check for that also. 750 * sent, so check for that also.
772 */ 751 */
773 if (atoi (buf) || buf[0] == '0') 752 if (atoi (buf) || buf[0] == '0')
774 { 753 {
775 pl->count = atoi ((char *) buf); 754 pl->count = atoi ((char *) buf);
755
776 buf = strchr (buf, ' '); /* advance beyond the numbers */ 756 buf = strchr (buf, ' '); /* advance beyond the numbers */
777 if (!buf) 757 if (!buf)
778 {
779#ifdef ESRV_DEBUG
780 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
781#endif
782 return; 758 return;
783 } 759
784 buf++; 760 buf++;
785 } 761 }
786 /* This should not happen anymore. */ 762
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); 763 execute_newserver_command (pl->ob, (char *) buf);
764
793 /* Perhaps something better should be done with a left over count. 765 /* Perhaps something better should be done with a left over count.
794 * Cleaning up the input should probably be done first - all actions 766 * 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 767 * for the command that issued the count should be done before any other
796 * commands. 768 * commands.
797 */ 769 */
798
799 pl->count = 0; 770 pl->count = 0;
800
801} 771}
802 772
803 773
804/** 774/**
805 * 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,
… …
808 * can throttle. 778 * can throttle.
809 */ 779 */
810void 780void
811NewPlayerCmd (char *buf, int len, player *pl) 781NewPlayerCmd (char *buf, int len, player *pl)
812{ 782{
813 int time, repeat;
814 char command[MAX_BUF];
815 int pktlen;
816
817 if (len < 7) 783 if (len <= 6)
818 { 784 {
819 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);
820 return; 786 return;
821 } 787 }
822 788
823 pktlen = net_uint16 ((uint8 *)buf); 789 uint16 cmdid = net_uint16 ((uint8 *)buf);
824 repeat = net_uint32 ((uint8 *)buf + 2); 790 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
825 791
826 /* -1 is special - no repeat, but don't update */ 792 /* -1 is special - no repeat, but don't update */
827 if (repeat != -1) 793 if (repeat != -1)
828 pl->count = repeat; 794 pl->count = repeat;
829 795
830 if ((len - 4) >= MAX_BUF) 796 buf += 6; //len -= 6;
831 len = MAX_BUF - 5;
832 797
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); 798 execute_newserver_command (pl->ob, buf);
799
842 /* Perhaps something better should be done with a left over count. 800 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 801 * 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 802 * for the command that issued the count should be done before any other
845 * commands. 803 * commands.
846 */ 804 */
847 pl->count = 0; 805 pl->count = 0;
848 806
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
849 if (FABS (pl->ob->speed) < 0.001) 808 int time = FABS (pl->ob->speed) < 0.001
850 time = MAX_TIME * 100; 809 ? time = MAX_TIME * 100
851 else
852 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 810 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
853 811
854 /* Send confirmation of command execution now */ 812 /* Send confirmation of command execution now */
855 813 packet sl ("comc");
856 packet sl;
857 sl << "comc " << uint16 (pktlen) << uint32 (time); 814 sl << uint16 (cmdid) << uint32 (time);
858 pl->socket->send_packet (sl); 815 pl->socket->send_packet (sl);
859} 816}
860 817
861 818
862/** This is a reply to a previous query. */ 819/** This is a reply to a previous query. */
863void 820void
864ReplyCmd (char *buf, int len, player *pl) 821ReplyCmd (char *buf, int len, player *pl)
865{ 822{
866 /* 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
867 * 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
868 * once all the X11 code is removed from the server. 825 * once all the X11 code is removed from the server.
869 * 826 *
870 * 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
871 * think it was the carriage return that was entered, and the 828 * think it was the carriage return that was entered, and the
872 * function then does not try to do additional input. 829 * function then does not try to do additional input.
… …
875 832
876 /* this avoids any hacking here */ 833 /* this avoids any hacking here */
877 834
878 switch (pl->state) 835 switch (pl->state)
879 { 836 {
880 case ST_PLAYING: 837 case ST_PLAYING:
881 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 838 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
882 break; 839 break;
883 840
884 case ST_PLAY_AGAIN: 841 case ST_PLAY_AGAIN:
885 /* We can check this for return value (2==quit). Maybe we 842 /* We can check this for return value (2==quit). Maybe we
886 * should, and do something appropriate? 843 * should, and do something appropriate?
887 */ 844 */
888 receive_play_again (pl->ob, buf[0]); 845 receive_play_again (pl->ob, buf[0]);
889 break; 846 break;
890 847
891 case ST_ROLL_STAT: 848 case ST_ROLL_STAT:
892 key_roll_stat (pl->ob, buf[0]); 849 key_roll_stat (pl->ob, buf[0]);
893 break; 850 break;
894 851
895 case ST_CHANGE_CLASS: 852 case ST_CHANGE_CLASS:
896 853
897 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
898 break; 855 break;
899 856
900 case ST_CONFIRM_QUIT: 857 case ST_CONFIRM_QUIT:
901 key_confirm_quit (pl->ob, buf[0]); 858 key_confirm_quit (pl->ob, buf[0]);
902 break; 859 break;
903 860
904 case ST_CONFIGURE: 861 case ST_CONFIGURE:
905 LOG (llevError, "In client input handling, but into configure state\n"); 862 LOG (llevError, "In client input handling, but into configure state\n");
906 pl->state = ST_PLAYING; 863 pl->state = ST_PLAYING;
907 break; 864 break;
908 865
909 case ST_GET_NAME: 866 case ST_GET_NAME:
910 receive_player_name (pl->ob, 13); 867 receive_player_name (pl->ob, 13);
911 break; 868 break;
912 869
913 case ST_GET_PASSWORD: 870 case ST_GET_PASSWORD:
914 case ST_CONFIRM_PASSWORD: 871 case ST_CONFIRM_PASSWORD:
915 receive_player_password (pl->ob, 13); 872 receive_player_password (pl->ob, 13);
916 break; 873 break;
917 874
918 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 875 case ST_GET_PARTY_PASSWORD: /* Get password for party */
919 receive_party_password (pl->ob, 13); 876 receive_party_password (pl->ob, 13);
920 break; 877 break;
921 878
922 default: 879 default:
923 LOG (llevError, "Unknown input state: %d\n", pl->state); 880 LOG (llevError, "Unknown input state: %d\n", pl->state);
924 } 881 }
925} 882}
926 883
927/** 884/**
928 * 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
… …
932 * problem. 889 * problem.
933 */ 890 */
934void 891void
935VersionCmd (char *buf, int len, client * ns) 892VersionCmd (char *buf, int len, client * ns)
936{ 893{
937 char *cp;
938 char version_warning[256];
939
940 if (!buf) 894 if (!buf)
941 { 895 {
942 LOG (llevError, "CS: received corrupted version command\n"); 896 LOG (llevError, "CS: received corrupted version command\n");
943 return; 897 return;
944 } 898 }
945 899
946 ns->cs_version = atoi (buf); 900 ns->cs_version = atoi (buf);
947 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
948 if (VERSION_CS != ns->cs_version) 908 //if (VERSION_CS != ns->cs_version)
949 { 909 // unchecked;
950#ifdef ESRV_DEBUG 910
951 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
952#endif
953 }
954 cp = strchr (buf + 1, ' '); 911 char *cp = strchr (buf + 1, ' ');
955 if (!cp) 912 if (!cp)
956 return; 913 return;
914
957 ns->sc_version = atoi (cp); 915 ns->sc_version = atoi (cp);
916
958 if (VERSION_SC != ns->sc_version) 917 //if (VERSION_SC != ns->sc_version)
959 { 918 // unchecked;
960#ifdef ESRV_DEBUG 919
961 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
962#endif
963 }
964 cp = strchr (cp + 1, ' '); 920 cp = strchr (cp + 1, ' ');
921
965 if (cp) 922 if (cp)
966 { 923 {
967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
968
969 assign (ns->version, cp + 1); 924 assign (ns->version, cp + 1);
970 925
971 if (ns->sc_version < 1026) 926 if (ns->sc_version < 1026)
972 { 927 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!! ****"); 928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning);
976 }
977
978 } 929 }
979} 930}
980 931
981/** sound related functions. */ 932/** sound related functions. */
982void 933void
… …
988/** client wants the map resent */ 939/** client wants the map resent */
989 940
990void 941void
991MapRedrawCmd (char *buf, int len, player *pl) 942MapRedrawCmd (char *buf, int len, player *pl)
992{ 943{
993
994/* 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
995 * 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.
996 * Unfortunately this solution does not work because some client versions send 946 * Unfortunately this solution does not work because some client versions send
997 * a mapredraw command after receiving a newmap command. 947 * a mapredraw command after receiving a newmap command.
998 */ 948 */
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} 949}
1007 950
1008/** 951/**
1009 * Moves an object (typically, container to inventory). 952 * Moves an object (typically, container to inventory).
1010 * syntax is: move (to) (tag) (nrof) 953 * syntax is: move (to) (tag) (nrof)
… …
1013MoveCmd (char *buf, int len, player *pl) 956MoveCmd (char *buf, int len, player *pl)
1014{ 957{
1015 int vals[3], i; 958 int vals[3], i;
1016 959
1017 /* A little funky here. We only cycle for 2 records, because 960 /* A little funky here. We only cycle for 2 records, because
1018 * 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
1019 * record. Perhaps we should just replace this with a 962 * record. Perhaps we should just replace this with a
1020 * sscanf? 963 * sscanf?
1021 */ 964 */
1022 for (i = 0; i < 2; i++) 965 for (i = 0; i < 2; i++)
1023 { 966 {
1024 vals[i] = atoi (buf); 967 vals[i] = atoi (buf);
968
1025 if (!(buf = strchr (buf, ' '))) 969 if (!(buf = strchr (buf, ' ')))
1026 { 970 {
1027 LOG (llevError, "Incomplete move command: %s\n", buf); 971 LOG (llevError, "Incomplete move command: %s\n", buf);
1028 return; 972 return;
1029 } 973 }
974
1030 buf++; 975 buf++;
1031 } 976 }
977
1032 vals[2] = atoi (buf); 978 vals[2] = atoi (buf);
1033 979
1034/* 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]);*/
1035 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1036} 982}
1037
1038
1039 983
1040/****************************************************************************** 984/******************************************************************************
1041 * 985 *
1042 * Start of commands the server sends to the client. 986 * Start of commands the server sends to the client.
1043 * 987 *
… …
1046/** 990/**
1047 * 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
1048 * 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)
1049 */ 993 */
1050void 994void
1051send_query (client * ns, uint8 flags, char *text) 995send_query (client *ns, uint8 flags, char *text)
1052{ 996{
1053 char buf[MAX_BUF];
1054
1055 sprintf (buf, "query %d %s", flags, text ? text : ""); 997 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1056 ns->send_packet (buf);
1057} 998}
1058 999
1059#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1000#define AddIfInt64(Old,New,Type) if (Old != New) {\
1060 Old = New; \ 1001 Old = New; \
1061 sl << uint8 (Type) << uint64 (New); \ 1002 sl << uint8 (Type) << uint64 (New); \
… …
1091esrv_update_stats (player *pl) 1032esrv_update_stats (player *pl)
1092{ 1033{
1093 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1094 uint16 flags; 1035 uint16 flags;
1095 1036
1096 packet sl; 1037 packet sl ("stats");
1097 sl << "stats ";
1098 1038
1099 if (pl->ob != NULL) 1039 if (pl->ob)
1100 { 1040 {
1101 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);
1102 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);
1103 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);
1104 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);
… …
1112 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);
1113 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);
1114 } 1054 }
1115 1055
1116 if (pl->socket->exp64) 1056 if (pl->socket->exp64)
1117 {
1118 uint8 s;
1119
1120 for (s = 0; s < NUM_SKILLS; s++) 1057 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) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1123 { 1059 {
1124 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1125 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1126 */ 1062 */
1127 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1128 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1129 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130 1066
1131 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;
1132 } 1068 }
1133 }
1134 }
1135 1069
1136 if (pl->socket->exp64) 1070 if (pl->socket->exp64)
1137 { 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) }
1138 else 1072 else
1139 { 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) }
… …
1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158 1092
1159 if (pl->socket->sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1160 { 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) }
1161 else 1095 else
1162 {
1163 int i;
1164
1165 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1166 { 1097 {
1167 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1168 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1169 continue; 1100 continue;
1170 1101
1171 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]);
1172 } 1103 }
1173 }
1174 1104
1175 if (pl->socket->monitor_spells) 1105 if (pl->socket->monitor_spells)
1176 { 1106 {
1177 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);
1178 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);
… …
1195void 1125void
1196esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1197{ 1127{
1198 pl->last_weight = weight; 1128 pl->last_weight = weight;
1199 1129
1200 packet sl; 1130 packet sl ("player");
1201 sl << "player ";
1202 1131
1203 sl << uint32 (pl->ob->count) 1132 sl << uint32 (pl->ob->count)
1204 << uint32 (weight) 1133 << uint32 (weight)
1205 << uint32 (pl->ob->face->number) 1134 << uint32 (pl->ob->face->number)
1206 << data8 (pl->ob->name); 1135 << data8 (pl->ob->name);
… …
1217 * when the player logs in and picks stuff up. 1146 * when the player logs in and picks stuff up.
1218 */ 1147 */
1219void 1148void
1220esrv_send_animation (client * ns, short anim_num) 1149esrv_send_animation (client * ns, short anim_num)
1221{ 1150{
1222 int i;
1223
1224 /* 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
1225 * 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
1226 * range, it must be a valid animation. 1153 * range, it must be a valid animation.
1227 */ 1154 */
1228 if (anim_num < 0 || anim_num > num_animations) 1155 if (anim_num < 0 || anim_num > num_animations)
1229 { 1156 {
1230 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);
1231 return; 1158 return;
1232 } 1159 }
1233 1160
1234 packet sl; 1161 packet sl ("anim");
1235 1162
1236 sl << "anim "
1237 << uint16 (anim_num) 1163 sl << uint16 (anim_num)
1238 << uint16 (0); /* flags - not used right now */ 1164 << uint16 (0); /* flags - not used right now */
1239 1165
1240 /* 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
1241 * the face itself) down to the client. 1167 * the face itself) down to the client.
1242 */ 1168 */
1243 for (i = 0; i < animations[anim_num].num_animations; i++) 1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1244 { 1170 {
1245 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))
1246 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1247 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 */
1248 } 1175 }
1249 1176
1250 ns->send_packet (sl); 1177 ns->send_packet (sl);
1251 1178
… …
1266static void 1193static void
1267esrv_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)
1268{ 1195{
1269 if (newmap->cells[x][y].count >= MAP_LAYERS) 1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1270 { 1197 {
1198 //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); 1199 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1272 return; 1200 return;
1273 abort (); 1201 abort ();
1274 } 1202 }
1275 1203
1276 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;
1277 newmap->cells[x][y].count++; 1205 newmap->cells[x][y].count++;
1278 1206
1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1280 esrv_send_face (ns, face_num, 0); 1208 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} 1209}
1389 1210
1390/** Clears a map cell */ 1211/** Clears a map cell */
1391static void 1212static void
1392map_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)
… …
1404#define MAX_LAYERS 3 1225#define MAX_LAYERS 3
1405 1226
1406/* 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
1407 * 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,
1408 * 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
1409 * 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
1410 * re-examined. 1231 * re-examined.
1411 */ 1232 */
1412
1413static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1414 1234
1415/** 1235/**
1416 * Returns true if any of the heads for this 1236 * Returns true if any of the heads for this
1417 * 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
1418 * for empty space checking. 1238 * for empty space checking.
1419 */ 1239 */
1420static inline int 1240static inline int
1421have_head (int ax, int ay) 1241have_head (int ax, int ay)
1422{ 1242{
1423
1424 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1243 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]) 1244 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1426 return 1; 1245 return 1;
1246
1427 return 0; 1247 return 0;
1428} 1248}
1429 1249
1430/** 1250/**
1431 * check_head is a bit simplistic version of update_space below. 1251 * 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 1252 * 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 1253 * 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 1254 * if needed, and returning 1. If this no data needs to get
1435 * sent, it returns zero. 1255 * sent, it returns zero.
1436 */ 1256 */
1437static int 1257static int
1438check_head (packet &sl, client &ns, int ax, int ay, int layer) 1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1439{ 1259{
… …
1475 * numbers the spaces differently - I think this was a leftover from 1295 * 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 1296 * 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 1297 * the case, it seems to make more sense to have these layer values
1478 * actually match. 1298 * actually match.
1479 */ 1299 */
1480
1481static int 1300static int
1482update_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)
1483{ 1302{
1484 object *ob, *head; 1303 object *ob, *head;
1485 uint16 face_num; 1304 uint16 face_num;
… …
1753 if (ns->ext_mapinfos) 1572 if (ns->ext_mapinfos)
1754 { 1573 {
1755 if (ns->EMI_smooth) 1574 if (ns->EMI_smooth)
1756 result += 1; /*One byte for smoothlevel */ 1575 result += 1; /*One byte for smoothlevel */
1757 } 1576 }
1577
1758 return result; 1578 return result;
1759} 1579}
1760 1580
1761/** 1581/**
1762 * 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
… …
1794 1614
1795 client &socket = *pl->contr->socket; 1615 client &socket = *pl->contr->socket;
1796 1616
1797 check_map_change (pl->contr); 1617 check_map_change (pl->contr);
1798 1618
1799 packet sl; 1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1800 packet esl; 1620 packet esl;
1801 1621
1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1803 startlen = sl.length (); 1622 startlen = sl.length ();
1804 1623
1805 /*Extendedmapinfo structure initialisation */ 1624 /*Extendedmapinfo structure initialisation */
1806 if (socket.ext_mapinfos) 1625 if (socket.ext_mapinfos)
1807 { 1626 {
… …
2199 { 2018 {
2200 ax = i; 2019 ax = i;
2201 ay = j; 2020 ay = j;
2202 m = pm; 2021 m = pm;
2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2022 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023
2204 if (mflags & P_OUT_OF_MAP) 2024 if (mflags & P_OUT_OF_MAP)
2205 continue; 2025 continue;
2026
2206 if (mflags & P_NEED_UPDATE) 2027 if (mflags & P_NEED_UPDATE)
2207 update_position (m, ax, ay); 2028 update_position (m, ax, ay);
2029
2208 /* If a map is visible to the player, we don't want to swap it out 2030 /* 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 2031 * just to reload it. This should really call something like
2210 * swap_map, but this is much more efficient and 'good enough' 2032 * swap_map, but this is much more efficient and 'good enough'
2211 */ 2033 */
2212 if (mflags & P_NEW_MAP) 2034 if (mflags & P_NEW_MAP)
… …
2348 { 2170 {
2349 LOG (llevError, "Invalid call to esrv_remove_spell"); 2171 LOG (llevError, "Invalid call to esrv_remove_spell");
2350 return; 2172 return;
2351 } 2173 }
2352 2174
2353 packet sl; 2175 packet sl ("delspell");
2354 2176
2355 sl << "delspell "
2356 << uint32 (spell->count); 2177 sl << uint32 (spell->count);
2357 2178
2358 pl->socket->send_packet (sl); 2179 pl->socket->send_packet (sl);
2359} 2180}
2360 2181
2361/* appends the spell *spell to the Socklist we will send the data to. */ 2182/* appends the spell *spell to the Socklist we will send the data to. */
… …
2414 } 2235 }
2415 2236
2416 if (!pl->socket->monitor_spells) 2237 if (!pl->socket->monitor_spells)
2417 return; 2238 return;
2418 2239
2419 packet sl; 2240 packet sl ("addspell");
2420
2421 sl << "addspell ";
2422 2241
2423 if (!spell) 2242 if (!spell)
2424 { 2243 {
2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2244 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2426 { 2245 {

Diff Legend

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