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.35 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 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 (client_socket * 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 client_socket & socket = pl->socket;
159
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
161 144
162 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
163 socket.send_packet ("newmap"); 146 pl->socket->send_packet ("newmap");
164 147
165 socket.update_look = 1; 148 pl->socket->floorbox_reset ();
166 socket.look_position = 0;
167} 149}
168 150
169/** check for map change and send new map data */ 151/** check for map change and send new map data */
170static void 152static void
171check_map_change (player *pl) 153check_map_change (player *pl)
172{ 154{
173 client_socket & socket = pl->socket; 155 client &socket = *pl->socket;
174 object *ob = pl->ob; 156 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
176 158
177 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
178 { 160 {
… …
212 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213 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
214 else 196 else
215 { 197 {
216 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);
217 socket.update_look = 1; 199 socket.floorbox_reset ();
218 socket.look_position = 0;
219 } 200 }
220 } 201 }
221 202
222 socket.current_x = ob->x; 203 socket.current_x = ob->x;
223 socket.current_y = ob->y; 204 socket.current_y = ob->y;
224} 205}
225 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
226void 251void
227ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
228{ 253{
229 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230} 261}
231 262
232void 263void
233MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
234{ 265{
… …
249 buf += 8; 280 buf += 8;
250 281
251 // initial map and its origin 282 // initial map and its origin
252 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
253 sint16 dx, dy; 284 sint16 dx, dy;
254 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->socket->mapx / 2 - pl->ob->x;
255 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->socket->mapy / 2 - pl->ob->y;
256 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
257 288
258 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
259 { 290 {
260 int dir = *buf++; 291 int dir = *buf++;
… …
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312 } 343 }
313 else 344 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315 346
316 pl->socket.send_packet (bigbuf); 347 pl->socket->send_packet (bigbuf);
317} 348}
318 349
319/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
320void 351void
321SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
322{ 353{
323 int s, slen; 354 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
325 356
326 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
536 * 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.
537 * 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,
538 * 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.
539 */ 570 */
540void 571void
541AddMeCmd (char *buf, int len, client_socket * ns) 572AddMeCmd (char *buf, int len, client * ns)
542{ 573{
543 Settings oldsettings;
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns)) 574 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed"); 575 ns->send_packet ("addme_failed");
548 else 576 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"); 577 ns->send_packet ("addme_success");
556 socket_info.nconns--;
557 ns->status = Ns_Avail;
558 }
559
560 settings = oldsettings;
561} 578}
562 579
563/** Reply to ExtendedInfos command */ 580/** Reply to ExtendedInfos command */
564void 581void
565ToggleExtendedInfos (char *buf, int len, client_socket * ns) 582ToggleExtendedInfos (char *buf, int len, client * ns)
566{ 583{
567 char cmdback[MAX_BUF]; 584 char cmdback[MAX_BUF];
568 char command[50]; 585 char command[50];
569 int info, nextinfo; 586 int info, nextinfo;
570 587
… …
621#define MSG_TYPE_MONUMENT 5 638#define MSG_TYPE_MONUMENT 5
622#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 639#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623 640
624/** Reply to ExtendedInfos command */ 641/** Reply to ExtendedInfos command */
625void 642void
626ToggleExtendedText (char *buf, int len, client_socket * ns) 643ToggleExtendedText (char *buf, int len, client * ns)
627{ 644{
628 char cmdback[MAX_BUF]; 645 char cmdback[MAX_BUF];
629 char temp[10]; 646 char temp[10];
630 char command[50]; 647 char command[50];
631 int info, nextinfo, i, flag; 648 int info, nextinfo, i, flag;
… …
682 * a piece of data from us that we know the client wants. So 699 * a piece of data from us that we know the client wants. So
683 * if we know the client wants it, might as well push it to the 700 * if we know the client wants it, might as well push it to the
684 * client. 701 * client.
685 */ 702 */
686static void 703static void
687SendSmooth (client_socket * ns, uint16 face) 704SendSmooth (client *ns, uint16 face)
688{ 705{
689 uint16 smoothface; 706 uint16 smoothface;
690 707
691 /* If we can't find a face, return and set it so we won't try to send this 708 /* If we can't find a face, return and set it so we won't try to send this
692 * again. 709 * again.
… …
702 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
703 esrv_send_face (ns, smoothface, 0); 720 esrv_send_face (ns, smoothface, 0);
704 721
705 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
706 723
707 packet sl; 724 packet sl ("smooth");
708 725
709 sl << "smooth "
710 << uint16 (face) 726 sl << uint16 (face)
711 << uint16 (smoothface); 727 << uint16 (smoothface);
712 728
713 Send_With_Handling (ns, &sl); 729 ns->send_packet (sl);
714} 730}
715 731
716 /** 732 /**
717 * Tells client the picture it has to use 733 * Tells client the picture it has to use
718 * to smooth a picture number given as argument. 734 * to smooth a picture number given as argument.
719 */ 735 */
720void 736void
721AskSmooth (char *buf, int len, client_socket * ns) 737AskSmooth (char *buf, int len, client *ns)
722{ 738{
723 uint16 facenbr; 739 SendSmooth (ns, atoi (buf));
724
725 facenbr = atoi (buf);
726 SendSmooth (ns, facenbr);
727} 740}
728 741
729/** 742/**
730 * This handles the general commands from the client (ie, north, fire, cast, 743 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.) 744 * etc.)
732 */ 745 */
733void 746void
734PlayerCmd (char *buf, int len, player *pl) 747PlayerCmd (char *buf, int len, player *pl)
735{ 748{
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 749 /* Check if there is a count. In theory, a zero count could also be
748 * sent, so check for that also. 750 * sent, so check for that also.
749 */ 751 */
750 if (atoi (buf) || buf[0] == '0') 752 if (atoi (buf) || buf[0] == '0')
751 { 753 {
752 pl->count = atoi ((char *) buf); 754 pl->count = atoi ((char *) buf);
755
753 buf = strchr (buf, ' '); /* advance beyond the numbers */ 756 buf = strchr (buf, ' '); /* advance beyond the numbers */
754 if (!buf) 757 if (!buf)
755 {
756#ifdef ESRV_DEBUG
757 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758#endif
759 return; 758 return;
760 } 759
761 buf++; 760 buf++;
762 } 761 }
763 /* This should not happen anymore. */ 762
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); 763 execute_newserver_command (pl->ob, (char *) buf);
764
770 /* Perhaps something better should be done with a left over count. 765 /* Perhaps something better should be done with a left over count.
771 * Cleaning up the input should probably be done first - all actions 766 * 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 767 * for the command that issued the count should be done before any other
773 * commands. 768 * commands.
774 */ 769 */
775
776 pl->count = 0; 770 pl->count = 0;
777
778} 771}
779 772
780 773
781/** 774/**
782 * This handles the general commands from the client (ie, north, fire, cast, 775 * This handles the general commands from the client (ie, north, fire, cast,
783 * etc.). It is a lot like PlayerCmd above, but is called with the 776 * 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 777 * 'ncom' method which gives more information back to the client so it
785 * can throttle. 778 * can throttle.
786 */ 779 */
787void 780void
788NewPlayerCmd (uint8 * buf, int len, player *pl) 781NewPlayerCmd (char *buf, int len, player *pl)
789{ 782{
790 int time, repeat;
791 char command[MAX_BUF];
792 int pktlen;
793
794 if (len < 7) 783 if (len <= 6)
795 { 784 {
796 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 785 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
797 return; 786 return;
798 } 787 }
799 788
800 pktlen = net_uint16 (buf); 789 uint16 cmdid = net_uint16 ((uint8 *)buf);
801 repeat = net_uint32 (buf + 2); 790 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
802 791
803 /* -1 is special - no repeat, but don't update */ 792 /* -1 is special - no repeat, but don't update */
804 if (repeat != -1) 793 if (repeat != -1)
805 pl->count = repeat; 794 pl->count = repeat;
806 795
807 if ((len - 4) >= MAX_BUF) 796 buf += 6; //len -= 6;
808 len = MAX_BUF - 5;
809 797
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); 798 execute_newserver_command (pl->ob, buf);
799
830 /* Perhaps something better should be done with a left over count. 800 /* Perhaps something better should be done with a left over count.
831 * Cleaning up the input should probably be done first - all actions 801 * 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 802 * for the command that issued the count should be done before any other
833 * commands. 803 * commands.
834 */ 804 */
835 pl->count = 0; 805 pl->count = 0;
836 806
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
837 if (FABS (pl->ob->speed) < 0.001) 808 int time = FABS (pl->ob->speed) < 0.001
838 time = MAX_TIME * 100; 809 ? time = MAX_TIME * 100
839 else
840 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 810 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
841 811
842 /* Send confirmation of command execution now */ 812 /* Send confirmation of command execution now */
843 813 packet sl ("comc");
844 packet sl;
845 sl << "comc " << uint16 (pktlen) << uint32 (time); 814 sl << uint16 (cmdid) << uint32 (time);
846 Send_With_Handling (&pl->socket, &sl); 815 pl->socket->send_packet (sl);
847} 816}
848 817
849 818
850/** This is a reply to a previous query. */ 819/** This is a reply to a previous query. */
851void 820void
852ReplyCmd (char *buf, int len, player *pl) 821ReplyCmd (char *buf, int len, player *pl)
853{ 822{
854 /* This is to synthesize how the data would be stored if it 823 /* This is to synthesize how the data would be stored if it
855 * was normally entered. A bit of a hack, and should be cleaned up 824 * was normally entered. A bit of a hack, and should be cleaned up
856 * once all the X11 code is removed from the server. 825 * once all the X11 code is removed from the server.
857 * 826 *
858 * We pass 13 to many of the functions because this way they 827 * We pass 13 to many of the functions because this way they
859 * think it was the carriage return that was entered, and the 828 * think it was the carriage return that was entered, and the
860 * function then does not try to do additional input. 829 * function then does not try to do additional input.
… …
863 832
864 /* this avoids any hacking here */ 833 /* this avoids any hacking here */
865 834
866 switch (pl->state) 835 switch (pl->state)
867 { 836 {
868 case ST_PLAYING: 837 case ST_PLAYING:
869 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 838 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
870 break; 839 break;
871 840
872 case ST_PLAY_AGAIN: 841 case ST_PLAY_AGAIN:
873 /* We can check this for return value (2==quit). Maybe we 842 /* We can check this for return value (2==quit). Maybe we
874 * should, and do something appropriate? 843 * should, and do something appropriate?
875 */ 844 */
876 receive_play_again (pl->ob, buf[0]); 845 receive_play_again (pl->ob, buf[0]);
877 break; 846 break;
878 847
879 case ST_ROLL_STAT: 848 case ST_ROLL_STAT:
880 key_roll_stat (pl->ob, buf[0]); 849 key_roll_stat (pl->ob, buf[0]);
881 break; 850 break;
882 851
883 case ST_CHANGE_CLASS: 852 case ST_CHANGE_CLASS:
884 853
885 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
886 break; 855 break;
887 856
888 case ST_CONFIRM_QUIT: 857 case ST_CONFIRM_QUIT:
889 key_confirm_quit (pl->ob, buf[0]); 858 key_confirm_quit (pl->ob, buf[0]);
890 break; 859 break;
891 860
892 case ST_CONFIGURE: 861 case ST_CONFIGURE:
893 LOG (llevError, "In client input handling, but into configure state\n"); 862 LOG (llevError, "In client input handling, but into configure state\n");
894 pl->state = ST_PLAYING; 863 pl->state = ST_PLAYING;
895 break; 864 break;
896 865
897 case ST_GET_NAME: 866 case ST_GET_NAME:
898 receive_player_name (pl->ob, 13); 867 receive_player_name (pl->ob, 13);
899 break; 868 break;
900 869
901 case ST_GET_PASSWORD: 870 case ST_GET_PASSWORD:
902 case ST_CONFIRM_PASSWORD: 871 case ST_CONFIRM_PASSWORD:
903 receive_player_password (pl->ob, 13); 872 receive_player_password (pl->ob, 13);
904 break; 873 break;
905 874
906 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 875 case ST_GET_PARTY_PASSWORD: /* Get password for party */
907 receive_party_password (pl->ob, 13); 876 receive_party_password (pl->ob, 13);
908 break; 877 break;
909 878
910 default: 879 default:
911 LOG (llevError, "Unknown input state: %d\n", pl->state); 880 LOG (llevError, "Unknown input state: %d\n", pl->state);
912 } 881 }
913} 882}
914 883
915/** 884/**
916 * Client tells its version. If there is a mismatch, we close the 885 * Client tells its version. If there is a mismatch, we close the
… …
918 * something older than the server. If we assume the client will be 887 * 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 888 * backwards compatible, having it be a later version should not be a
920 * problem. 889 * problem.
921 */ 890 */
922void 891void
923VersionCmd (char *buf, int len, client_socket * ns) 892VersionCmd (char *buf, int len, client * ns)
924{ 893{
925 char *cp;
926 char version_warning[256];
927
928 if (!buf) 894 if (!buf)
929 { 895 {
930 LOG (llevError, "CS: received corrupted version command\n"); 896 LOG (llevError, "CS: received corrupted version command\n");
931 return; 897 return;
932 } 898 }
933 899
934 ns->cs_version = atoi (buf); 900 ns->cs_version = atoi (buf);
935 ns->sc_version = ns->cs_version; 901 ns->sc_version = ns->cs_version;
902
903 LOG (llevDebug, "connection from client <%s>\n", buf);
904
905
906 //TODO: should log here just for statistics
907
936 if (VERSION_CS != ns->cs_version) 908 //if (VERSION_CS != ns->cs_version)
937 { 909 // unchecked;
938#ifdef ESRV_DEBUG 910
939 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
940#endif
941 }
942 cp = strchr (buf + 1, ' '); 911 char *cp = strchr (buf + 1, ' ');
943 if (!cp) 912 if (!cp)
944 return; 913 return;
914
945 ns->sc_version = atoi (cp); 915 ns->sc_version = atoi (cp);
916
946 if (VERSION_SC != ns->sc_version) 917 //if (VERSION_SC != ns->sc_version)
947 { 918 // unchecked;
948#ifdef ESRV_DEBUG 919
949 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
950#endif
951 }
952 cp = strchr (cp + 1, ' '); 920 cp = strchr (cp + 1, ' ');
921
953 if (cp) 922 if (cp)
954 { 923 {
955 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 924 assign (ns->version, cp + 1);
956 925
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) 926 if (ns->sc_version < 1026)
969 { 927 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!! ****"); 928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
972 ns->send_packet (version_warning);
973 }
974
975 } 929 }
976} 930}
977 931
978/** sound related functions. */ 932/** sound related functions. */
979
980void 933void
981SetSound (char *buf, int len, client_socket * ns) 934SetSound (char *buf, int len, client * ns)
982{ 935{
983 ns->sound = atoi (buf); 936 ns->sound = atoi (buf);
984} 937}
985 938
986/** client wants the map resent */ 939/** client wants the map resent */
987 940
988void 941void
989MapRedrawCmd (char *buf, int len, player *pl) 942MapRedrawCmd (char *buf, int len, player *pl)
990{ 943{
991
992/* This function is currently disabled; just clearing the map state results in 944/* This function is currently disabled; just clearing the map state results in
993 * display errors. It should clear the cache and send a newmap command. 945 * display errors. It should clear the cache and send a newmap command.
994 * Unfortunately this solution does not work because some client versions send 946 * Unfortunately this solution does not work because some client versions send
995 * a mapredraw command after receiving a newmap command. 947 * a mapredraw command after receiving a newmap command.
996 */ 948 */
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} 949}
1005 950
1006/** 951/**
1007 * Moves an object (typically, container to inventory). 952 * Moves an object (typically, container to inventory).
1008 * syntax is: move (to) (tag) (nrof) 953 * syntax is: move (to) (tag) (nrof)
… …
1011MoveCmd (char *buf, int len, player *pl) 956MoveCmd (char *buf, int len, player *pl)
1012{ 957{
1013 int vals[3], i; 958 int vals[3], i;
1014 959
1015 /* A little funky here. We only cycle for 2 records, because 960 /* A little funky here. We only cycle for 2 records, because
1016 * we obviously am not going to find a space after the third 961 * we obviously are not going to find a space after the third
1017 * record. Perhaps we should just replace this with a 962 * record. Perhaps we should just replace this with a
1018 * sscanf? 963 * sscanf?
1019 */ 964 */
1020 for (i = 0; i < 2; i++) 965 for (i = 0; i < 2; i++)
1021 { 966 {
1022 vals[i] = atoi (buf); 967 vals[i] = atoi (buf);
968
1023 if (!(buf = strchr (buf, ' '))) 969 if (!(buf = strchr (buf, ' ')))
1024 { 970 {
1025 LOG (llevError, "Incomplete move command: %s\n", buf); 971 LOG (llevError, "Incomplete move command: %s\n", buf);
1026 return; 972 return;
1027 } 973 }
974
1028 buf++; 975 buf++;
1029 } 976 }
977
1030 vals[2] = atoi (buf); 978 vals[2] = atoi (buf);
1031 979
1032/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 980/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1033 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1034} 982}
1035
1036
1037 983
1038/****************************************************************************** 984/******************************************************************************
1039 * 985 *
1040 * Start of commands the server sends to the client. 986 * Start of commands the server sends to the client.
1041 * 987 *
… …
1044/** 990/**
1045 * Asks the client to query the user. This way, the client knows 991 * Asks the client to query the user. This way, the client knows
1046 * it needs to send something back (vs just printing out a message) 992 * it needs to send something back (vs just printing out a message)
1047 */ 993 */
1048void 994void
1049send_query (client_socket * ns, uint8 flags, char *text) 995send_query (client *ns, uint8 flags, char *text)
1050{ 996{
1051 char buf[MAX_BUF];
1052
1053 sprintf (buf, "query %d %s", flags, text ? text : ""); 997 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1054 ns->send_packet (buf);
1055} 998}
1056 999
1057#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1000#define AddIfInt64(Old,New,Type) if (Old != New) {\
1058 Old = New; \ 1001 Old = New; \
1059 sl << uint8 (Type) << uint64 (New); \ 1002 sl << uint8 (Type) << uint64 (New); \
… …
1089esrv_update_stats (player *pl) 1032esrv_update_stats (player *pl)
1090{ 1033{
1091 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1092 uint16 flags; 1035 uint16 flags;
1093 1036
1094 packet sl; 1037 packet sl ("stats");
1095 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 */
1193void 1125void
1194esrv_new_player (player *pl, uint32 weight) 1126esrv_new_player (player *pl, uint32 weight)
1195{ 1127{
1196 pl->last_weight = weight; 1128 pl->last_weight = weight;
1197 1129
1198 packet sl; 1130 packet sl ("player");
1199 sl << "player ";
1200 1131
1201 sl << uint32 (pl->ob->count) 1132 sl << uint32 (pl->ob->count)
1202 << uint32 (weight) 1133 << uint32 (weight)
1203 << uint32 (pl->ob->face->number) 1134 << uint32 (pl->ob->face->number)
1204 << data8 (pl->ob->name); 1135 << data8 (pl->ob->name);
1205 1136
1206 Send_With_Handling (&pl->socket, &sl); 1137 pl->socket->send_packet (sl);
1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1138 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208} 1139}
1209 1140
1210/** 1141/**
1211 * Need to send an animation sequence to the client. 1142 * Need to send an animation sequence to the client.
… …
1213 * sent them the face yet (this can become quite costly in terms of 1144 * 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 1145 * how much we are sending - on the other hand, this should only happen
1215 * when the player logs in and picks stuff up. 1146 * when the player logs in and picks stuff up.
1216 */ 1147 */
1217void 1148void
1218esrv_send_animation (client_socket * ns, short anim_num) 1149esrv_send_animation (client * ns, short anim_num)
1219{ 1150{
1220 int i;
1221
1222 /* Do some checking on the anim_num we got. Note that the animations 1151 /* Do some checking on the anim_num we got. Note that the animations
1223 * are added in contigous order, so if the number is in the valid 1152 * are added in contigous order, so if the number is in the valid
1224 * range, it must be a valid animation. 1153 * range, it must be a valid animation.
1225 */ 1154 */
1226 if (anim_num < 0 || anim_num > num_animations) 1155 if (anim_num < 0 || anim_num > num_animations)
1227 { 1156 {
1228 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1157 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1229 return; 1158 return;
1230 } 1159 }
1231 1160
1232 packet sl; 1161 packet sl ("anim");
1233 1162
1234 sl << "anim "
1235 << uint16 (anim_num) 1163 sl << uint16 (anim_num)
1236 << uint16 (0); /* flags - not used right now */ 1164 << uint16 (0); /* flags - not used right now */
1237 1165
1238 /* Build up the list of faces. Also, send any information (ie, the 1166 /* Build up the list of faces. Also, send any information (ie, the
1239 * the face itself) down to the client. 1167 * the face itself) down to the client.
1240 */ 1168 */
1241 for (i = 0; i < animations[anim_num].num_animations; i++) 1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1242 { 1170 {
1243 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1171 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1244 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1245 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1174 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1246 } 1175 }
1247 1176
1248 Send_With_Handling (ns, &sl); 1177 ns->send_packet (sl);
1249 1178
1250 ns->anims_sent[anim_num] = 1; 1179 ns->anims_sent[anim_num] = 1;
1251} 1180}
1252 1181
1253 1182
… …
1260/** 1189/**
1261 * This adds face_num to a map cell at x,y. If the client doesn't have 1190 * 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. 1191 * the face yet, we will also send it.
1263 */ 1192 */
1264static void 1193static void
1265esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1194esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1266{ 1195{
1267 if (newmap->cells[x][y].count >= MAP_LAYERS) 1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1268 { 1197 {
1198 //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); 1199 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270 return; 1200 return;
1271 abort (); 1201 abort ();
1272 } 1202 }
1273 1203
1274 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1204 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1275 newmap->cells[x][y].count++; 1205 newmap->cells[x][y].count++;
1276 1206
1277 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1278 esrv_send_face (ns, face_num, 0); 1208 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 (client_socket * 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 (client_socket * 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} 1209}
1387 1210
1388/** Clears a map cell */ 1211/** Clears a map cell */
1389static void 1212static void
1390map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1213map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1402#define MAX_LAYERS 3 1225#define MAX_LAYERS 3
1403 1226
1404/* Using a global really isn't a good approach, but saves the over head of 1227/* Using a global really isn't a good approach, but saves the over head of
1405 * allocating and deallocating such a block of data each time run through, 1228 * allocating and deallocating such a block of data each time run through,
1406 * and saves the space of allocating this in the socket object when we only 1229 * and saves the space of allocating this in the socket object when we only
1407 * need it for this cycle. If the serve is ever threaded, this needs to be 1230 * need it for this cycle. If the server is ever threaded, this needs to be
1408 * re-examined. 1231 * re-examined.
1409 */ 1232 */
1410
1411static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1412 1234
1413/** 1235/**
1414 * Returns true if any of the heads for this 1236 * Returns true if any of the heads for this
1415 * space is set. Returns false if all are blank - this is used 1237 * space is set. Returns false if all are blank - this is used
1416 * for empty space checking. 1238 * for empty space checking.
1417 */ 1239 */
1418static inline int 1240static inline int
1419have_head (int ax, int ay) 1241have_head (int ax, int ay)
1420{ 1242{
1421
1422 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1243 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]) 1244 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1424 return 1; 1245 return 1;
1246
1425 return 0; 1247 return 0;
1426} 1248}
1427 1249
1428/** 1250/**
1429 * check_head is a bit simplistic version of update_space below. 1251 * 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 1252 * 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 1253 * 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 1254 * if needed, and returning 1. If this no data needs to get
1433 * sent, it returns zero. 1255 * sent, it returns zero.
1434 */ 1256 */
1435static int 1257static int
1436check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1437{ 1259{
1438 short face_num; 1260 short face_num;
1439 1261
1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1262 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1263 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 1295 * 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 1296 * 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 1297 * the case, it seems to make more sense to have these layer values
1476 * actually match. 1298 * actually match.
1477 */ 1299 */
1478
1479static int 1300static int
1480update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1301update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1481{ 1302{
1482 object *ob, *head; 1303 object *ob, *head;
1483 uint16 face_num; 1304 uint16 face_num;
1484 int bx, by, i; 1305 int bx, by, i;
1485 1306
… …
1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1519 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699 * take. 1520 * take.
1700 */ 1521 */
1701 1522
1702static inline int 1523static inline int
1703update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1524update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704{ 1525{
1705 object *ob; 1526 object *ob;
1706 int smoothlevel; /* old face_num; */ 1527 int smoothlevel; /* old face_num; */
1707 1528
1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1742 * Returns the size of a data for a map square as returned by 1563 * Returns the size of a data for a map square as returned by
1743 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1564 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744 * available. 1565 * available.
1745 */ 1566 */
1746int 1567int
1747getExtendedMapInfoSize (client_socket * ns) 1568getExtendedMapInfoSize (client * ns)
1748{ 1569{
1749 int result = 0; 1570 int result = 0;
1750 1571
1751 if (ns->ext_mapinfos) 1572 if (ns->ext_mapinfos)
1752 { 1573 {
1753 if (ns->EMI_smooth) 1574 if (ns->EMI_smooth)
1754 result += 1; /*One byte for smoothlevel */ 1575 result += 1; /*One byte for smoothlevel */
1755 } 1576 }
1577
1756 return result; 1578 return result;
1757} 1579}
1758 1580
1759/** 1581/**
1760 * This function uses the new map1 protocol command to send the map 1582 * This function uses the new map1 protocol command to send the map
… …
1788 uint8 eentrysize; 1610 uint8 eentrysize;
1789 uint16 ewhatstart, ewhatflag; 1611 uint16 ewhatstart, ewhatflag;
1790 uint8 extendedinfos; 1612 uint8 extendedinfos;
1791 maptile *m; 1613 maptile *m;
1792 1614
1793 client_socket &socket = pl->contr->socket; 1615 client &socket = *pl->contr->socket;
1794 1616
1795 check_map_change (pl->contr); 1617 check_map_change (pl->contr);
1796 1618
1797 packet sl; 1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1798 packet esl; 1620 packet esl;
1799 1621
1800 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1801 startlen = sl.length (); 1622 startlen = sl.length ();
1802 1623
1803 /*Extendedmapinfo structure initialisation */ 1624 /*Extendedmapinfo structure initialisation */
1804 if (socket.ext_mapinfos) 1625 if (socket.ext_mapinfos)
1805 { 1626 {
… …
1849 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1670 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1850 { 1671 {
1851 ax = 0; 1672 ax = 0;
1852 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1673 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1853 { 1674 {
1854
1855 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1675 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1856 1676
1857 /* If this space is out of the normal viewable area, we only check 1677 /* If this space is out of the normal viewable area, we only check
1858 * the heads value ax or ay will only be greater than what 1678 * the heads value ax or ay will only be greater than what
1859 * the client wants if using the map1a command - this is because 1679 * the client wants if using the map1a command - this is because
… …
1877 * with no faces tells the client to blank out the 1697 * with no faces tells the client to blank out the
1878 * space. 1698 * space.
1879 */ 1699 */
1880 got_one = 0; 1700 got_one = 0;
1881 for (i = oldlen + 2; i < sl.length (); i++) 1701 for (i = oldlen + 2; i < sl.length (); i++)
1882 if (sl.buf[i]) 1702 if (sl[i])
1883 got_one = 1; 1703 got_one = 1;
1884 1704
1885 if (got_one && (mask & 0xf)) 1705 if (got_one && (mask & 0xf))
1886 sl.buf[oldlen + 1] = mask & 0xff; 1706 sl[oldlen + 1] = mask & 0xff;
1887 else 1707 else
1888 { /*either all faces blank, either no face at all */ 1708 { /*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 */ 1709 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890 sl.reset (oldlen + 2); 1710 sl.reset (oldlen + 2);
1891 else 1711 else
… …
1957 1777
1958 map_clearcell (&lastcell, 0, 0, 0, count); 1778 map_clearcell (&lastcell, 0, 0, 0, count);
1959 } 1779 }
1960 1780
1961 if ((mask & 0xf) || need_send) 1781 if ((mask & 0xf) || need_send)
1962 sl.buf[oldlen + 1] = mask & 0xff; 1782 sl[oldlen + 1] = mask & 0xff;
1963 else 1783 else
1964 sl.reset (oldlen); 1784 sl.reset (oldlen);
1965 } 1785 }
1966 else 1786 else
1967 { 1787 {
… …
1997 mask |= 0x8; 1817 mask |= 0x8;
1998 1818
1999 if (socket.extmap) 1819 if (socket.extmap)
2000 { 1820 {
2001 *last_ext |= 0x80; 1821 *last_ext |= 0x80;
2002 last_ext = sl.buf + sl.length (); 1822 last_ext = &sl[sl.length ()];
2003 sl << uint8 (d); 1823 sl << uint8 (d);
2004 } 1824 }
2005 else 1825 else
2006 sl << uint8 (255 - 64 * d); 1826 sl << uint8 (255 - 64 * d);
2007 } 1827 }
… …
2041 { 1861 {
2042 lastcell.stat_hp = stat_hp; 1862 lastcell.stat_hp = stat_hp;
2043 1863
2044 mask |= 0x8; 1864 mask |= 0x8;
2045 *last_ext |= 0x80; 1865 *last_ext |= 0x80;
2046 last_ext = sl.buf + sl.length (); 1866 last_ext = &sl[sl.length ()];
2047 1867
2048 sl << uint8 (5) << uint8 (stat_hp); 1868 sl << uint8 (5) << uint8 (stat_hp);
2049 1869
2050 if (stat_width > 1) 1870 if (stat_width > 1)
2051 { 1871 {
2052 *last_ext |= 0x80; 1872 *last_ext |= 0x80;
2053 last_ext = sl.buf + sl.length (); 1873 last_ext = &sl[sl.length ()];
2054 1874
2055 sl << uint8 (6) << uint8 (stat_width); 1875 sl << uint8 (6) << uint8 (stat_width);
2056 } 1876 }
2057 } 1877 }
2058 1878
… …
2060 { 1880 {
2061 lastcell.player = player; 1881 lastcell.player = player;
2062 1882
2063 mask |= 0x8; 1883 mask |= 0x8;
2064 *last_ext |= 0x80; 1884 *last_ext |= 0x80;
2065 last_ext = sl.buf + sl.length (); 1885 last_ext = &sl[sl.length ()];
2066 1886
2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1887 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068 } 1888 }
2069 1889
2070 if (lastcell.flags != flags) 1890 if (lastcell.flags != flags)
2071 { 1891 {
2072 lastcell.flags = flags; 1892 lastcell.flags = flags;
2073 1893
2074 mask |= 0x8; 1894 mask |= 0x8;
2075 *last_ext |= 0x80; 1895 *last_ext |= 0x80;
2076 last_ext = sl.buf + sl.length (); 1896 last_ext = &sl[sl.length ()];
2077 1897
2078 sl << uint8 (8) << uint8 (flags); 1898 sl << uint8 (8) << uint8 (flags);
2079 } 1899 }
2080 } 1900 }
2081 1901
… …
2123 * space by checking the mask. If so, update the mask. 1943 * space by checking the mask. If so, update the mask.
2124 * if not, reset the len to that from before adding the mask 1944 * if not, reset the len to that from before adding the mask
2125 * value, so we don't send those bits. 1945 * value, so we don't send those bits.
2126 */ 1946 */
2127 if (mask & 0xf) 1947 if (mask & 0xf)
2128 sl.buf[oldlen + 1] = mask & 0xff; 1948 sl[oldlen + 1] = mask & 0xff;
2129 else 1949 else
2130 sl.reset (oldlen); 1950 sl.reset (oldlen);
2131 1951
2132 if (emask & 0xf) 1952 if (emask & 0xf)
2133 esl.buf[eoldlen + 1] = emask & 0xff; 1953 esl[eoldlen + 1] = emask & 0xff;
2134 else 1954 else
2135 esl.reset (eoldlen); 1955 esl.reset (eoldlen);
2136 } /* else this is a viewable space */ 1956 } /* else this is a viewable space */
2137 } /* for x loop */ 1957 } /* for x loop */
2138 } /* for y loop */ 1958 } /* for y loop */
… …
2144 { 1964 {
2145 /* No map data will follow, so don't say the client 1965 /* No map data will follow, so don't say the client
2146 * it doesn't need draw! 1966 * it doesn't need draw!
2147 */ 1967 */
2148 ewhatflag &= (~EMI_NOREDRAW); 1968 ewhatflag &= (~EMI_NOREDRAW);
2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1969 esl[ewhatstart + 1] = ewhatflag & 0xff;
2150 } 1970 }
2151 1971
2152 if (esl.length () > estartlen) 1972 if (esl.length () > estartlen)
2153 Send_With_Handling (&socket, &esl); 1973 socket.send_packet (esl);
2154 } 1974 }
2155 1975
2156 if (sl.length () > startlen || socket.sent_scroll) 1976 if (sl.length () > startlen || socket.sent_scroll)
2157 { 1977 {
2158 Send_With_Handling (&socket, &sl); 1978 socket.send_packet (sl);
2159 socket.sent_scroll = 0; 1979 socket.sent_scroll = 0;
2160 } 1980 }
2161} 1981}
2162 1982
2163/** 1983/**
… …
2189 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2009 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190 return; 2010 return;
2191 2011
2192 memset (&newmap, 0, sizeof (struct Map)); 2012 memset (&newmap, 0, sizeof (struct Map));
2193 2013
2194 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2014 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2195 {
2196 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2015 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2197 { 2016 {
2198 ax = i; 2017 ax = i;
2199 ay = j; 2018 ay = j;
2200 m = pm; 2019 m = pm;
2201 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2020 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2021
2202 if (mflags & P_OUT_OF_MAP) 2022 if (mflags & P_OUT_OF_MAP)
2203 continue; 2023 continue;
2204 if (mflags & P_NEED_UPDATE) 2024
2205 update_position (m, ax, ay);
2206 /* If a map is visible to the player, we don't want to swap it out 2025 /* 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 2026 * just to reload it. This should really call something like
2208 * swap_map, but this is much more efficient and 'good enough' 2027 * swap_map, but this is much more efficient and 'good enough'
2209 */ 2028 */
2210 if (mflags & P_NEW_MAP) 2029 if (mflags & P_NEW_MAP)
2211 m->timeout = 50; 2030 m->timeout = 50;
2212 } 2031 }
2213 } 2032
2214 /* do LOS after calls to update_position */ 2033 /* do LOS after calls to update_position */
2215 if (pl->contr->do_los) 2034 if (pl->contr->do_los)
2216 { 2035 {
2217 update_los (pl); 2036 update_los (pl);
2218 pl->contr->do_los = 0; 2037 pl->contr->do_los = 0;
… …
2233 2052
2234/*****************************************************************************/ 2053/*****************************************************************************/
2235void 2054void
2236send_plugin_custom_message (object *pl, char *buf) 2055send_plugin_custom_message (object *pl, char *buf)
2237{ 2056{
2238 pl->contr->socket.send_packet (buf); 2057 pl->contr->socket->send_packet (buf);
2239} 2058}
2240 2059
2241/** 2060/**
2242 * This sends the skill number to name mapping. We ignore 2061 * This sends the skill number to name mapping. We ignore
2243 * the params - we always send the same info no matter what. 2062 * the params - we always send the same info no matter what.
2244 */ 2063 */
2245void 2064void
2246send_skill_info (client_socket *ns, char *params) 2065send_skill_info (client *ns, char *params)
2247{ 2066{
2248 packet sl; 2067 packet sl;
2249 sl << "replyinfo skill_info\n"; 2068 sl << "replyinfo skill_info\n";
2250 2069
2251 for (int i = 1; i < NUM_SKILLS; i++) 2070 for (int i = 1; i < NUM_SKILLS; i++)
… …
2255 { 2074 {
2256 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2075 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257 fatal (0); 2076 fatal (0);
2258 } 2077 }
2259 2078
2260 Send_With_Handling (ns, &sl); 2079 ns->send_packet (sl);
2261} 2080}
2262 2081
2263/** 2082/**
2264 * This sends the spell path to name mapping. We ignore 2083 * This sends the spell path to name mapping. We ignore
2265 * the params - we always send the same info no matter what. 2084 * the params - we always send the same info no matter what.
2266 */ 2085 */
2267void 2086void
2268send_spell_paths (client_socket * ns, char *params) 2087send_spell_paths (client * ns, char *params)
2269{ 2088{
2270 packet sl; 2089 packet sl;
2271 2090
2272 sl << "replyinfo spell_paths\n"; 2091 sl << "replyinfo spell_paths\n";
2273 2092
… …
2278 { 2097 {
2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2098 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280 fatal (0); 2099 fatal (0);
2281 } 2100 }
2282 2101
2283 Send_With_Handling (ns, &sl); 2102 ns->send_packet (sl);
2284} 2103}
2285 2104
2286/** 2105/**
2287 * This looks for any spells the player may have that have changed their stats. 2106 * 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 2107 * it then sends an updspell packet for each spell that has changed in this way
2289 */ 2108 */
2290void 2109void
2291esrv_update_spells (player *pl) 2110esrv_update_spells (player *pl)
2292{ 2111{
2293 if (!pl->socket.monitor_spells) 2112 if (!pl->socket->monitor_spells)
2294 return; 2113 return;
2295 2114
2296 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2115 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297 { 2116 {
2298 if (spell->type == SPELL) 2117 if (spell->type == SPELL)
… …
2328 2147
2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2148 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2149 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2150 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332 2151
2333 Send_With_Handling (&pl->socket, &sl); 2152 pl->socket->send_packet (sl);
2334 } 2153 }
2335 } 2154 }
2336 } 2155 }
2337} 2156}
2338 2157
2339void 2158void
2340esrv_remove_spell (player *pl, object *spell) 2159esrv_remove_spell (player *pl, object *spell)
2341{ 2160{
2342 if (!pl->socket.monitor_spells) 2161 if (!pl->socket->monitor_spells)
2343 return; 2162 return;
2344 2163
2345 if (!pl || !spell || spell->env != pl->ob) 2164 if (!pl || !spell || spell->env != pl->ob)
2346 { 2165 {
2347 LOG (llevError, "Invalid call to esrv_remove_spell"); 2166 LOG (llevError, "Invalid call to esrv_remove_spell");
2348 return; 2167 return;
2349 } 2168 }
2350 2169
2351 packet sl; 2170 packet sl ("delspell");
2352 2171
2353 sl << "delspell "
2354 << uint32 (spell->count); 2172 sl << uint32 (spell->count);
2355 2173
2356 Send_With_Handling (&pl->socket, &sl); 2174 pl->socket->send_packet (sl);
2357} 2175}
2358 2176
2359/* appends the spell *spell to the Socklist we will send the data to. */ 2177/* appends the spell *spell to the Socklist we will send the data to. */
2360static void 2178static void
2361append_spell (player *pl, packet &sl, object *spell) 2179append_spell (player *pl, packet &sl, object *spell)
… …
2409 { 2227 {
2410 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2228 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411 return; 2229 return;
2412 } 2230 }
2413 2231
2414 if (!pl->socket.monitor_spells) 2232 if (!pl->socket->monitor_spells)
2415 return; 2233 return;
2416 2234
2417 packet sl; 2235 packet sl ("addspell");
2418
2419 sl << "addspell ";
2420 2236
2421 if (!spell) 2237 if (!spell)
2422 { 2238 {
2423 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2239 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2424 { 2240 {
… …
2438 if (spell->type != SPELL) 2254 if (spell->type != SPELL)
2439 continue; 2255 continue;
2440 2256
2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2257 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442 { 2258 {
2443 Send_With_Handling (&pl->socket, &sl); 2259 pl->socket->send_packet (sl);
2444 2260
2445 sl.reset (); 2261 sl.reset ();
2446 sl << "addspell "; 2262 sl << "addspell ";
2447 } 2263 }
2448 2264
… …
2462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2278 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463 fatal (0); 2279 fatal (0);
2464 } 2280 }
2465 2281
2466 /* finally, we can send the packet */ 2282 /* finally, we can send the packet */
2467 Send_With_Handling (&pl->socket, &sl); 2283 pl->socket->send_packet (sl);
2468
2469} 2284}
2470 2285

Diff Legend

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