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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.60 by root, Sun Jan 7 02:39:15 2007 UTC

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

Diff Legend

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