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.38 by root, Thu Dec 14 22:45:41 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
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 52 * it should work here.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * 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
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
156 144
157 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
158 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
159 147
160 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
161 socket.look_position = 0;
162} 149}
163 150
164/** check for map change and send new map data */ 151/** check for map change and send new map data */
165static void 152static void
166check_map_change (player *pl) 153check_map_change (player *pl)
167{ 154{
168 client_socket &socket = *pl->socket; 155 client &socket = *pl->socket;
169 object *ob = pl->ob; 156 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
171 158
172 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
173 { 160 {
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 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
209 else 196 else
210 { 197 {
211 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);
212 socket.update_look = 1; 199 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 200 }
215 } 201 }
216 202
217 socket.current_x = ob->x; 203 socket.current_x = ob->x;
218 socket.current_y = ob->y; 204 socket.current_y = ob->y;
219} 205}
220 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
221void 251void
222ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
223{ 253{
224 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));
225} 261}
226 262
227void 263void
228MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
229{ 265{
… …
311 pl->socket->send_packet (bigbuf); 347 pl->socket->send_packet (bigbuf);
312} 348}
313 349
314/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
315void 351void
316SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
317{ 353{
318 int s, slen; 354 int s, slen;
319 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
320 356
321 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
531 * This is what takes care of it. We tell the client how things worked out. 567 * This is what takes care of it. We tell the client how things worked out.
532 * I am not sure if this file is the best place for this function. however, 568 * I am not sure if this file is the best place for this function. however,
533 * 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.
534 */ 570 */
535void 571void
536AddMeCmd (char *buf, int len, client_socket * ns) 572AddMeCmd (char *buf, int len, client * ns)
537{ 573{
538 Settings oldsettings; 574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
539 576
540 oldsettings = settings;
541 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
542 ns->send_packet ("addme_failed"); 578 ns->send_packet ("addme_failed");
543 else 579 else
544 ns->send_packet ("addme_success"); 580 ns->send_packet ("addme_success");
545
546 settings = oldsettings;
547} 581}
548 582
549/** Reply to ExtendedInfos command */ 583/** Reply to ExtendedInfos command */
550void 584void
551ToggleExtendedInfos (char *buf, int len, client_socket * ns) 585ToggleExtendedInfos (char *buf, int len, client * ns)
552{ 586{
553 char cmdback[MAX_BUF]; 587 char cmdback[MAX_BUF];
554 char command[50]; 588 char command[50];
555 int info, nextinfo; 589 int info, nextinfo;
556 590
… …
607#define MSG_TYPE_MONUMENT 5 641#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 642#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609 643
610/** Reply to ExtendedInfos command */ 644/** Reply to ExtendedInfos command */
611void 645void
612ToggleExtendedText (char *buf, int len, client_socket * ns) 646ToggleExtendedText (char *buf, int len, client * ns)
613{ 647{
614 char cmdback[MAX_BUF]; 648 char cmdback[MAX_BUF];
615 char temp[10]; 649 char temp[10];
616 char command[50]; 650 char command[50];
617 int info, nextinfo, i, flag; 651 int info, nextinfo, i, flag;
… …
668 * 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
669 * 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
670 * client. 704 * client.
671 */ 705 */
672static void 706static void
673SendSmooth (client_socket * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
674{ 708{
675 uint16 smoothface; 709 uint16 smoothface;
676 710
677 /* 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
678 * again. 712 * again.
… …
688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
689 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
690 724
691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
692 726
693 packet sl; 727 packet sl ("smooth");
694 728
695 sl << "smooth "
696 << uint16 (face) 729 sl << uint16 (face)
697 << uint16 (smoothface); 730 << uint16 (smoothface);
698 731
699 ns->send_packet (sl); 732 ns->send_packet (sl);
700} 733}
701 734
702 /** 735 /**
703 * Tells client the picture it has to use 736 * Tells client the picture it has to use
704 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
705 */ 738 */
706void 739void
707AskSmooth (char *buf, int len, client_socket * ns) 740AskSmooth (char *buf, int len, client *ns)
708{ 741{
709 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
710
711 facenbr = atoi (buf);
712 SendSmooth (ns, facenbr);
713} 743}
714 744
715/** 745/**
716 * 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,
717 * etc.) 747 * etc.)
718 */ 748 */
719void 749void
720PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
721{ 751{
722
723 /* The following should never happen with a proper or honest client.
724 * Therefore, the error message doesn't have to be too clear - if
725 * someone is playing with a hacked/non working client, this gives them
726 * an idea of the problem, but they deserve what they get
727 */
728 if (pl->state != ST_PLAYING)
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731 return;
732 }
733 /* 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
734 * sent, so check for that also. 753 * sent, so check for that also.
735 */ 754 */
736 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
737 { 756 {
738 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 760 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 761 return;
746 } 762
747 buf++; 763 buf++;
748 } 764 }
749 /* This should not happen anymore. */ 765
750 if (pl->ob->speed_left < -1.0)
751 {
752 LOG (llevError, "Player has negative time - shouldn't do command.\n");
753 }
754 /* In c_new.c */
755 execute_newserver_command (pl->ob, (char *) buf); 766 execute_newserver_command (pl->ob, (char *) buf);
767
756 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
757 * Cleaning up the input should probably be done first - all actions 769 * Cleaning up the input should probably be done first - all actions
758 * 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
759 * commands. 771 * commands.
760 */ 772 */
761
762 pl->count = 0; 773 pl->count = 0;
763
764} 774}
765 775
766 776
767/** 777/**
768 * 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,
769 * etc.). It is a lot like PlayerCmd above, but is called with the 779 * etc.). It is a lot like PlayerCmd above, but is called with the
770 * 'ncom' method which gives more information back to the client so it 780 * 'ncom' method which gives more information back to the client so it
771 * can throttle. 781 * can throttle.
772 */ 782 */
773void 783void
774NewPlayerCmd (uint8 * buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
775{ 785{
776 int time, repeat;
777 char command[MAX_BUF];
778 int pktlen;
779
780 if (len < 7) 786 if (len <= 6)
781 { 787 {
782 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);
783 return; 789 return;
784 } 790 }
785 791
786 pktlen = net_uint16 (buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
787 repeat = net_uint32 (buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788 794
789 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
790 if (repeat != -1) 796 if (repeat != -1)
791 pl->count = repeat; 797 pl->count = repeat;
792 798
793 if ((len - 4) >= MAX_BUF) 799 buf += 6; //len -= 6;
794 len = MAX_BUF - 5;
795 800
796 strncpy ((char *) command, (char *) buf + 6, len - 4);
797 command[len - 4] = '\0';
798
799 /* The following should never happen with a proper or honest client.
800 * Therefore, the error message doesn't have to be too clear - if
801 * someone is playing with a hacked/non working client, this gives them
802 * an idea of the problem, but they deserve what they get
803 */
804 if (pl->state != ST_PLAYING)
805 {
806 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
807 return;
808 }
809
810 /* This should not happen anymore. */
811 if (pl->ob->speed_left < -1.0)
812 LOG (llevError, "Player has negative time - shouldn't do command.\n");
813
814 /* In c_new.c */
815 execute_newserver_command (pl->ob, (char *) command); 801 execute_newserver_command (pl->ob, buf);
802
816 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
817 * Cleaning up the input should probably be done first - all actions 804 * Cleaning up the input should probably be done first - all actions
818 * 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
819 * commands. 806 * commands.
820 */ 807 */
821 pl->count = 0; 808 pl->count = 0;
822 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
823 if (FABS (pl->ob->speed) < 0.001) 811 int time = FABS (pl->ob->speed) < 0.001
824 time = MAX_TIME * 100; 812 ? time = MAX_TIME * 100
825 else
826 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
827 814
828 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
829 816 packet sl ("comc");
830 packet sl;
831 sl << "comc " << uint16 (pktlen) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
832 pl->socket->send_packet (sl); 818 pl->socket->send_packet (sl);
833} 819}
834 820
835
836/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
837void 822void
838ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
839{ 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
840 /* 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
841 * 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
842 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
843 * 834 *
844 * 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
845 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
846 * function then does not try to do additional input. 837 * function then does not try to do additional input.
… …
849 840
850 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
851 842
852 switch (pl->state) 843 switch (pl->state)
853 { 844 {
854 case ST_PLAYING: 845 case ST_PLAYING:
855 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
856 break; 847 break;
857 848
858 case ST_PLAY_AGAIN: 849 case ST_PLAY_AGAIN:
859 /* We can check this for return value (2==quit). Maybe we 850 /* We can check this for return value (2==quit). Maybe we
860 * should, and do something appropriate? 851 * should, and do something appropriate?
861 */ 852 */
862 receive_play_again (pl->ob, buf[0]); 853 receive_play_again (pl->ob, buf[0]);
863 break; 854 break;
864 855
865 case ST_ROLL_STAT: 856 case ST_ROLL_STAT:
866 key_roll_stat (pl->ob, buf[0]); 857 key_roll_stat (pl->ob, buf[0]);
867 break; 858 break;
868 859
869 case ST_CHANGE_CLASS: 860 case ST_CHANGE_CLASS:
870
871 key_change_class (pl->ob, buf[0]); 861 key_change_class (pl->ob, buf[0]);
872 break; 862 break;
873 863
874 case ST_CONFIRM_QUIT: 864 case ST_CONFIRM_QUIT:
875 key_confirm_quit (pl->ob, buf[0]); 865 key_confirm_quit (pl->ob, buf[0]);
876 break; 866 break;
877 867
878 case ST_CONFIGURE: 868 case ST_CONFIGURE:
879 LOG (llevError, "In client input handling, but into configure state\n"); 869 LOG (llevError, "In client input handling, but into configure state\n");
880 pl->state = ST_PLAYING; 870 pl->state = ST_PLAYING;
881 break; 871 break;
882 872
883 case ST_GET_NAME: 873 case ST_GET_NAME:
884 receive_player_name (pl->ob, 13); 874 receive_player_name (pl->ob, 13);
885 break; 875 break;
886 876
887 case ST_GET_PASSWORD: 877 case ST_GET_PASSWORD:
888 case ST_CONFIRM_PASSWORD: 878 case ST_CONFIRM_PASSWORD:
889 receive_player_password (pl->ob, 13); 879 receive_player_password (pl->ob, 13);
890 break; 880 break;
891 881
892 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 882 case ST_GET_PARTY_PASSWORD: /* Get password for party */
893 receive_party_password (pl->ob, 13); 883 receive_party_password (pl->ob, 13);
894 break; 884 break;
895 885
896 default: 886 default:
897 LOG (llevError, "Unknown input state: %d\n", pl->state); 887 LOG (llevError, "Unknown input state: %d\n", pl->state);
898 } 888 }
899} 889}
900 890
901/** 891/**
902 * 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
… …
904 * something older than the server. If we assume the client will be 894 * something older than the server. If we assume the client will be
905 * backwards compatible, having it be a later version should not be a 895 * backwards compatible, having it be a later version should not be a
906 * problem. 896 * problem.
907 */ 897 */
908void 898void
909VersionCmd (char *buf, int len, client_socket * ns) 899VersionCmd (char *buf, int len, client * ns)
910{ 900{
911 char *cp;
912 char version_warning[256];
913
914 if (!buf) 901 if (!buf)
915 { 902 {
916 LOG (llevError, "CS: received corrupted version command\n"); 903 LOG (llevError, "CS: received corrupted version command\n");
917 return; 904 return;
918 } 905 }
919 906
920 ns->cs_version = atoi (buf); 907 ns->cs_version = atoi (buf);
921 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
922 if (VERSION_CS != ns->cs_version) 915 //if (VERSION_CS != ns->cs_version)
923 { 916 // unchecked;
924#ifdef ESRV_DEBUG 917
925 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
926#endif
927 }
928 cp = strchr (buf + 1, ' '); 918 char *cp = strchr (buf + 1, ' ');
929 if (!cp) 919 if (!cp)
930 return; 920 return;
921
931 ns->sc_version = atoi (cp); 922 ns->sc_version = atoi (cp);
923
932 if (VERSION_SC != ns->sc_version) 924 //if (VERSION_SC != ns->sc_version)
933 { 925 // unchecked;
934#ifdef ESRV_DEBUG 926
935 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
936#endif
937 }
938 cp = strchr (cp + 1, ' '); 927 cp = strchr (cp + 1, ' ');
928
939 if (cp) 929 if (cp)
940 { 930 {
941 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 931 assign (ns->version, cp + 1);
942 932
943 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
944
945 /* This is first implementation - i skip all beta DX clients with it
946 * Add later stuff here for other clients
947 */
948
949 /* these are old dxclients */
950 /* Version 1024 added support for singular + plural name values -
951 * requiing this minimal value reduces complexity of that code, and it
952 * has been around for a long time.
953 */
954 if (ns->sc_version < 1026) 933 if (ns->sc_version < 1026)
955 { 934 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
956 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
957 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 935 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
958 ns->send_packet (version_warning);
959 }
960
961 } 936 }
962} 937}
963 938
964/** sound related functions. */ 939/** sound related functions. */
965
966void 940void
967SetSound (char *buf, int len, client_socket * ns) 941SetSound (char *buf, int len, client * ns)
968{ 942{
969 ns->sound = atoi (buf); 943 ns->sound = atoi (buf);
970} 944}
971 945
972/** client wants the map resent */ 946/** client wants the map resent */
973 947
974void 948void
975MapRedrawCmd (char *buf, int len, player *pl) 949MapRedrawCmd (char *buf, int len, player *pl)
976{ 950{
977
978/* 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
979 * 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.
980 * Unfortunately this solution does not work because some client versions send 953 * Unfortunately this solution does not work because some client versions send
981 * a mapredraw command after receiving a newmap command. 954 * a mapredraw command after receiving a newmap command.
982 */ 955 */
983#if 0
984 /* Okay, this is MAJOR UGLY. but the only way I know how to
985 * clear the "cache"
986 */
987 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
988 draw_client_map (pl->ob);
989#endif
990} 956}
991 957
992/** 958/**
993 * Moves an object (typically, container to inventory). 959 * Moves an object (typically, container to inventory).
994 * syntax is: move (to) (tag) (nrof) 960 * syntax is: move (to) (tag) (nrof)
… …
997MoveCmd (char *buf, int len, player *pl) 963MoveCmd (char *buf, int len, player *pl)
998{ 964{
999 int vals[3], i; 965 int vals[3], i;
1000 966
1001 /* A little funky here. We only cycle for 2 records, because 967 /* A little funky here. We only cycle for 2 records, because
1002 * 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
1003 * record. Perhaps we should just replace this with a 969 * record. Perhaps we should just replace this with a
1004 * sscanf? 970 * sscanf?
1005 */ 971 */
1006 for (i = 0; i < 2; i++) 972 for (i = 0; i < 2; i++)
1007 { 973 {
1008 vals[i] = atoi (buf); 974 vals[i] = atoi (buf);
975
1009 if (!(buf = strchr (buf, ' '))) 976 if (!(buf = strchr (buf, ' ')))
1010 { 977 {
1011 LOG (llevError, "Incomplete move command: %s\n", buf); 978 LOG (llevError, "Incomplete move command: %s\n", buf);
1012 return; 979 return;
1013 } 980 }
981
1014 buf++; 982 buf++;
1015 } 983 }
984
1016 vals[2] = atoi (buf); 985 vals[2] = atoi (buf);
1017 986
1018/* 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]);*/
1019 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 988 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1020} 989}
1021
1022
1023 990
1024/****************************************************************************** 991/******************************************************************************
1025 * 992 *
1026 * Start of commands the server sends to the client. 993 * Start of commands the server sends to the client.
1027 * 994 *
… …
1030/** 997/**
1031 * 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
1032 * 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)
1033 */ 1000 */
1034void 1001void
1035send_query (client_socket * ns, uint8 flags, char *text) 1002send_query (client *ns, uint8 flags, char *text)
1036{ 1003{
1037 char buf[MAX_BUF];
1038
1039 sprintf (buf, "query %d %s", flags, text ? text : ""); 1004 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1040 ns->send_packet (buf);
1041} 1005}
1042 1006
1043#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1007#define AddIfInt64(Old,New,Type) if (Old != New) {\
1044 Old = New; \ 1008 Old = New; \
1045 sl << uint8 (Type) << uint64 (New); \ 1009 sl << uint8 (Type) << uint64 (New); \
… …
1075esrv_update_stats (player *pl) 1039esrv_update_stats (player *pl)
1076{ 1040{
1077 char buf[MAX_BUF]; 1041 char buf[MAX_BUF];
1078 uint16 flags; 1042 uint16 flags;
1079 1043
1080 packet sl; 1044 packet sl ("stats");
1081 sl << "stats ";
1082 1045
1083 if (pl->ob != NULL) 1046 if (pl->ob)
1084 { 1047 {
1085 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);
1086 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);
1087 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);
1088 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);
… …
1096 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);
1097 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);
1098 } 1061 }
1099 1062
1100 if (pl->socket->exp64) 1063 if (pl->socket->exp64)
1101 {
1102 uint8 s;
1103
1104 for (s = 0; s < NUM_SKILLS; s++) 1064 for (int s = 0; s < NUM_SKILLS; s++)
1105 {
1106 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)
1107 { 1066 {
1108 /* Always send along the level if exp changes. This is only 1067 /* Always send along the level if exp changes. This is only
1109 * 1 extra byte, but keeps processing simpler. 1068 * 1 extra byte, but keeps processing simpler.
1110 */ 1069 */
1111 sl << uint8 (s + CS_STAT_SKILLINFO) 1070 sl << uint8 (s + CS_STAT_SKILLINFO)
1112 << uint8 (pl->last_skill_ob[s]->level) 1071 << uint8 (pl->last_skill_ob[s]->level)
1113 << uint64 (pl->last_skill_ob[s]->stats.exp); 1072 << uint64 (pl->last_skill_ob[s]->stats.exp);
1114 1073
1115 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;
1116 } 1075 }
1117 }
1118 }
1119 1076
1120 if (pl->socket->exp64) 1077 if (pl->socket->exp64)
1121 { 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) }
1122 else 1079 else
1123 { 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) }
… …
1141 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1142 1099
1143 if (pl->socket->sc_version < 1025) 1100 if (pl->socket->sc_version < 1025)
1144 { 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) }
1145 else 1102 else
1146 {
1147 int i;
1148
1149 for (i = 0; i < NROFATTACKS; i++) 1103 for (int i = 0; i < NROFATTACKS; i++)
1150 { 1104 {
1151 /* Skip ones we won't send */ 1105 /* Skip ones we won't send */
1152 if (atnr_cs_stat[i] == -1) 1106 if (atnr_cs_stat[i] == -1)
1153 continue; 1107 continue;
1154 1108
1155 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]);
1156 } 1110 }
1157 }
1158 1111
1159 if (pl->socket->monitor_spells) 1112 if (pl->socket->monitor_spells)
1160 { 1113 {
1161 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);
1162 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);
… …
1179void 1132void
1180esrv_new_player (player *pl, uint32 weight) 1133esrv_new_player (player *pl, uint32 weight)
1181{ 1134{
1182 pl->last_weight = weight; 1135 pl->last_weight = weight;
1183 1136
1184 packet sl; 1137 packet sl ("player");
1185 sl << "player ";
1186 1138
1187 sl << uint32 (pl->ob->count) 1139 sl << uint32 (pl->ob->count)
1188 << uint32 (weight) 1140 << uint32 (weight)
1189 << uint32 (pl->ob->face->number) 1141 << uint32 (pl->ob->face->number)
1190 << data8 (pl->ob->name); 1142 << data8 (pl->ob->name);
… …
1199 * sent them the face yet (this can become quite costly in terms of 1151 * sent them the face yet (this can become quite costly in terms of
1200 * how much we are sending - on the other hand, this should only happen 1152 * how much we are sending - on the other hand, this should only happen
1201 * when the player logs in and picks stuff up. 1153 * when the player logs in and picks stuff up.
1202 */ 1154 */
1203void 1155void
1204esrv_send_animation (client_socket * ns, short anim_num) 1156esrv_send_animation (client * ns, short anim_num)
1205{ 1157{
1206 int i;
1207
1208 /* 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
1209 * 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
1210 * range, it must be a valid animation. 1160 * range, it must be a valid animation.
1211 */ 1161 */
1212 if (anim_num < 0 || anim_num > num_animations) 1162 if (anim_num < 0 || anim_num > num_animations)
1213 { 1163 {
1214 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);
1215 return; 1165 return;
1216 } 1166 }
1217 1167
1218 packet sl; 1168 packet sl ("anim");
1219 1169
1220 sl << "anim "
1221 << uint16 (anim_num) 1170 sl << uint16 (anim_num)
1222 << uint16 (0); /* flags - not used right now */ 1171 << uint16 (0); /* flags - not used right now */
1223 1172
1224 /* 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
1225 * the face itself) down to the client. 1174 * the face itself) down to the client.
1226 */ 1175 */
1227 for (i = 0; i < animations[anim_num].num_animations; i++) 1176 for (int i = 0; i < animations[anim_num].num_animations; i++)
1228 { 1177 {
1229 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))
1230 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1179 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1180
1231 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 */
1232 } 1182 }
1233 1183
1234 ns->send_packet (sl); 1184 ns->send_packet (sl);
1235 1185
… …
1246/** 1196/**
1247 * This adds face_num to a map cell at x,y. If the client doesn't have 1197 * This adds face_num to a map cell at x,y. If the client doesn't have
1248 * the face yet, we will also send it. 1198 * the face yet, we will also send it.
1249 */ 1199 */
1250static void 1200static void
1251esrv_map_setbelow (client_socket * 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)
1252{ 1202{
1253 if (newmap->cells[x][y].count >= MAP_LAYERS) 1203 if (newmap->cells[x][y].count >= MAP_LAYERS)
1254 { 1204 {
1205 //TODO: one or the other, can't both have abort and return, verify and act
1255 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);
1256 return; 1207 return;
1257 abort (); 1208 abort ();
1258 } 1209 }
1259 1210
1260 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;
1261 newmap->cells[x][y].count++; 1212 newmap->cells[x][y].count++;
1262 1213
1263 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1214 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1264 esrv_send_face (ns, face_num, 0); 1215 esrv_send_face (ns, face_num, 0);
1265}
1266
1267struct LayerCell
1268{
1269 uint16 xy;
1270 short face;
1271};
1272
1273struct MapLayer
1274{
1275 int count;
1276 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1277};
1278
1279/** Checkes if map cells have changed */
1280static int
1281mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1282{
1283 int k;
1284
1285 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1286 return 1;
1287 for (k = 0; k < newmap->cells[i][j].count; k++)
1288 {
1289 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1290 {
1291 return 1;
1292 }
1293 }
1294 return 0;
1295}
1296
1297/**
1298 * Basically, what this does is pack the data into layers.
1299 * cnum is the client number, cur is the the buffer we put all of
1300 * this data into. we return the end of the data. layers is
1301 * how many layers of data we should back.
1302 */
1303static uint8 *
1304compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1305{
1306 int x, y, k;
1307 int face;
1308 unsigned char *fcur;
1309 struct MapLayer layers[MAP_LAYERS];
1310
1311 for (k = 0; k < MAP_LAYERS; k++)
1312 layers[k].count = 0;
1313 fcur = cur;
1314 for (x = 0; x < ns->mapx; x++)
1315 {
1316 for (y = 0; y < ns->mapy; y++)
1317 {
1318 if (!mapcellchanged (ns, x, y, newmap))
1319 continue;
1320 if (newmap->cells[x][y].count == 0)
1321 {
1322 *cur = x * ns->mapy + y; /* mark empty space */
1323 cur++;
1324 continue;
1325 }
1326 for (k = 0; k < newmap->cells[x][y].count; k++)
1327 {
1328 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1329 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1330 layers[k].count++;
1331 }
1332 }
1333 }
1334 /* If no data, return now. */
1335 if (fcur == cur && layers[0].count == 0)
1336 return cur;
1337 *cur = 255; /* mark end of explicitly cleared cells */
1338 cur++;
1339 /* First pack by layers. */
1340 for (k = 0; k < numlayers; k++)
1341 {
1342 if (layers[k].count == 0)
1343 break; /* once a layer is entirely empty, no layer below it can
1344 have anything in it either */
1345 /* Pack by entries in thie layer */
1346 for (x = 0; x < layers[k].count;)
1347 {
1348 fcur = cur;
1349 *cur = layers[k].lcells[x].face >> 8;
1350 cur++;
1351 *cur = layers[k].lcells[x].face & 0xFF;
1352 cur++;
1353 face = layers[k].lcells[x].face;
1354 /* Now, we back the redundant data into 1 byte xy pairings */
1355 for (y = x; y < layers[k].count; y++)
1356 {
1357 if (layers[k].lcells[y].face == face)
1358 {
1359 *cur = (uint8) layers[k].lcells[y].xy;
1360 cur++;
1361 layers[k].lcells[y].face = -1;
1362 }
1363 }
1364 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1365 /* forward over the now redundant data */
1366 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1367 x++;
1368 }
1369 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1370 }
1371 return cur;
1372} 1216}
1373 1217
1374/** Clears a map cell */ 1218/** Clears a map cell */
1375static void 1219static void
1376map_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)
… …
1388#define MAX_LAYERS 3 1232#define MAX_LAYERS 3
1389 1233
1390/* 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
1391 * 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,
1392 * 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
1393 * 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
1394 * re-examined. 1238 * re-examined.
1395 */ 1239 */
1396
1397static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1240static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1398 1241
1399/** 1242/**
1400 * Returns true if any of the heads for this 1243 * Returns true if any of the heads for this
1401 * 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
1402 * for empty space checking. 1245 * for empty space checking.
1403 */ 1246 */
1404static inline int 1247static inline int
1405have_head (int ax, int ay) 1248have_head (int ax, int ay)
1406{ 1249{
1407
1408 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1250 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1409 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])
1410 return 1; 1252 return 1;
1253
1411 return 0; 1254 return 0;
1412} 1255}
1413 1256
1414/** 1257/**
1415 * check_head is a bit simplistic version of update_space below. 1258 * check_head is a bit simplistic version of update_space below.
1416 * 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
1417 * 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
1418 * 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
1419 * sent, it returns zero. 1262 * sent, it returns zero.
1420 */ 1263 */
1421static int 1264static int
1422check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1265check_head (packet &sl, client &ns, int ax, int ay, int layer)
1423{ 1266{
1424 short face_num; 1267 short face_num;
1425 1268
1426 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1269 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1427 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1270 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1459 * numbers the spaces differently - I think this was a leftover from 1302 * numbers the spaces differently - I think this was a leftover from
1460 * 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
1461 * 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
1462 * actually match. 1305 * actually match.
1463 */ 1306 */
1464
1465static int 1307static int
1466update_space (packet &sl, client_socket &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)
1467{ 1309{
1468 object *ob, *head; 1310 object *ob, *head;
1469 uint16 face_num; 1311 uint16 face_num;
1470 int bx, by, i; 1312 int bx, by, i;
1471 1313
… …
1684 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1526 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1685 * take. 1527 * take.
1686 */ 1528 */
1687 1529
1688static inline int 1530static inline int
1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1531update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1690{ 1532{
1691 object *ob; 1533 object *ob;
1692 int smoothlevel; /* old face_num; */ 1534 int smoothlevel; /* old face_num; */
1693 1535
1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1536 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1728 * Returns the size of a data for a map square as returned by 1570 * Returns the size of a data for a map square as returned by
1729 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1571 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1730 * available. 1572 * available.
1731 */ 1573 */
1732int 1574int
1733getExtendedMapInfoSize (client_socket * ns) 1575getExtendedMapInfoSize (client * ns)
1734{ 1576{
1735 int result = 0; 1577 int result = 0;
1736 1578
1737 if (ns->ext_mapinfos) 1579 if (ns->ext_mapinfos)
1738 { 1580 {
1739 if (ns->EMI_smooth) 1581 if (ns->EMI_smooth)
1740 result += 1; /*One byte for smoothlevel */ 1582 result += 1; /*One byte for smoothlevel */
1741 } 1583 }
1584
1742 return result; 1585 return result;
1743} 1586}
1744 1587
1745/** 1588/**
1746 * 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
… …
1774 uint8 eentrysize; 1617 uint8 eentrysize;
1775 uint16 ewhatstart, ewhatflag; 1618 uint16 ewhatstart, ewhatflag;
1776 uint8 extendedinfos; 1619 uint8 extendedinfos;
1777 maptile *m; 1620 maptile *m;
1778 1621
1779 client_socket &socket = *pl->contr->socket; 1622 client &socket = *pl->contr->socket;
1780 1623
1781 check_map_change (pl->contr); 1624 check_map_change (pl->contr);
1782 1625
1783 packet sl; 1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1784 packet esl; 1627 packet esl;
1785 1628
1786 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1787 startlen = sl.length (); 1629 startlen = sl.length ();
1788 1630
1789 /*Extendedmapinfo structure initialisation */ 1631 /*Extendedmapinfo structure initialisation */
1790 if (socket.ext_mapinfos) 1632 if (socket.ext_mapinfos)
1791 { 1633 {
… …
1835 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++)
1836 { 1678 {
1837 ax = 0; 1679 ax = 0;
1838 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++)
1839 { 1681 {
1840
1841 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1682 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1842 1683
1843 /* 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
1844 * 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
1845 * the client wants if using the map1a command - this is because 1686 * the client wants if using the map1a command - this is because
… …
2176 return; 2017 return;
2177 2018
2178 memset (&newmap, 0, sizeof (struct Map)); 2019 memset (&newmap, 0, sizeof (struct Map));
2179 2020
2180 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++)
2181 {
2182 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++)
2183 { 2023 {
2184 ax = i; 2024 ax = i;
2185 ay = j; 2025 ay = j;
2186 m = pm; 2026 m = pm;
2187 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028
2188 if (mflags & P_OUT_OF_MAP) 2029 if (mflags & P_OUT_OF_MAP)
2189 continue; 2030 continue;
2190 if (mflags & P_NEED_UPDATE) 2031
2191 update_position (m, ax, ay);
2192 /* 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
2193 * just to reload it. This should really call something like 2033 * just to reload it. This should really call something like
2194 * swap_map, but this is much more efficient and 'good enough' 2034 * swap_map, but this is much more efficient and 'good enough'
2195 */ 2035 */
2196 if (mflags & P_NEW_MAP) 2036 if (mflags & P_NEW_MAP)
2197 m->timeout = 50; 2037 m->timeout = 50;
2198 } 2038 }
2199 } 2039
2200 /* do LOS after calls to update_position */ 2040 /* do LOS after calls to update_position */
2201 if (pl->contr->do_los) 2041 if (pl->contr->do_los)
2202 { 2042 {
2203 update_los (pl); 2043 update_los (pl);
2204 pl->contr->do_los = 0; 2044 pl->contr->do_los = 0;
… …
2227/** 2067/**
2228 * This sends the skill number to name mapping. We ignore 2068 * This sends the skill number to name mapping. We ignore
2229 * the params - we always send the same info no matter what. 2069 * the params - we always send the same info no matter what.
2230 */ 2070 */
2231void 2071void
2232send_skill_info (client_socket *ns, char *params) 2072send_skill_info (client *ns, char *params)
2233{ 2073{
2234 packet sl; 2074 packet sl;
2235 sl << "replyinfo skill_info\n"; 2075 sl << "replyinfo skill_info\n";
2236 2076
2237 for (int i = 1; i < NUM_SKILLS; i++) 2077 for (int i = 1; i < NUM_SKILLS; i++)
… …
2249/** 2089/**
2250 * This sends the spell path to name mapping. We ignore 2090 * This sends the spell path to name mapping. We ignore
2251 * the params - we always send the same info no matter what. 2091 * the params - we always send the same info no matter what.
2252 */ 2092 */
2253void 2093void
2254send_spell_paths (client_socket * ns, char *params) 2094send_spell_paths (client * ns, char *params)
2255{ 2095{
2256 packet sl; 2096 packet sl;
2257 2097
2258 sl << "replyinfo spell_paths\n"; 2098 sl << "replyinfo spell_paths\n";
2259 2099
… …
2332 { 2172 {
2333 LOG (llevError, "Invalid call to esrv_remove_spell"); 2173 LOG (llevError, "Invalid call to esrv_remove_spell");
2334 return; 2174 return;
2335 } 2175 }
2336 2176
2337 packet sl; 2177 packet sl ("delspell");
2338 2178
2339 sl << "delspell "
2340 << uint32 (spell->count); 2179 sl << uint32 (spell->count);
2341 2180
2342 pl->socket->send_packet (sl); 2181 pl->socket->send_packet (sl);
2343} 2182}
2344 2183
2345/* 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. */
… …
2398 } 2237 }
2399 2238
2400 if (!pl->socket->monitor_spells) 2239 if (!pl->socket->monitor_spells)
2401 return; 2240 return;
2402 2241
2403 packet sl; 2242 packet sl ("addspell");
2404
2405 sl << "addspell ";
2406 2243
2407 if (!spell) 2244 if (!spell)
2408 { 2245 {
2409 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2246 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2410 { 2247 {

Diff Legend

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