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.41 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.55 by root, Sat Dec 30 10:16:11 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
… …
86 -1, /* life stealing */ 83 -1, /* life stealing */
87 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
88}; 85};
89 86
90static void 87static void
91socket_map_scroll (client * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
92{ 89{
93 struct Map newmap; 90 struct Map newmap;
94 int x, y, mx, my; 91 int x, y, mx, my;
95 92
96 {
97 packet sl;
98
99 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
100 ns->send_packet (sl);
101 }
102 94
103 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
104 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
105 * 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
106 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
146} 138}
147 139
148static void 140static void
149clear_map (player *pl) 141clear_map (player *pl)
150{ 142{
151 client &socket = *pl->socket;
152
153 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
154 144
155 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
156 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
157 147
158 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
159 socket.look_position = 0;
160} 149}
161 150
162/** check for map change and send new map data */ 151/** check for map change and send new map data */
163static void 152static void
164check_map_change (player *pl) 153check_map_change (player *pl)
165{ 154{
166 client &socket = *pl->socket; 155 client &socket = *pl->ns;
167 object *ob = pl->ob; 156 object *ob = pl->ob;
168 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
169 158
170 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
171 { 160 {
… …
187 flags |= 4; 176 flags |= 4;
188 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
189 flags |= 8; 178 flags |= 8;
190 179
191 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
192 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
193 } 182 }
194 else 183 else
195 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
196 185
197 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
205 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
206 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
207 else 196 else
208 { 197 {
209 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);
210 socket.update_look = 1; 199 socket.floorbox_reset ();
211 socket.look_position = 0;
212 } 200 }
213 } 201 }
214 202
215 socket.current_x = ob->x; 203 socket.current_x = ob->x;
216 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
265{ 253{
266 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
267} 255}
268 256
269void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
270MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
271{ 265{
272 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
273 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
274 268
… …
286 buf += 8; 280 buf += 8;
287 281
288 // initial map and its origin 282 // initial map and its origin
289 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
290 sint16 dx, dy; 284 sint16 dx, dy;
291 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
292 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
293 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
294 288
295 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
296 { 290 {
297 int dir = *buf++; 291 int dir = *buf++;
… …
340 if (map->tile_path[2]) 334 if (map->tile_path[2])
341 flags |= 4; 335 flags |= 4;
342 if (map->tile_path[3]) 336 if (map->tile_path[3])
343 flags |= 8; 337 flags |= 8;
344 338
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
346 } 340 }
347 else 341 else
348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
349 } 343 }
350 else 344 else
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
352 346
353 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
354} 348}
355 349
356/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
357void 351void
358SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
405 { 399 {
406 ns->sound = atoi (param); 400 ns->sound = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 } 402 }
409 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
410 {
411 ns->exp64 = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
415 { 406 {
416 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
417 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
418 } 409 }
… …
575 * 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.
576 */ 567 */
577void 568void
578AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
579{ 570{
580 Settings oldsettings; 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
581
582 oldsettings = settings;
583 if (ns->status != Ns_Add || add_player (ns))
584 ns->send_packet ("addme_failed");
585 else
586 ns->send_packet ("addme_success");
587
588 settings = oldsettings;
589} 572}
590 573
591/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
592void 575void
593ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
710 * 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
711 * 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
712 * client. 695 * client.
713 */ 696 */
714static void 697static void
715SendSmooth (client * ns, uint16 face) 698SendSmooth (client *ns, uint16 face)
716{ 699{
717 uint16 smoothface; 700 uint16 smoothface;
718 701
719 /* 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
720 * again. 703 * again.
… …
730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
731 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
732 715
733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
734 717
735 packet sl; 718 packet sl ("smooth");
736 719
737 sl << "smooth "
738 << uint16 (face) 720 sl << uint16 (face)
739 << uint16 (smoothface); 721 << uint16 (smoothface);
740 722
741 ns->send_packet (sl); 723 ns->send_packet (sl);
742} 724}
743 725
744 /** 726 /**
745 * Tells client the picture it has to use 727 * Tells client the picture it has to use
746 * to smooth a picture number given as argument. 728 * to smooth a picture number given as argument.
747 */ 729 */
748void 730void
749AskSmooth (char *buf, int len, client * ns) 731AskSmooth (char *buf, int len, client *ns)
750{ 732{
751 uint16 facenbr; 733 SendSmooth (ns, atoi (buf));
752
753 facenbr = atoi (buf);
754 SendSmooth (ns, facenbr);
755} 734}
756 735
757/** 736/**
758 * 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,
759 * etc.) 738 * etc.)
760 */ 739 */
761void 740void
762PlayerCmd (char *buf, int len, player *pl) 741PlayerCmd (char *buf, int len, player *pl)
763{ 742{
764
765 /* The following should never happen with a proper or honest client.
766 * Therefore, the error message doesn't have to be too clear - if
767 * someone is playing with a hacked/non working client, this gives them
768 * an idea of the problem, but they deserve what they get
769 */
770 if (pl->state != ST_PLAYING)
771 {
772 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
773 return;
774 }
775 /* 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
776 * sent, so check for that also. 744 * sent, so check for that also.
777 */ 745 */
778 if (atoi (buf) || buf[0] == '0') 746 if (atoi (buf) || buf[0] == '0')
779 { 747 {
780 pl->count = atoi ((char *) buf); 748 pl->count = atoi ((char *) buf);
749
781 buf = strchr (buf, ' '); /* advance beyond the numbers */ 750 buf = strchr (buf, ' '); /* advance beyond the numbers */
782 if (!buf) 751 if (!buf)
783 {
784#ifdef ESRV_DEBUG
785 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
786#endif
787 return; 752 return;
788 } 753
789 buf++; 754 buf++;
790 } 755 }
791 /* This should not happen anymore. */ 756
792 if (pl->ob->speed_left < -1.0)
793 {
794 LOG (llevError, "Player has negative time - shouldn't do command.\n");
795 }
796 /* In c_new.c */
797 execute_newserver_command (pl->ob, (char *) buf); 757 execute_newserver_command (pl->ob, (char *) buf);
758
798 /* Perhaps something better should be done with a left over count. 759 /* Perhaps something better should be done with a left over count.
799 * Cleaning up the input should probably be done first - all actions 760 * Cleaning up the input should probably be done first - all actions
800 * 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
801 * commands. 762 * commands.
802 */ 763 */
803
804 pl->count = 0; 764 pl->count = 0;
805
806} 765}
807 766
808 767
809/** 768/**
810 * 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,
… …
813 * can throttle. 772 * can throttle.
814 */ 773 */
815void 774void
816NewPlayerCmd (char *buf, int len, player *pl) 775NewPlayerCmd (char *buf, int len, player *pl)
817{ 776{
818 int time, repeat;
819 char command[MAX_BUF];
820 int pktlen;
821
822 if (len < 7) 777 if (len <= 6)
823 { 778 {
824 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);
825 return; 780 return;
826 } 781 }
827 782
828 pktlen = net_uint16 ((uint8 *)buf); 783 uint16 cmdid = net_uint16 ((uint8 *)buf);
829 repeat = net_uint32 ((uint8 *)buf + 2); 784 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
830 785
831 /* -1 is special - no repeat, but don't update */ 786 /* -1 is special - no repeat, but don't update */
832 if (repeat != -1) 787 if (repeat != -1)
833 pl->count = repeat; 788 pl->count = repeat;
834 789
835 if ((len - 4) >= MAX_BUF) 790 buf += 6; //len -= 6;
836 len = MAX_BUF - 5;
837 791
838 strncpy ((char *) command, (char *) buf + 6, len - 4);
839 command[len - 4] = 0;
840
841 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0)
843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
844
845 /* In c_new.c */
846 execute_newserver_command (pl->ob, (char *) command); 792 execute_newserver_command (pl->ob, buf);
793
847 /* Perhaps something better should be done with a left over count. 794 /* Perhaps something better should be done with a left over count.
848 * Cleaning up the input should probably be done first - all actions 795 * Cleaning up the input should probably be done first - all actions
849 * 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
850 * commands. 797 * commands.
851 */ 798 */
852 pl->count = 0; 799 pl->count = 0;
853 800
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
854 if (FABS (pl->ob->speed) < 0.001) 802 int time = FABS (pl->ob->speed) < 0.001
855 time = MAX_TIME * 100; 803 ? time = MAX_TIME * 100
856 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 805
859 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
860 807 packet sl ("comc");
861 packet sl;
862 sl << "comc " << uint16 (pktlen) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
863 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
864} 810}
865
866 811
867/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
868void 813void
869ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
870{ 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
871 /* 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
872 * 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
873 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
874 * 831 *
875 * 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
876 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
877 * function then does not try to do additional input. 834 * function then does not try to do additional input.
878 */ 835 */
879 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
880 837
881 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
882 839
883 switch (pl->state) 840 switch (ns->state)
884 { 841 {
885 case ST_PLAYING: 842 case ST_PLAYING:
886 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
887 break; 844 break;
888 845
889 case ST_PLAY_AGAIN:
890 /* We can check this for return value (2==quit). Maybe we
891 * should, and do something appropriate?
892 */
893 receive_play_again (pl->ob, buf[0]);
894 break;
895
896 case ST_ROLL_STAT:
897 key_roll_stat (pl->ob, buf[0]);
898 break;
899
900 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
901
902 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
903 break; 848 break;
904 849
905 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
906 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
907 break; 852 break;
908 853
909 case ST_CONFIGURE:
910 LOG (llevError, "In client input handling, but into configure state\n");
911 pl->state = ST_PLAYING;
912 break;
913
914 case ST_GET_NAME:
915 receive_player_name (pl->ob, 13);
916 break;
917
918 case ST_GET_PASSWORD:
919 case ST_CONFIRM_PASSWORD:
920 receive_player_password (pl->ob, 13);
921 break;
922
923 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
924 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
925 break; 856 break;
926 857
927 default: 858 default:
928 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
929 } 860 }
930} 861}
931 862
932/** 863/**
933 * 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
… …
937 * problem. 868 * problem.
938 */ 869 */
939void 870void
940VersionCmd (char *buf, int len, client * ns) 871VersionCmd (char *buf, int len, client * ns)
941{ 872{
942 char *cp;
943 char version_warning[256];
944
945 if (!buf) 873 if (!buf)
946 { 874 {
947 LOG (llevError, "CS: received corrupted version command\n"); 875 LOG (llevError, "CS: received corrupted version command\n");
948 return; 876 return;
949 } 877 }
950 878
951 ns->cs_version = atoi (buf); 879 ns->cs_version = atoi (buf);
952 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
953 if (VERSION_CS != ns->cs_version) 887 //if (VERSION_CS != ns->cs_version)
954 { 888 // unchecked;
955#ifdef ESRV_DEBUG 889
956 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
957#endif
958 }
959 cp = strchr (buf + 1, ' '); 890 char *cp = strchr (buf + 1, ' ');
960 if (!cp) 891 if (!cp)
961 return; 892 return;
893
962 ns->sc_version = atoi (cp); 894 ns->sc_version = atoi (cp);
895
963 if (VERSION_SC != ns->sc_version) 896 //if (VERSION_SC != ns->sc_version)
964 { 897 // unchecked;
965#ifdef ESRV_DEBUG 898
966 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
967#endif
968 }
969 cp = strchr (cp + 1, ' '); 899 cp = strchr (cp + 1, ' ');
900
970 if (cp) 901 if (cp)
971 { 902 {
972 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
973
974 assign (ns->version, cp + 1); 903 assign (ns->version, cp + 1);
975 904
976 if (ns->sc_version < 1026) 905 if (ns->sc_version < 1026)
977 { 906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
980 ns->send_packet (version_warning);
981 }
982
983 } 908 }
984} 909}
985 910
986/** sound related functions. */ 911/** sound related functions. */
987void 912void
… …
993/** client wants the map resent */ 918/** client wants the map resent */
994 919
995void 920void
996MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
997{ 922{
998
999/* 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
1000 * 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.
1001 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
1002 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
1003 */ 927 */
1004#if 0
1005 /* Okay, this is MAJOR UGLY. but the only way I know how to
1006 * clear the "cache"
1007 */
1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009 draw_client_map (pl->ob);
1010#endif
1011} 928}
1012 929
1013/** 930/**
1014 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
1015 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
1018MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
1019{ 936{
1020 int vals[3], i; 937 int vals[3], i;
1021 938
1022 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
1023 * 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
1024 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
1025 * sscanf? 942 * sscanf?
1026 */ 943 */
1027 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
1028 { 945 {
1029 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
1030 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
1031 { 949 {
1032 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1033 return; 951 return;
1034 } 952 }
953
1035 buf++; 954 buf++;
1036 } 955 }
956
1037 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1038 958
1039/* 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]);*/
1040 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1041} 961}
1042
1043
1044 962
1045/****************************************************************************** 963/******************************************************************************
1046 * 964 *
1047 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1048 * 966 *
… …
1051/** 969/**
1052 * 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
1053 * 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)
1054 */ 972 */
1055void 973void
1056send_query (client * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1057{ 975{
1058 char buf[MAX_BUF];
1059
1060 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1061 ns->send_packet (buf);
1062} 977}
1063 978
1064#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065 Old = New; \ 980 Old = New; \
1066 sl << uint8 (Type) << uint64 (New); \ 981 sl << uint8 (Type) << uint64 (New); \
… …
1096esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1097{ 1012{
1098 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1099 uint16 flags; 1014 uint16 flags;
1100 1015
1101 packet sl; 1016 if (!pl->ns)
1102 sl << "stats "; 1017 return;
1103 1018
1019 packet sl ("stats");
1020
1104 if (pl->ob != NULL) 1021 if (pl->ob)
1105 { 1022 {
1106 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);
1107 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);
1108 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);
1109 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);
1110 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);
1111 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);
1112 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);
1113 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1114 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1115 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1116 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);
1117 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);
1118 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);
1119 } 1036 }
1120 1037
1121 if (pl->socket->exp64)
1122 {
1123 uint8 s;
1124
1125 for (s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1126 {
1127 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)
1128 { 1040 {
1129 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1130 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1131 */ 1043 */
1132 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1133 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1134 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1135 1047
1136 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;
1137 }
1138 } 1049 }
1139 }
1140 1050
1141 if (pl->socket->exp64)
1142 { 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);
1143 else
1144 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1145
1146 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1147 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);
1148 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);
1149 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);
1150 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1159 if (pl->run_on) 1065 if (pl->run_on)
1160 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1161 1067
1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1163 1069
1164 if (pl->socket->sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1165 { 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) }
1166 else 1072 else
1167 {
1168 int i;
1169
1170 for (i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1171 { 1074 {
1172 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1173 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1174 continue; 1077 continue;
1175 1078
1176 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]);
1177 } 1080 }
1178 }
1179 1081
1180 if (pl->socket->monitor_spells) 1082 if (pl->ns->monitor_spells)
1181 { 1083 {
1182 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);
1183 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);
1184 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);
1185 } 1087 }
1186 1088
1187 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 */
1188 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1189 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1190 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1191 1093
1192 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1193 if (sl.length () > 6) 1095 if (sl.length () > 6)
1194 pl->socket->send_packet (sl); 1096 pl->ns->send_packet (sl);
1195} 1097}
1196 1098
1197/** 1099/**
1198 * 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.
1199 */ 1101 */
1200void 1102void
1201esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1202{ 1104{
1203 pl->last_weight = weight; 1105 pl->last_weight = weight;
1204 1106
1205 packet sl; 1107 packet sl ("player");
1206 sl << "player ";
1207 1108
1208 sl << uint32 (pl->ob->count) 1109 sl << uint32 (pl->ob->count)
1209 << uint32 (weight) 1110 << uint32 (weight)
1210 << uint32 (pl->ob->face->number) 1111 << uint32 (pl->ob->face->number)
1211 << data8 (pl->ob->name); 1112 << data8 (pl->ob->name);
1212 1113
1213 pl->socket->send_packet (sl); 1114 pl->ns->send_packet (sl);
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 1116}
1216 1117
1217/** 1118/**
1218 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
… …
1222 * when the player logs in and picks stuff up. 1123 * when the player logs in and picks stuff up.
1223 */ 1124 */
1224void 1125void
1225esrv_send_animation (client * ns, short anim_num) 1126esrv_send_animation (client * ns, short anim_num)
1226{ 1127{
1227 int i;
1228
1229 /* 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
1230 * 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
1231 * range, it must be a valid animation. 1130 * range, it must be a valid animation.
1232 */ 1131 */
1233 if (anim_num < 0 || anim_num > num_animations) 1132 if (anim_num < 0 || anim_num > num_animations)
1234 { 1133 {
1235 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);
1236 return; 1135 return;
1237 } 1136 }
1238 1137
1239 packet sl; 1138 packet sl ("anim");
1240 1139
1241 sl << "anim "
1242 << uint16 (anim_num) 1140 sl << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */ 1141 << uint16 (0); /* flags - not used right now */
1244 1142
1245 /* 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
1246 * the face itself) down to the client. 1144 * the face itself) down to the client.
1247 */ 1145 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++) 1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1249 { 1147 {
1250 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))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1252 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 */
1253 } 1152 }
1254 1153
1255 ns->send_packet (sl); 1154 ns->send_packet (sl);
1256 1155
… …
1271static void 1170static void
1272esrv_map_setbelow (client * 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)
1273{ 1172{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1173 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1174 {
1175 //TODO: one or the other, can't both have abort and return, verify and act
1276 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);
1277 return; 1177 return;
1278 abort (); 1178 abort ();
1279 } 1179 }
1280 1180
1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1181 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1282 newmap->cells[x][y].count++; 1182 newmap->cells[x][y].count++;
1283 1183
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0); 1185 esrv_send_face (ns, face_num, 0);
1286}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393} 1186}
1394 1187
1395/** Clears a map cell */ 1188/** Clears a map cell */
1396static void 1189static void
1397map_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)
… …
1409#define MAX_LAYERS 3 1202#define MAX_LAYERS 3
1410 1203
1411/* 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
1412 * 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,
1413 * 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
1414 * 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
1415 * re-examined. 1208 * re-examined.
1416 */ 1209 */
1417
1418static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1210static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1419 1211
1420/** 1212/**
1421 * Returns true if any of the heads for this 1213 * Returns true if any of the heads for this
1422 * 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
1423 * for empty space checking. 1215 * for empty space checking.
1424 */ 1216 */
1425static inline int 1217static inline int
1426have_head (int ax, int ay) 1218have_head (int ax, int ay)
1427{ 1219{
1428
1429 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1430 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])
1431 return 1; 1222 return 1;
1223
1432 return 0; 1224 return 0;
1433} 1225}
1434 1226
1435/** 1227/**
1436 * check_head is a bit simplistic version of update_space below. 1228 * check_head is a bit simplistic version of update_space below.
1437 * 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
1438 * 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
1439 * 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
1440 * sent, it returns zero. 1232 * sent, it returns zero.
1441 */ 1233 */
1442static int 1234static int
1443check_head (packet &sl, client &ns, int ax, int ay, int layer) 1235check_head (packet &sl, client &ns, int ax, int ay, int layer)
1444{ 1236{
… …
1480 * numbers the spaces differently - I think this was a leftover from 1272 * numbers the spaces differently - I think this was a leftover from
1481 * 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
1482 * 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
1483 * actually match. 1275 * actually match.
1484 */ 1276 */
1485
1486static int 1277static int
1487update_space (packet &sl, client &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)
1488{ 1279{
1489 object *ob, *head; 1280 object *ob, *head;
1490 uint16 face_num; 1281 uint16 face_num;
… …
1715 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1716 1507
1717 /* 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
1718 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1719 */ 1510 */
1720 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face)
1721 smoothlevel = 0; 1512 smoothlevel = 0;
1722 else 1513 else
1723 { 1514 {
1724 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1725 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1758 if (ns->ext_mapinfos) 1549 if (ns->ext_mapinfos)
1759 { 1550 {
1760 if (ns->EMI_smooth) 1551 if (ns->EMI_smooth)
1761 result += 1; /*One byte for smoothlevel */ 1552 result += 1; /*One byte for smoothlevel */
1762 } 1553 }
1554
1763 return result; 1555 return result;
1764} 1556}
1765 1557
1766/** 1558/**
1767 * 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
… …
1774 * 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
1775 * 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,
1776 * 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
1777 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1778 * I will describe internally what we do: 1570 * I will describe internally what we do:
1779 * 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.
1780 * 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
1781 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1782 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1783 * 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
1784 * is not viewable. 1576 * is not viewable.
… …
1795 uint8 eentrysize; 1587 uint8 eentrysize;
1796 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1797 uint8 extendedinfos; 1589 uint8 extendedinfos;
1798 maptile *m; 1590 maptile *m;
1799 1591
1800 client &socket = *pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1801 1593
1802 check_map_change (pl->contr); 1594 check_map_change (pl->contr);
1803 1595
1804 packet sl; 1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1805 packet esl; 1597 packet esl;
1806 1598
1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1808 startlen = sl.length (); 1599 startlen = sl.length ();
1809 1600
1810 /*Extendedmapinfo structure initialisation */ 1601 /*Extendedmapinfo structure initialisation */
1811 if (socket.ext_mapinfos) 1602 if (socket.ext_mapinfos)
1812 { 1603 {
… …
1856 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++)
1857 { 1648 {
1858 ax = 0; 1649 ax = 0;
1859 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++)
1860 { 1651 {
1861
1862 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1863 1653
1864 /* 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
1865 * 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
1866 * the client wants if using the map1a command - this is because 1656 * the client wants if using the map1a command - this is because
… …
2196 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1986 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2197 return; 1987 return;
2198 1988
2199 memset (&newmap, 0, sizeof (struct Map)); 1989 memset (&newmap, 0, sizeof (struct Map));
2200 1990
2201 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++)
2202 {
2203 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++)
2204 { 1993 {
2205 ax = i; 1994 ax = i;
2206 ay = j; 1995 ay = j;
2207 m = pm; 1996 m = pm;
2208 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1997 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1998
2209 if (mflags & P_OUT_OF_MAP) 1999 if (mflags & P_OUT_OF_MAP)
2210 continue; 2000 continue;
2211 if (mflags & P_NEED_UPDATE) 2001
2212 update_position (m, ax, ay);
2213 /* 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
2214 * just to reload it. This should really call something like 2003 * just to reload it. This should really call something like
2215 * swap_map, but this is much more efficient and 'good enough' 2004 * swap_map, but this is much more efficient and 'good enough'
2216 */ 2005 */
2217 if (mflags & P_NEW_MAP) 2006 if (mflags & P_NEW_MAP)
2218 m->timeout = 50; 2007 m->timeout = 50;
2219 } 2008 }
2220 } 2009
2221 /* do LOS after calls to update_position */ 2010 /* do LOS after calls to update_position */
2222 if (pl->contr->do_los) 2011 if (pl->contr->do_los)
2223 { 2012 {
2224 update_los (pl); 2013 update_los (pl);
2225 pl->contr->do_los = 0; 2014 pl->contr->do_los = 0;
… …
2240 2029
2241/*****************************************************************************/ 2030/*****************************************************************************/
2242void 2031void
2243send_plugin_custom_message (object *pl, char *buf) 2032send_plugin_custom_message (object *pl, char *buf)
2244{ 2033{
2245 pl->contr->socket->send_packet (buf); 2034 pl->contr->ns->send_packet (buf);
2246} 2035}
2247 2036
2248/** 2037/**
2249 * This sends the skill number to name mapping. We ignore 2038 * This sends the skill number to name mapping. We ignore
2250 * the params - we always send the same info no matter what. 2039 * the params - we always send the same info no matter what.
… …
2295 * 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
2296 */ 2085 */
2297void 2086void
2298esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2299{ 2088{
2089 if (!pl->ns)
2090 return;
2091
2300 if (!pl->socket->monitor_spells) 2092 if (!pl->ns->monitor_spells)
2301 return; 2093 return;
2302 2094
2303 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2304 { 2096 {
2305 if (spell->type == SPELL) 2097 if (spell->type == SPELL)
… …
2335 2127
2336 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2128 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2337 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2129 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2338 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2130 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2339 2131
2340 pl->socket->send_packet (sl); 2132 pl->ns->send_packet (sl);
2341 } 2133 }
2342 } 2134 }
2343 } 2135 }
2344} 2136}
2345 2137
2346void 2138void
2347esrv_remove_spell (player *pl, object *spell) 2139esrv_remove_spell (player *pl, object *spell)
2348{ 2140{
2349 if (!pl->socket->monitor_spells) 2141 if (!pl->ns->monitor_spells)
2350 return; 2142 return;
2351 2143
2352 if (!pl || !spell || spell->env != pl->ob) 2144 if (!pl || !spell || spell->env != pl->ob)
2353 { 2145 {
2354 LOG (llevError, "Invalid call to esrv_remove_spell"); 2146 LOG (llevError, "Invalid call to esrv_remove_spell");
2355 return; 2147 return;
2356 } 2148 }
2357 2149
2358 packet sl; 2150 packet sl ("delspell");
2359 2151
2360 sl << "delspell "
2361 << uint32 (spell->count); 2152 sl << uint32 (spell->count);
2362 2153
2363 pl->socket->send_packet (sl); 2154 pl->ns->send_packet (sl);
2364} 2155}
2365 2156
2366/* 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. */
2367static void 2158static void
2368append_spell (player *pl, packet &sl, object *spell) 2159append_spell (player *pl, packet &sl, object *spell)
… …
2416 { 2207 {
2417 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");
2418 return; 2209 return;
2419 } 2210 }
2420 2211
2421 if (!pl->socket->monitor_spells) 2212 if (!pl->ns->monitor_spells)
2422 return; 2213 return;
2423 2214
2424 packet sl; 2215 packet sl ("addspell");
2425
2426 sl << "addspell ";
2427 2216
2428 if (!spell) 2217 if (!spell)
2429 { 2218 {
2430 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2219 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2431 { 2220 {
… …
2445 if (spell->type != SPELL) 2234 if (spell->type != SPELL)
2446 continue; 2235 continue;
2447 2236
2448 if (sl.length () >= (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))))
2449 { 2238 {
2450 pl->socket->send_packet (sl); 2239 pl->ns->send_packet (sl);
2451 2240
2452 sl.reset (); 2241 sl.reset ();
2453 sl << "addspell "; 2242 sl << "addspell ";
2454 } 2243 }
2455 2244
… …
2469 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2258 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2470 fatal (0); 2259 fatal (0);
2471 } 2260 }
2472 2261
2473 /* finally, we can send the packet */ 2262 /* finally, we can send the packet */
2474 pl->socket->send_packet (sl); 2263 pl->ns->send_packet (sl);
2475} 2264}
2476 2265

Diff Legend

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