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.40 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.50 by root, Thu Dec 21 23:37:06 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->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 144
157 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
159 147
160 socket.update_look = 1; 148 pl->ns->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->ns;
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;
… …
222 * RequestInfo is sort of a meta command. There is some specific 208 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 209 * request of information, but we call other functions to provide
224 * that information. 210 * that information.
225 */ 211 */
226void 212void
227RequestInfo (char *buf, int len, client_socket * ns) 213RequestInfo (char *buf, int len, client * ns)
228{ 214{
229 char *params = NULL, *cp; 215 char *params = NULL, *cp;
230 216
231 /* No match */ 217 /* No match */
232 char bigbuf[MAX_BUF]; 218 char bigbuf[MAX_BUF];
… …
267{ 253{
268 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
269} 255}
270 256
271void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
272MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
273{ 265{
274 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
276 268
… …
288 buf += 8; 280 buf += 8;
289 281
290 // initial map and its origin 282 // initial map and its origin
291 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
292 sint16 dx, dy; 284 sint16 dx, dy;
293 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
294 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
295 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
296 288
297 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
298 { 290 {
299 int dir = *buf++; 291 int dir = *buf++;
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
351 } 343 }
352 else 344 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354 346
355 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
356} 348}
357 349
358/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
359void 351void
360SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
361{ 353{
362 int s, slen; 354 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
364 356
365 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
575 * 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.
576 * 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,
577 * 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.
578 */ 570 */
579void 571void
580AddMeCmd (char *buf, int len, client_socket * ns) 572AddMeCmd (char *buf, int len, client * ns)
581{ 573{
582 Settings oldsettings; 574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
583 576
584 oldsettings = settings;
585 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
586 ns->send_packet ("addme_failed"); 578 ns->send_packet ("addme_failed");
587 else 579 else
588 ns->send_packet ("addme_success"); 580 ns->send_packet ("addme_success");
589
590 settings = oldsettings;
591} 581}
592 582
593/** Reply to ExtendedInfos command */ 583/** Reply to ExtendedInfos command */
594void 584void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 585ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 586{
597 char cmdback[MAX_BUF]; 587 char cmdback[MAX_BUF];
598 char command[50]; 588 char command[50];
599 int info, nextinfo; 589 int info, nextinfo;
600 590
… …
651#define MSG_TYPE_MONUMENT 5 641#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 642#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 643
654/** Reply to ExtendedInfos command */ 644/** Reply to ExtendedInfos command */
655void 645void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 646ToggleExtendedText (char *buf, int len, client * ns)
657{ 647{
658 char cmdback[MAX_BUF]; 648 char cmdback[MAX_BUF];
659 char temp[10]; 649 char temp[10];
660 char command[50]; 650 char command[50];
661 int info, nextinfo, i, flag; 651 int info, nextinfo, i, flag;
… …
712 * 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
713 * 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
714 * client. 704 * client.
715 */ 705 */
716static void 706static void
717SendSmooth (client_socket * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
718{ 708{
719 uint16 smoothface; 709 uint16 smoothface;
720 710
721 /* 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
722 * again. 712 * again.
… …
732 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
733 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
734 724
735 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
736 726
737 packet sl; 727 packet sl ("smooth");
738 728
739 sl << "smooth "
740 << uint16 (face) 729 sl << uint16 (face)
741 << uint16 (smoothface); 730 << uint16 (smoothface);
742 731
743 ns->send_packet (sl); 732 ns->send_packet (sl);
744} 733}
745 734
746 /** 735 /**
747 * Tells client the picture it has to use 736 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
749 */ 738 */
750void 739void
751AskSmooth (char *buf, int len, client_socket * ns) 740AskSmooth (char *buf, int len, client *ns)
752{ 741{
753 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 743}
758 744
759/** 745/**
760 * 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,
761 * etc.) 747 * etc.)
762 */ 748 */
763void 749void
764PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
765{ 751{
766
767 /* The following should never happen with a proper or honest client.
768 * Therefore, the error message doesn't have to be too clear - if
769 * someone is playing with a hacked/non working client, this gives them
770 * an idea of the problem, but they deserve what they get
771 */
772 if (pl->state != ST_PLAYING)
773 {
774 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
775 return;
776 }
777 /* 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
778 * sent, so check for that also. 753 * sent, so check for that also.
779 */ 754 */
780 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
781 { 756 {
782 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 760 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 761 return;
790 } 762
791 buf++; 763 buf++;
792 } 764 }
793 /* This should not happen anymore. */ 765
794 if (pl->ob->speed_left < -1.0)
795 {
796 LOG (llevError, "Player has negative time - shouldn't do command.\n");
797 }
798 /* In c_new.c */
799 execute_newserver_command (pl->ob, (char *) buf); 766 execute_newserver_command (pl->ob, (char *) buf);
767
800 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
801 * Cleaning up the input should probably be done first - all actions 769 * Cleaning up the input should probably be done first - all actions
802 * 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
803 * commands. 771 * commands.
804 */ 772 */
805
806 pl->count = 0; 773 pl->count = 0;
807
808} 774}
809 775
810 776
811/** 777/**
812 * 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,
… …
815 * can throttle. 781 * can throttle.
816 */ 782 */
817void 783void
818NewPlayerCmd (char *buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
819{ 785{
820 int time, repeat;
821 char command[MAX_BUF];
822 int pktlen;
823
824 if (len < 7) 786 if (len <= 6)
825 { 787 {
826 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);
827 return; 789 return;
828 } 790 }
829 791
830 pktlen = net_uint16 ((uint8 *)buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
831 repeat = net_uint32 ((uint8 *)buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832 794
833 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
834 if (repeat != -1) 796 if (repeat != -1)
835 pl->count = repeat; 797 pl->count = repeat;
836 798
837 if ((len - 4) >= MAX_BUF) 799 buf += 6; //len -= 6;
838 len = MAX_BUF - 5;
839 800
840 strncpy ((char *) command, (char *) buf + 6, len - 4);
841 command[len - 4] = 0;
842
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 LOG (llevError, "Player has negative time - shouldn't do command.\n");
846
847 /* In c_new.c */
848 execute_newserver_command (pl->ob, (char *) command); 801 execute_newserver_command (pl->ob, buf);
802
849 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 804 * Cleaning up the input should probably be done first - all actions
851 * 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
852 * commands. 806 * commands.
853 */ 807 */
854 pl->count = 0; 808 pl->count = 0;
855 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
856 if (FABS (pl->ob->speed) < 0.001) 811 int time = FABS (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 812 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
860 814
861 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
862 816 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 818 pl->ns->send_packet (sl);
866} 819}
867
868 820
869/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
870void 822void
871ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
872{ 824{
825 if (ns->state == ST_CUSTOM)
826 {
827 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
828 return;
829 }
830
831 if (!ns->pl)
832 return; //TODO: depends on the exact reply we are after
833 //TODO: but right now, we always have a ns->pl
834
835 player *pl = ns->pl;
836
873 /* This is to synthesize how the data would be stored if it 837 /* This is to synthesize how the data would be stored if it
874 * was normally entered. A bit of a hack, and should be cleaned up 838 * was normally entered. A bit of a hack, and should be cleaned up
875 * once all the X11 code is removed from the server. 839 * once all the X11 code is removed from the server.
876 * 840 *
877 * We pass 13 to many of the functions because this way they 841 * We pass 13 to many of the functions because this way they
878 * think it was the carriage return that was entered, and the 842 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 843 * function then does not try to do additional input.
880 */ 844 */
881 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 845 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882 846
883 /* this avoids any hacking here */ 847 /* this avoids any hacking here */
884 848
885 switch (pl->state) 849 switch (ns->state)
886 { 850 {
887 case ST_PLAYING: 851 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 852 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 853 break;
890 854
891 case ST_PLAY_AGAIN: 855 case ST_PLAY_AGAIN:
892 /* We can check this for return value (2==quit). Maybe we 856 /* We can check this for return value (2==quit). Maybe we
893 * should, and do something appropriate? 857 * should, and do something appropriate?
894 */ 858 */
895 receive_play_again (pl->ob, buf[0]); 859 receive_play_again (pl->ob, buf[0]);
896 break; 860 break;
897 861
898 case ST_ROLL_STAT: 862 case ST_ROLL_STAT:
899 key_roll_stat (pl->ob, buf[0]); 863 key_roll_stat (pl->ob, buf[0]);
900 break; 864 break;
901 865
902 case ST_CHANGE_CLASS: 866 case ST_CHANGE_CLASS:
903
904 key_change_class (pl->ob, buf[0]); 867 key_change_class (pl->ob, buf[0]);
905 break; 868 break;
906 869
907 case ST_CONFIRM_QUIT: 870 case ST_CONFIRM_QUIT:
908 key_confirm_quit (pl->ob, buf[0]); 871 key_confirm_quit (pl->ob, buf[0]);
909 break; 872 break;
910 873
911 case ST_CONFIGURE: 874 case ST_CONFIGURE:
912 LOG (llevError, "In client input handling, but into configure state\n"); 875 LOG (llevError, "In client input handling, but into configure state\n");
913 pl->state = ST_PLAYING; 876 ns->state = ST_PLAYING;
914 break; 877 break;
915 878
916 case ST_GET_NAME: 879 case ST_GET_NAME:
917 receive_player_name (pl->ob, 13); 880 receive_player_name (pl->ob, 13);
918 break; 881 break;
919 882
920 case ST_GET_PASSWORD: 883 case ST_GET_PASSWORD:
921 case ST_CONFIRM_PASSWORD: 884 case ST_CONFIRM_PASSWORD:
922 receive_player_password (pl->ob, 13); 885 receive_player_password (pl->ob, 13);
923 break; 886 break;
924 887
925 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 888 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 889 receive_party_password (pl->ob, 13);
927 break; 890 break;
928 891
929 default: 892 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 893 LOG (llevError, "Unknown input state: %d\n", ns->state);
931 } 894 }
932} 895}
933 896
934/** 897/**
935 * Client tells its version. If there is a mismatch, we close the 898 * Client tells its version. If there is a mismatch, we close the
… …
937 * something older than the server. If we assume the client will be 900 * something older than the server. If we assume the client will be
938 * backwards compatible, having it be a later version should not be a 901 * backwards compatible, having it be a later version should not be a
939 * problem. 902 * problem.
940 */ 903 */
941void 904void
942VersionCmd (char *buf, int len, client_socket * ns) 905VersionCmd (char *buf, int len, client * ns)
943{ 906{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 907 if (!buf)
948 { 908 {
949 LOG (llevError, "CS: received corrupted version command\n"); 909 LOG (llevError, "CS: received corrupted version command\n");
950 return; 910 return;
951 } 911 }
952 912
953 ns->cs_version = atoi (buf); 913 ns->cs_version = atoi (buf);
954 ns->sc_version = ns->cs_version; 914 ns->sc_version = ns->cs_version;
915
916 LOG (llevDebug, "connection from client <%s>\n", buf);
917
918
919 //TODO: should log here just for statistics
920
955 if (VERSION_CS != ns->cs_version) 921 //if (VERSION_CS != ns->cs_version)
956 { 922 // unchecked;
957#ifdef ESRV_DEBUG 923
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 924 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 925 if (!cp)
963 return; 926 return;
927
964 ns->sc_version = atoi (cp); 928 ns->sc_version = atoi (cp);
929
965 if (VERSION_SC != ns->sc_version) 930 //if (VERSION_SC != ns->sc_version)
966 { 931 // unchecked;
967#ifdef ESRV_DEBUG 932
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 933 cp = strchr (cp + 1, ' ');
934
972 if (cp) 935 if (cp)
973 { 936 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 937 assign (ns->version, cp + 1);
975 938
976 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
977
978 /* This is first implementation - i skip all beta DX clients with it
979 * Add later stuff here for other clients
980 */
981
982 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time.
986 */
987 if (ns->sc_version < 1026) 939 if (ns->sc_version < 1026)
988 { 940 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 941 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 942 }
995} 943}
996 944
997/** sound related functions. */ 945/** sound related functions. */
998
999void 946void
1000SetSound (char *buf, int len, client_socket * ns) 947SetSound (char *buf, int len, client * ns)
1001{ 948{
1002 ns->sound = atoi (buf); 949 ns->sound = atoi (buf);
1003} 950}
1004 951
1005/** client wants the map resent */ 952/** client wants the map resent */
1006 953
1007void 954void
1008MapRedrawCmd (char *buf, int len, player *pl) 955MapRedrawCmd (char *buf, int len, player *pl)
1009{ 956{
1010
1011/* This function is currently disabled; just clearing the map state results in 957/* This function is currently disabled; just clearing the map state results in
1012 * display errors. It should clear the cache and send a newmap command. 958 * display errors. It should clear the cache and send a newmap command.
1013 * Unfortunately this solution does not work because some client versions send 959 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 960 * a mapredraw command after receiving a newmap command.
1015 */ 961 */
1016#if 0
1017 /* Okay, this is MAJOR UGLY. but the only way I know how to
1018 * clear the "cache"
1019 */
1020 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021 draw_client_map (pl->ob);
1022#endif
1023} 962}
1024 963
1025/** 964/**
1026 * Moves an object (typically, container to inventory). 965 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 966 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 969MoveCmd (char *buf, int len, player *pl)
1031{ 970{
1032 int vals[3], i; 971 int vals[3], i;
1033 972
1034 /* A little funky here. We only cycle for 2 records, because 973 /* A little funky here. We only cycle for 2 records, because
1035 * we obviously am not going to find a space after the third 974 * we obviously are not going to find a space after the third
1036 * record. Perhaps we should just replace this with a 975 * record. Perhaps we should just replace this with a
1037 * sscanf? 976 * sscanf?
1038 */ 977 */
1039 for (i = 0; i < 2; i++) 978 for (i = 0; i < 2; i++)
1040 { 979 {
1041 vals[i] = atoi (buf); 980 vals[i] = atoi (buf);
981
1042 if (!(buf = strchr (buf, ' '))) 982 if (!(buf = strchr (buf, ' ')))
1043 { 983 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 984 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 985 return;
1046 } 986 }
987
1047 buf++; 988 buf++;
1048 } 989 }
990
1049 vals[2] = atoi (buf); 991 vals[2] = atoi (buf);
1050 992
1051/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 993/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 994 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 995}
1054
1055
1056 996
1057/****************************************************************************** 997/******************************************************************************
1058 * 998 *
1059 * Start of commands the server sends to the client. 999 * Start of commands the server sends to the client.
1060 * 1000 *
… …
1063/** 1003/**
1064 * Asks the client to query the user. This way, the client knows 1004 * Asks the client to query the user. This way, the client knows
1065 * it needs to send something back (vs just printing out a message) 1005 * it needs to send something back (vs just printing out a message)
1066 */ 1006 */
1067void 1007void
1068send_query (client_socket * ns, uint8 flags, char *text) 1008send_query (client *ns, uint8 flags, char *text)
1069{ 1009{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 1010 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 1011}
1075 1012
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1013#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1014 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 1015 sl << uint8 (Type) << uint64 (New); \
… …
1108esrv_update_stats (player *pl) 1045esrv_update_stats (player *pl)
1109{ 1046{
1110 char buf[MAX_BUF]; 1047 char buf[MAX_BUF];
1111 uint16 flags; 1048 uint16 flags;
1112 1049
1113 packet sl; 1050 packet sl ("stats");
1114 sl << "stats ";
1115 1051
1116 if (pl->ob != NULL) 1052 if (pl->ob)
1117 { 1053 {
1118 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1054 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1119 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1055 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1120 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1121 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1057 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1128 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1064 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1129 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1065 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1131 } 1067 }
1132 1068
1133 if (pl->socket->exp64) 1069 if (pl->ns->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1070 for (int s = 0; s < NUM_SKILLS; s++)
1138 {
1139 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1140 { 1072 {
1141 /* Always send along the level if exp changes. This is only 1073 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1074 * 1 extra byte, but keeps processing simpler.
1143 */ 1075 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1076 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1077 << uint8 (pl->last_skill_ob[s]->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1078 << uint64 (pl->last_skill_ob[s]->stats.exp);
1147 1079
1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149 } 1081 }
1150 }
1151 }
1152 1082
1153 if (pl->socket->exp64) 1083 if (pl->ns->exp64)
1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1155 else 1085 else
1156 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1157 1087
1158 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1171 if (pl->run_on) 1101 if (pl->run_on)
1172 flags |= SF_RUNON; 1102 flags |= SF_RUNON;
1173 1103
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1104 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1175 1105
1176 if (pl->socket->sc_version < 1025) 1106 if (pl->ns->sc_version < 1025)
1177 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1107 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1178 else 1108 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1109 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1110 {
1184 /* Skip ones we won't send */ 1111 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1112 if (atnr_cs_stat[i] == -1)
1186 continue; 1113 continue;
1187 1114
1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1115 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1189 } 1116 }
1190 }
1191 1117
1192 if (pl->socket->monitor_spells) 1118 if (pl->ns->monitor_spells)
1193 { 1119 {
1194 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1120 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1195 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1121 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1196 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1122 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1197 } 1123 }
1198 1124
1199 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1125 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1126 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1201 set_title (pl->ob, buf); 1127 set_title (pl->ob, buf);
1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1128 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1203 1129
1204 /* Only send it away if we have some actual data */ 1130 /* Only send it away if we have some actual data */
1205 if (sl.length () > 6) 1131 if (sl.length () > 6)
1206 pl->socket->send_packet (sl); 1132 pl->ns->send_packet (sl);
1207} 1133}
1208 1134
1209/** 1135/**
1210 * Tells the client that here is a player it should start using. 1136 * Tells the client that here is a player it should start using.
1211 */ 1137 */
1212void 1138void
1213esrv_new_player (player *pl, uint32 weight) 1139esrv_new_player (player *pl, uint32 weight)
1214{ 1140{
1215 pl->last_weight = weight; 1141 pl->last_weight = weight;
1216 1142
1217 packet sl; 1143 packet sl ("player");
1218 sl << "player ";
1219 1144
1220 sl << uint32 (pl->ob->count) 1145 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 1146 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 1147 << uint32 (pl->ob->face->number)
1223 << data8 (pl->ob->name); 1148 << data8 (pl->ob->name);
1224 1149
1225 pl->socket->send_packet (sl); 1150 pl->ns->send_packet (sl);
1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1151 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227} 1152}
1228 1153
1229/** 1154/**
1230 * Need to send an animation sequence to the client. 1155 * Need to send an animation sequence to the client.
… …
1232 * sent them the face yet (this can become quite costly in terms of 1157 * sent them the face yet (this can become quite costly in terms of
1233 * how much we are sending - on the other hand, this should only happen 1158 * how much we are sending - on the other hand, this should only happen
1234 * when the player logs in and picks stuff up. 1159 * when the player logs in and picks stuff up.
1235 */ 1160 */
1236void 1161void
1237esrv_send_animation (client_socket * ns, short anim_num) 1162esrv_send_animation (client * ns, short anim_num)
1238{ 1163{
1239 int i;
1240
1241 /* Do some checking on the anim_num we got. Note that the animations 1164 /* Do some checking on the anim_num we got. Note that the animations
1242 * are added in contigous order, so if the number is in the valid 1165 * are added in contigous order, so if the number is in the valid
1243 * range, it must be a valid animation. 1166 * range, it must be a valid animation.
1244 */ 1167 */
1245 if (anim_num < 0 || anim_num > num_animations) 1168 if (anim_num < 0 || anim_num > num_animations)
1246 { 1169 {
1247 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1170 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1248 return; 1171 return;
1249 } 1172 }
1250 1173
1251 packet sl; 1174 packet sl ("anim");
1252 1175
1253 sl << "anim "
1254 << uint16 (anim_num) 1176 sl << uint16 (anim_num)
1255 << uint16 (0); /* flags - not used right now */ 1177 << uint16 (0); /* flags - not used right now */
1256 1178
1257 /* Build up the list of faces. Also, send any information (ie, the 1179 /* Build up the list of faces. Also, send any information (ie, the
1258 * the face itself) down to the client. 1180 * the face itself) down to the client.
1259 */ 1181 */
1260 for (i = 0; i < animations[anim_num].num_animations; i++) 1182 for (int i = 0; i < animations[anim_num].num_animations; i++)
1261 { 1183 {
1262 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1263 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1185 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1186
1264 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1187 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1265 } 1188 }
1266 1189
1267 ns->send_packet (sl); 1190 ns->send_packet (sl);
1268 1191
… …
1279/** 1202/**
1280 * This adds face_num to a map cell at x,y. If the client doesn't have 1203 * This adds face_num to a map cell at x,y. If the client doesn't have
1281 * the face yet, we will also send it. 1204 * the face yet, we will also send it.
1282 */ 1205 */
1283static void 1206static void
1284esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1207esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1285{ 1208{
1286 if (newmap->cells[x][y].count >= MAP_LAYERS) 1209 if (newmap->cells[x][y].count >= MAP_LAYERS)
1287 { 1210 {
1211 //TODO: one or the other, can't both have abort and return, verify and act
1288 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1212 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1289 return; 1213 return;
1290 abort (); 1214 abort ();
1291 } 1215 }
1292 1216
1293 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1217 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1294 newmap->cells[x][y].count++; 1218 newmap->cells[x][y].count++;
1295 1219
1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1220 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297 esrv_send_face (ns, face_num, 0); 1221 esrv_send_face (ns, face_num, 0);
1298}
1299
1300struct LayerCell
1301{
1302 uint16 xy;
1303 short face;
1304};
1305
1306struct MapLayer
1307{
1308 int count;
1309 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1310};
1311
1312/** Checkes if map cells have changed */
1313static int
1314mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1315{
1316 int k;
1317
1318 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1319 return 1;
1320 for (k = 0; k < newmap->cells[i][j].count; k++)
1321 {
1322 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1323 {
1324 return 1;
1325 }
1326 }
1327 return 0;
1328}
1329
1330/**
1331 * Basically, what this does is pack the data into layers.
1332 * cnum is the client number, cur is the the buffer we put all of
1333 * this data into. we return the end of the data. layers is
1334 * how many layers of data we should back.
1335 */
1336static uint8 *
1337compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1338{
1339 int x, y, k;
1340 int face;
1341 unsigned char *fcur;
1342 struct MapLayer layers[MAP_LAYERS];
1343
1344 for (k = 0; k < MAP_LAYERS; k++)
1345 layers[k].count = 0;
1346 fcur = cur;
1347 for (x = 0; x < ns->mapx; x++)
1348 {
1349 for (y = 0; y < ns->mapy; y++)
1350 {
1351 if (!mapcellchanged (ns, x, y, newmap))
1352 continue;
1353 if (newmap->cells[x][y].count == 0)
1354 {
1355 *cur = x * ns->mapy + y; /* mark empty space */
1356 cur++;
1357 continue;
1358 }
1359 for (k = 0; k < newmap->cells[x][y].count; k++)
1360 {
1361 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1362 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1363 layers[k].count++;
1364 }
1365 }
1366 }
1367 /* If no data, return now. */
1368 if (fcur == cur && layers[0].count == 0)
1369 return cur;
1370 *cur = 255; /* mark end of explicitly cleared cells */
1371 cur++;
1372 /* First pack by layers. */
1373 for (k = 0; k < numlayers; k++)
1374 {
1375 if (layers[k].count == 0)
1376 break; /* once a layer is entirely empty, no layer below it can
1377 have anything in it either */
1378 /* Pack by entries in thie layer */
1379 for (x = 0; x < layers[k].count;)
1380 {
1381 fcur = cur;
1382 *cur = layers[k].lcells[x].face >> 8;
1383 cur++;
1384 *cur = layers[k].lcells[x].face & 0xFF;
1385 cur++;
1386 face = layers[k].lcells[x].face;
1387 /* Now, we back the redundant data into 1 byte xy pairings */
1388 for (y = x; y < layers[k].count; y++)
1389 {
1390 if (layers[k].lcells[y].face == face)
1391 {
1392 *cur = (uint8) layers[k].lcells[y].xy;
1393 cur++;
1394 layers[k].lcells[y].face = -1;
1395 }
1396 }
1397 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1398 /* forward over the now redundant data */
1399 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1400 x++;
1401 }
1402 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1403 }
1404 return cur;
1405} 1222}
1406 1223
1407/** Clears a map cell */ 1224/** Clears a map cell */
1408static void 1225static void
1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1226map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1421#define MAX_LAYERS 3 1238#define MAX_LAYERS 3
1422 1239
1423/* Using a global really isn't a good approach, but saves the over head of 1240/* Using a global really isn't a good approach, but saves the over head of
1424 * allocating and deallocating such a block of data each time run through, 1241 * allocating and deallocating such a block of data each time run through,
1425 * and saves the space of allocating this in the socket object when we only 1242 * and saves the space of allocating this in the socket object when we only
1426 * need it for this cycle. If the serve is ever threaded, this needs to be 1243 * need it for this cycle. If the server is ever threaded, this needs to be
1427 * re-examined. 1244 * re-examined.
1428 */ 1245 */
1429
1430static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1246static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431 1247
1432/** 1248/**
1433 * Returns true if any of the heads for this 1249 * Returns true if any of the heads for this
1434 * space is set. Returns false if all are blank - this is used 1250 * space is set. Returns false if all are blank - this is used
1435 * for empty space checking. 1251 * for empty space checking.
1436 */ 1252 */
1437static inline int 1253static inline int
1438have_head (int ax, int ay) 1254have_head (int ax, int ay)
1439{ 1255{
1440
1441 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1256 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1442 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1257 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1443 return 1; 1258 return 1;
1259
1444 return 0; 1260 return 0;
1445} 1261}
1446 1262
1447/** 1263/**
1448 * check_head is a bit simplistic version of update_space below. 1264 * check_head is a bit simplistic version of update_space below.
1449 * basically, it only checks the that the head on space ax,ay at layer 1265 * basically, it only checks the that the head on space ax,ay at layer
1450 * needs to get sent - if so, it adds the data, sending the head 1266 * needs to get sent - if so, it adds the data, sending the head
1451 * if needed, and returning 1. If this no data needs to get 1267 * if needed, and returning 1. If this no data needs to get
1452 * sent, it returns zero. 1268 * sent, it returns zero.
1453 */ 1269 */
1454static int 1270static int
1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1271check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456{ 1272{
1457 short face_num; 1273 short face_num;
1458 1274
1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1275 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1276 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1492 * numbers the spaces differently - I think this was a leftover from 1308 * numbers the spaces differently - I think this was a leftover from
1493 * the map command, where the faces stack up. Sinces that is no longer 1309 * the map command, where the faces stack up. Sinces that is no longer
1494 * the case, it seems to make more sense to have these layer values 1310 * the case, it seems to make more sense to have these layer values
1495 * actually match. 1311 * actually match.
1496 */ 1312 */
1497
1498static int 1313static int
1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1314update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1500{ 1315{
1501 object *ob, *head; 1316 object *ob, *head;
1502 uint16 face_num; 1317 uint16 face_num;
1503 int bx, by, i; 1318 int bx, by, i;
1504 1319
… …
1717 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1532 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1718 * take. 1533 * take.
1719 */ 1534 */
1720 1535
1721static inline int 1536static inline int
1722update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1537update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1723{ 1538{
1724 object *ob; 1539 object *ob;
1725 int smoothlevel; /* old face_num; */ 1540 int smoothlevel; /* old face_num; */
1726 1541
1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1542 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1761 * Returns the size of a data for a map square as returned by 1576 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1577 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1578 * available.
1764 */ 1579 */
1765int 1580int
1766getExtendedMapInfoSize (client_socket * ns) 1581getExtendedMapInfoSize (client * ns)
1767{ 1582{
1768 int result = 0; 1583 int result = 0;
1769 1584
1770 if (ns->ext_mapinfos) 1585 if (ns->ext_mapinfos)
1771 { 1586 {
1772 if (ns->EMI_smooth) 1587 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1588 result += 1; /*One byte for smoothlevel */
1774 } 1589 }
1590
1775 return result; 1591 return result;
1776} 1592}
1777 1593
1778/** 1594/**
1779 * This function uses the new map1 protocol command to send the map 1595 * This function uses the new map1 protocol command to send the map
… …
1786 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1602 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1787 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1603 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1788 * and use the other 4 bits for other informatiion. For full documentation 1604 * and use the other 4 bits for other informatiion. For full documentation
1789 * of what we send, see the doc/Protocol file. 1605 * of what we send, see the doc/Protocol file.
1790 * I will describe internally what we do: 1606 * I will describe internally what we do:
1791 * the socket->lastmap shows how the map last looked when sent to the client. 1607 * the ns->lastmap shows how the map last looked when sent to the client.
1792 * in the lastmap structure, there is a cells array, which is set to the 1608 * in the lastmap structure, there is a cells array, which is set to the
1793 * maximum viewable size (As set in config.h). 1609 * maximum viewable size (As set in config.h).
1794 * in the cells, there are faces and a count value. 1610 * in the cells, there are faces and a count value.
1795 * we use the count value to hold the darkness value. If -1, then this space 1611 * we use the count value to hold the darkness value. If -1, then this space
1796 * is not viewable. 1612 * is not viewable.
… …
1807 uint8 eentrysize; 1623 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1624 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1625 uint8 extendedinfos;
1810 maptile *m; 1626 maptile *m;
1811 1627
1812 client_socket &socket = *pl->contr->socket; 1628 client &socket = *pl->contr->ns;
1813 1629
1814 check_map_change (pl->contr); 1630 check_map_change (pl->contr);
1815 1631
1816 packet sl; 1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1633 packet esl;
1818 1634
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1635 startlen = sl.length ();
1821 1636
1822 /*Extendedmapinfo structure initialisation */ 1637 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1638 if (socket.ext_mapinfos)
1824 { 1639 {
… …
1868 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1683 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1869 { 1684 {
1870 ax = 0; 1685 ax = 0;
1871 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1686 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1872 { 1687 {
1873
1874 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1688 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875 1689
1876 /* If this space is out of the normal viewable area, we only check 1690 /* If this space is out of the normal viewable area, we only check
1877 * the heads value ax or ay will only be greater than what 1691 * the heads value ax or ay will only be greater than what
1878 * the client wants if using the map1a command - this is because 1692 * the client wants if using the map1a command - this is because
… …
2208 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2209 return; 2023 return;
2210 2024
2211 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2212 2026
2213 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2214 {
2215 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2216 { 2029 {
2217 ax = i; 2030 ax = i;
2218 ay = j; 2031 ay = j;
2219 m = pm; 2032 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2221 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2222 continue; 2036 continue;
2223 if (mflags & P_NEED_UPDATE) 2037
2224 update_position (m, ax, ay);
2225 /* If a map is visible to the player, we don't want to swap it out 2038 /* If a map is visible to the player, we don't want to swap it out
2226 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2228 */ 2041 */
2229 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2230 m->timeout = 50; 2043 m->timeout = 50;
2231 } 2044 }
2232 } 2045
2233 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2234 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2235 { 2048 {
2236 update_los (pl); 2049 update_los (pl);
2237 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2252 2065
2253/*****************************************************************************/ 2066/*****************************************************************************/
2254void 2067void
2255send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2256{ 2069{
2257 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2258} 2071}
2259 2072
2260/** 2073/**
2261 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
2263 */ 2076 */
2264void 2077void
2265send_skill_info (client_socket *ns, char *params) 2078send_skill_info (client *ns, char *params)
2266{ 2079{
2267 packet sl; 2080 packet sl;
2268 sl << "replyinfo skill_info\n"; 2081 sl << "replyinfo skill_info\n";
2269 2082
2270 for (int i = 1; i < NUM_SKILLS; i++) 2083 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 2095/**
2283 * This sends the spell path to name mapping. We ignore 2096 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 2097 * the params - we always send the same info no matter what.
2285 */ 2098 */
2286void 2099void
2287send_spell_paths (client_socket * ns, char *params) 2100send_spell_paths (client * ns, char *params)
2288{ 2101{
2289 packet sl; 2102 packet sl;
2290 2103
2291 sl << "replyinfo spell_paths\n"; 2104 sl << "replyinfo spell_paths\n";
2292 2105
… …
2307 * it then sends an updspell packet for each spell that has changed in this way 2120 * it then sends an updspell packet for each spell that has changed in this way
2308 */ 2121 */
2309void 2122void
2310esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2311{ 2124{
2312 if (!pl->socket->monitor_spells) 2125 if (!pl->ns->monitor_spells)
2313 return; 2126 return;
2314 2127
2315 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2128 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316 { 2129 {
2317 if (spell->type == SPELL) 2130 if (spell->type == SPELL)
… …
2347 2160
2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2161 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2162 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2163 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2351 2164
2352 pl->socket->send_packet (sl); 2165 pl->ns->send_packet (sl);
2353 } 2166 }
2354 } 2167 }
2355 } 2168 }
2356} 2169}
2357 2170
2358void 2171void
2359esrv_remove_spell (player *pl, object *spell) 2172esrv_remove_spell (player *pl, object *spell)
2360{ 2173{
2361 if (!pl->socket->monitor_spells) 2174 if (!pl->ns->monitor_spells)
2362 return; 2175 return;
2363 2176
2364 if (!pl || !spell || spell->env != pl->ob) 2177 if (!pl || !spell || spell->env != pl->ob)
2365 { 2178 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 2179 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 2180 return;
2368 } 2181 }
2369 2182
2370 packet sl; 2183 packet sl ("delspell");
2371 2184
2372 sl << "delspell "
2373 << uint32 (spell->count); 2185 sl << uint32 (spell->count);
2374 2186
2375 pl->socket->send_packet (sl); 2187 pl->ns->send_packet (sl);
2376} 2188}
2377 2189
2378/* appends the spell *spell to the Socklist we will send the data to. */ 2190/* appends the spell *spell to the Socklist we will send the data to. */
2379static void 2191static void
2380append_spell (player *pl, packet &sl, object *spell) 2192append_spell (player *pl, packet &sl, object *spell)
… …
2428 { 2240 {
2429 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2241 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2430 return; 2242 return;
2431 } 2243 }
2432 2244
2433 if (!pl->socket->monitor_spells) 2245 if (!pl->ns->monitor_spells)
2434 return; 2246 return;
2435 2247
2436 packet sl; 2248 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 2249
2440 if (!spell) 2250 if (!spell)
2441 { 2251 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2252 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2443 { 2253 {
… …
2457 if (spell->type != SPELL) 2267 if (spell->type != SPELL)
2458 continue; 2268 continue;
2459 2269
2460 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2270 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2461 { 2271 {
2462 pl->socket->send_packet (sl); 2272 pl->ns->send_packet (sl);
2463 2273
2464 sl.reset (); 2274 sl.reset ();
2465 sl << "addspell "; 2275 sl << "addspell ";
2466 } 2276 }
2467 2277
… …
2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2291 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482 fatal (0); 2292 fatal (0);
2483 } 2293 }
2484 2294
2485 /* finally, we can send the packet */ 2295 /* finally, we can send the packet */
2486 pl->socket->send_packet (sl); 2296 pl->ns->send_packet (sl);
2487} 2297}
2488 2298

Diff Legend

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