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.42 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.58 by root, Thu Jan 4 16:19:32 2007 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 ns->send_packet_printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
… …
141} 138}
142 139
143static void 140static void
144clear_map (player *pl) 141clear_map (player *pl)
145{ 142{
146 client &socket = *pl->socket;
147
148 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149 144
150 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
151 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
152 147
153 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
154 socket.look_position = 0;
155} 149}
156 150
157/** check for map change and send new map data */ 151/** check for map change and send new map data */
158static void 152static void
159check_map_change (player *pl) 153check_map_change (player *pl)
160{ 154{
161 client &socket = *pl->socket; 155 client &socket = *pl->ns;
162 object *ob = pl->ob; 156 object *ob = pl->ob;
163 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
164 158
165 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
166 { 160 {
… …
182 flags |= 4; 176 flags |= 4;
183 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
184 flags |= 8; 178 flags |= 8;
185 179
186 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",
187 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);
188 } 182 }
189 else 183 else
190 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
191 185
192 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201 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
202 else 196 else
203 { 197 {
204 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);
205 socket.update_look = 1; 199 socket.floorbox_reset ();
206 socket.look_position = 0;
207 } 200 }
208 } 201 }
209 202
210 socket.current_x = ob->x; 203 socket.current_x = ob->x;
211 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
260{ 253{
261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262} 255}
263 256
264void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
265MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
266{ 265{
267 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
269 268
… …
281 buf += 8; 280 buf += 8;
282 281
283 // initial map and its origin 282 // initial map and its origin
284 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
285 sint16 dx, dy; 284 sint16 dx, dy;
286 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
287 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
288 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
289 288
290 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
291 { 290 {
292 int dir = *buf++; 291 int dir = *buf++;
293 292
294 switch (dir) 293 switch (dir)
295 { 294 {
296 case '1': 295 case '1':
297 dx = 0; 296 dx = 0;
298 dy = -1; 297 dy = -1;
299 map = get_map_from_coord (map, &dx, &dy); 298 map = map->xy_find (dx, dy);
300 map && (mapy -= map->height); 299 map && (mapy -= map->height);
301 break; 300 break;
302 case '2': 301 case '2':
303 mapx += map->width; 302 mapx += map->width;
304 dx = map->width; 303 dx = map->width;
305 dy = 0; 304 dy = 0;
306 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
307 break; 306 break;
308 case '3': 307 case '3':
309 mapy += map->height; 308 mapy += map->height;
310 dx = 0; 309 dx = 0;
311 dy = map->height; 310 dy = map->height;
312 map = get_map_from_coord (map, &dx, &dy); 311 map = map->xy_find (dx, dy);
313 break; 312 break;
314 case '4': 313 case '4':
315 dx = -1; 314 dx = -1;
316 dy = 0; 315 dy = 0;
317 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
318 map && (mapx -= map->width); 317 map && (mapx -= map->width);
319 break; 318 break;
320 } 319 }
321 320
322 --max_distance; 321 --max_distance;
323 } 322 }
324 323
… …
335 if (map->tile_path[2]) 334 if (map->tile_path[2])
336 flags |= 4; 335 flags |= 4;
337 if (map->tile_path[3]) 336 if (map->tile_path[3])
338 flags |= 8; 337 flags |= 8;
339 338
340 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);
341 } 340 }
342 else 341 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
344 } 343 }
345 else 344 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347 346
348 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
349} 348}
350 349
351/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
352void 351void
353SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
400 { 399 {
401 ns->sound = atoi (param); 400 ns->sound = atoi (param);
402 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
403 } 402 }
404 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
405 {
406 ns->exp64 = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
410 { 406 {
411 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 } 409 }
… …
570 * 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.
571 */ 567 */
572void 568void
573AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
574{ 570{
575 Settings oldsettings; 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
576
577 oldsettings = settings;
578 if (ns->status != Ns_Add || add_player (ns))
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582
583 settings = oldsettings;
584} 572}
585 573
586/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
587void 575void
588ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
705 * 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
706 * 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
707 * client. 695 * client.
708 */ 696 */
709static void 697static void
710SendSmooth (client * ns, uint16 face) 698SendSmooth (client *ns, uint16 face)
711{ 699{
712 uint16 smoothface; 700 uint16 smoothface;
713 701
714 /* 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
715 * again. 703 * again.
… …
725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
726 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
727 715
728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729 717
730 packet sl; 718 packet sl ("smooth");
731 719
732 sl << "smooth "
733 << uint16 (face) 720 sl << uint16 (face)
734 << uint16 (smoothface); 721 << uint16 (smoothface);
735 722
736 ns->send_packet (sl); 723 ns->send_packet (sl);
737} 724}
738 725
739 /** 726 /**
740 * Tells client the picture it has to use 727 * Tells client the picture it has to use
741 * to smooth a picture number given as argument. 728 * to smooth a picture number given as argument.
742 */ 729 */
743void 730void
744AskSmooth (char *buf, int len, client * ns) 731AskSmooth (char *buf, int len, client *ns)
745{ 732{
746 uint16 facenbr; 733 SendSmooth (ns, atoi (buf));
747
748 facenbr = atoi (buf);
749 SendSmooth (ns, facenbr);
750} 734}
751 735
752/** 736/**
753 * 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,
754 * etc.) 738 * etc.)
755 */ 739 */
756void 740void
757PlayerCmd (char *buf, int len, player *pl) 741PlayerCmd (char *buf, int len, player *pl)
758{ 742{
759
760 /* The following should never happen with a proper or honest client.
761 * Therefore, the error message doesn't have to be too clear - if
762 * someone is playing with a hacked/non working client, this gives them
763 * an idea of the problem, but they deserve what they get
764 */
765 if (pl->state != ST_PLAYING)
766 {
767 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
768 return;
769 }
770 /* 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
771 * sent, so check for that also. 744 * sent, so check for that also.
772 */ 745 */
773 if (atoi (buf) || buf[0] == '0') 746 if (atoi (buf) || buf[0] == '0')
774 { 747 {
775 pl->count = atoi ((char *) buf); 748 pl->count = atoi ((char *) buf);
749
776 buf = strchr (buf, ' '); /* advance beyond the numbers */ 750 buf = strchr (buf, ' '); /* advance beyond the numbers */
777 if (!buf) 751 if (!buf)
778 {
779#ifdef ESRV_DEBUG
780 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
781#endif
782 return; 752 return;
783 } 753
784 buf++; 754 buf++;
785 } 755 }
786 /* This should not happen anymore. */ 756
787 if (pl->ob->speed_left < -1.0)
788 {
789 LOG (llevError, "Player has negative time - shouldn't do command.\n");
790 }
791 /* In c_new.c */
792 execute_newserver_command (pl->ob, (char *) buf); 757 execute_newserver_command (pl->ob, (char *) buf);
758
793 /* Perhaps something better should be done with a left over count. 759 /* Perhaps something better should be done with a left over count.
794 * Cleaning up the input should probably be done first - all actions 760 * Cleaning up the input should probably be done first - all actions
795 * 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
796 * commands. 762 * commands.
797 */ 763 */
798
799 pl->count = 0; 764 pl->count = 0;
800
801} 765}
802 766
803 767
804/** 768/**
805 * 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,
… …
808 * can throttle. 772 * can throttle.
809 */ 773 */
810void 774void
811NewPlayerCmd (char *buf, int len, player *pl) 775NewPlayerCmd (char *buf, int len, player *pl)
812{ 776{
813 int time, repeat;
814 char command[MAX_BUF];
815 int pktlen;
816
817 if (len < 7) 777 if (len <= 6)
818 { 778 {
819 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);
820 return; 780 return;
821 } 781 }
822 782
823 pktlen = net_uint16 ((uint8 *)buf); 783 uint16 cmdid = net_uint16 ((uint8 *)buf);
824 repeat = net_uint32 ((uint8 *)buf + 2); 784 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
825 785
826 /* -1 is special - no repeat, but don't update */ 786 /* -1 is special - no repeat, but don't update */
827 if (repeat != -1) 787 if (repeat != -1)
828 pl->count = repeat; 788 pl->count = repeat;
829 789
830 if ((len - 4) >= MAX_BUF) 790 buf += 6; //len -= 6;
831 len = MAX_BUF - 5;
832 791
833 strncpy ((char *) command, (char *) buf + 6, len - 4);
834 command[len - 4] = 0;
835
836 /* This should not happen anymore. */
837 if (pl->ob->speed_left < -1.0)
838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839
840 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command); 792 execute_newserver_command (pl->ob, buf);
793
842 /* Perhaps something better should be done with a left over count. 794 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 795 * Cleaning up the input should probably be done first - all actions
844 * 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
845 * commands. 797 * commands.
846 */ 798 */
847 pl->count = 0; 799 pl->count = 0;
848 800
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
849 if (FABS (pl->ob->speed) < 0.001) 802 int time = FABS (pl->ob->speed) < 0.001
850 time = MAX_TIME * 100; 803 ? time = MAX_TIME * 100
851 else
852 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
853 805
854 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
855 807 packet sl ("comc");
856 packet sl;
857 sl << "comc " << uint16 (pktlen) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
858 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
859} 810}
860
861 811
862/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
863void 813void
864ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
865{ 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
866 /* 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
867 * 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
868 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
869 * 831 *
870 * 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
871 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
872 * function then does not try to do additional input. 834 * function then does not try to do additional input.
873 */ 835 */
874 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
875 837
876 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
877 839
878 switch (pl->state) 840 switch (ns->state)
879 { 841 {
880 case ST_PLAYING: 842 case ST_PLAYING:
881 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
882 break; 844 break;
883 845
884 case ST_PLAY_AGAIN:
885 /* We can check this for return value (2==quit). Maybe we
886 * should, and do something appropriate?
887 */
888 receive_play_again (pl->ob, buf[0]);
889 break;
890
891 case ST_ROLL_STAT:
892 key_roll_stat (pl->ob, buf[0]);
893 break;
894
895 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
896
897 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
898 break; 848 break;
899 849
900 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
901 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
902 break; 852 break;
903 853
904 case ST_CONFIGURE:
905 LOG (llevError, "In client input handling, but into configure state\n");
906 pl->state = ST_PLAYING;
907 break;
908
909 case ST_GET_NAME:
910 receive_player_name (pl->ob, 13);
911 break;
912
913 case ST_GET_PASSWORD:
914 case ST_CONFIRM_PASSWORD:
915 receive_player_password (pl->ob, 13);
916 break;
917
918 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
919 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
920 break; 856 break;
921 857
922 default: 858 default:
923 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
924 } 860 }
925} 861}
926 862
927/** 863/**
928 * 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
… …
932 * problem. 868 * problem.
933 */ 869 */
934void 870void
935VersionCmd (char *buf, int len, client * ns) 871VersionCmd (char *buf, int len, client * ns)
936{ 872{
937 char *cp;
938 char version_warning[256];
939
940 if (!buf) 873 if (!buf)
941 { 874 {
942 LOG (llevError, "CS: received corrupted version command\n"); 875 LOG (llevError, "CS: received corrupted version command\n");
943 return; 876 return;
944 } 877 }
945 878
946 ns->cs_version = atoi (buf); 879 ns->cs_version = atoi (buf);
947 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
948 if (VERSION_CS != ns->cs_version) 887 //if (VERSION_CS != ns->cs_version)
949 { 888 // unchecked;
950#ifdef ESRV_DEBUG 889
951 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
952#endif
953 }
954 cp = strchr (buf + 1, ' '); 890 char *cp = strchr (buf + 1, ' ');
955 if (!cp) 891 if (!cp)
956 return; 892 return;
893
957 ns->sc_version = atoi (cp); 894 ns->sc_version = atoi (cp);
895
958 if (VERSION_SC != ns->sc_version) 896 //if (VERSION_SC != ns->sc_version)
959 { 897 // unchecked;
960#ifdef ESRV_DEBUG 898
961 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
962#endif
963 }
964 cp = strchr (cp + 1, ' '); 899 cp = strchr (cp + 1, ' ');
900
965 if (cp) 901 if (cp)
966 { 902 {
967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
968
969 assign (ns->version, cp + 1); 903 assign (ns->version, cp + 1);
970 904
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. */
982void 912void
… …
984{ 914{
985 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
986} 916}
987 917
988/** client wants the map resent */ 918/** client wants the map resent */
989
990void 919void
991MapRedrawCmd (char *buf, int len, player *pl) 920MapRedrawCmd (char *buf, int len, player *pl)
992{ 921{
993
994/* This function is currently disabled; just clearing the map state results in 922/* This function is currently disabled; just clearing the map state results in
995 * display errors. It should clear the cache and send a newmap command. 923 * display errors. It should clear the cache and send a newmap command.
996 * Unfortunately this solution does not work because some client versions send 924 * Unfortunately this solution does not work because some client versions send
997 * a mapredraw command after receiving a newmap command. 925 * a mapredraw command after receiving a newmap command.
998 */ 926 */
999#if 0
1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
1001 * clear the "cache"
1002 */
1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1004 draw_client_map (pl->ob);
1005#endif
1006} 927}
1007 928
1008/** 929/**
1009 * Moves an object (typically, container to inventory). 930 * Moves an object (typically, container to inventory).
1010 * syntax is: move (to) (tag) (nrof) 931 * syntax is: move (to) (tag) (nrof)
… …
1013MoveCmd (char *buf, int len, player *pl) 934MoveCmd (char *buf, int len, player *pl)
1014{ 935{
1015 int vals[3], i; 936 int vals[3], i;
1016 937
1017 /* A little funky here. We only cycle for 2 records, because 938 /* A little funky here. We only cycle for 2 records, because
1018 * we obviously am not going to find a space after the third 939 * we obviously are not going to find a space after the third
1019 * record. Perhaps we should just replace this with a 940 * record. Perhaps we should just replace this with a
1020 * sscanf? 941 * sscanf?
1021 */ 942 */
1022 for (i = 0; i < 2; i++) 943 for (i = 0; i < 2; i++)
1023 { 944 {
1024 vals[i] = atoi (buf); 945 vals[i] = atoi (buf);
946
1025 if (!(buf = strchr (buf, ' '))) 947 if (!(buf = strchr (buf, ' ')))
1026 { 948 {
1027 LOG (llevError, "Incomplete move command: %s\n", buf); 949 LOG (llevError, "Incomplete move command: %s\n", buf);
1028 return; 950 return;
1029 } 951 }
952
1030 buf++; 953 buf++;
1031 } 954 }
955
1032 vals[2] = atoi (buf); 956 vals[2] = atoi (buf);
1033 957
1034/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 958/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1035 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 959 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1036} 960}
1037
1038
1039 961
1040/****************************************************************************** 962/******************************************************************************
1041 * 963 *
1042 * Start of commands the server sends to the client. 964 * Start of commands the server sends to the client.
1043 * 965 *
… …
1046/** 968/**
1047 * Asks the client to query the user. This way, the client knows 969 * Asks the client to query the user. This way, the client knows
1048 * it needs to send something back (vs just printing out a message) 970 * it needs to send something back (vs just printing out a message)
1049 */ 971 */
1050void 972void
1051send_query (client * ns, uint8 flags, char *text) 973send_query (client *ns, uint8 flags, char *text)
1052{ 974{
1053 char buf[MAX_BUF];
1054
1055 sprintf (buf, "query %d %s", flags, text ? text : ""); 975 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1056 ns->send_packet (buf);
1057} 976}
1058 977
1059#define AddIfInt64(Old,New,Type) if (Old != New) {\ 978#define AddIfInt64(Old,New,Type) if (Old != New) {\
1060 Old = New; \ 979 Old = New; \
1061 sl << uint8 (Type) << uint64 (New); \ 980 sl << uint8 (Type) << uint64 (New); \
… …
1091esrv_update_stats (player *pl) 1010esrv_update_stats (player *pl)
1092{ 1011{
1093 char buf[MAX_BUF]; 1012 char buf[MAX_BUF];
1094 uint16 flags; 1013 uint16 flags;
1095 1014
1096 packet sl; 1015 if (!pl->ns)
1097 sl << "stats "; 1016 return;
1098 1017
1018 packet sl ("stats");
1019
1099 if (pl->ob != NULL) 1020 if (pl->ob)
1100 { 1021 {
1101 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1102 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1103 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1104 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1105 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1106 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1107 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1108 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1109 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1110 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1111 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1112 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1114 } 1035 }
1115 1036
1116 if (pl->socket->exp64)
1117 {
1118 uint8 s;
1119
1120 for (s = 0; s < NUM_SKILLS; s++) 1037 for (int s = 0; s < NUM_SKILLS; s++)
1121 {
1122 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1123 { 1039 {
1124 /* Always send along the level if exp changes. This is only 1040 /* Always send along the level if exp changes. This is only
1125 * 1 extra byte, but keeps processing simpler. 1041 * 1 extra byte, but keeps processing simpler.
1126 */ 1042 */
1127 sl << uint8 (s + CS_STAT_SKILLINFO) 1043 sl << uint8 (s + CS_STAT_SKILLINFO)
1128 << uint8 (pl->last_skill_ob[s]->level) 1044 << uint8 (pl->last_skill_ob[s]->level)
1129 << uint64 (pl->last_skill_ob[s]->stats.exp); 1045 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130 1046
1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1132 }
1133 } 1048 }
1134 }
1135 1049
1136 if (pl->socket->exp64)
1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1138 else
1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1140
1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1142 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1143 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1144 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1145 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1154 if (pl->run_on) 1064 if (pl->run_on)
1155 flags |= SF_RUNON; 1065 flags |= SF_RUNON;
1156 1066
1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158 1068
1159 if (pl->socket->sc_version < 1025) 1069 if (pl->ns->sc_version < 1025)
1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1161 else 1071 else
1162 {
1163 int i;
1164
1165 for (i = 0; i < NROFATTACKS; i++) 1072 for (int i = 0; i < NROFATTACKS; i++)
1166 { 1073 {
1167 /* Skip ones we won't send */ 1074 /* Skip ones we won't send */
1168 if (atnr_cs_stat[i] == -1) 1075 if (atnr_cs_stat[i] == -1)
1169 continue; 1076 continue;
1170 1077
1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1172 } 1079 }
1173 }
1174 1080
1175 if (pl->socket->monitor_spells) 1081 if (pl->ns->monitor_spells)
1176 { 1082 {
1177 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1178 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1180 } 1086 }
1181 1087
1182 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1184 set_title (pl->ob, buf); 1090 set_title (pl->ob, buf);
1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1186 1092
1187 /* Only send it away if we have some actual data */ 1093 /* Only send it away if we have some actual data */
1188 if (sl.length () > 6) 1094 if (sl.length () > 6)
1189 pl->socket->send_packet (sl); 1095 pl->ns->send_packet (sl);
1190} 1096}
1191 1097
1192/** 1098/**
1193 * Tells the client that here is a player it should start using. 1099 * Tells the client that here is a player it should start using.
1194 */ 1100 */
1195void 1101void
1196esrv_new_player (player *pl, uint32 weight) 1102esrv_new_player (player *pl, uint32 weight)
1197{ 1103{
1198 pl->last_weight = weight; 1104 pl->last_weight = weight;
1199 1105
1200 packet sl; 1106 packet sl ("player");
1201 sl << "player ";
1202 1107
1203 sl << uint32 (pl->ob->count) 1108 sl << uint32 (pl->ob->count)
1204 << uint32 (weight) 1109 << uint32 (weight)
1205 << uint32 (pl->ob->face->number) 1110 << uint32 (pl->ob->face->number)
1206 << data8 (pl->ob->name); 1111 << data8 (pl->ob->name);
1207 1112
1208 pl->socket->send_packet (sl); 1113 pl->ns->send_packet (sl);
1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1210} 1115}
1211 1116
1212/** 1117/**
1213 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
… …
1217 * when the player logs in and picks stuff up. 1122 * when the player logs in and picks stuff up.
1218 */ 1123 */
1219void 1124void
1220esrv_send_animation (client * ns, short anim_num) 1125esrv_send_animation (client * ns, short anim_num)
1221{ 1126{
1222 int i;
1223
1224 /* Do some checking on the anim_num we got. Note that the animations 1127 /* Do some checking on the anim_num we got. Note that the animations
1225 * are added in contigous order, so if the number is in the valid 1128 * are added in contigous order, so if the number is in the valid
1226 * range, it must be a valid animation. 1129 * range, it must be a valid animation.
1227 */ 1130 */
1228 if (anim_num < 0 || anim_num > num_animations) 1131 if (anim_num < 0 || anim_num > num_animations)
1229 { 1132 {
1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1231 return; 1134 return;
1232 } 1135 }
1233 1136
1234 packet sl; 1137 packet sl ("anim");
1235 1138
1236 sl << "anim "
1237 << uint16 (anim_num) 1139 sl << uint16 (anim_num)
1238 << uint16 (0); /* flags - not used right now */ 1140 << uint16 (0); /* flags - not used right now */
1239 1141
1240 /* Build up the list of faces. Also, send any information (ie, the 1142 /* Build up the list of faces. Also, send any information (ie, the
1241 * the face itself) down to the client. 1143 * the face itself) down to the client.
1242 */ 1144 */
1243 for (i = 0; i < animations[anim_num].num_animations; i++) 1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1244 { 1146 {
1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1246 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1248 } 1151 }
1249 1152
1250 ns->send_packet (sl); 1153 ns->send_packet (sl);
1251 1154
… …
1266static void 1169static void
1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) 1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1268{ 1171{
1269 if (newmap->cells[x][y].count >= MAP_LAYERS) 1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1270 { 1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1272 return; 1176 return;
1273 abort (); 1177 abort ();
1274 } 1178 }
1275 1179
1276 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1277 newmap->cells[x][y].count++; 1181 newmap->cells[x][y].count++;
1278 1182
1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1280 esrv_send_face (ns, face_num, 0); 1184 esrv_send_face (ns, face_num, 0);
1281}
1282
1283struct LayerCell
1284{
1285 uint16 xy;
1286 short face;
1287};
1288
1289struct MapLayer
1290{
1291 int count;
1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1293};
1294
1295/** Checkes if map cells have changed */
1296static int
1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1298{
1299 int k;
1300
1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1302 return 1;
1303 for (k = 0; k < newmap->cells[i][j].count; k++)
1304 {
1305 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1306 {
1307 return 1;
1308 }
1309 }
1310 return 0;
1311}
1312
1313/**
1314 * Basically, what this does is pack the data into layers.
1315 * cnum is the client number, cur is the the buffer we put all of
1316 * this data into. we return the end of the data. layers is
1317 * how many layers of data we should back.
1318 */
1319static uint8 *
1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1321{
1322 int x, y, k;
1323 int face;
1324 unsigned char *fcur;
1325 struct MapLayer layers[MAP_LAYERS];
1326
1327 for (k = 0; k < MAP_LAYERS; k++)
1328 layers[k].count = 0;
1329 fcur = cur;
1330 for (x = 0; x < ns->mapx; x++)
1331 {
1332 for (y = 0; y < ns->mapy; y++)
1333 {
1334 if (!mapcellchanged (ns, x, y, newmap))
1335 continue;
1336 if (newmap->cells[x][y].count == 0)
1337 {
1338 *cur = x * ns->mapy + y; /* mark empty space */
1339 cur++;
1340 continue;
1341 }
1342 for (k = 0; k < newmap->cells[x][y].count; k++)
1343 {
1344 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1345 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1346 layers[k].count++;
1347 }
1348 }
1349 }
1350 /* If no data, return now. */
1351 if (fcur == cur && layers[0].count == 0)
1352 return cur;
1353 *cur = 255; /* mark end of explicitly cleared cells */
1354 cur++;
1355 /* First pack by layers. */
1356 for (k = 0; k < numlayers; k++)
1357 {
1358 if (layers[k].count == 0)
1359 break; /* once a layer is entirely empty, no layer below it can
1360 have anything in it either */
1361 /* Pack by entries in thie layer */
1362 for (x = 0; x < layers[k].count;)
1363 {
1364 fcur = cur;
1365 *cur = layers[k].lcells[x].face >> 8;
1366 cur++;
1367 *cur = layers[k].lcells[x].face & 0xFF;
1368 cur++;
1369 face = layers[k].lcells[x].face;
1370 /* Now, we back the redundant data into 1 byte xy pairings */
1371 for (y = x; y < layers[k].count; y++)
1372 {
1373 if (layers[k].lcells[y].face == face)
1374 {
1375 *cur = (uint8) layers[k].lcells[y].xy;
1376 cur++;
1377 layers[k].lcells[y].face = -1;
1378 }
1379 }
1380 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1381 /* forward over the now redundant data */
1382 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1383 x++;
1384 }
1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1386 }
1387 return cur;
1388} 1185}
1389 1186
1390/** Clears a map cell */ 1187/** Clears a map cell */
1391static void 1188static void
1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1404#define MAX_LAYERS 3 1201#define MAX_LAYERS 3
1405 1202
1406/* Using a global really isn't a good approach, but saves the over head of 1203/* Using a global really isn't a good approach, but saves the over head of
1407 * allocating and deallocating such a block of data each time run through, 1204 * allocating and deallocating such a block of data each time run through,
1408 * and saves the space of allocating this in the socket object when we only 1205 * and saves the space of allocating this in the socket object when we only
1409 * need it for this cycle. If the serve is ever threaded, this needs to be 1206 * need it for this cycle. If the server is ever threaded, this needs to be
1410 * re-examined. 1207 * re-examined.
1411 */ 1208 */
1412
1413static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1414 1210
1415/** 1211/**
1416 * Returns true if any of the heads for this 1212 * Returns true if any of the heads for this
1417 * space is set. Returns false if all are blank - this is used 1213 * space is set. Returns false if all are blank - this is used
1418 * for empty space checking. 1214 * for empty space checking.
1419 */ 1215 */
1420static inline int 1216static inline int
1421have_head (int ax, int ay) 1217have_head (int ax, int ay)
1422{ 1218{
1423
1424 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1425 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1426 return 1; 1221 return 1;
1222
1427 return 0; 1223 return 0;
1428} 1224}
1429 1225
1430/** 1226/**
1431 * check_head is a bit simplistic version of update_space below. 1227 * check_head is a bit simplistic version of update_space below.
1432 * basically, it only checks the that the head on space ax,ay at layer 1228 * basically, it only checks the that the head on space ax,ay at layer
1433 * needs to get sent - if so, it adds the data, sending the head 1229 * needs to get sent - if so, it adds the data, sending the head
1434 * if needed, and returning 1. If this no data needs to get 1230 * if needed, and returning 1. If this no data needs to get
1435 * sent, it returns zero. 1231 * sent, it returns zero.
1436 */ 1232 */
1437static int 1233static int
1438check_head (packet &sl, client &ns, int ax, int ay, int layer) 1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1439{ 1235{
… …
1475 * numbers the spaces differently - I think this was a leftover from 1271 * numbers the spaces differently - I think this was a leftover from
1476 * the map command, where the faces stack up. Sinces that is no longer 1272 * the map command, where the faces stack up. Sinces that is no longer
1477 * the case, it seems to make more sense to have these layer values 1273 * the case, it seems to make more sense to have these layer values
1478 * actually match. 1274 * actually match.
1479 */ 1275 */
1480
1481static int 1276static int
1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{ 1278{
1484 object *ob, *head; 1279 object *ob, *head;
1485 uint16 face_num; 1280 uint16 face_num;
… …
1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1711 1506
1712 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1713 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1714 */ 1509 */
1715 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1716 smoothlevel = 0; 1511 smoothlevel = 0;
1717 else 1512 else
1718 { 1513 {
1719 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1720 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1753 if (ns->ext_mapinfos) 1548 if (ns->ext_mapinfos)
1754 { 1549 {
1755 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1756 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1757 } 1552 }
1553
1758 return result; 1554 return result;
1759} 1555}
1760 1556
1761/** 1557/**
1762 * This function uses the new map1 protocol command to send the map 1558 * This function uses the new map1 protocol command to send the map
… …
1769 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1565 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1770 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1566 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1771 * and use the other 4 bits for other informatiion. For full documentation 1567 * and use the other 4 bits for other informatiion. For full documentation
1772 * of what we send, see the doc/Protocol file. 1568 * of what we send, see the doc/Protocol file.
1773 * I will describe internally what we do: 1569 * I will describe internally what we do:
1774 * the socket->lastmap shows how the map last looked when sent to the client. 1570 * the ns->lastmap shows how the map last looked when sent to the client.
1775 * in the lastmap structure, there is a cells array, which is set to the 1571 * in the lastmap structure, there is a cells array, which is set to the
1776 * maximum viewable size (As set in config.h). 1572 * maximum viewable size (As set in config.h).
1777 * in the cells, there are faces and a count value. 1573 * in the cells, there are faces and a count value.
1778 * we use the count value to hold the darkness value. If -1, then this space 1574 * we use the count value to hold the darkness value. If -1, then this space
1779 * is not viewable. 1575 * is not viewable.
… …
1790 uint8 eentrysize; 1586 uint8 eentrysize;
1791 uint16 ewhatstart, ewhatflag; 1587 uint16 ewhatstart, ewhatflag;
1792 uint8 extendedinfos; 1588 uint8 extendedinfos;
1793 maptile *m; 1589 maptile *m;
1794 1590
1795 client &socket = *pl->contr->socket; 1591 client &socket = *pl->contr->ns;
1592
1593 if (!pl->active ())
1594 return;
1796 1595
1797 check_map_change (pl->contr); 1596 check_map_change (pl->contr);
1798 1597
1799 packet sl; 1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1800 packet esl; 1599 packet esl;
1801 1600
1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1803 startlen = sl.length (); 1601 startlen = sl.length ();
1804 1602
1805 /*Extendedmapinfo structure initialisation */ 1603 /*Extendedmapinfo structure initialisation */
1806 if (socket.ext_mapinfos) 1604 if (socket.ext_mapinfos)
1807 { 1605 {
… …
1851 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1649 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1852 { 1650 {
1853 ax = 0; 1651 ax = 0;
1854 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1652 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1855 { 1653 {
1856
1857 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1654 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1858 1655
1859 /* If this space is out of the normal viewable area, we only check 1656 /* If this space is out of the normal viewable area, we only check
1860 * the heads value ax or ay will only be greater than what 1657 * the heads value ax or ay will only be greater than what
1861 * the client wants if using the map1a command - this is because 1658 * the client wants if using the map1a command - this is because
… …
1923 map_clearcell (&lastcell, 0, 0, 0, -1); 1720 map_clearcell (&lastcell, 0, 0, 0, -1);
1924 } 1721 }
1925 } 1722 }
1926 else if (d > 3) 1723 else if (d > 3)
1927 { 1724 {
1725 m->touch ();
1726
1928 int need_send = 0, count; 1727 int need_send = 0, count;
1929 1728
1930 /* This block deals with spaces that are not visible for whatever 1729 /* This block deals with spaces that are not visible for whatever
1931 * reason. Still may need to send the head for this space. 1730 * reason. Still may need to send the head for this space.
1932 */ 1731 */
… …
1965 else 1764 else
1966 sl.reset (oldlen); 1765 sl.reset (oldlen);
1967 } 1766 }
1968 else 1767 else
1969 { 1768 {
1769 m->touch ();
1770
1970 /* In this block, the space is visible or there are head objects 1771 /* In this block, the space is visible or there are head objects
1971 * we need to send. 1772 * we need to send.
1972 */ 1773 */
1973 1774
1974 /* Rather than try to figure out what everything that we might 1775 /* Rather than try to figure out what everything that we might
… …
2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1992 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2192 return; 1993 return;
2193 1994
2194 memset (&newmap, 0, sizeof (struct Map)); 1995 memset (&newmap, 0, sizeof (struct Map));
2195 1996
2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1997 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2197 {
2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1998 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2199 { 1999 {
2200 ax = i; 2000 ax = i;
2201 ay = j; 2001 ay = j;
2202 m = pm; 2002 m = pm;
2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2003 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2004
2204 if (mflags & P_OUT_OF_MAP) 2005 if (mflags & P_OUT_OF_MAP)
2205 continue; 2006 continue;
2206 if (mflags & P_NEED_UPDATE) 2007
2207 update_position (m, ax, ay);
2208 /* If a map is visible to the player, we don't want to swap it out 2008 /* If a map is visible to the player, we don't want to swap it out
2209 * just to reload it. This should really call something like 2009 * just to reload it. This should really call something like
2210 * swap_map, but this is much more efficient and 'good enough' 2010 * swap_map, but this is much more efficient and 'good enough'
2211 */ 2011 */
2212 if (mflags & P_NEW_MAP) 2012 if (mflags & P_NEW_MAP)
2213 m->timeout = 50; 2013 m->timeout = 50;
2214 } 2014 }
2215 } 2015
2216 /* do LOS after calls to update_position */ 2016 /* do LOS after calls to update_position */
2217 if (pl->contr->do_los) 2017 if (pl->contr->do_los)
2218 { 2018 {
2219 update_los (pl); 2019 update_los (pl);
2220 pl->contr->do_los = 0; 2020 pl->contr->do_los = 0;
… …
2235 2035
2236/*****************************************************************************/ 2036/*****************************************************************************/
2237void 2037void
2238send_plugin_custom_message (object *pl, char *buf) 2038send_plugin_custom_message (object *pl, char *buf)
2239{ 2039{
2240 pl->contr->socket->send_packet (buf); 2040 pl->contr->ns->send_packet (buf);
2241} 2041}
2242 2042
2243/** 2043/**
2244 * This sends the skill number to name mapping. We ignore 2044 * This sends the skill number to name mapping. We ignore
2245 * the params - we always send the same info no matter what. 2045 * the params - we always send the same info no matter what.
… …
2290 * it then sends an updspell packet for each spell that has changed in this way 2090 * it then sends an updspell packet for each spell that has changed in this way
2291 */ 2091 */
2292void 2092void
2293esrv_update_spells (player *pl) 2093esrv_update_spells (player *pl)
2294{ 2094{
2095 if (!pl->ns)
2096 return;
2097
2295 if (!pl->socket->monitor_spells) 2098 if (!pl->ns->monitor_spells)
2296 return; 2099 return;
2297 2100
2298 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2101 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2299 { 2102 {
2300 if (spell->type == SPELL) 2103 if (spell->type == SPELL)
… …
2330 2133
2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2134 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2135 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2136 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2334 2137
2335 pl->socket->send_packet (sl); 2138 pl->ns->send_packet (sl);
2336 } 2139 }
2337 } 2140 }
2338 } 2141 }
2339} 2142}
2340 2143
2341void 2144void
2342esrv_remove_spell (player *pl, object *spell) 2145esrv_remove_spell (player *pl, object *spell)
2343{ 2146{
2344 if (!pl->socket->monitor_spells) 2147 if (!pl->ns->monitor_spells)
2345 return; 2148 return;
2346 2149
2347 if (!pl || !spell || spell->env != pl->ob) 2150 if (!pl || !spell || spell->env != pl->ob)
2348 { 2151 {
2349 LOG (llevError, "Invalid call to esrv_remove_spell"); 2152 LOG (llevError, "Invalid call to esrv_remove_spell");
2350 return; 2153 return;
2351 } 2154 }
2352 2155
2353 packet sl; 2156 packet sl ("delspell");
2354 2157
2355 sl << "delspell "
2356 << uint32 (spell->count); 2158 sl << uint32 (spell->count);
2357 2159
2358 pl->socket->send_packet (sl); 2160 pl->ns->send_packet (sl);
2359} 2161}
2360 2162
2361/* appends the spell *spell to the Socklist we will send the data to. */ 2163/* appends the spell *spell to the Socklist we will send the data to. */
2362static void 2164static void
2363append_spell (player *pl, packet &sl, object *spell) 2165append_spell (player *pl, packet &sl, object *spell)
… …
2411 { 2213 {
2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2214 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2413 return; 2215 return;
2414 } 2216 }
2415 2217
2416 if (!pl->socket->monitor_spells) 2218 if (!pl->ns->monitor_spells)
2417 return; 2219 return;
2418 2220
2419 packet sl; 2221 packet sl ("addspell");
2420
2421 sl << "addspell ";
2422 2222
2423 if (!spell) 2223 if (!spell)
2424 { 2224 {
2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2426 { 2226 {
… …
2440 if (spell->type != SPELL) 2240 if (spell->type != SPELL)
2441 continue; 2241 continue;
2442 2242
2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2243 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2444 { 2244 {
2445 pl->socket->send_packet (sl); 2245 pl->ns->send_packet (sl);
2446 2246
2447 sl.reset (); 2247 sl.reset ();
2448 sl << "addspell "; 2248 sl << "addspell ";
2449 } 2249 }
2450 2250
… …
2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2264 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2465 fatal (0); 2265 fatal (0);
2466 } 2266 }
2467 2267
2468 /* finally, we can send the packet */ 2268 /* finally, we can send the packet */
2469 pl->socket->send_packet (sl); 2269 pl->ns->send_packet (sl);
2470} 2270}
2471 2271

Diff Legend

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