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.33 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.54 by root, Mon Dec 25 14:54:44 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 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 43 */
50 44
51#include <global.h> 45#include <global.h>
52#include <sproto.h> 46#include <sproto.h>
53 47
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 48#include <living.h>
57#include <commands.h> 49#include <commands.h>
58 50
59/* 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,
60 * it should work here. 52 * it should work here.
… …
63#include <sys/time.h> 55#include <sys/time.h>
64#include <sys/socket.h> 56#include <sys/socket.h>
65#include <netinet/in.h> 57#include <netinet/in.h>
66#include <netdb.h> 58#include <netdb.h>
67 59
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 60#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 61#include <sys/time.h>
74#endif
75 62
76#include "sounds.h" 63#include "sounds.h"
77 64
78/** 65/**
79 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 83 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
98}; 85};
99 86
100static void 87static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
102{ 89{
103 struct Map newmap; 90 struct Map newmap;
104 int x, y, mx, my; 91 int x, y, mx, my;
105 92
106 {
107 packet sl;
108
109 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl);
111 }
112 94
113 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
115 * 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
116 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
156} 138}
157 139
158static void 140static void
159clear_map (player *pl) 141clear_map (player *pl)
160{ 142{
161 NewSocket & socket = pl->socket;
162
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
164 144
165 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
166 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
167 147
168 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
169 socket.look_position = 0;
170} 149}
171 150
172/** check for map change and send new map data */ 151/** check for map change and send new map data */
173static void 152static void
174check_map_change (player *pl) 153check_map_change (player *pl)
175{ 154{
176 NewSocket & socket = pl->socket; 155 client &socket = *pl->ns;
177 object *ob = pl->ob; 156 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
179 158
180 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
181 { 160 {
… …
215 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
216 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
217 else 196 else
218 { 197 {
219 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);
220 socket.update_look = 1; 199 socket.floorbox_reset ();
221 socket.look_position = 0;
222 } 200 }
223 } 201 }
224 202
225 socket.current_x = ob->x; 203 socket.current_x = ob->x;
226 socket.current_y = ob->y; 204 socket.current_y = ob->y;
227} 205}
228 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
229void 251void
230ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
231{ 253{
232 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));
233} 261}
234 262
235void 263void
236MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
237{ 265{
… …
252 buf += 8; 280 buf += 8;
253 281
254 // initial map and its origin 282 // initial map and its origin
255 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
256 sint16 dx, dy; 284 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
260 288
261 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
262 { 290 {
263 int dir = *buf++; 291 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 343 }
316 else 344 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 346
319 pl->socket.send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
320} 348}
321 349
322/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
323void 351void
324SetUp (char *buf, int len, NewSocket * ns) 352SetUp (char *buf, int len, client * ns)
325{ 353{
326 int s, slen; 354 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
328 356
329 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
371 { 399 {
372 ns->sound = atoi (param); 400 ns->sound = atoi (param);
373 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
374 } 402 }
375 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
376 {
377 ns->exp64 = atoi (param);
378 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
379 }
380 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
381 { 406 {
382 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
383 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
384 } 409 }
… …
539 * This is what takes care of it. We tell the client how things worked out. 564 * This is what takes care of it. We tell the client how things worked out.
540 * I am not sure if this file is the best place for this function. however, 565 * I am not sure if this file is the best place for this function. however,
541 * it either has to be here or init_sockets needs to be exported. 566 * it either has to be here or init_sockets needs to be exported.
542 */ 567 */
543void 568void
544AddMeCmd (char *buf, int len, NewSocket * ns) 569AddMeCmd (char *buf, int len, client * ns)
545{ 570{
546 Settings oldsettings; 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
547
548 oldsettings = settings;
549 if (ns->status != Ns_Add || add_player (ns))
550 ns->send_packet ("addme_failed");
551 else
552 {
553 /* Basically, the add_player copies the socket structure into
554 * the player structure, so this one (which is from init_sockets)
555 * is not needed anymore. The write below should still work, as the
556 * stuff in ns is still relevant.
557 */
558 ns->send_packet ("addme_success");
559 socket_info.nconns--;
560 ns->status = Ns_Avail;
561 }
562
563 settings = oldsettings;
564} 572}
565 573
566/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
567void 575void
568ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
569{ 577{
570 char cmdback[MAX_BUF]; 578 char cmdback[MAX_BUF];
571 char command[50]; 579 char command[50];
572 int info, nextinfo; 580 int info, nextinfo;
573 581
… …
624#define MSG_TYPE_MONUMENT 5 632#define MSG_TYPE_MONUMENT 5
625#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 633#define MSG_TYPE_SCRIPTED_DIALOG 6*/
626 634
627/** Reply to ExtendedInfos command */ 635/** Reply to ExtendedInfos command */
628void 636void
629ToggleExtendedText (char *buf, int len, NewSocket * ns) 637ToggleExtendedText (char *buf, int len, client * ns)
630{ 638{
631 char cmdback[MAX_BUF]; 639 char cmdback[MAX_BUF];
632 char temp[10]; 640 char temp[10];
633 char command[50]; 641 char command[50];
634 int info, nextinfo, i, flag; 642 int info, nextinfo, i, flag;
… …
685 * a piece of data from us that we know the client wants. So 693 * a piece of data from us that we know the client wants. So
686 * if we know the client wants it, might as well push it to the 694 * if we know the client wants it, might as well push it to the
687 * client. 695 * client.
688 */ 696 */
689static void 697static void
690SendSmooth (NewSocket * ns, uint16 face) 698SendSmooth (client *ns, uint16 face)
691{ 699{
692 uint16 smoothface; 700 uint16 smoothface;
693 701
694 /* If we can't find a face, return and set it so we won't try to send this 702 /* If we can't find a face, return and set it so we won't try to send this
695 * again. 703 * again.
… …
705 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
706 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
707 715
708 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
709 717
710 packet sl; 718 packet sl ("smooth");
711 719
712 sl << "smooth "
713 << uint16 (face) 720 sl << uint16 (face)
714 << uint16 (smoothface); 721 << uint16 (smoothface);
715 722
716 Send_With_Handling (ns, &sl); 723 ns->send_packet (sl);
717} 724}
718 725
719 /** 726 /**
720 * Tells client the picture it has to use 727 * Tells client the picture it has to use
721 * to smooth a picture number given as argument. 728 * to smooth a picture number given as argument.
722 */ 729 */
723void 730void
724AskSmooth (char *buf, int len, NewSocket * ns) 731AskSmooth (char *buf, int len, client *ns)
725{ 732{
726 uint16 facenbr; 733 SendSmooth (ns, atoi (buf));
727
728 facenbr = atoi (buf);
729 SendSmooth (ns, facenbr);
730} 734}
731 735
732/** 736/**
733 * This handles the general commands from the client (ie, north, fire, cast, 737 * This handles the general commands from the client (ie, north, fire, cast,
734 * etc.) 738 * etc.)
735 */ 739 */
736void 740void
737PlayerCmd (char *buf, int len, player *pl) 741PlayerCmd (char *buf, int len, player *pl)
738{ 742{
739
740 /* The following should never happen with a proper or honest client.
741 * Therefore, the error message doesn't have to be too clear - if
742 * someone is playing with a hacked/non working client, this gives them
743 * an idea of the problem, but they deserve what they get
744 */
745 if (pl->state != ST_PLAYING)
746 {
747 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
748 return;
749 }
750 /* Check if there is a count. In theory, a zero count could also be 743 /* Check if there is a count. In theory, a zero count could also be
751 * sent, so check for that also. 744 * sent, so check for that also.
752 */ 745 */
753 if (atoi (buf) || buf[0] == '0') 746 if (atoi (buf) || buf[0] == '0')
754 { 747 {
755 pl->count = atoi ((char *) buf); 748 pl->count = atoi ((char *) buf);
749
756 buf = strchr (buf, ' '); /* advance beyond the numbers */ 750 buf = strchr (buf, ' '); /* advance beyond the numbers */
757 if (!buf) 751 if (!buf)
758 {
759#ifdef ESRV_DEBUG
760 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
761#endif
762 return; 752 return;
763 } 753
764 buf++; 754 buf++;
765 } 755 }
766 /* This should not happen anymore. */ 756
767 if (pl->ob->speed_left < -1.0)
768 {
769 LOG (llevError, "Player has negative time - shouldn't do command.\n");
770 }
771 /* In c_new.c */
772 execute_newserver_command (pl->ob, (char *) buf); 757 execute_newserver_command (pl->ob, (char *) buf);
758
773 /* Perhaps something better should be done with a left over count. 759 /* Perhaps something better should be done with a left over count.
774 * Cleaning up the input should probably be done first - all actions 760 * Cleaning up the input should probably be done first - all actions
775 * for the command that issued the count should be done before any other 761 * for the command that issued the count should be done before any other
776 * commands. 762 * commands.
777 */ 763 */
778
779 pl->count = 0; 764 pl->count = 0;
780
781} 765}
782 766
783 767
784/** 768/**
785 * This handles the general commands from the client (ie, north, fire, cast, 769 * This handles the general commands from the client (ie, north, fire, cast,
786 * etc.). It is a lot like PlayerCmd above, but is called with the 770 * etc.). It is a lot like PlayerCmd above, but is called with the
787 * 'ncom' method which gives more information back to the client so it 771 * 'ncom' method which gives more information back to the client so it
788 * can throttle. 772 * can throttle.
789 */ 773 */
790void 774void
791NewPlayerCmd (uint8 * buf, int len, player *pl) 775NewPlayerCmd (char *buf, int len, player *pl)
792{ 776{
793 int time, repeat;
794 char command[MAX_BUF];
795 int pktlen;
796
797 if (len < 7) 777 if (len <= 6)
798 { 778 {
799 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 779 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
800 return; 780 return;
801 } 781 }
802 782
803 pktlen = net_uint16 (buf); 783 uint16 cmdid = net_uint16 ((uint8 *)buf);
804 repeat = net_uint32 (buf + 2); 784 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
805 785
806 /* -1 is special - no repeat, but don't update */ 786 /* -1 is special - no repeat, but don't update */
807 if (repeat != -1) 787 if (repeat != -1)
808 pl->count = repeat; 788 pl->count = repeat;
809 789
810 if ((len - 4) >= MAX_BUF) 790 buf += 6; //len -= 6;
811 len = MAX_BUF - 5;
812 791
813 strncpy ((char *) command, (char *) buf + 6, len - 4);
814 command[len - 4] = '\0';
815
816 /* The following should never happen with a proper or honest client.
817 * Therefore, the error message doesn't have to be too clear - if
818 * someone is playing with a hacked/non working client, this gives them
819 * an idea of the problem, but they deserve what they get
820 */
821 if (pl->state != ST_PLAYING)
822 {
823 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
824 return;
825 }
826
827 /* This should not happen anymore. */
828 if (pl->ob->speed_left < -1.0)
829 LOG (llevError, "Player has negative time - shouldn't do command.\n");
830
831 /* In c_new.c */
832 execute_newserver_command (pl->ob, (char *) command); 792 execute_newserver_command (pl->ob, buf);
793
833 /* Perhaps something better should be done with a left over count. 794 /* Perhaps something better should be done with a left over count.
834 * Cleaning up the input should probably be done first - all actions 795 * Cleaning up the input should probably be done first - all actions
835 * for the command that issued the count should be done before any other 796 * for the command that issued the count should be done before any other
836 * commands. 797 * commands.
837 */ 798 */
838 pl->count = 0; 799 pl->count = 0;
839 800
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
840 if (FABS (pl->ob->speed) < 0.001) 802 int time = FABS (pl->ob->speed) < 0.001
841 time = MAX_TIME * 100; 803 ? time = MAX_TIME * 100
842 else
843 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
844 805
845 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
846 807 packet sl ("comc");
847 packet sl;
848 sl << "comc " << uint16 (pktlen) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
849 Send_With_Handling (&pl->socket, &sl); 809 pl->ns->send_packet (sl);
850} 810}
851
852 811
853/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
854void 813void
855ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
856{ 815{
816 if (ns->state == ST_CUSTOM)
817 {
818 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
819 return;
820 }
821
822 if (!ns->pl)
823 return; //TODO: depends on the exact reply we are after
824 //TODO: but right now, we always have a ns->pl
825
826 player *pl = ns->pl;
827
857 /* This is to synthesize how the data would be stored if it 828 /* This is to synthesize how the data would be stored if it
858 * was normally entered. A bit of a hack, and should be cleaned up 829 * was normally entered. A bit of a hack, and should be cleaned up
859 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
860 * 831 *
861 * We pass 13 to many of the functions because this way they 832 * We pass 13 to many of the functions because this way they
862 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
863 * function then does not try to do additional input. 834 * function then does not try to do additional input.
864 */ 835 */
865 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
866 837
867 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
868 839
869 switch (pl->state) 840 switch (ns->state)
870 { 841 {
871 case ST_PLAYING: 842 case ST_PLAYING:
872 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
873 break; 844 break;
874 845
875 case ST_PLAY_AGAIN:
876 /* We can check this for return value (2==quit). Maybe we
877 * should, and do something appropriate?
878 */
879 receive_play_again (pl->ob, buf[0]);
880 break;
881
882 case ST_ROLL_STAT:
883 key_roll_stat (pl->ob, buf[0]);
884 break;
885
886 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
887
888 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
889 break; 848 break;
890 849
891 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
892 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
893 break; 852 break;
894 853
895 case ST_CONFIGURE:
896 LOG (llevError, "In client input handling, but into configure state\n");
897 pl->state = ST_PLAYING;
898 break;
899
900 case ST_GET_NAME:
901 receive_player_name (pl->ob, 13);
902 break;
903
904 case ST_GET_PASSWORD:
905 case ST_CONFIRM_PASSWORD:
906 receive_player_password (pl->ob, 13);
907 break;
908
909 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
910 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
911 break; 856 break;
912 857
913 default: 858 default:
914 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
915 } 860 }
916} 861}
917 862
918/** 863/**
919 * Client tells its version. If there is a mismatch, we close the 864 * Client tells its version. If there is a mismatch, we close the
… …
921 * something older than the server. If we assume the client will be 866 * something older than the server. If we assume the client will be
922 * backwards compatible, having it be a later version should not be a 867 * backwards compatible, having it be a later version should not be a
923 * problem. 868 * problem.
924 */ 869 */
925void 870void
926VersionCmd (char *buf, int len, NewSocket * ns) 871VersionCmd (char *buf, int len, client * ns)
927{ 872{
928 char *cp;
929 char version_warning[256];
930
931 if (!buf) 873 if (!buf)
932 { 874 {
933 LOG (llevError, "CS: received corrupted version command\n"); 875 LOG (llevError, "CS: received corrupted version command\n");
934 return; 876 return;
935 } 877 }
936 878
937 ns->cs_version = atoi (buf); 879 ns->cs_version = atoi (buf);
938 ns->sc_version = ns->cs_version; 880 ns->sc_version = ns->cs_version;
881
882 LOG (llevDebug, "connection from client <%s>\n", buf);
883
884
885 //TODO: should log here just for statistics
886
939 if (VERSION_CS != ns->cs_version) 887 //if (VERSION_CS != ns->cs_version)
940 { 888 // unchecked;
941#ifdef ESRV_DEBUG 889
942 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
943#endif
944 }
945 cp = strchr (buf + 1, ' '); 890 char *cp = strchr (buf + 1, ' ');
946 if (!cp) 891 if (!cp)
947 return; 892 return;
893
948 ns->sc_version = atoi (cp); 894 ns->sc_version = atoi (cp);
895
949 if (VERSION_SC != ns->sc_version) 896 //if (VERSION_SC != ns->sc_version)
950 { 897 // unchecked;
951#ifdef ESRV_DEBUG 898
952 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
953#endif
954 }
955 cp = strchr (cp + 1, ' '); 899 cp = strchr (cp + 1, ' ');
900
956 if (cp) 901 if (cp)
957 { 902 {
958 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 903 assign (ns->version, cp + 1);
959 904
960 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
961
962 /* This is first implementation - i skip all beta DX clients with it
963 * Add later stuff here for other clients
964 */
965
966 /* these are old dxclients */
967 /* Version 1024 added support for singular + plural name values -
968 * requiing this minimal value reduces complexity of that code, and it
969 * has been around for a long time.
970 */
971 if (ns->sc_version < 1026) 905 if (ns->sc_version < 1026)
972 { 906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning);
976 }
977
978 } 908 }
979} 909}
980 910
981/** sound related functions. */ 911/** sound related functions. */
982
983void 912void
984SetSound (char *buf, int len, NewSocket * ns) 913SetSound (char *buf, int len, client * ns)
985{ 914{
986 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
987} 916}
988 917
989/** client wants the map resent */ 918/** client wants the map resent */
990 919
991void 920void
992MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
993{ 922{
994
995/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
996 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
997 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
998 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
999 */ 927 */
1000#if 0
1001 /* Okay, this is MAJOR UGLY. but the only way I know how to
1002 * clear the "cache"
1003 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob);
1006#endif
1007} 928}
1008 929
1009/** 930/**
1010 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
1011 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
1014MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
1015{ 936{
1016 int vals[3], i; 937 int vals[3], i;
1017 938
1018 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
1019 * we obviously am not going to find a space after the third 940 * we obviously are not going to find a space after the third
1020 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
1021 * sscanf? 942 * sscanf?
1022 */ 943 */
1023 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
1024 { 945 {
1025 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
1026 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
1027 { 949 {
1028 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1029 return; 951 return;
1030 } 952 }
953
1031 buf++; 954 buf++;
1032 } 955 }
956
1033 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1034 958
1035/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 959/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1036 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1037} 961}
1038
1039
1040 962
1041/****************************************************************************** 963/******************************************************************************
1042 * 964 *
1043 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1044 * 966 *
… …
1047/** 969/**
1048 * Asks the client to query the user. This way, the client knows 970 * Asks the client to query the user. This way, the client knows
1049 * it needs to send something back (vs just printing out a message) 971 * it needs to send something back (vs just printing out a message)
1050 */ 972 */
1051void 973void
1052send_query (NewSocket * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1053{ 975{
1054 char buf[MAX_BUF];
1055
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1057 ns->send_packet (buf);
1058} 977}
1059 978
1060#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1061 Old = New; \ 980 Old = New; \
1062 sl << uint8 (Type) << uint64 (New); \ 981 sl << uint8 (Type) << uint64 (New); \
… …
1092esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1093{ 1012{
1094 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1095 uint16 flags; 1014 uint16 flags;
1096 1015
1097 packet sl; 1016 if (!pl->ns)
1098 sl << "stats "; 1017 return;
1099 1018
1019 packet sl ("stats");
1020
1100 if (pl->ob != NULL) 1021 if (pl->ob)
1101 { 1022 {
1102 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1103 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1104 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1105 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1106 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1107 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1108 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1109 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1110 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1111 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1112 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1113 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1114 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1115 } 1036 }
1116 1037
1117 if (pl->socket.exp64)
1118 {
1119 uint8 s;
1120
1121 for (s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1122 {
1123 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1124 { 1040 {
1125 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1126 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1127 */ 1043 */
1128 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1129 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1130 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1131 1047
1132 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1133 }
1134 } 1049 }
1135 }
1136 1050
1137 if (pl->socket.exp64)
1138 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1139 else
1140 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1141
1142 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1143 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1144 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1145 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1146 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1155 if (pl->run_on) 1065 if (pl->run_on)
1156 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1157 1067
1158 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1159 1069
1160 if (pl->socket.sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1161 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1162 else 1072 else
1163 {
1164 int i;
1165
1166 for (i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1167 { 1074 {
1168 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1169 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1170 continue; 1077 continue;
1171 1078
1172 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1173 } 1080 }
1174 }
1175 1081
1176 if (pl->socket.monitor_spells) 1082 if (pl->ns->monitor_spells)
1177 { 1083 {
1178 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1179 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1180 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1181 } 1087 }
1182 1088
1183 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1184 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1185 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1186 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1187 1093
1188 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1189 if (sl.len > 6) 1095 if (sl.length () > 6)
1190 { 1096 pl->ns->send_packet (sl);
1191#ifdef ESRV_DEBUG
1192 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1193#endif
1194 Send_With_Handling (&pl->socket, &sl);
1195 }
1196
1197} 1097}
1198 1098
1199/** 1099/**
1200 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1201 */ 1101 */
1202void 1102void
1203esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1204{ 1104{
1205 pl->last_weight = weight; 1105 pl->last_weight = weight;
1206 1106
1207 packet sl; 1107 packet sl ("player");
1208 sl << "player ";
1209 1108
1210 sl << uint32 (pl->ob->count) 1109 sl << uint32 (pl->ob->count)
1211 << uint32 (weight) 1110 << uint32 (weight)
1212 << uint32 (pl->ob->face->number) 1111 << uint32 (pl->ob->face->number)
1213 << data8 (pl->ob->name); 1112 << data8 (pl->ob->name);
1214 1113
1215 Send_With_Handling (&pl->socket, &sl); 1114 pl->ns->send_packet (sl);
1216 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1217} 1116}
1218 1117
1219/** 1118/**
1220 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
… …
1222 * sent them the face yet (this can become quite costly in terms of 1121 * sent them the face yet (this can become quite costly in terms of
1223 * how much we are sending - on the other hand, this should only happen 1122 * how much we are sending - on the other hand, this should only happen
1224 * when the player logs in and picks stuff up. 1123 * when the player logs in and picks stuff up.
1225 */ 1124 */
1226void 1125void
1227esrv_send_animation (NewSocket * ns, short anim_num) 1126esrv_send_animation (client * ns, short anim_num)
1228{ 1127{
1229 int i;
1230
1231 /* Do some checking on the anim_num we got. Note that the animations 1128 /* Do some checking on the anim_num we got. Note that the animations
1232 * are added in contigous order, so if the number is in the valid 1129 * are added in contigous order, so if the number is in the valid
1233 * range, it must be a valid animation. 1130 * range, it must be a valid animation.
1234 */ 1131 */
1235 if (anim_num < 0 || anim_num > num_animations) 1132 if (anim_num < 0 || anim_num > num_animations)
1236 { 1133 {
1237 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1238 return; 1135 return;
1239 } 1136 }
1240 1137
1241 packet sl; 1138 packet sl ("anim");
1242 1139
1243 sl << "anim "
1244 << uint16 (anim_num) 1140 sl << uint16 (anim_num)
1245 << uint16 (0); /* flags - not used right now */ 1141 << uint16 (0); /* flags - not used right now */
1246 1142
1247 /* Build up the list of faces. Also, send any information (ie, the 1143 /* Build up the list of faces. Also, send any information (ie, the
1248 * the face itself) down to the client. 1144 * the face itself) down to the client.
1249 */ 1145 */
1250 for (i = 0; i < animations[anim_num].num_animations; i++) 1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1251 { 1147 {
1252 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1148 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1253 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1254 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1151 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1255 } 1152 }
1256 1153
1257 Send_With_Handling (ns, &sl); 1154 ns->send_packet (sl);
1258 1155
1259 ns->anims_sent[anim_num] = 1; 1156 ns->anims_sent[anim_num] = 1;
1260} 1157}
1261 1158
1262 1159
… …
1269/** 1166/**
1270 * This adds face_num to a map cell at x,y. If the client doesn't have 1167 * This adds face_num to a map cell at x,y. If the client doesn't have
1271 * the face yet, we will also send it. 1168 * the face yet, we will also send it.
1272 */ 1169 */
1273static void 1170static void
1274esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1171esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1275{ 1172{
1276 if (newmap->cells[x][y].count >= MAP_LAYERS) 1173 if (newmap->cells[x][y].count >= MAP_LAYERS)
1277 { 1174 {
1175 //TODO: one or the other, can't both have abort and return, verify and act
1278 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1176 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1279 return; 1177 return;
1280 abort (); 1178 abort ();
1281 } 1179 }
1282 1180
… …
1284 newmap->cells[x][y].count++; 1182 newmap->cells[x][y].count++;
1285 1183
1286 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1287 esrv_send_face (ns, face_num, 0); 1185 esrv_send_face (ns, face_num, 0);
1288} 1186}
1289
1290struct LayerCell
1291{
1292 uint16 xy;
1293 short face;
1294};
1295
1296struct MapLayer
1297{
1298 int count;
1299 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1300};
1301
1302/** Checkes if map cells have changed */
1303static int
1304mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1305{
1306 int k;
1307
1308 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1309 return 1;
1310 for (k = 0; k < newmap->cells[i][j].count; k++)
1311 {
1312 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1313 {
1314 return 1;
1315 }
1316 }
1317 return 0;
1318}
1319
1320/**
1321 * Basically, what this does is pack the data into layers.
1322 * cnum is the client number, cur is the the buffer we put all of
1323 * this data into. we return the end of the data. layers is
1324 * how many layers of data we should back.
1325 */
1326static uint8 *
1327compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1328{
1329 int x, y, k;
1330 int face;
1331 unsigned char *fcur;
1332 struct MapLayer layers[MAP_LAYERS];
1333
1334 for (k = 0; k < MAP_LAYERS; k++)
1335 layers[k].count = 0;
1336 fcur = cur;
1337 for (x = 0; x < ns->mapx; x++)
1338 {
1339 for (y = 0; y < ns->mapy; y++)
1340 {
1341 if (!mapcellchanged (ns, x, y, newmap))
1342 continue;
1343 if (newmap->cells[x][y].count == 0)
1344 {
1345 *cur = x * ns->mapy + y; /* mark empty space */
1346 cur++;
1347 continue;
1348 }
1349 for (k = 0; k < newmap->cells[x][y].count; k++)
1350 {
1351 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1352 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1353 layers[k].count++;
1354 }
1355 }
1356 }
1357 /* If no data, return now. */
1358 if (fcur == cur && layers[0].count == 0)
1359 return cur;
1360 *cur = 255; /* mark end of explicitly cleared cells */
1361 cur++;
1362 /* First pack by layers. */
1363 for (k = 0; k < numlayers; k++)
1364 {
1365 if (layers[k].count == 0)
1366 break; /* once a layer is entirely empty, no layer below it can
1367 have anything in it either */
1368 /* Pack by entries in thie layer */
1369 for (x = 0; x < layers[k].count;)
1370 {
1371 fcur = cur;
1372 *cur = layers[k].lcells[x].face >> 8;
1373 cur++;
1374 *cur = layers[k].lcells[x].face & 0xFF;
1375 cur++;
1376 face = layers[k].lcells[x].face;
1377 /* Now, we back the redundant data into 1 byte xy pairings */
1378 for (y = x; y < layers[k].count; y++)
1379 {
1380 if (layers[k].lcells[y].face == face)
1381 {
1382 *cur = (uint8) layers[k].lcells[y].xy;
1383 cur++;
1384 layers[k].lcells[y].face = -1;
1385 }
1386 }
1387 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1388 /* forward over the now redundant data */
1389 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1390 x++;
1391 }
1392 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1393 }
1394 return cur;
1395}
1396
1397static void
1398esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1399{
1400 static long frames, bytes, tbytes, tframes;
1401 char *cur;
1402
1403 packet sl;
1404 sl << "map ";
1405
1406 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1407 sl.len = cur - (char *) sl.buf;
1408
1409/* LOG(llevDebug, "Sending map command.\n");*/
1410
1411 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1412 {
1413 /* All of this is just accounting stuff */
1414 if (tframes > 100)
1415 tframes = tbytes = 0;
1416
1417 tframes++;
1418 frames++;
1419 tbytes += sl.len;
1420 bytes += sl.len;
1421 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1422 Send_With_Handling (ns, &sl);
1423 ns->sent_scroll = 0;
1424 }
1425
1426}
1427
1428 1187
1429/** Clears a map cell */ 1188/** Clears a map cell */
1430static void 1189static void
1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1190map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1432{ 1191{
… …
1443#define MAX_LAYERS 3 1202#define MAX_LAYERS 3
1444 1203
1445/* Using a global really isn't a good approach, but saves the over head of 1204/* Using a global really isn't a good approach, but saves the over head of
1446 * allocating and deallocating such a block of data each time run through, 1205 * allocating and deallocating such a block of data each time run through,
1447 * and saves the space of allocating this in the socket object when we only 1206 * and saves the space of allocating this in the socket object when we only
1448 * need it for this cycle. If the serve is ever threaded, this needs to be 1207 * need it for this cycle. If the server is ever threaded, this needs to be
1449 * re-examined. 1208 * re-examined.
1450 */ 1209 */
1451
1452static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1210static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1453 1211
1454/** 1212/**
1455 * Returns true if any of the heads for this 1213 * Returns true if any of the heads for this
1456 * space is set. Returns false if all are blank - this is used 1214 * space is set. Returns false if all are blank - this is used
1457 * for empty space checking. 1215 * for empty space checking.
1458 */ 1216 */
1459static inline int 1217static inline int
1460have_head (int ax, int ay) 1218have_head (int ax, int ay)
1461{ 1219{
1462
1463 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1464 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1221 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1465 return 1; 1222 return 1;
1223
1466 return 0; 1224 return 0;
1467} 1225}
1468 1226
1469/** 1227/**
1470 * check_head is a bit simplistic version of update_space below. 1228 * check_head is a bit simplistic version of update_space below.
1471 * basically, it only checks the that the head on space ax,ay at layer 1229 * basically, it only checks the that the head on space ax,ay at layer
1472 * needs to get sent - if so, it adds the data, sending the head 1230 * needs to get sent - if so, it adds the data, sending the head
1473 * if needed, and returning 1. If this no data needs to get 1231 * if needed, and returning 1. If this no data needs to get
1474 * sent, it returns zero. 1232 * sent, it returns zero.
1475 */ 1233 */
1476static int 1234static int
1477check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) 1235check_head (packet &sl, client &ns, int ax, int ay, int layer)
1478{ 1236{
1479 short face_num; 1237 short face_num;
1480 1238
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1239 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1240 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1514 * numbers the spaces differently - I think this was a leftover from 1272 * numbers the spaces differently - I think this was a leftover from
1515 * the map command, where the faces stack up. Sinces that is no longer 1273 * the map command, where the faces stack up. Sinces that is no longer
1516 * the case, it seems to make more sense to have these layer values 1274 * the case, it seems to make more sense to have these layer values
1517 * actually match. 1275 * actually match.
1518 */ 1276 */
1519
1520static int 1277static int
1521update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1278update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1522{ 1279{
1523 object *ob, *head; 1280 object *ob, *head;
1524 uint16 face_num; 1281 uint16 face_num;
1525 int bx, by, i; 1282 int bx, by, i;
1526 1283
… …
1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1496 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1740 * take. 1497 * take.
1741 */ 1498 */
1742 1499
1743static inline int 1500static inline int
1744update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1501update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1745{ 1502{
1746 object *ob; 1503 object *ob;
1747 int smoothlevel; /* old face_num; */ 1504 int smoothlevel; /* old face_num; */
1748 1505
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1750 1507
1751 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1752 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1753 */ 1510 */
1754 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face || mp->nosmooth)
1755 smoothlevel = 0; 1512 smoothlevel = 0;
1756 else 1513 else
1757 { 1514 {
1758 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1759 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1783 * Returns the size of a data for a map square as returned by 1540 * Returns the size of a data for a map square as returned by
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1541 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 1542 * available.
1786 */ 1543 */
1787int 1544int
1788getExtendedMapInfoSize (NewSocket * ns) 1545getExtendedMapInfoSize (client * ns)
1789{ 1546{
1790 int result = 0; 1547 int result = 0;
1791 1548
1792 if (ns->ext_mapinfos) 1549 if (ns->ext_mapinfos)
1793 { 1550 {
1794 if (ns->EMI_smooth) 1551 if (ns->EMI_smooth)
1795 result += 1; /*One byte for smoothlevel */ 1552 result += 1; /*One byte for smoothlevel */
1796 } 1553 }
1554
1797 return result; 1555 return result;
1798} 1556}
1799 1557
1800/** 1558/**
1801 * This function uses the new map1 protocol command to send the map 1559 * This function uses the new map1 protocol command to send the map
… …
1808 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1566 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1809 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1567 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1810 * and use the other 4 bits for other informatiion. For full documentation 1568 * and use the other 4 bits for other informatiion. For full documentation
1811 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1812 * I will describe internally what we do: 1570 * I will describe internally what we do:
1813 * the socket->lastmap shows how the map last looked when sent to the client. 1571 * the ns->lastmap shows how the map last looked when sent to the client.
1814 * in the lastmap structure, there is a cells array, which is set to the 1572 * in the lastmap structure, there is a cells array, which is set to the
1815 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1816 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1817 * we use the count value to hold the darkness value. If -1, then this space 1575 * we use the count value to hold the darkness value. If -1, then this space
1818 * is not viewable. 1576 * is not viewable.
… …
1829 uint8 eentrysize; 1587 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1589 uint8 extendedinfos;
1832 maptile *m; 1590 maptile *m;
1833 1591
1834 NewSocket &socket = pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1835 1593
1836 check_map_change (pl->contr); 1594 check_map_change (pl->contr);
1837 1595
1838 packet sl; 1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1839 packet esl; 1597 packet esl;
1840 1598
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1842 startlen = sl.len; 1599 startlen = sl.length ();
1843 1600
1844 /*Extendedmapinfo structure initialisation */ 1601 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1602 if (socket.ext_mapinfos)
1846 { 1603 {
1847 extendedinfos = EMI_NOREDRAW; 1604 extendedinfos = EMI_NOREDRAW;
1848 1605
1849 if (socket.EMI_smooth) 1606 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1607 extendedinfos |= EMI_SMOOTH;
1851 1608
1852 ewhatstart = esl.len; 1609 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1610 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1611 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1612 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1613 esl << "mapextended "
1857 << uint8 (extendedinfos) 1614 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1615 << uint8 (eentrysize);
1616
1859 estartlen = esl.len; 1617 estartlen = esl.length ();
1860 } 1618 }
1861 else 1619 else
1862 { 1620 {
1863 /* suppress compiler warnings */ 1621 /* suppress compiler warnings */
1864 ewhatstart = 0; 1622 ewhatstart = 0;
… …
1889 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1647 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1890 { 1648 {
1891 ax = 0; 1649 ax = 0;
1892 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1650 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1893 { 1651 {
1894
1895 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1896 1653
1897 /* If this space is out of the normal viewable area, we only check 1654 /* If this space is out of the normal viewable area, we only check
1898 * the heads value ax or ay will only be greater than what 1655 * the heads value ax or ay will only be greater than what
1899 * the client wants if using the map1a command - this is because 1656 * the client wants if using the map1a command - this is because
… …
1902 */ 1659 */
1903 if (ax >= socket.mapx || ay >= socket.mapy) 1660 if (ax >= socket.mapx || ay >= socket.mapy)
1904 { 1661 {
1905 int i, got_one; 1662 int i, got_one;
1906 1663
1907 oldlen = sl.len; 1664 oldlen = sl.length ();
1908 1665
1909 sl << uint16 (mask); 1666 sl << uint16 (mask);
1910 1667
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1668 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1669 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1916 * actually need to send that - just the coordinates 1673 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the 1674 * with no faces tells the client to blank out the
1918 * space. 1675 * space.
1919 */ 1676 */
1920 got_one = 0; 1677 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++) 1678 for (i = oldlen + 2; i < sl.length (); i++)
1922 if (sl.buf[i]) 1679 if (sl[i])
1923 got_one = 1; 1680 got_one = 1;
1924 1681
1925 if (got_one && (mask & 0xf)) 1682 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff; 1683 sl[oldlen + 1] = mask & 0xff;
1927 else 1684 else
1928 { /*either all faces blank, either no face at all */ 1685 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1686 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2; 1687 sl.reset (oldlen + 2);
1931 else 1688 else
1932 sl.len = oldlen; 1689 sl.reset (oldlen);
1933 } 1690 }
1934 1691
1935 /*What concerns extendinfos, nothing to be done for now 1692 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later) 1693 * (perhaps effects layer later)
1937 */ 1694 */
… …
1967 1724
1968 /* This block deals with spaces that are not visible for whatever 1725 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1726 * reason. Still may need to send the head for this space.
1970 */ 1727 */
1971 1728
1972 oldlen = sl.len; 1729 oldlen = sl.length ();
1973 1730
1974 sl << uint16 (mask); 1731 sl << uint16 (mask);
1975 1732
1976 if (lastcell.count != -1) 1733 if (lastcell.count != -1)
1977 need_send = 1; 1734 need_send = 1;
… …
1997 1754
1998 map_clearcell (&lastcell, 0, 0, 0, count); 1755 map_clearcell (&lastcell, 0, 0, 0, count);
1999 } 1756 }
2000 1757
2001 if ((mask & 0xf) || need_send) 1758 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff; 1759 sl[oldlen + 1] = mask & 0xff;
2003 else 1760 else
2004 sl.len = oldlen; 1761 sl.reset (oldlen);
2005 } 1762 }
2006 else 1763 else
2007 { 1764 {
2008 /* In this block, the space is visible or there are head objects 1765 /* In this block, the space is visible or there are head objects
2009 * we need to send. 1766 * we need to send.
… …
2011 1768
2012 /* Rather than try to figure out what everything that we might 1769 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1770 * need to send is, then form the packet after that,
2014 * we presume that we will in fact form a packet, and update 1771 * we presume that we will in fact form a packet, and update
2015 * the bits by what we do actually send. If we send nothing, 1772 * the bits by what we do actually send. If we send nothing,
2016 * we just back out sl.len to the old value, and no harm 1773 * we just back out sl.length () to the old value, and no harm
2017 * is done. 1774 * is done.
2018 * I think this is simpler than doing a bunch of checks to see 1775 * I think this is simpler than doing a bunch of checks to see
2019 * what if anything we need to send, setting the bits, then 1776 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1777 * doing those checks again to add the real data.
2021 */ 1778 */
2022 oldlen = sl.len; 1779 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1780 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1781 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1782 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2026 sl << uint16 (mask); 1783 sl << uint16 (mask);
2027 1784
2028 if (socket.ext_mapinfos) 1785 if (socket.ext_mapinfos)
2029 esl << uint16 (emask); 1786 esl << uint16 (emask);
… …
2037 mask |= 0x8; 1794 mask |= 0x8;
2038 1795
2039 if (socket.extmap) 1796 if (socket.extmap)
2040 { 1797 {
2041 *last_ext |= 0x80; 1798 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 1799 last_ext = &sl[sl.length ()];
2043 sl << uint8 (d); 1800 sl << uint8 (d);
2044 } 1801 }
2045 else 1802 else
2046 sl << uint8 (255 - 64 * d); 1803 sl << uint8 (255 - 64 * d);
2047 } 1804 }
… …
2081 { 1838 {
2082 lastcell.stat_hp = stat_hp; 1839 lastcell.stat_hp = stat_hp;
2083 1840
2084 mask |= 0x8; 1841 mask |= 0x8;
2085 *last_ext |= 0x80; 1842 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1843 last_ext = &sl[sl.length ()];
2087 1844
2088 sl << uint8 (5) << uint8 (stat_hp); 1845 sl << uint8 (5) << uint8 (stat_hp);
2089 1846
2090 if (stat_width > 1) 1847 if (stat_width > 1)
2091 { 1848 {
2092 *last_ext |= 0x80; 1849 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1850 last_ext = &sl[sl.length ()];
2094 1851
2095 sl << uint8 (6) << uint8 (stat_width); 1852 sl << uint8 (6) << uint8 (stat_width);
2096 } 1853 }
2097 } 1854 }
2098 1855
… …
2100 { 1857 {
2101 lastcell.player = player; 1858 lastcell.player = player;
2102 1859
2103 mask |= 0x8; 1860 mask |= 0x8;
2104 *last_ext |= 0x80; 1861 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 1862 last_ext = &sl[sl.length ()];
2106 1863
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1864 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 1865 }
2109 1866
2110 if (lastcell.flags != flags) 1867 if (lastcell.flags != flags)
2111 { 1868 {
2112 lastcell.flags = flags; 1869 lastcell.flags = flags;
2113 1870
2114 mask |= 0x8; 1871 mask |= 0x8;
2115 *last_ext |= 0x80; 1872 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 1873 last_ext = &sl[sl.length ()];
2117 1874
2118 sl << uint8 (8) << uint8 (flags); 1875 sl << uint8 (8) << uint8 (flags);
2119 } 1876 }
2120 } 1877 }
2121 1878
… …
2163 * space by checking the mask. If so, update the mask. 1920 * space by checking the mask. If so, update the mask.
2164 * if not, reset the len to that from before adding the mask 1921 * if not, reset the len to that from before adding the mask
2165 * value, so we don't send those bits. 1922 * value, so we don't send those bits.
2166 */ 1923 */
2167 if (mask & 0xf) 1924 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 1925 sl[oldlen + 1] = mask & 0xff;
2169 else 1926 else
2170 sl.len = oldlen; 1927 sl.reset (oldlen);
2171 1928
2172 if (emask & 0xf) 1929 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 1930 esl[eoldlen + 1] = emask & 0xff;
2174 else 1931 else
2175 esl.len = eoldlen; 1932 esl.reset (eoldlen);
2176 } /* else this is a viewable space */ 1933 } /* else this is a viewable space */
2177 } /* for x loop */ 1934 } /* for x loop */
2178 } /* for y loop */ 1935 } /* for y loop */
2179 1936
2180 /* Verify that we in fact do need to send this */ 1937 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 1938 if (socket.ext_mapinfos)
2182 { 1939 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 1940 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 1941 {
2185 /* No map data will follow, so don't say the client 1942 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 1943 * it doesn't need draw!
2187 */ 1944 */
2188 ewhatflag &= (~EMI_NOREDRAW); 1945 ewhatflag &= (~EMI_NOREDRAW);
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1946 esl[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 1947 }
2191 1948
2192 if (esl.len > estartlen) 1949 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 1950 socket.send_packet (esl);
2194 } 1951 }
2195 1952
2196 if (sl.len > startlen || socket.sent_scroll) 1953 if (sl.length () > startlen || socket.sent_scroll)
2197 { 1954 {
2198 Send_With_Handling (&socket, &sl); 1955 socket.send_packet (sl);
2199 socket.sent_scroll = 0; 1956 socket.sent_scroll = 0;
2200 } 1957 }
2201} 1958}
2202 1959
2203/** 1960/**
… …
2229 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1986 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2230 return; 1987 return;
2231 1988
2232 memset (&newmap, 0, sizeof (struct Map)); 1989 memset (&newmap, 0, sizeof (struct Map));
2233 1990
2234 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1991 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2235 {
2236 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1992 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2237 { 1993 {
2238 ax = i; 1994 ax = i;
2239 ay = j; 1995 ay = j;
2240 m = pm; 1996 m = pm;
2241 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1997 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1998
2242 if (mflags & P_OUT_OF_MAP) 1999 if (mflags & P_OUT_OF_MAP)
2243 continue; 2000 continue;
2244 if (mflags & P_NEED_UPDATE) 2001
2245 update_position (m, ax, ay);
2246 /* If a map is visible to the player, we don't want to swap it out 2002 /* If a map is visible to the player, we don't want to swap it out
2247 * just to reload it. This should really call something like 2003 * just to reload it. This should really call something like
2248 * swap_map, but this is much more efficient and 'good enough' 2004 * swap_map, but this is much more efficient and 'good enough'
2249 */ 2005 */
2250 if (mflags & P_NEW_MAP) 2006 if (mflags & P_NEW_MAP)
2251 m->timeout = 50; 2007 m->timeout = 50;
2252 } 2008 }
2253 } 2009
2254 /* do LOS after calls to update_position */ 2010 /* do LOS after calls to update_position */
2255 if (pl->contr->do_los) 2011 if (pl->contr->do_los)
2256 { 2012 {
2257 update_los (pl); 2013 update_los (pl);
2258 pl->contr->do_los = 0; 2014 pl->contr->do_los = 0;
2259 } 2015 }
2260 2016
2261 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2262 {
2263 /* Big maps need a different drawing mechanism to work */ 2017 /* Big maps need a different drawing mechanism to work */
2264 draw_client_map1 (pl); 2018 draw_client_map1 (pl);
2265 return;
2266 }
2267
2268 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2269 {
2270 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2271 }
2272
2273 /* j and i are the y and x coordinates of the real map (which is
2274 * basically some number of spaces around the player)
2275 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2276 * left corner) and are thus disconnected from the map values.
2277 * Subtract 1 from the max values so that we properly handle cases where
2278 * player has specified an even map. Otherwise, we try to send them too
2279 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2280 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2281 * odd, this still works fine.
2282 */
2283 ay = 0;
2284 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2285 {
2286 ax = 0;
2287 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2288 {
2289
2290 d = pl->contr->blocked_los[ax][ay];
2291 /* note the out_of_map and d>3 checks are both within the same
2292 * negation check.
2293 */
2294 nx = i;
2295 ny = j;
2296 m = get_map_from_coord (pm, &nx, &ny);
2297 if (m && d < 4)
2298 {
2299 face = GET_MAP_FACE (m, nx, ny, 0);
2300 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2301 floor = GET_MAP_FACE (m, nx, ny, 2);
2302
2303 /* If all is blank, send a blank face. */
2304 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2307 }
2308 else
2309 { /* actually have something interesting */
2310 /* send the darkness mask, if any. */
2311 if (d && pl->contr->socket.darkness)
2312 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2313
2314 if (face && face != blank_face)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2316 if (floor2 && floor2 != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2318 if (floor && floor != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2320 }
2321 } /* Is a valid space */
2322 }
2323 }
2324
2325 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2326
2327 check_map_change (pl->contr);
2328} 2019}
2329 2020
2330 2021
2331/*****************************************************************************/ 2022/*****************************************************************************/
2332 2023
… …
2338 2029
2339/*****************************************************************************/ 2030/*****************************************************************************/
2340void 2031void
2341send_plugin_custom_message (object *pl, char *buf) 2032send_plugin_custom_message (object *pl, char *buf)
2342{ 2033{
2343 pl->contr->socket.send_packet (buf); 2034 pl->contr->ns->send_packet (buf);
2344} 2035}
2345 2036
2346/** 2037/**
2347 * This sends the skill number to name mapping. We ignore 2038 * This sends the skill number to name mapping. We ignore
2348 * the params - we always send the same info no matter what. 2039 * the params - we always send the same info no matter what.
2349 */ 2040 */
2350void 2041void
2351send_skill_info (NewSocket *ns, char *params) 2042send_skill_info (client *ns, char *params)
2352{ 2043{
2353 packet sl; 2044 packet sl;
2354 sl << "replyinfo skill_info\n"; 2045 sl << "replyinfo skill_info\n";
2355 2046
2356 for (int i = 1; i < NUM_SKILLS; i++) 2047 for (int i = 1; i < NUM_SKILLS; i++)
2357 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2048 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2358 2049
2359 if (sl.len >= MAXSOCKBUF) 2050 if (sl.length () >= MAXSOCKBUF)
2360 { 2051 {
2361 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2052 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2362 fatal (0); 2053 fatal (0);
2363 } 2054 }
2364 2055
2365 Send_With_Handling (ns, &sl); 2056 ns->send_packet (sl);
2366} 2057}
2367 2058
2368/** 2059/**
2369 * This sends the spell path to name mapping. We ignore 2060 * This sends the spell path to name mapping. We ignore
2370 * the params - we always send the same info no matter what. 2061 * the params - we always send the same info no matter what.
2371 */ 2062 */
2372void 2063void
2373send_spell_paths (NewSocket * ns, char *params) 2064send_spell_paths (client * ns, char *params)
2374{ 2065{
2375 packet sl; 2066 packet sl;
2376 2067
2377 sl << "replyinfo spell_paths\n"; 2068 sl << "replyinfo spell_paths\n";
2378 2069
2379 for (int i = 0; i < NRSPELLPATHS; i++) 2070 for (int i = 0; i < NRSPELLPATHS; i++)
2380 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2071 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2381 2072
2382 if (sl.len >= MAXSOCKBUF) 2073 if (sl.length () >= MAXSOCKBUF)
2383 { 2074 {
2384 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2075 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2385 fatal (0); 2076 fatal (0);
2386 } 2077 }
2387 2078
2388 Send_With_Handling (ns, &sl); 2079 ns->send_packet (sl);
2389} 2080}
2390 2081
2391/** 2082/**
2392 * This looks for any spells the player may have that have changed their stats. 2083 * This looks for any spells the player may have that have changed their stats.
2393 * it then sends an updspell packet for each spell that has changed in this way 2084 * it then sends an updspell packet for each spell that has changed in this way
2394 */ 2085 */
2395void 2086void
2396esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2397{ 2088{
2089 if (!pl->ns)
2090 return;
2091
2398 if (!pl->socket.monitor_spells) 2092 if (!pl->ns->monitor_spells)
2399 return; 2093 return;
2400 2094
2401 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2402 { 2096 {
2403 if (spell->type == SPELL) 2097 if (spell->type == SPELL)
… …
2433 2127
2434 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2128 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2435 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2129 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2436 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2130 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2437 2131
2438 Send_With_Handling (&pl->socket, &sl); 2132 pl->ns->send_packet (sl);
2439 } 2133 }
2440 } 2134 }
2441 } 2135 }
2442} 2136}
2443 2137
2444void 2138void
2445esrv_remove_spell (player *pl, object *spell) 2139esrv_remove_spell (player *pl, object *spell)
2446{ 2140{
2447 if (!pl->socket.monitor_spells) 2141 if (!pl->ns->monitor_spells)
2448 return; 2142 return;
2449 2143
2450 if (!pl || !spell || spell->env != pl->ob) 2144 if (!pl || !spell || spell->env != pl->ob)
2451 { 2145 {
2452 LOG (llevError, "Invalid call to esrv_remove_spell"); 2146 LOG (llevError, "Invalid call to esrv_remove_spell");
2453 return; 2147 return;
2454 } 2148 }
2455 2149
2456 packet sl; 2150 packet sl ("delspell");
2457 2151
2458 sl << "delspell "
2459 << uint32 (spell->count); 2152 sl << uint32 (spell->count);
2460 2153
2461 Send_With_Handling (&pl->socket, &sl); 2154 pl->ns->send_packet (sl);
2462} 2155}
2463 2156
2464/* appends the spell *spell to the Socklist we will send the data to. */ 2157/* appends the spell *spell to the Socklist we will send the data to. */
2465static void 2158static void
2466append_spell (player *pl, packet &sl, object *spell) 2159append_spell (player *pl, packet &sl, object *spell)
… …
2514 { 2207 {
2515 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2208 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2516 return; 2209 return;
2517 } 2210 }
2518 2211
2519 if (!pl->socket.monitor_spells) 2212 if (!pl->ns->monitor_spells)
2520 return; 2213 return;
2521 2214
2522 packet sl; 2215 packet sl ("addspell");
2523
2524 sl << "addspell ";
2525 2216
2526 if (!spell) 2217 if (!spell)
2527 { 2218 {
2528 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2219 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2529 { 2220 {
… …
2541 * like it will fix this 2232 * like it will fix this
2542 */ 2233 */
2543 if (spell->type != SPELL) 2234 if (spell->type != SPELL)
2544 continue; 2235 continue;
2545 2236
2546 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2237 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2547 { 2238 {
2548 Send_With_Handling (&pl->socket, &sl); 2239 pl->ns->send_packet (sl);
2549 strcpy ((char *) sl.buf, "addspell "); 2240
2550 sl.len = strlen ((char *) sl.buf); 2241 sl.reset ();
2242 sl << "addspell ";
2551 } 2243 }
2552 2244
2553 append_spell (pl, sl, spell); 2245 append_spell (pl, sl, spell);
2554 } 2246 }
2555 } 2247 }
… …
2566 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2258 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2567 fatal (0); 2259 fatal (0);
2568 } 2260 }
2569 2261
2570 /* finally, we can send the packet */ 2262 /* finally, we can send the packet */
2571 Send_With_Handling (&pl->socket, &sl); 2263 pl->ns->send_packet (sl);
2572
2573} 2264}
2574 2265

Diff Legend

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