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.34 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 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.
… …
60#include <sys/time.h> 55#include <sys/time.h>
61#include <sys/socket.h> 56#include <sys/socket.h>
62#include <netinet/in.h> 57#include <netinet/in.h>
63#include <netdb.h> 58#include <netdb.h>
64 59
65#ifdef HAVE_UNISTD_H
66# include <unistd.h> 60#include <unistd.h>
67#endif
68
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h> 61#include <sys/time.h>
71#endif
72 62
73#include "sounds.h" 63#include "sounds.h"
74 64
75/** 65/**
76 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
93 -1, /* life stealing */ 83 -1, /* life stealing */
94 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
95}; 85};
96 86
97static void 87static void
98socket_map_scroll (NewSocket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
99{ 89{
100 struct Map newmap; 90 struct Map newmap;
101 int x, y, mx, my; 91 int x, y, mx, my;
102 92
103 {
104 packet sl;
105
106 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107 ns->send_packet (sl);
108 }
109 94
110 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
111 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
112 * 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
113 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
153} 138}
154 139
155static void 140static void
156clear_map (player *pl) 141clear_map (player *pl)
157{ 142{
158 NewSocket & socket = pl->socket; 143 client &socket = *pl->socket;
159 144
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 145 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
161 146
162 if (socket.newmapcmd == 1) 147 if (socket.newmapcmd == 1)
163 socket.send_packet ("newmap"); 148 socket.send_packet ("newmap");
… …
168 153
169/** check for map change and send new map data */ 154/** check for map change and send new map data */
170static void 155static void
171check_map_change (player *pl) 156check_map_change (player *pl)
172{ 157{
173 NewSocket & socket = pl->socket; 158 client &socket = *pl->socket;
174 object *ob = pl->ob; 159 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 160 char buf[MAX_BUF]; /* eauugggh */
176 161
177 if (socket.current_map != ob->map) 162 if (socket.current_map != ob->map)
178 { 163 {
… …
221 206
222 socket.current_x = ob->x; 207 socket.current_x = ob->x;
223 socket.current_y = ob->y; 208 socket.current_y = ob->y;
224} 209}
225 210
211/**
212 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide
214 * that information.
215 */
216void
217RequestInfo (char *buf, int len, client * ns)
218{
219 char *params = NULL, *cp;
220
221 /* No match */
222 char bigbuf[MAX_BUF];
223 int slen;
224
225 /* Set up replyinfo before we modify any of the buffers - this is used
226 * if we don't find a match.
227 */
228 strcpy (bigbuf, "replyinfo ");
229 slen = strlen (bigbuf);
230 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
231
232 /* find the first space, make it null, and update the
233 * params pointer.
234 */
235 for (cp = buf; *cp != '\0'; cp++)
236 if (*cp == ' ')
237 {
238 *cp = '\0';
239 params = cp + 1;
240 break;
241 }
242
243 if (!strcmp (buf, "image_info"))
244 send_image_info (ns, params);
245 else if (!strcmp (buf, "image_sums"))
246 send_image_sums (ns, params);
247 else if (!strcmp (buf, "skill_info"))
248 send_skill_info (ns, params);
249 else if (!strcmp (buf, "spell_paths"))
250 send_spell_paths (ns, params);
251 else
252 ns->send_packet (bigbuf, len);
253}
254
226void 255void
227ExtCmd (char *buf, int len, player *pl) 256ExtCmd (char *buf, int len, player *pl)
228{ 257{
229 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 258 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
230} 259}
… …
249 buf += 8; 278 buf += 8;
250 279
251 // initial map and its origin 280 // initial map and its origin
252 maptile *map = pl->ob->map; 281 maptile *map = pl->ob->map;
253 sint16 dx, dy; 282 sint16 dx, dy;
254 int mapx = pl->socket.mapx / 2 - pl->ob->x; 283 int mapx = pl->socket->mapx / 2 - pl->ob->x;
255 int mapy = pl->socket.mapy / 2 - pl->ob->y; 284 int mapy = pl->socket->mapy / 2 - pl->ob->y;
256 int max_distance = 8; // limit maximum path length to something generous 285 int max_distance = 8; // limit maximum path length to something generous
257 286
258 while (*buf && map && max_distance) 287 while (*buf && map && max_distance)
259 { 288 {
260 int dir = *buf++; 289 int dir = *buf++;
… …
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312 } 341 }
313 else 342 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315 344
316 pl->socket.send_packet (bigbuf); 345 pl->socket->send_packet (bigbuf);
317} 346}
318 347
319/** This is the Setup cmd - easy first implementation */ 348/** This is the Setup cmd - easy first implementation */
320void 349void
321SetUp (char *buf, int len, NewSocket * ns) 350SetUp (char *buf, int len, client * ns)
322{ 351{
323 int s, slen; 352 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 353 char *cmd, *param, cmdback[HUGE_BUF];
325 354
326 /* run through the cmds of setup 355 /* run through the cmds of setup
… …
536 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
537 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
538 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
539 */ 568 */
540void 569void
541AddMeCmd (char *buf, int len, NewSocket * ns) 570AddMeCmd (char *buf, int len, client * ns)
542{ 571{
543 Settings oldsettings;
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns)) 572 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed"); 573 ns->send_packet ("addme_failed");
548 else 574 else
549 {
550 /* Basically, the add_player copies the socket structure into
551 * the player structure, so this one (which is from init_sockets)
552 * is not needed anymore. The write below should still work, as the
553 * stuff in ns is still relevant.
554 */
555 ns->send_packet ("addme_success"); 575 ns->send_packet ("addme_success");
556 socket_info.nconns--;
557 ns->status = Ns_Avail;
558 }
559
560 settings = oldsettings;
561} 576}
562 577
563/** Reply to ExtendedInfos command */ 578/** Reply to ExtendedInfos command */
564void 579void
565ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 580ToggleExtendedInfos (char *buf, int len, client * ns)
566{ 581{
567 char cmdback[MAX_BUF]; 582 char cmdback[MAX_BUF];
568 char command[50]; 583 char command[50];
569 int info, nextinfo; 584 int info, nextinfo;
570 585
… …
621#define MSG_TYPE_MONUMENT 5 636#define MSG_TYPE_MONUMENT 5
622#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 637#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623 638
624/** Reply to ExtendedInfos command */ 639/** Reply to ExtendedInfos command */
625void 640void
626ToggleExtendedText (char *buf, int len, NewSocket * ns) 641ToggleExtendedText (char *buf, int len, client * ns)
627{ 642{
628 char cmdback[MAX_BUF]; 643 char cmdback[MAX_BUF];
629 char temp[10]; 644 char temp[10];
630 char command[50]; 645 char command[50];
631 int info, nextinfo, i, flag; 646 int info, nextinfo, i, flag;
… …
682 * a piece of data from us that we know the client wants. So 697 * a piece of data from us that we know the client wants. So
683 * if we know the client wants it, might as well push it to the 698 * if we know the client wants it, might as well push it to the
684 * client. 699 * client.
685 */ 700 */
686static void 701static void
687SendSmooth (NewSocket * ns, uint16 face) 702SendSmooth (client *ns, uint16 face)
688{ 703{
689 uint16 smoothface; 704 uint16 smoothface;
690 705
691 /* If we can't find a face, return and set it so we won't try to send this 706 /* If we can't find a face, return and set it so we won't try to send this
692 * again. 707 * again.
… …
708 723
709 sl << "smooth " 724 sl << "smooth "
710 << uint16 (face) 725 << uint16 (face)
711 << uint16 (smoothface); 726 << uint16 (smoothface);
712 727
713 Send_With_Handling (ns, &sl); 728 ns->send_packet (sl);
714} 729}
715 730
716 /** 731 /**
717 * Tells client the picture it has to use 732 * Tells client the picture it has to use
718 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
719 */ 734 */
720void 735void
721AskSmooth (char *buf, int len, NewSocket * ns) 736AskSmooth (char *buf, int len, client *ns)
722{ 737{
723 uint16 facenbr; 738 SendSmooth (ns, atoi (buf));
724
725 facenbr = atoi (buf);
726 SendSmooth (ns, facenbr);
727} 739}
728 740
729/** 741/**
730 * This handles the general commands from the client (ie, north, fire, cast, 742 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.) 743 * etc.)
732 */ 744 */
733void 745void
734PlayerCmd (char *buf, int len, player *pl) 746PlayerCmd (char *buf, int len, player *pl)
735{ 747{
736
737 /* The following should never happen with a proper or honest client.
738 * Therefore, the error message doesn't have to be too clear - if
739 * someone is playing with a hacked/non working client, this gives them
740 * an idea of the problem, but they deserve what they get
741 */
742 if (pl->state != ST_PLAYING)
743 {
744 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
745 return;
746 }
747 /* Check if there is a count. In theory, a zero count could also be 748 /* Check if there is a count. In theory, a zero count could also be
748 * sent, so check for that also. 749 * sent, so check for that also.
749 */ 750 */
750 if (atoi (buf) || buf[0] == '0') 751 if (atoi (buf) || buf[0] == '0')
751 { 752 {
752 pl->count = atoi ((char *) buf); 753 pl->count = atoi ((char *) buf);
754
753 buf = strchr (buf, ' '); /* advance beyond the numbers */ 755 buf = strchr (buf, ' '); /* advance beyond the numbers */
754 if (!buf) 756 if (!buf)
755 {
756#ifdef ESRV_DEBUG
757 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758#endif
759 return; 757 return;
760 } 758
761 buf++; 759 buf++;
762 } 760 }
763 /* This should not happen anymore. */ 761
764 if (pl->ob->speed_left < -1.0)
765 {
766 LOG (llevError, "Player has negative time - shouldn't do command.\n");
767 }
768 /* In c_new.c */
769 execute_newserver_command (pl->ob, (char *) buf); 762 execute_newserver_command (pl->ob, (char *) buf);
763
770 /* Perhaps something better should be done with a left over count. 764 /* Perhaps something better should be done with a left over count.
771 * Cleaning up the input should probably be done first - all actions 765 * Cleaning up the input should probably be done first - all actions
772 * for the command that issued the count should be done before any other 766 * for the command that issued the count should be done before any other
773 * commands. 767 * commands.
774 */ 768 */
775
776 pl->count = 0; 769 pl->count = 0;
777
778} 770}
779 771
780 772
781/** 773/**
782 * This handles the general commands from the client (ie, north, fire, cast, 774 * This handles the general commands from the client (ie, north, fire, cast,
783 * etc.). It is a lot like PlayerCmd above, but is called with the 775 * etc.). It is a lot like PlayerCmd above, but is called with the
784 * 'ncom' method which gives more information back to the client so it 776 * 'ncom' method which gives more information back to the client so it
785 * can throttle. 777 * can throttle.
786 */ 778 */
787void 779void
788NewPlayerCmd (uint8 * buf, int len, player *pl) 780NewPlayerCmd (char *buf, int len, player *pl)
789{ 781{
790 int time, repeat;
791 char command[MAX_BUF];
792 int pktlen;
793
794 if (len < 7) 782 if (len <= 6)
795 { 783 {
796 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
797 return; 785 return;
798 } 786 }
799 787
800 pktlen = net_uint16 (buf); 788 uint16 cmdid = net_uint16 ((uint8 *)buf);
801 repeat = net_uint32 (buf + 2); 789 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
802 790
803 /* -1 is special - no repeat, but don't update */ 791 /* -1 is special - no repeat, but don't update */
804 if (repeat != -1) 792 if (repeat != -1)
805 pl->count = repeat; 793 pl->count = repeat;
806 794
807 if ((len - 4) >= MAX_BUF) 795 buf += 6; //len -= 6;
808 len = MAX_BUF - 5;
809 796
810 strncpy ((char *) command, (char *) buf + 6, len - 4);
811 command[len - 4] = '\0';
812
813 /* The following should never happen with a proper or honest client.
814 * Therefore, the error message doesn't have to be too clear - if
815 * someone is playing with a hacked/non working client, this gives them
816 * an idea of the problem, but they deserve what they get
817 */
818 if (pl->state != ST_PLAYING)
819 {
820 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
821 return;
822 }
823
824 /* This should not happen anymore. */
825 if (pl->ob->speed_left < -1.0)
826 LOG (llevError, "Player has negative time - shouldn't do command.\n");
827
828 /* In c_new.c */
829 execute_newserver_command (pl->ob, (char *) command); 797 execute_newserver_command (pl->ob, buf);
798
830 /* Perhaps something better should be done with a left over count. 799 /* Perhaps something better should be done with a left over count.
831 * Cleaning up the input should probably be done first - all actions 800 * Cleaning up the input should probably be done first - all actions
832 * for the command that issued the count should be done before any other 801 * for the command that issued the count should be done before any other
833 * commands. 802 * commands.
834 */ 803 */
835 pl->count = 0; 804 pl->count = 0;
836 805
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
837 if (FABS (pl->ob->speed) < 0.001) 807 int time = FABS (pl->ob->speed) < 0.001
838 time = MAX_TIME * 100; 808 ? time = MAX_TIME * 100
839 else
840 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
841 810
842 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
843
844 packet sl; 812 packet sl;
845 sl << "comc " << uint16 (pktlen) << uint32 (time); 813 sl << "comc " << uint16 (cmdid) << uint32 (time);
846 Send_With_Handling (&pl->socket, &sl); 814 pl->socket->send_packet (sl);
847} 815}
848 816
849 817
850/** This is a reply to a previous query. */ 818/** This is a reply to a previous query. */
851void 819void
852ReplyCmd (char *buf, int len, player *pl) 820ReplyCmd (char *buf, int len, player *pl)
853{ 821{
854 /* This is to synthesize how the data would be stored if it 822 /* This is to synthesize how the data would be stored if it
855 * was normally entered. A bit of a hack, and should be cleaned up 823 * was normally entered. A bit of a hack, and should be cleaned up
856 * once all the X11 code is removed from the server. 824 * once all the X11 code is removed from the server.
857 * 825 *
858 * We pass 13 to many of the functions because this way they 826 * We pass 13 to many of the functions because this way they
859 * think it was the carriage return that was entered, and the 827 * think it was the carriage return that was entered, and the
860 * function then does not try to do additional input. 828 * function then does not try to do additional input.
… …
863 831
864 /* this avoids any hacking here */ 832 /* this avoids any hacking here */
865 833
866 switch (pl->state) 834 switch (pl->state)
867 { 835 {
868 case ST_PLAYING: 836 case ST_PLAYING:
869 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 837 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
870 break; 838 break;
871 839
872 case ST_PLAY_AGAIN: 840 case ST_PLAY_AGAIN:
873 /* We can check this for return value (2==quit). Maybe we 841 /* We can check this for return value (2==quit). Maybe we
874 * should, and do something appropriate? 842 * should, and do something appropriate?
875 */ 843 */
876 receive_play_again (pl->ob, buf[0]); 844 receive_play_again (pl->ob, buf[0]);
877 break; 845 break;
878 846
879 case ST_ROLL_STAT: 847 case ST_ROLL_STAT:
880 key_roll_stat (pl->ob, buf[0]); 848 key_roll_stat (pl->ob, buf[0]);
881 break; 849 break;
882 850
883 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
884 852
885 key_change_class (pl->ob, buf[0]); 853 key_change_class (pl->ob, buf[0]);
886 break; 854 break;
887 855
888 case ST_CONFIRM_QUIT: 856 case ST_CONFIRM_QUIT:
889 key_confirm_quit (pl->ob, buf[0]); 857 key_confirm_quit (pl->ob, buf[0]);
890 break; 858 break;
891 859
892 case ST_CONFIGURE: 860 case ST_CONFIGURE:
893 LOG (llevError, "In client input handling, but into configure state\n"); 861 LOG (llevError, "In client input handling, but into configure state\n");
894 pl->state = ST_PLAYING; 862 pl->state = ST_PLAYING;
895 break; 863 break;
896 864
897 case ST_GET_NAME: 865 case ST_GET_NAME:
898 receive_player_name (pl->ob, 13); 866 receive_player_name (pl->ob, 13);
899 break; 867 break;
900 868
901 case ST_GET_PASSWORD: 869 case ST_GET_PASSWORD:
902 case ST_CONFIRM_PASSWORD: 870 case ST_CONFIRM_PASSWORD:
903 receive_player_password (pl->ob, 13); 871 receive_player_password (pl->ob, 13);
904 break; 872 break;
905 873
906 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 874 case ST_GET_PARTY_PASSWORD: /* Get password for party */
907 receive_party_password (pl->ob, 13); 875 receive_party_password (pl->ob, 13);
908 break; 876 break;
909 877
910 default: 878 default:
911 LOG (llevError, "Unknown input state: %d\n", pl->state); 879 LOG (llevError, "Unknown input state: %d\n", pl->state);
912 } 880 }
913} 881}
914 882
915/** 883/**
916 * Client tells its version. If there is a mismatch, we close the 884 * Client tells its version. If there is a mismatch, we close the
… …
918 * something older than the server. If we assume the client will be 886 * something older than the server. If we assume the client will be
919 * backwards compatible, having it be a later version should not be a 887 * backwards compatible, having it be a later version should not be a
920 * problem. 888 * problem.
921 */ 889 */
922void 890void
923VersionCmd (char *buf, int len, NewSocket * ns) 891VersionCmd (char *buf, int len, client * ns)
924{ 892{
925 char *cp;
926 char version_warning[256];
927
928 if (!buf) 893 if (!buf)
929 { 894 {
930 LOG (llevError, "CS: received corrupted version command\n"); 895 LOG (llevError, "CS: received corrupted version command\n");
931 return; 896 return;
932 } 897 }
933 898
934 ns->cs_version = atoi (buf); 899 ns->cs_version = atoi (buf);
935 ns->sc_version = ns->cs_version; 900 ns->sc_version = ns->cs_version;
901
902 LOG (llevDebug, "connection from client <%s>\n", buf);
903
904
905 //TODO: should log here just for statistics
906
936 if (VERSION_CS != ns->cs_version) 907 //if (VERSION_CS != ns->cs_version)
937 { 908 // unchecked;
938#ifdef ESRV_DEBUG 909
939 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
940#endif
941 }
942 cp = strchr (buf + 1, ' '); 910 char *cp = strchr (buf + 1, ' ');
943 if (!cp) 911 if (!cp)
944 return; 912 return;
913
945 ns->sc_version = atoi (cp); 914 ns->sc_version = atoi (cp);
915
946 if (VERSION_SC != ns->sc_version) 916 //if (VERSION_SC != ns->sc_version)
947 { 917 // unchecked;
948#ifdef ESRV_DEBUG 918
949 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
950#endif
951 }
952 cp = strchr (cp + 1, ' '); 919 cp = strchr (cp + 1, ' ');
920
953 if (cp) 921 if (cp)
954 { 922 {
955 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 923 assign (ns->version, cp + 1);
956 924
957 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
958
959 /* This is first implementation - i skip all beta DX clients with it
960 * Add later stuff here for other clients
961 */
962
963 /* these are old dxclients */
964 /* Version 1024 added support for singular + plural name values -
965 * requiing this minimal value reduces complexity of that code, and it
966 * has been around for a long time.
967 */
968 if (ns->sc_version < 1026) 925 if (ns->sc_version < 1026)
969 { 926 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
970 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
971 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 927 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
972 ns->send_packet (version_warning);
973 }
974
975 } 928 }
976} 929}
977 930
978/** sound related functions. */ 931/** sound related functions. */
979
980void 932void
981SetSound (char *buf, int len, NewSocket * ns) 933SetSound (char *buf, int len, client * ns)
982{ 934{
983 ns->sound = atoi (buf); 935 ns->sound = atoi (buf);
984} 936}
985 937
986/** client wants the map resent */ 938/** client wants the map resent */
987 939
988void 940void
989MapRedrawCmd (char *buf, int len, player *pl) 941MapRedrawCmd (char *buf, int len, player *pl)
990{ 942{
991
992/* This function is currently disabled; just clearing the map state results in 943/* This function is currently disabled; just clearing the map state results in
993 * display errors. It should clear the cache and send a newmap command. 944 * display errors. It should clear the cache and send a newmap command.
994 * Unfortunately this solution does not work because some client versions send 945 * Unfortunately this solution does not work because some client versions send
995 * a mapredraw command after receiving a newmap command. 946 * a mapredraw command after receiving a newmap command.
996 */ 947 */
997#if 0
998 /* Okay, this is MAJOR UGLY. but the only way I know how to
999 * clear the "cache"
1000 */
1001 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1002 draw_client_map (pl->ob);
1003#endif
1004} 948}
1005 949
1006/** 950/**
1007 * Moves an object (typically, container to inventory). 951 * Moves an object (typically, container to inventory).
1008 * syntax is: move (to) (tag) (nrof) 952 * syntax is: move (to) (tag) (nrof)
… …
1011MoveCmd (char *buf, int len, player *pl) 955MoveCmd (char *buf, int len, player *pl)
1012{ 956{
1013 int vals[3], i; 957 int vals[3], i;
1014 958
1015 /* A little funky here. We only cycle for 2 records, because 959 /* A little funky here. We only cycle for 2 records, because
1016 * we obviously am not going to find a space after the third 960 * we obviously are not going to find a space after the third
1017 * record. Perhaps we should just replace this with a 961 * record. Perhaps we should just replace this with a
1018 * sscanf? 962 * sscanf?
1019 */ 963 */
1020 for (i = 0; i < 2; i++) 964 for (i = 0; i < 2; i++)
1021 { 965 {
1022 vals[i] = atoi (buf); 966 vals[i] = atoi (buf);
967
1023 if (!(buf = strchr (buf, ' '))) 968 if (!(buf = strchr (buf, ' ')))
1024 { 969 {
1025 LOG (llevError, "Incomplete move command: %s\n", buf); 970 LOG (llevError, "Incomplete move command: %s\n", buf);
1026 return; 971 return;
1027 } 972 }
973
1028 buf++; 974 buf++;
1029 } 975 }
976
1030 vals[2] = atoi (buf); 977 vals[2] = atoi (buf);
1031 978
1032/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 979/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1033 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 980 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1034} 981}
1035
1036
1037 982
1038/****************************************************************************** 983/******************************************************************************
1039 * 984 *
1040 * Start of commands the server sends to the client. 985 * Start of commands the server sends to the client.
1041 * 986 *
… …
1044/** 989/**
1045 * Asks the client to query the user. This way, the client knows 990 * Asks the client to query the user. This way, the client knows
1046 * it needs to send something back (vs just printing out a message) 991 * it needs to send something back (vs just printing out a message)
1047 */ 992 */
1048void 993void
1049send_query (NewSocket * ns, uint8 flags, char *text) 994send_query (client *ns, uint8 flags, char *text)
1050{ 995{
1051 char buf[MAX_BUF];
1052
1053 sprintf (buf, "query %d %s", flags, text ? text : ""); 996 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1054 ns->send_packet (buf);
1055} 997}
1056 998
1057#define AddIfInt64(Old,New,Type) if (Old != New) {\ 999#define AddIfInt64(Old,New,Type) if (Old != New) {\
1058 Old = New; \ 1000 Old = New; \
1059 sl << uint8 (Type) << uint64 (New); \ 1001 sl << uint8 (Type) << uint64 (New); \
… …
1092 uint16 flags; 1034 uint16 flags;
1093 1035
1094 packet sl; 1036 packet sl;
1095 sl << "stats "; 1037 sl << "stats ";
1096 1038
1097 if (pl->ob != NULL) 1039 if (pl->ob)
1098 { 1040 {
1099 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1100 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1101 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1102 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1109 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1051 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1110 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1111 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1112 } 1054 }
1113 1055
1114 if (pl->socket.exp64) 1056 if (pl->socket->exp64)
1115 {
1116 uint8 s;
1117
1118 for (s = 0; s < NUM_SKILLS; s++) 1057 for (int s = 0; s < NUM_SKILLS; s++)
1119 {
1120 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1121 { 1059 {
1122 /* Always send along the level if exp changes. This is only 1060 /* Always send along the level if exp changes. This is only
1123 * 1 extra byte, but keeps processing simpler. 1061 * 1 extra byte, but keeps processing simpler.
1124 */ 1062 */
1125 sl << uint8 (s + CS_STAT_SKILLINFO) 1063 sl << uint8 (s + CS_STAT_SKILLINFO)
1126 << uint8 (pl->last_skill_ob[s]->level) 1064 << uint8 (pl->last_skill_ob[s]->level)
1127 << uint64 (pl->last_skill_ob[s]->stats.exp); 1065 << uint64 (pl->last_skill_ob[s]->stats.exp);
1128 1066
1129 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1130 } 1068 }
1131 }
1132 }
1133 1069
1134 if (pl->socket.exp64) 1070 if (pl->socket->exp64)
1135 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1136 else 1072 else
1137 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1138 1074
1139 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1152 if (pl->run_on) 1088 if (pl->run_on)
1153 flags |= SF_RUNON; 1089 flags |= SF_RUNON;
1154 1090
1155 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1156 1092
1157 if (pl->socket.sc_version < 1025) 1093 if (pl->socket->sc_version < 1025)
1158 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1159 else 1095 else
1160 {
1161 int i;
1162
1163 for (i = 0; i < NROFATTACKS; i++) 1096 for (int i = 0; i < NROFATTACKS; i++)
1164 { 1097 {
1165 /* Skip ones we won't send */ 1098 /* Skip ones we won't send */
1166 if (atnr_cs_stat[i] == -1) 1099 if (atnr_cs_stat[i] == -1)
1167 continue; 1100 continue;
1168 1101
1169 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1170 } 1103 }
1171 }
1172 1104
1173 if (pl->socket.monitor_spells) 1105 if (pl->socket->monitor_spells)
1174 { 1106 {
1175 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1176 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1177 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1109 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1178 } 1110 }
1179 1111
1180 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1181 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1182 set_title (pl->ob, buf); 1114 set_title (pl->ob, buf);
1183 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1184 1116
1185 /* Only send it away if we have some actual data */ 1117 /* Only send it away if we have some actual data */
1186 if (sl.length () > 6) 1118 if (sl.length () > 6)
1187 Send_With_Handling (&pl->socket, &sl); 1119 pl->socket->send_packet (sl);
1188} 1120}
1189 1121
1190/** 1122/**
1191 * Tells the client that here is a player it should start using. 1123 * Tells the client that here is a player it should start using.
1192 */ 1124 */
… …
1201 sl << uint32 (pl->ob->count) 1133 sl << uint32 (pl->ob->count)
1202 << uint32 (weight) 1134 << uint32 (weight)
1203 << uint32 (pl->ob->face->number) 1135 << uint32 (pl->ob->face->number)
1204 << data8 (pl->ob->name); 1136 << data8 (pl->ob->name);
1205 1137
1206 Send_With_Handling (&pl->socket, &sl); 1138 pl->socket->send_packet (sl);
1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208} 1140}
1209 1141
1210/** 1142/**
1211 * Need to send an animation sequence to the client. 1143 * Need to send an animation sequence to the client.
… …
1213 * sent them the face yet (this can become quite costly in terms of 1145 * sent them the face yet (this can become quite costly in terms of
1214 * how much we are sending - on the other hand, this should only happen 1146 * how much we are sending - on the other hand, this should only happen
1215 * when the player logs in and picks stuff up. 1147 * when the player logs in and picks stuff up.
1216 */ 1148 */
1217void 1149void
1218esrv_send_animation (NewSocket * ns, short anim_num) 1150esrv_send_animation (client * ns, short anim_num)
1219{ 1151{
1220 int i;
1221
1222 /* Do some checking on the anim_num we got. Note that the animations 1152 /* Do some checking on the anim_num we got. Note that the animations
1223 * are added in contigous order, so if the number is in the valid 1153 * are added in contigous order, so if the number is in the valid
1224 * range, it must be a valid animation. 1154 * range, it must be a valid animation.
1225 */ 1155 */
1226 if (anim_num < 0 || anim_num > num_animations) 1156 if (anim_num < 0 || anim_num > num_animations)
… …
1236 << uint16 (0); /* flags - not used right now */ 1166 << uint16 (0); /* flags - not used right now */
1237 1167
1238 /* Build up the list of faces. Also, send any information (ie, the 1168 /* Build up the list of faces. Also, send any information (ie, the
1239 * the face itself) down to the client. 1169 * the face itself) down to the client.
1240 */ 1170 */
1241 for (i = 0; i < animations[anim_num].num_animations; i++) 1171 for (int i = 0; i < animations[anim_num].num_animations; i++)
1242 { 1172 {
1243 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1173 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1244 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1174 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1175
1245 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1176 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1246 } 1177 }
1247 1178
1248 Send_With_Handling (ns, &sl); 1179 ns->send_packet (sl);
1249 1180
1250 ns->anims_sent[anim_num] = 1; 1181 ns->anims_sent[anim_num] = 1;
1251} 1182}
1252 1183
1253 1184
… …
1260/** 1191/**
1261 * This adds face_num to a map cell at x,y. If the client doesn't have 1192 * This adds face_num to a map cell at x,y. If the client doesn't have
1262 * the face yet, we will also send it. 1193 * the face yet, we will also send it.
1263 */ 1194 */
1264static void 1195static void
1265esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1196esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1266{ 1197{
1267 if (newmap->cells[x][y].count >= MAP_LAYERS) 1198 if (newmap->cells[x][y].count >= MAP_LAYERS)
1268 { 1199 {
1200 //TODO: one or the other, can't both have abort and return, verify and act
1269 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1201 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270 return; 1202 return;
1271 abort (); 1203 abort ();
1272 } 1204 }
1273 1205
1274 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1206 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1275 newmap->cells[x][y].count++; 1207 newmap->cells[x][y].count++;
1276 1208
1277 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1209 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1278 esrv_send_face (ns, face_num, 0); 1210 esrv_send_face (ns, face_num, 0);
1279}
1280
1281struct LayerCell
1282{
1283 uint16 xy;
1284 short face;
1285};
1286
1287struct MapLayer
1288{
1289 int count;
1290 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1291};
1292
1293/** Checkes if map cells have changed */
1294static int
1295mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1296{
1297 int k;
1298
1299 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1300 return 1;
1301 for (k = 0; k < newmap->cells[i][j].count; k++)
1302 {
1303 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1304 {
1305 return 1;
1306 }
1307 }
1308 return 0;
1309}
1310
1311/**
1312 * Basically, what this does is pack the data into layers.
1313 * cnum is the client number, cur is the the buffer we put all of
1314 * this data into. we return the end of the data. layers is
1315 * how many layers of data we should back.
1316 */
1317static uint8 *
1318compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1319{
1320 int x, y, k;
1321 int face;
1322 unsigned char *fcur;
1323 struct MapLayer layers[MAP_LAYERS];
1324
1325 for (k = 0; k < MAP_LAYERS; k++)
1326 layers[k].count = 0;
1327 fcur = cur;
1328 for (x = 0; x < ns->mapx; x++)
1329 {
1330 for (y = 0; y < ns->mapy; y++)
1331 {
1332 if (!mapcellchanged (ns, x, y, newmap))
1333 continue;
1334 if (newmap->cells[x][y].count == 0)
1335 {
1336 *cur = x * ns->mapy + y; /* mark empty space */
1337 cur++;
1338 continue;
1339 }
1340 for (k = 0; k < newmap->cells[x][y].count; k++)
1341 {
1342 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1343 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1344 layers[k].count++;
1345 }
1346 }
1347 }
1348 /* If no data, return now. */
1349 if (fcur == cur && layers[0].count == 0)
1350 return cur;
1351 *cur = 255; /* mark end of explicitly cleared cells */
1352 cur++;
1353 /* First pack by layers. */
1354 for (k = 0; k < numlayers; k++)
1355 {
1356 if (layers[k].count == 0)
1357 break; /* once a layer is entirely empty, no layer below it can
1358 have anything in it either */
1359 /* Pack by entries in thie layer */
1360 for (x = 0; x < layers[k].count;)
1361 {
1362 fcur = cur;
1363 *cur = layers[k].lcells[x].face >> 8;
1364 cur++;
1365 *cur = layers[k].lcells[x].face & 0xFF;
1366 cur++;
1367 face = layers[k].lcells[x].face;
1368 /* Now, we back the redundant data into 1 byte xy pairings */
1369 for (y = x; y < layers[k].count; y++)
1370 {
1371 if (layers[k].lcells[y].face == face)
1372 {
1373 *cur = (uint8) layers[k].lcells[y].xy;
1374 cur++;
1375 layers[k].lcells[y].face = -1;
1376 }
1377 }
1378 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1379 /* forward over the now redundant data */
1380 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1381 x++;
1382 }
1383 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1384 }
1385 return cur;
1386} 1211}
1387 1212
1388/** Clears a map cell */ 1213/** Clears a map cell */
1389static void 1214static void
1390map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1215map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1402#define MAX_LAYERS 3 1227#define MAX_LAYERS 3
1403 1228
1404/* Using a global really isn't a good approach, but saves the over head of 1229/* Using a global really isn't a good approach, but saves the over head of
1405 * allocating and deallocating such a block of data each time run through, 1230 * allocating and deallocating such a block of data each time run through,
1406 * and saves the space of allocating this in the socket object when we only 1231 * and saves the space of allocating this in the socket object when we only
1407 * need it for this cycle. If the serve is ever threaded, this needs to be 1232 * need it for this cycle. If the server is ever threaded, this needs to be
1408 * re-examined. 1233 * re-examined.
1409 */ 1234 */
1410
1411static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1235static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1412 1236
1413/** 1237/**
1414 * Returns true if any of the heads for this 1238 * Returns true if any of the heads for this
1415 * space is set. Returns false if all are blank - this is used 1239 * space is set. Returns false if all are blank - this is used
1416 * for empty space checking. 1240 * for empty space checking.
1417 */ 1241 */
1418static inline int 1242static inline int
1419have_head (int ax, int ay) 1243have_head (int ax, int ay)
1420{ 1244{
1421
1422 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1423 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1424 return 1; 1247 return 1;
1248
1425 return 0; 1249 return 0;
1426} 1250}
1427 1251
1428/** 1252/**
1429 * check_head is a bit simplistic version of update_space below. 1253 * check_head is a bit simplistic version of update_space below.
1430 * basically, it only checks the that the head on space ax,ay at layer 1254 * basically, it only checks the that the head on space ax,ay at layer
1431 * needs to get sent - if so, it adds the data, sending the head 1255 * needs to get sent - if so, it adds the data, sending the head
1432 * if needed, and returning 1. If this no data needs to get 1256 * if needed, and returning 1. If this no data needs to get
1433 * sent, it returns zero. 1257 * sent, it returns zero.
1434 */ 1258 */
1435static int 1259static int
1436check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) 1260check_head (packet &sl, client &ns, int ax, int ay, int layer)
1437{ 1261{
1438 short face_num; 1262 short face_num;
1439 1263
1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1264 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1265 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1473 * numbers the spaces differently - I think this was a leftover from 1297 * numbers the spaces differently - I think this was a leftover from
1474 * the map command, where the faces stack up. Sinces that is no longer 1298 * the map command, where the faces stack up. Sinces that is no longer
1475 * the case, it seems to make more sense to have these layer values 1299 * the case, it seems to make more sense to have these layer values
1476 * actually match. 1300 * actually match.
1477 */ 1301 */
1478
1479static int 1302static int
1480update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1303update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1481{ 1304{
1482 object *ob, *head; 1305 object *ob, *head;
1483 uint16 face_num; 1306 uint16 face_num;
1484 int bx, by, i; 1307 int bx, by, i;
1485 1308
… …
1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1521 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699 * take. 1522 * take.
1700 */ 1523 */
1701 1524
1702static inline int 1525static inline int
1703update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1526update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704{ 1527{
1705 object *ob; 1528 object *ob;
1706 int smoothlevel; /* old face_num; */ 1529 int smoothlevel; /* old face_num; */
1707 1530
1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1742 * Returns the size of a data for a map square as returned by 1565 * Returns the size of a data for a map square as returned by
1743 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1566 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744 * available. 1567 * available.
1745 */ 1568 */
1746int 1569int
1747getExtendedMapInfoSize (NewSocket * ns) 1570getExtendedMapInfoSize (client * ns)
1748{ 1571{
1749 int result = 0; 1572 int result = 0;
1750 1573
1751 if (ns->ext_mapinfos) 1574 if (ns->ext_mapinfos)
1752 { 1575 {
1753 if (ns->EMI_smooth) 1576 if (ns->EMI_smooth)
1754 result += 1; /*One byte for smoothlevel */ 1577 result += 1; /*One byte for smoothlevel */
1755 } 1578 }
1579
1756 return result; 1580 return result;
1757} 1581}
1758 1582
1759/** 1583/**
1760 * This function uses the new map1 protocol command to send the map 1584 * This function uses the new map1 protocol command to send the map
… …
1788 uint8 eentrysize; 1612 uint8 eentrysize;
1789 uint16 ewhatstart, ewhatflag; 1613 uint16 ewhatstart, ewhatflag;
1790 uint8 extendedinfos; 1614 uint8 extendedinfos;
1791 maptile *m; 1615 maptile *m;
1792 1616
1793 NewSocket &socket = pl->contr->socket; 1617 client &socket = *pl->contr->socket;
1794 1618
1795 check_map_change (pl->contr); 1619 check_map_change (pl->contr);
1796 1620
1797 packet sl; 1621 packet sl;
1798 packet esl; 1622 packet esl;
… …
1877 * with no faces tells the client to blank out the 1701 * with no faces tells the client to blank out the
1878 * space. 1702 * space.
1879 */ 1703 */
1880 got_one = 0; 1704 got_one = 0;
1881 for (i = oldlen + 2; i < sl.length (); i++) 1705 for (i = oldlen + 2; i < sl.length (); i++)
1882 if (sl.buf[i]) 1706 if (sl[i])
1883 got_one = 1; 1707 got_one = 1;
1884 1708
1885 if (got_one && (mask & 0xf)) 1709 if (got_one && (mask & 0xf))
1886 sl.buf[oldlen + 1] = mask & 0xff; 1710 sl[oldlen + 1] = mask & 0xff;
1887 else 1711 else
1888 { /*either all faces blank, either no face at all */ 1712 { /*either all faces blank, either no face at all */
1889 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1713 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890 sl.reset (oldlen + 2); 1714 sl.reset (oldlen + 2);
1891 else 1715 else
… …
1957 1781
1958 map_clearcell (&lastcell, 0, 0, 0, count); 1782 map_clearcell (&lastcell, 0, 0, 0, count);
1959 } 1783 }
1960 1784
1961 if ((mask & 0xf) || need_send) 1785 if ((mask & 0xf) || need_send)
1962 sl.buf[oldlen + 1] = mask & 0xff; 1786 sl[oldlen + 1] = mask & 0xff;
1963 else 1787 else
1964 sl.reset (oldlen); 1788 sl.reset (oldlen);
1965 } 1789 }
1966 else 1790 else
1967 { 1791 {
… …
1997 mask |= 0x8; 1821 mask |= 0x8;
1998 1822
1999 if (socket.extmap) 1823 if (socket.extmap)
2000 { 1824 {
2001 *last_ext |= 0x80; 1825 *last_ext |= 0x80;
2002 last_ext = sl.buf + sl.length (); 1826 last_ext = &sl[sl.length ()];
2003 sl << uint8 (d); 1827 sl << uint8 (d);
2004 } 1828 }
2005 else 1829 else
2006 sl << uint8 (255 - 64 * d); 1830 sl << uint8 (255 - 64 * d);
2007 } 1831 }
… …
2041 { 1865 {
2042 lastcell.stat_hp = stat_hp; 1866 lastcell.stat_hp = stat_hp;
2043 1867
2044 mask |= 0x8; 1868 mask |= 0x8;
2045 *last_ext |= 0x80; 1869 *last_ext |= 0x80;
2046 last_ext = sl.buf + sl.length (); 1870 last_ext = &sl[sl.length ()];
2047 1871
2048 sl << uint8 (5) << uint8 (stat_hp); 1872 sl << uint8 (5) << uint8 (stat_hp);
2049 1873
2050 if (stat_width > 1) 1874 if (stat_width > 1)
2051 { 1875 {
2052 *last_ext |= 0x80; 1876 *last_ext |= 0x80;
2053 last_ext = sl.buf + sl.length (); 1877 last_ext = &sl[sl.length ()];
2054 1878
2055 sl << uint8 (6) << uint8 (stat_width); 1879 sl << uint8 (6) << uint8 (stat_width);
2056 } 1880 }
2057 } 1881 }
2058 1882
… …
2060 { 1884 {
2061 lastcell.player = player; 1885 lastcell.player = player;
2062 1886
2063 mask |= 0x8; 1887 mask |= 0x8;
2064 *last_ext |= 0x80; 1888 *last_ext |= 0x80;
2065 last_ext = sl.buf + sl.length (); 1889 last_ext = &sl[sl.length ()];
2066 1890
2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1891 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068 } 1892 }
2069 1893
2070 if (lastcell.flags != flags) 1894 if (lastcell.flags != flags)
2071 { 1895 {
2072 lastcell.flags = flags; 1896 lastcell.flags = flags;
2073 1897
2074 mask |= 0x8; 1898 mask |= 0x8;
2075 *last_ext |= 0x80; 1899 *last_ext |= 0x80;
2076 last_ext = sl.buf + sl.length (); 1900 last_ext = &sl[sl.length ()];
2077 1901
2078 sl << uint8 (8) << uint8 (flags); 1902 sl << uint8 (8) << uint8 (flags);
2079 } 1903 }
2080 } 1904 }
2081 1905
… …
2123 * space by checking the mask. If so, update the mask. 1947 * space by checking the mask. If so, update the mask.
2124 * if not, reset the len to that from before adding the mask 1948 * if not, reset the len to that from before adding the mask
2125 * value, so we don't send those bits. 1949 * value, so we don't send those bits.
2126 */ 1950 */
2127 if (mask & 0xf) 1951 if (mask & 0xf)
2128 sl.buf[oldlen + 1] = mask & 0xff; 1952 sl[oldlen + 1] = mask & 0xff;
2129 else 1953 else
2130 sl.reset (oldlen); 1954 sl.reset (oldlen);
2131 1955
2132 if (emask & 0xf) 1956 if (emask & 0xf)
2133 esl.buf[eoldlen + 1] = emask & 0xff; 1957 esl[eoldlen + 1] = emask & 0xff;
2134 else 1958 else
2135 esl.reset (eoldlen); 1959 esl.reset (eoldlen);
2136 } /* else this is a viewable space */ 1960 } /* else this is a viewable space */
2137 } /* for x loop */ 1961 } /* for x loop */
2138 } /* for y loop */ 1962 } /* for y loop */
… …
2144 { 1968 {
2145 /* No map data will follow, so don't say the client 1969 /* No map data will follow, so don't say the client
2146 * it doesn't need draw! 1970 * it doesn't need draw!
2147 */ 1971 */
2148 ewhatflag &= (~EMI_NOREDRAW); 1972 ewhatflag &= (~EMI_NOREDRAW);
2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1973 esl[ewhatstart + 1] = ewhatflag & 0xff;
2150 } 1974 }
2151 1975
2152 if (esl.length () > estartlen) 1976 if (esl.length () > estartlen)
2153 Send_With_Handling (&socket, &esl); 1977 socket.send_packet (esl);
2154 } 1978 }
2155 1979
2156 if (sl.length () > startlen || socket.sent_scroll) 1980 if (sl.length () > startlen || socket.sent_scroll)
2157 { 1981 {
2158 Send_With_Handling (&socket, &sl); 1982 socket.send_packet (sl);
2159 socket.sent_scroll = 0; 1983 socket.sent_scroll = 0;
2160 } 1984 }
2161} 1985}
2162 1986
2163/** 1987/**
… …
2189 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190 return; 2014 return;
2191 2015
2192 memset (&newmap, 0, sizeof (struct Map)); 2016 memset (&newmap, 0, sizeof (struct Map));
2193 2017
2194 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2018 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2195 { 2019 {
2196 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2020 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2197 { 2021 {
2198 ax = i; 2022 ax = i;
2199 ay = j; 2023 ay = j;
2200 m = pm; 2024 m = pm;
2201 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026
2202 if (mflags & P_OUT_OF_MAP) 2027 if (mflags & P_OUT_OF_MAP)
2203 continue; 2028 continue;
2029
2204 if (mflags & P_NEED_UPDATE) 2030 if (mflags & P_NEED_UPDATE)
2205 update_position (m, ax, ay); 2031 update_position (m, ax, ay);
2032
2206 /* If a map is visible to the player, we don't want to swap it out 2033 /* If a map is visible to the player, we don't want to swap it out
2207 * just to reload it. This should really call something like 2034 * just to reload it. This should really call something like
2208 * swap_map, but this is much more efficient and 'good enough' 2035 * swap_map, but this is much more efficient and 'good enough'
2209 */ 2036 */
2210 if (mflags & P_NEW_MAP) 2037 if (mflags & P_NEW_MAP)
… …
2233 2060
2234/*****************************************************************************/ 2061/*****************************************************************************/
2235void 2062void
2236send_plugin_custom_message (object *pl, char *buf) 2063send_plugin_custom_message (object *pl, char *buf)
2237{ 2064{
2238 pl->contr->socket.send_packet (buf); 2065 pl->contr->socket->send_packet (buf);
2239} 2066}
2240 2067
2241/** 2068/**
2242 * This sends the skill number to name mapping. We ignore 2069 * This sends the skill number to name mapping. We ignore
2243 * the params - we always send the same info no matter what. 2070 * the params - we always send the same info no matter what.
2244 */ 2071 */
2245void 2072void
2246send_skill_info (NewSocket *ns, char *params) 2073send_skill_info (client *ns, char *params)
2247{ 2074{
2248 packet sl; 2075 packet sl;
2249 sl << "replyinfo skill_info\n"; 2076 sl << "replyinfo skill_info\n";
2250 2077
2251 for (int i = 1; i < NUM_SKILLS; i++) 2078 for (int i = 1; i < NUM_SKILLS; i++)
… …
2255 { 2082 {
2256 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2083 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257 fatal (0); 2084 fatal (0);
2258 } 2085 }
2259 2086
2260 Send_With_Handling (ns, &sl); 2087 ns->send_packet (sl);
2261} 2088}
2262 2089
2263/** 2090/**
2264 * This sends the spell path to name mapping. We ignore 2091 * This sends the spell path to name mapping. We ignore
2265 * the params - we always send the same info no matter what. 2092 * the params - we always send the same info no matter what.
2266 */ 2093 */
2267void 2094void
2268send_spell_paths (NewSocket * ns, char *params) 2095send_spell_paths (client * ns, char *params)
2269{ 2096{
2270 packet sl; 2097 packet sl;
2271 2098
2272 sl << "replyinfo spell_paths\n"; 2099 sl << "replyinfo spell_paths\n";
2273 2100
… …
2278 { 2105 {
2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2106 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280 fatal (0); 2107 fatal (0);
2281 } 2108 }
2282 2109
2283 Send_With_Handling (ns, &sl); 2110 ns->send_packet (sl);
2284} 2111}
2285 2112
2286/** 2113/**
2287 * This looks for any spells the player may have that have changed their stats. 2114 * This looks for any spells the player may have that have changed their stats.
2288 * it then sends an updspell packet for each spell that has changed in this way 2115 * it then sends an updspell packet for each spell that has changed in this way
2289 */ 2116 */
2290void 2117void
2291esrv_update_spells (player *pl) 2118esrv_update_spells (player *pl)
2292{ 2119{
2293 if (!pl->socket.monitor_spells) 2120 if (!pl->socket->monitor_spells)
2294 return; 2121 return;
2295 2122
2296 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2123 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297 { 2124 {
2298 if (spell->type == SPELL) 2125 if (spell->type == SPELL)
… …
2328 2155
2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332 2159
2333 Send_With_Handling (&pl->socket, &sl); 2160 pl->socket->send_packet (sl);
2334 } 2161 }
2335 } 2162 }
2336 } 2163 }
2337} 2164}
2338 2165
2339void 2166void
2340esrv_remove_spell (player *pl, object *spell) 2167esrv_remove_spell (player *pl, object *spell)
2341{ 2168{
2342 if (!pl->socket.monitor_spells) 2169 if (!pl->socket->monitor_spells)
2343 return; 2170 return;
2344 2171
2345 if (!pl || !spell || spell->env != pl->ob) 2172 if (!pl || !spell || spell->env != pl->ob)
2346 { 2173 {
2347 LOG (llevError, "Invalid call to esrv_remove_spell"); 2174 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2351 packet sl; 2178 packet sl;
2352 2179
2353 sl << "delspell " 2180 sl << "delspell "
2354 << uint32 (spell->count); 2181 << uint32 (spell->count);
2355 2182
2356 Send_With_Handling (&pl->socket, &sl); 2183 pl->socket->send_packet (sl);
2357} 2184}
2358 2185
2359/* appends the spell *spell to the Socklist we will send the data to. */ 2186/* appends the spell *spell to the Socklist we will send the data to. */
2360static void 2187static void
2361append_spell (player *pl, packet &sl, object *spell) 2188append_spell (player *pl, packet &sl, object *spell)
… …
2409 { 2236 {
2410 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411 return; 2238 return;
2412 } 2239 }
2413 2240
2414 if (!pl->socket.monitor_spells) 2241 if (!pl->socket->monitor_spells)
2415 return; 2242 return;
2416 2243
2417 packet sl; 2244 packet sl;
2418
2419 sl << "addspell "; 2245 sl << "addspell ";
2420 2246
2421 if (!spell) 2247 if (!spell)
2422 { 2248 {
2423 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
… …
2438 if (spell->type != SPELL) 2264 if (spell->type != SPELL)
2439 continue; 2265 continue;
2440 2266
2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442 { 2268 {
2443 Send_With_Handling (&pl->socket, &sl); 2269 pl->socket->send_packet (sl);
2444 2270
2445 sl.reset (); 2271 sl.reset ();
2446 sl << "addspell "; 2272 sl << "addspell ";
2447 } 2273 }
2448 2274
… …
2462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463 fatal (0); 2289 fatal (0);
2464 } 2290 }
2465 2291
2466 /* finally, we can send the packet */ 2292 /* finally, we can send the packet */
2467 Send_With_Handling (&pl->socket, &sl); 2293 pl->socket->send_packet (sl);
2468
2469} 2294}
2470 2295

Diff Legend

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