[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.37 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC

…		…
38	* esrv_map_new starts updating the map	38	* esrv_map_new starts updating the map
39	*	39	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.	40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.	41	* if a face has not already been sent to the client, it is sent now.
42	*	42	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	43	*/
47		44
48	#include <global.h>	45	#include <global.h>
49	#include <sproto.h>	46	#include <sproto.h>
50		47
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	48	#include <living.h>
54	#include <commands.h>	49	#include <commands.h>
55		50
56	/* This block is basically taken from socket.c - I assume if it works there,	51	/* This block is basically taken from socket.c - I assume if it works there,
57	* it should work here.	52	* it should work here.
…		…
60	#include <sys/time.h>	55	#include <sys/time.h>
61	#include <sys/socket.h>	56	#include <sys/socket.h>
62	#include <netinet/in.h>	57	#include <netinet/in.h>
63	#include <netdb.h>	58	#include <netdb.h>
64		59
65	#ifdef HAVE_UNISTD_H
66	# include <unistd.h>	60	#include <unistd.h>
67	#endif
68
69	#ifdef HAVE_SYS_TIME_H
70	# include <sys/time.h>	61	#include <sys/time.h>
71	#endif
72		62
73	#include "sounds.h"	63	#include "sounds.h"
74		64
75	/**	65	/**
76	* This table translates the attack numbers as used within the	66	* This table translates the attack numbers as used within the
…		…
93	-1, /* life stealing */	83	-1, /* life stealing */
94	-1 /* Disease - not fully done yet */	84	-1 /* Disease - not fully done yet */
95	};	85	};
96		86
97	static void	87	static void
98	socket_map_scroll (client_socket * ns, int dx, int dy)	88	socket_map_scroll (client *ns, int dx, int dy)
99	{	89	{
100	struct Map newmap;	90	struct Map newmap;
101	int x, y, mx, my;	91	int x, y, mx, my;
102		92
103	{
104	packet sl;
105
106	sl.printf ("map_scroll %d %d", dx, dy);	93	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107	ns->send_packet (sl);
108	}
109		94
110	/* If we are using the Map1aCmd, we may in fact send	95	/* If we are using the Map1aCmd, we may in fact send
111	* head information that is outside the viewable map.	96	* head information that is outside the viewable map.
112	* So set the mx,my to the max value we want to	97	* So set the mx,my to the max value we want to
113	* look for. Removed code to do so - it caused extra	98	* look for. Removed code to do so - it caused extra
…		…
153	}	138	}
154		139
155	static void	140	static void
156	clear_map (player *pl)	141	clear_map (player *pl)
157	{	142	{
158	client_socket &socket = *pl->socket;
159
160	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	143	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));
161		144
162	if (socket.newmapcmd == 1)	145	if (pl->socket->newmapcmd == 1)
163	socket.send_packet ("newmap");	146	pl->socket->send_packet ("newmap");
164		147
165	socket.update_look = 1;	148	pl->socket->floorbox_reset ();
166	socket.look_position = 0;
167	}	149	}
168		150
169	/** check for map change and send new map data */	151	/** check for map change and send new map data */
170	static void	152	static void
171	check_map_change (player *pl)	153	check_map_change (player *pl)
172	{	154	{
173	client_socket &socket = *pl->socket;	155	client &socket = *pl->socket;
174	object *ob = pl->ob;	156	object *ob = pl->ob;
175	char buf[MAX_BUF]; /* eauugggh */	157	char buf[MAX_BUF]; /* eauugggh */
176		158
177	if (socket.current_map != ob->map)	159	if (socket.current_map != ob->map)
178	{	160	{
…		…
212	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))	194	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
213	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	195	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
214	else	196	else
215	{	197	{
216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	198	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
217	socket.update_look = 1;	199	socket.floorbox_reset ();
218	socket.look_position = 0;
219	}	200	}
220	}	201	}
221		202
222	socket.current_x = ob->x;	203	socket.current_x = ob->x;
223	socket.current_y = ob->y;	204	socket.current_y = ob->y;
224	}	205	}
225		206
		207	/**
		208	* RequestInfo is sort of a meta command. There is some specific
		209	* request of information, but we call other functions to provide
		210	* that information.
		211	*/
		212	void
		213	RequestInfo (char buf, int len, client ns)
		214	{
		215	char params = NULL, cp;
		216
		217	/* No match */
		218	char bigbuf[MAX_BUF];
		219	int slen;
		220
		221	/* Set up replyinfo before we modify any of the buffers - this is used
		222	* if we don't find a match.
		223	*/
		224	strcpy (bigbuf, "replyinfo ");
		225	slen = strlen (bigbuf);
		226	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		227
		228	/* find the first space, make it null, and update the
		229	* params pointer.
		230	*/
		231	for (cp = buf; *cp != '\0'; cp++)
		232	if (*cp == ' ')
		233	{
		234	*cp = '\0';
		235	params = cp + 1;
		236	break;
		237	}
		238
		239	if (!strcmp (buf, "image_info"))
		240	send_image_info (ns, params);
		241	else if (!strcmp (buf, "image_sums"))
		242	send_image_sums (ns, params);
		243	else if (!strcmp (buf, "skill_info"))
		244	send_skill_info (ns, params);
		245	else if (!strcmp (buf, "spell_paths"))
		246	send_spell_paths (ns, params);
		247	else
		248	ns->send_packet (bigbuf, len);
		249	}
		250
226	void	251	void
227	ExtCmd (char buf, int len, player pl)	252	ExtCmd (char buf, int len, player pl)
228	{	253	{
229	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	254	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
		255	}
		256
		257	void
		258	ExtiCmd (char buf, int len, client ns)
		259	{
		260	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230	}	261	}
231		262
232	void	263	void
233	MapInfoCmd (char buf, int len, player pl)	264	MapInfoCmd (char buf, int len, player pl)
234	{	265	{
…		…
316	pl->socket->send_packet (bigbuf);	347	pl->socket->send_packet (bigbuf);
317	}	348	}
318		349
319	/** This is the Setup cmd - easy first implementation */	350	/** This is the Setup cmd - easy first implementation */
320	void	351	void
321	SetUp (char buf, int len, client_socket ns)	352	SetUp (char buf, int len, client ns)
322	{	353	{
323	int s, slen;	354	int s, slen;
324	char cmd, param, cmdback[HUGE_BUF];	355	char cmd, param, cmdback[HUGE_BUF];
325		356
326	/* run through the cmds of setup	357	/* run through the cmds of setup
…		…
536	* This is what takes care of it. We tell the client how things worked out.	567	* This is what takes care of it. We tell the client how things worked out.
537	* I am not sure if this file is the best place for this function. however,	568	* I am not sure if this file is the best place for this function. however,
538	* it either has to be here or init_sockets needs to be exported.	569	* it either has to be here or init_sockets needs to be exported.
539	*/	570	*/
540	void	571	void
541	AddMeCmd (char buf, int len, client_socket ns)	572	AddMeCmd (char buf, int len, client ns)
542	{	573	{
543	Settings oldsettings;
544
545	oldsettings = settings;
546	if (ns->status != Ns_Add \|\| add_player (ns))	574	if (ns->status != Ns_Add \|\| add_player (ns))
547	ns->send_packet ("addme_failed");	575	ns->send_packet ("addme_failed");
548	else	576	else
549	ns->send_packet ("addme_success");	577	ns->send_packet ("addme_success");
550
551	settings = oldsettings;
552	}	578	}
553		579
554	/** Reply to ExtendedInfos command */	580	/** Reply to ExtendedInfos command */
555	void	581	void
556	ToggleExtendedInfos (char buf, int len, client_socket ns)	582	ToggleExtendedInfos (char buf, int len, client ns)
557	{	583	{
558	char cmdback[MAX_BUF];	584	char cmdback[MAX_BUF];
559	char command[50];	585	char command[50];
560	int info, nextinfo;	586	int info, nextinfo;
561		587
…		…
612	#define MSG_TYPE_MONUMENT 5	638	#define MSG_TYPE_MONUMENT 5
613	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	639	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614		640
615	/** Reply to ExtendedInfos command */	641	/** Reply to ExtendedInfos command */
616	void	642	void
617	ToggleExtendedText (char buf, int len, client_socket ns)	643	ToggleExtendedText (char buf, int len, client ns)
618	{	644	{
619	char cmdback[MAX_BUF];	645	char cmdback[MAX_BUF];
620	char temp[10];	646	char temp[10];
621	char command[50];	647	char command[50];
622	int info, nextinfo, i, flag;	648	int info, nextinfo, i, flag;
…		…
673	* a piece of data from us that we know the client wants. So	699	* a piece of data from us that we know the client wants. So
674	* if we know the client wants it, might as well push it to the	700	* if we know the client wants it, might as well push it to the
675	* client.	701	* client.
676	*/	702	*/
677	static void	703	static void
678	SendSmooth (client_socket * ns, uint16 face)	704	SendSmooth (client *ns, uint16 face)
679	{	705	{
680	uint16 smoothface;	706	uint16 smoothface;
681		707
682	/* If we can't find a face, return and set it so we won't try to send this	708	/* If we can't find a face, return and set it so we won't try to send this
683	* again.	709	* again.
…		…
707	/**	733	/**
708	* Tells client the picture it has to use	734	* Tells client the picture it has to use
709	* to smooth a picture number given as argument.	735	* to smooth a picture number given as argument.
710	*/	736	*/
711	void	737	void
712	AskSmooth (char buf, int len, client_socket ns)	738	AskSmooth (char buf, int len, client ns)
713	{	739	{
714	uint16 facenbr;	740	SendSmooth (ns, atoi (buf));
715
716	facenbr = atoi (buf);
717	SendSmooth (ns, facenbr);
718	}	741	}
719		742
720	/**	743	/**
721	* This handles the general commands from the client (ie, north, fire, cast,	744	* This handles the general commands from the client (ie, north, fire, cast,
722	* etc.)	745	* etc.)
723	*/	746	*/
724	void	747	void
725	PlayerCmd (char buf, int len, player pl)	748	PlayerCmd (char buf, int len, player pl)
726	{	749	{
727
728	/* The following should never happen with a proper or honest client.
729	* Therefore, the error message doesn't have to be too clear - if
730	* someone is playing with a hacked/non working client, this gives them
731	* an idea of the problem, but they deserve what they get
732	*/
733	if (pl->state != ST_PLAYING)
734	{
735	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
736	return;
737	}
738	/* Check if there is a count. In theory, a zero count could also be	750	/* Check if there is a count. In theory, a zero count could also be
739	* sent, so check for that also.	751	* sent, so check for that also.
740	*/	752	*/
741	if (atoi (buf) \|\| buf[0] == '0')	753	if (atoi (buf) \|\| buf[0] == '0')
742	{	754	{
743	pl->count = atoi ((char *) buf);	755	pl->count = atoi ((char *) buf);
		756
744	buf = strchr (buf, ' '); /* advance beyond the numbers */	757	buf = strchr (buf, ' '); /* advance beyond the numbers */
745	if (!buf)	758	if (!buf)
746	{
747	#ifdef ESRV_DEBUG
748	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749	#endif
750	return;	759	return;
751	}	760
752	buf++;	761	buf++;
753	}	762	}
754	/* This should not happen anymore. */	763
755	if (pl->ob->speed_left < -1.0)
756	{
757	LOG (llevError, "Player has negative time - shouldn't do command.\n");
758	}
759	/* In c_new.c */
760	execute_newserver_command (pl->ob, (char *) buf);	764	execute_newserver_command (pl->ob, (char *) buf);
		765
761	/* Perhaps something better should be done with a left over count.	766	/* Perhaps something better should be done with a left over count.
762	* Cleaning up the input should probably be done first - all actions	767	* Cleaning up the input should probably be done first - all actions
763	* for the command that issued the count should be done before any other	768	* for the command that issued the count should be done before any other
764	* commands.	769	* commands.
765	*/	770	*/
766
767	pl->count = 0;	771	pl->count = 0;
768
769	}	772	}
770		773
771		774
772	/**	775	/**
773	* This handles the general commands from the client (ie, north, fire, cast,	776	* This handles the general commands from the client (ie, north, fire, cast,
774	* etc.). It is a lot like PlayerCmd above, but is called with the	777	* etc.). It is a lot like PlayerCmd above, but is called with the
775	* 'ncom' method which gives more information back to the client so it	778	* 'ncom' method which gives more information back to the client so it
776	* can throttle.	779	* can throttle.
777	*/	780	*/
778	void	781	void
779	NewPlayerCmd (uint8 * buf, int len, player *pl)	782	NewPlayerCmd (char buf, int len, player pl)
780	{	783	{
781	int time, repeat;
782	char command[MAX_BUF];
783	int pktlen;
784
785	if (len < 7)	784	if (len <= 6)
786	{	785	{
787	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	786	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
788	return;	787	return;
789	}	788	}
790		789
791	pktlen = net_uint16 (buf);	790	uint16 cmdid = net_uint16 ((uint8 *)buf);
792	repeat = net_uint32 (buf + 2);	791	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793		792
794	/* -1 is special - no repeat, but don't update */	793	/* -1 is special - no repeat, but don't update */
795	if (repeat != -1)	794	if (repeat != -1)
796	pl->count = repeat;	795	pl->count = repeat;
797		796
798	if ((len - 4) >= MAX_BUF)	797	buf += 6; //len -= 6;
799	len = MAX_BUF - 5;
800		798
801	strncpy ((char ) command, (char ) buf + 6, len - 4);
802	command[len - 4] = '\0';
803
804	/* The following should never happen with a proper or honest client.
805	* Therefore, the error message doesn't have to be too clear - if
806	* someone is playing with a hacked/non working client, this gives them
807	* an idea of the problem, but they deserve what they get
808	*/
809	if (pl->state != ST_PLAYING)
810	{
811	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
812	return;
813	}
814
815	/* This should not happen anymore. */
816	if (pl->ob->speed_left < -1.0)
817	LOG (llevError, "Player has negative time - shouldn't do command.\n");
818
819	/* In c_new.c */
820	execute_newserver_command (pl->ob, (char *) command);	799	execute_newserver_command (pl->ob, buf);
		800
821	/* Perhaps something better should be done with a left over count.	801	/* Perhaps something better should be done with a left over count.
822	* Cleaning up the input should probably be done first - all actions	802	* Cleaning up the input should probably be done first - all actions
823	* for the command that issued the count should be done before any other	803	* for the command that issued the count should be done before any other
824	* commands.	804	* commands.
825	*/	805	*/
826	pl->count = 0;	806	pl->count = 0;
827		807
		808	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
828	if (FABS (pl->ob->speed) < 0.001)	809	int time = FABS (pl->ob->speed) < 0.001
829	time = MAX_TIME * 100;	810	? time = MAX_TIME * 100
830	else
831	time = (int) (MAX_TIME / FABS (pl->ob->speed));	811	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
832		812
833	/* Send confirmation of command execution now */	813	/* Send confirmation of command execution now */
834
835	packet sl;	814	packet sl;
836	sl << "comc " << uint16 (pktlen) << uint32 (time);	815	sl << "comc " << uint16 (cmdid) << uint32 (time);
837	pl->socket->send_packet (sl);	816	pl->socket->send_packet (sl);
838	}	817	}
839		818
840		819
841	/** This is a reply to a previous query. */	820	/** This is a reply to a previous query. */
842	void	821	void
843	ReplyCmd (char buf, int len, player pl)	822	ReplyCmd (char buf, int len, player pl)
844	{	823	{
845	/* This is to synthesize how the data would be stored if it	824	/* This is to synthesize how the data would be stored if it
846	* was normally entered. A bit of a hack, and should be cleaned up	825	* was normally entered. A bit of a hack, and should be cleaned up
847	* once all the X11 code is removed from the server.	826	* once all the X11 code is removed from the server.
848	*	827	*
849	* We pass 13 to many of the functions because this way they	828	* We pass 13 to many of the functions because this way they
850	* think it was the carriage return that was entered, and the	829	* think it was the carriage return that was entered, and the
851	* function then does not try to do additional input.	830	* function then does not try to do additional input.
…		…
854		833
855	/* this avoids any hacking here */	834	/* this avoids any hacking here */
856		835
857	switch (pl->state)	836	switch (pl->state)
858	{	837	{
859	case ST_PLAYING:	838	case ST_PLAYING:
860	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	839	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861	break;	840	break;
862		841
863	case ST_PLAY_AGAIN:	842	case ST_PLAY_AGAIN:
864	/* We can check this for return value (2==quit). Maybe we	843	/* We can check this for return value (2==quit). Maybe we
865	* should, and do something appropriate?	844	* should, and do something appropriate?
866	*/	845	*/
867	receive_play_again (pl->ob, buf[0]);	846	receive_play_again (pl->ob, buf[0]);
868	break;	847	break;
869		848
870	case ST_ROLL_STAT:	849	case ST_ROLL_STAT:
871	key_roll_stat (pl->ob, buf[0]);	850	key_roll_stat (pl->ob, buf[0]);
872	break;	851	break;
873		852
874	case ST_CHANGE_CLASS:	853	case ST_CHANGE_CLASS:
875		854
876	key_change_class (pl->ob, buf[0]);	855	key_change_class (pl->ob, buf[0]);
877	break;	856	break;
878		857
879	case ST_CONFIRM_QUIT:	858	case ST_CONFIRM_QUIT:
880	key_confirm_quit (pl->ob, buf[0]);	859	key_confirm_quit (pl->ob, buf[0]);
881	break;	860	break;
882		861
883	case ST_CONFIGURE:	862	case ST_CONFIGURE:
884	LOG (llevError, "In client input handling, but into configure state\n");	863	LOG (llevError, "In client input handling, but into configure state\n");
885	pl->state = ST_PLAYING;	864	pl->state = ST_PLAYING;
886	break;	865	break;
887		866
888	case ST_GET_NAME:	867	case ST_GET_NAME:
889	receive_player_name (pl->ob, 13);	868	receive_player_name (pl->ob, 13);
890	break;	869	break;
891		870
892	case ST_GET_PASSWORD:	871	case ST_GET_PASSWORD:
893	case ST_CONFIRM_PASSWORD:	872	case ST_CONFIRM_PASSWORD:
894	receive_player_password (pl->ob, 13);	873	receive_player_password (pl->ob, 13);
895	break;	874	break;
896		875
897	case ST_GET_PARTY_PASSWORD: /* Get password for party */	876	case ST_GET_PARTY_PASSWORD: /* Get password for party */
898	receive_party_password (pl->ob, 13);	877	receive_party_password (pl->ob, 13);
899	break;	878	break;
900		879
901	default:	880	default:
902	LOG (llevError, "Unknown input state: %d\n", pl->state);	881	LOG (llevError, "Unknown input state: %d\n", pl->state);
903	}	882	}
904	}	883	}
905		884
906	/**	885	/**
907	* Client tells its version. If there is a mismatch, we close the	886	* Client tells its version. If there is a mismatch, we close the
…		…
909	* something older than the server. If we assume the client will be	888	* something older than the server. If we assume the client will be
910	* backwards compatible, having it be a later version should not be a	889	* backwards compatible, having it be a later version should not be a
911	* problem.	890	* problem.
912	*/	891	*/
913	void	892	void
914	VersionCmd (char buf, int len, client_socket ns)	893	VersionCmd (char buf, int len, client ns)
915	{	894	{
916	char *cp;
917	char version_warning[256];
918
919	if (!buf)	895	if (!buf)
920	{	896	{
921	LOG (llevError, "CS: received corrupted version command\n");	897	LOG (llevError, "CS: received corrupted version command\n");
922	return;	898	return;
923	}	899	}
924		900
925	ns->cs_version = atoi (buf);	901	ns->cs_version = atoi (buf);
926	ns->sc_version = ns->cs_version;	902	ns->sc_version = ns->cs_version;
		903
		904	LOG (llevDebug, "connection from client <%s>\n", buf);
		905
		906
		907	//TODO: should log here just for statistics
		908
927	if (VERSION_CS != ns->cs_version)	909	//if (VERSION_CS != ns->cs_version)
928	{	910	// unchecked;
929	#ifdef ESRV_DEBUG	911
930	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931	#endif
932	}
933	cp = strchr (buf + 1, ' ');	912	char *cp = strchr (buf + 1, ' ');
934	if (!cp)	913	if (!cp)
935	return;	914	return;
		915
936	ns->sc_version = atoi (cp);	916	ns->sc_version = atoi (cp);
		917
937	if (VERSION_SC != ns->sc_version)	918	//if (VERSION_SC != ns->sc_version)
938	{	919	// unchecked;
939	#ifdef ESRV_DEBUG	920
940	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941	#endif
942	}
943	cp = strchr (cp + 1, ' ');	921	cp = strchr (cp + 1, ' ');
		922
944	if (cp)	923	if (cp)
945	{	924	{
946	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	925	assign (ns->version, cp + 1);
947		926
948	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
949
950	/* This is first implementation - i skip all beta DX clients with it
951	* Add later stuff here for other clients
952	*/
953
954	/* these are old dxclients */
955	/* Version 1024 added support for singular + plural name values -
956	* requiing this minimal value reduces complexity of that code, and it
957	* has been around for a long time.
958	*/
959	if (ns->sc_version < 1026)	927	if (ns->sc_version < 1026)
960	{	928	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
961	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
962	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");	929	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
963	ns->send_packet (version_warning);
964	}
965
966	}	930	}
967	}	931	}
968		932
969	/** sound related functions. */	933	/** sound related functions. */
970
971	void	934	void
972	SetSound (char buf, int len, client_socket ns)	935	SetSound (char buf, int len, client ns)
973	{	936	{
974	ns->sound = atoi (buf);	937	ns->sound = atoi (buf);
975	}	938	}
976		939
977	/** client wants the map resent */	940	/** client wants the map resent */
978		941
979	void	942	void
980	MapRedrawCmd (char buf, int len, player pl)	943	MapRedrawCmd (char buf, int len, player pl)
981	{	944	{
982
983	/* This function is currently disabled; just clearing the map state results in	945	/* This function is currently disabled; just clearing the map state results in
984	* display errors. It should clear the cache and send a newmap command.	946	* display errors. It should clear the cache and send a newmap command.
985	* Unfortunately this solution does not work because some client versions send	947	* Unfortunately this solution does not work because some client versions send
986	* a mapredraw command after receiving a newmap command.	948	* a mapredraw command after receiving a newmap command.
987	*/	949	*/
988	#if 0
989	/* Okay, this is MAJOR UGLY. but the only way I know how to
990	* clear the "cache"
991	*/
992	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
993	draw_client_map (pl->ob);
994	#endif
995	}	950	}
996		951
997	/**	952	/**
998	* Moves an object (typically, container to inventory).	953	* Moves an object (typically, container to inventory).
999	* syntax is: move (to) (tag) (nrof)	954	* syntax is: move (to) (tag) (nrof)
…		…
1002	MoveCmd (char buf, int len, player pl)	957	MoveCmd (char buf, int len, player pl)
1003	{	958	{
1004	int vals[3], i;	959	int vals[3], i;
1005		960
1006	/* A little funky here. We only cycle for 2 records, because	961	/* A little funky here. We only cycle for 2 records, because
1007	* we obviously am not going to find a space after the third	962	* we obviously are not going to find a space after the third
1008	* record. Perhaps we should just replace this with a	963	* record. Perhaps we should just replace this with a
1009	* sscanf?	964	* sscanf?
1010	*/	965	*/
1011	for (i = 0; i < 2; i++)	966	for (i = 0; i < 2; i++)
1012	{	967	{
1013	vals[i] = atoi (buf);	968	vals[i] = atoi (buf);
		969
1014	if (!(buf = strchr (buf, ' ')))	970	if (!(buf = strchr (buf, ' ')))
1015	{	971	{
1016	LOG (llevError, "Incomplete move command: %s\n", buf);	972	LOG (llevError, "Incomplete move command: %s\n", buf);
1017	return;	973	return;
1018	}	974	}
		975
1019	buf++;	976	buf++;
1020	}	977	}
		978
1021	vals[2] = atoi (buf);	979	vals[2] = atoi (buf);
1022		980
1023	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	981	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1024	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	982	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025	}	983	}
1026
1027
1028		984
1029	/******************************************************************************	985	/******************************************************************************
1030	*	986	*
1031	* Start of commands the server sends to the client.	987	* Start of commands the server sends to the client.
1032	*	988	*
…		…
1035	/**	991	/**
1036	* Asks the client to query the user. This way, the client knows	992	* Asks the client to query the user. This way, the client knows
1037	* it needs to send something back (vs just printing out a message)	993	* it needs to send something back (vs just printing out a message)
1038	*/	994	*/
1039	void	995	void
1040	send_query (client_socket * ns, uint8 flags, char *text)	996	send_query (client ns, uint8 flags, char text)
1041	{	997	{
1042	char buf[MAX_BUF];
1043
1044	sprintf (buf, "query %d %s", flags, text ? text : "");	998	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045	ns->send_packet (buf);
1046	}	999	}
1047		1000
1048	#define AddIfInt64(Old,New,Type) if (Old != New) {\	1001	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049	Old = New; \	1002	Old = New; \
1050	sl << uint8 (Type) << uint64 (New); \	1003	sl << uint8 (Type) << uint64 (New); \
…		…
1083	uint16 flags;	1036	uint16 flags;
1084		1037
1085	packet sl;	1038	packet sl;
1086	sl << "stats ";	1039	sl << "stats ";
1087		1040
1088	if (pl->ob != NULL)	1041	if (pl->ob)
1089	{	1042	{
1090	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1043	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1091	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1044	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1092	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1045	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1093	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1046	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
…		…
1101	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1054	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1102	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1055	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1103	}	1056	}
1104		1057
1105	if (pl->socket->exp64)	1058	if (pl->socket->exp64)
1106	{
1107	uint8 s;
1108
1109	for (s = 0; s < NUM_SKILLS; s++)	1059	for (int s = 0; s < NUM_SKILLS; s++)
1110	{
1111	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1060	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1112	{	1061	{
1113	/* Always send along the level if exp changes. This is only	1062	/* Always send along the level if exp changes. This is only
1114	* 1 extra byte, but keeps processing simpler.	1063	* 1 extra byte, but keeps processing simpler.
1115	*/	1064	*/
1116	sl << uint8 (s + CS_STAT_SKILLINFO)	1065	sl << uint8 (s + CS_STAT_SKILLINFO)
1117	<< uint8 (pl->last_skill_ob[s]->level)	1066	<< uint8 (pl->last_skill_ob[s]->level)
1118	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1067	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1119		1068
1120	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;	1069	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1121	}	1070	}
1122	}
1123	}
1124		1071
1125	if (pl->socket->exp64)	1072	if (pl->socket->exp64)
1126	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1073	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1127	else	1074	else
1128	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }	1075	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
…		…
1146	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1093	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1147		1094
1148	if (pl->socket->sc_version < 1025)	1095	if (pl->socket->sc_version < 1025)
1149	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1096	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1150	else	1097	else
1151	{
1152	int i;
1153
1154	for (i = 0; i < NROFATTACKS; i++)	1098	for (int i = 0; i < NROFATTACKS; i++)
1155	{	1099	{
1156	/* Skip ones we won't send */	1100	/* Skip ones we won't send */
1157	if (atnr_cs_stat[i] == -1)	1101	if (atnr_cs_stat[i] == -1)
1158	continue;	1102	continue;
1159		1103
1160	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1104	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1161	}	1105	}
1162	}
1163		1106
1164	if (pl->socket->monitor_spells)	1107	if (pl->socket->monitor_spells)
1165	{	1108	{
1166	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1109	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1167	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1110	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
…		…
1204	* sent them the face yet (this can become quite costly in terms of	1147	* sent them the face yet (this can become quite costly in terms of
1205	* how much we are sending - on the other hand, this should only happen	1148	* how much we are sending - on the other hand, this should only happen
1206	* when the player logs in and picks stuff up.	1149	* when the player logs in and picks stuff up.
1207	*/	1150	*/
1208	void	1151	void
1209	esrv_send_animation (client_socket * ns, short anim_num)	1152	esrv_send_animation (client * ns, short anim_num)
1210	{	1153	{
1211	int i;
1212
1213	/* Do some checking on the anim_num we got. Note that the animations	1154	/* Do some checking on the anim_num we got. Note that the animations
1214	* are added in contigous order, so if the number is in the valid	1155	* are added in contigous order, so if the number is in the valid
1215	* range, it must be a valid animation.	1156	* range, it must be a valid animation.
1216	*/	1157	*/
1217	if (anim_num < 0 \|\| anim_num > num_animations)	1158	if (anim_num < 0 \|\| anim_num > num_animations)
…		…
1227	<< uint16 (0); /* flags - not used right now */	1168	<< uint16 (0); /* flags - not used right now */
1228		1169
1229	/* Build up the list of faces. Also, send any information (ie, the	1170	/* Build up the list of faces. Also, send any information (ie, the
1230	* the face itself) down to the client.	1171	* the face itself) down to the client.
1231	*/	1172	*/
1232	for (i = 0; i < animations[anim_num].num_animations; i++)	1173	for (int i = 0; i < animations[anim_num].num_animations; i++)
1233	{	1174	{
1234	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1175	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1235	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1176	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1177
1236	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1178	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1237	}	1179	}
1238		1180
1239	ns->send_packet (sl);	1181	ns->send_packet (sl);
1240		1182
…		…
1251	/**	1193	/**
1252	* This adds face_num to a map cell at x,y. If the client doesn't have	1194	* This adds face_num to a map cell at x,y. If the client doesn't have
1253	* the face yet, we will also send it.	1195	* the face yet, we will also send it.
1254	*/	1196	*/
1255	static void	1197	static void
1256	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)	1198	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1257	{	1199	{
1258	if (newmap->cells[x][y].count >= MAP_LAYERS)	1200	if (newmap->cells[x][y].count >= MAP_LAYERS)
1259	{	1201	{
		1202	//TODO: one or the other, can't both have abort and return, verify and act
1260	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1203	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261	return;	1204	return;
1262	abort ();	1205	abort ();
1263	}	1206	}
1264		1207
1265	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1208	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266	newmap->cells[x][y].count++;	1209	newmap->cells[x][y].count++;
1267		1210
1268	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1211	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269	esrv_send_face (ns, face_num, 0);	1212	esrv_send_face (ns, face_num, 0);
1270	}
1271
1272	struct LayerCell
1273	{
1274	uint16 xy;
1275	short face;
1276	};
1277
1278	struct MapLayer
1279	{
1280	int count;
1281	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1282	};
1283
1284	/** Checkes if map cells have changed */
1285	static int
1286	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1287	{
1288	int k;
1289
1290	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1291	return 1;
1292	for (k = 0; k < newmap->cells[i][j].count; k++)
1293	{
1294	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1295	{
1296	return 1;
1297	}
1298	}
1299	return 0;
1300	}
1301
1302	/**
1303	* Basically, what this does is pack the data into layers.
1304	* cnum is the client number, cur is the the buffer we put all of
1305	* this data into. we return the end of the data. layers is
1306	* how many layers of data we should back.
1307	*/
1308	static uint8 *
1309	compactlayer (client_socket * ns, unsigned char cur, int numlayers, struct Map newmap)
1310	{
1311	int x, y, k;
1312	int face;
1313	unsigned char *fcur;
1314	struct MapLayer layers[MAP_LAYERS];
1315
1316	for (k = 0; k < MAP_LAYERS; k++)
1317	layers[k].count = 0;
1318	fcur = cur;
1319	for (x = 0; x < ns->mapx; x++)
1320	{
1321	for (y = 0; y < ns->mapy; y++)
1322	{
1323	if (!mapcellchanged (ns, x, y, newmap))
1324	continue;
1325	if (newmap->cells[x][y].count == 0)
1326	{
1327	cur = x ns->mapy + y; /* mark empty space */
1328	cur++;
1329	continue;
1330	}
1331	for (k = 0; k < newmap->cells[x][y].count; k++)
1332	{
1333	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1334	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1335	layers[k].count++;
1336	}
1337	}
1338	}
1339	/* If no data, return now. */
1340	if (fcur == cur && layers[0].count == 0)
1341	return cur;
1342	cur = 255; / mark end of explicitly cleared cells */
1343	cur++;
1344	/* First pack by layers. */
1345	for (k = 0; k < numlayers; k++)
1346	{
1347	if (layers[k].count == 0)
1348	break; /* once a layer is entirely empty, no layer below it can
1349	have anything in it either */
1350	/* Pack by entries in thie layer */
1351	for (x = 0; x < layers[k].count;)
1352	{
1353	fcur = cur;
1354	*cur = layers[k].lcells[x].face >> 8;
1355	cur++;
1356	*cur = layers[k].lcells[x].face & 0xFF;
1357	cur++;
1358	face = layers[k].lcells[x].face;
1359	/* Now, we back the redundant data into 1 byte xy pairings */
1360	for (y = x; y < layers[k].count; y++)
1361	{
1362	if (layers[k].lcells[y].face == face)
1363	{
1364	*cur = (uint8) layers[k].lcells[y].xy;
1365	cur++;
1366	layers[k].lcells[y].face = -1;
1367	}
1368	}
1369	(cur - 1) = (cur - 1) \| 128; /* mark for end of xy's; 1111 < 128 /
1370	/* forward over the now redundant data */
1371	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1372	x++;
1373	}
1374	fcur = fcur \| 128; /* mark for end of faces at this layer */
1375	}
1376	return cur;
1377	}	1213	}
1378		1214
1379	/** Clears a map cell */	1215	/** Clears a map cell */
1380	static void	1216	static void
1381	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1217	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
…		…
1393	#define MAX_LAYERS 3	1229	#define MAX_LAYERS 3
1394		1230
1395	/* Using a global really isn't a good approach, but saves the over head of	1231	/* Using a global really isn't a good approach, but saves the over head of
1396	* allocating and deallocating such a block of data each time run through,	1232	* allocating and deallocating such a block of data each time run through,
1397	* and saves the space of allocating this in the socket object when we only	1233	* and saves the space of allocating this in the socket object when we only
1398	* need it for this cycle. If the serve is ever threaded, this needs to be	1234	* need it for this cycle. If the server is ever threaded, this needs to be
1399	* re-examined.	1235	* re-examined.
1400	*/	1236	*/
1401
1402	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];	1237	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1403		1238
1404	/**	1239	/**
1405	* Returns true if any of the heads for this	1240	* Returns true if any of the heads for this
1406	* space is set. Returns false if all are blank - this is used	1241	* space is set. Returns false if all are blank - this is used
1407	* for empty space checking.	1242	* for empty space checking.
1408	*/	1243	*/
1409	static inline int	1244	static inline int
1410	have_head (int ax, int ay)	1245	have_head (int ax, int ay)
1411	{	1246	{
1412
1413	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|	1247	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1414	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1248	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415	return 1;	1249	return 1;
		1250
1416	return 0;	1251	return 0;
1417	}	1252	}
1418		1253
1419	/**	1254	/**
1420	* check_head is a bit simplistic version of update_space below.	1255	* check_head is a bit simplistic version of update_space below.
1421	* basically, it only checks the that the head on space ax,ay at layer	1256	* basically, it only checks the that the head on space ax,ay at layer
1422	* needs to get sent - if so, it adds the data, sending the head	1257	* needs to get sent - if so, it adds the data, sending the head
1423	* if needed, and returning 1. If this no data needs to get	1258	* if needed, and returning 1. If this no data needs to get
1424	* sent, it returns zero.	1259	* sent, it returns zero.
1425	*/	1260	*/
1426	static int	1261	static int
1427	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1262	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1428	{	1263	{
1429	short face_num;	1264	short face_num;
1430		1265
1431	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1266	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1267	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
…		…
1464	* numbers the spaces differently - I think this was a leftover from	1299	* numbers the spaces differently - I think this was a leftover from
1465	* the map command, where the faces stack up. Sinces that is no longer	1300	* the map command, where the faces stack up. Sinces that is no longer
1466	* the case, it seems to make more sense to have these layer values	1301	* the case, it seems to make more sense to have these layer values
1467	* actually match.	1302	* actually match.
1468	*/	1303	*/
1469
1470	static int	1304	static int
1471	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1305	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1472	{	1306	{
1473	object ob, head;	1307	object ob, head;
1474	uint16 face_num;	1308	uint16 face_num;
1475	int bx, by, i;	1309	int bx, by, i;
1476		1310
…		…
1689	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1523	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1690	* take.	1524	* take.
1691	*/	1525	*/
1692		1526
1693	static inline int	1527	static inline int
1694	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1528	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1695	{	1529	{
1696	object *ob;	1530	object *ob;
1697	int smoothlevel; /* old face_num; */	1531	int smoothlevel; /* old face_num; */
1698		1532
1699	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1533	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1733	* Returns the size of a data for a map square as returned by	1567	* Returns the size of a data for a map square as returned by
1734	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries	1568	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
1735	* available.	1569	* available.
1736	*/	1570	*/
1737	int	1571	int
1738	getExtendedMapInfoSize (client_socket * ns)	1572	getExtendedMapInfoSize (client * ns)
1739	{	1573	{
1740	int result = 0;	1574	int result = 0;
1741		1575
1742	if (ns->ext_mapinfos)	1576	if (ns->ext_mapinfos)
1743	{	1577	{
1744	if (ns->EMI_smooth)	1578	if (ns->EMI_smooth)
1745	result += 1; /One byte for smoothlevel /	1579	result += 1; /One byte for smoothlevel /
1746	}	1580	}
		1581
1747	return result;	1582	return result;
1748	}	1583	}
1749		1584
1750	/**	1585	/**
1751	* This function uses the new map1 protocol command to send the map	1586	* This function uses the new map1 protocol command to send the map
…		…
1779	uint8 eentrysize;	1614	uint8 eentrysize;
1780	uint16 ewhatstart, ewhatflag;	1615	uint16 ewhatstart, ewhatflag;
1781	uint8 extendedinfos;	1616	uint8 extendedinfos;
1782	maptile *m;	1617	maptile *m;
1783		1618
1784	client_socket &socket = *pl->contr->socket;	1619	client &socket = *pl->contr->socket;
1785		1620
1786	check_map_change (pl->contr);	1621	check_map_change (pl->contr);
1787		1622
1788	packet sl;	1623	packet sl;
1789	packet esl;	1624	packet esl;
…		…
2188	{	2023	{
2189	ax = i;	2024	ax = i;
2190	ay = j;	2025	ay = j;
2191	m = pm;	2026	m = pm;
2192	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2027	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2028
2193	if (mflags & P_OUT_OF_MAP)	2029	if (mflags & P_OUT_OF_MAP)
2194	continue;	2030	continue;
		2031
2195	if (mflags & P_NEED_UPDATE)	2032	if (mflags & P_NEED_UPDATE)
2196	update_position (m, ax, ay);	2033	update_position (m, ax, ay);
		2034
2197	/* If a map is visible to the player, we don't want to swap it out	2035	/* If a map is visible to the player, we don't want to swap it out
2198	* just to reload it. This should really call something like	2036	* just to reload it. This should really call something like
2199	* swap_map, but this is much more efficient and 'good enough'	2037	* swap_map, but this is much more efficient and 'good enough'
2200	*/	2038	*/
2201	if (mflags & P_NEW_MAP)	2039	if (mflags & P_NEW_MAP)
…		…
2232	/**	2070	/**
2233	* This sends the skill number to name mapping. We ignore	2071	* This sends the skill number to name mapping. We ignore
2234	* the params - we always send the same info no matter what.	2072	* the params - we always send the same info no matter what.
2235	*/	2073	*/
2236	void	2074	void
2237	send_skill_info (client_socket ns, char params)	2075	send_skill_info (client ns, char params)
2238	{	2076	{
2239	packet sl;	2077	packet sl;
2240	sl << "replyinfo skill_info\n";	2078	sl << "replyinfo skill_info\n";
2241		2079
2242	for (int i = 1; i < NUM_SKILLS; i++)	2080	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2254	/**	2092	/**
2255	* This sends the spell path to name mapping. We ignore	2093	* This sends the spell path to name mapping. We ignore
2256	* the params - we always send the same info no matter what.	2094	* the params - we always send the same info no matter what.
2257	*/	2095	*/
2258	void	2096	void
2259	send_spell_paths (client_socket * ns, char *params)	2097	send_spell_paths (client * ns, char *params)
2260	{	2098	{
2261	packet sl;	2099	packet sl;
2262		2100
2263	sl << "replyinfo spell_paths\n";	2101	sl << "replyinfo spell_paths\n";
2264		2102
…		…
2404		2242
2405	if (!pl->socket->monitor_spells)	2243	if (!pl->socket->monitor_spells)
2406	return;	2244	return;
2407		2245
2408	packet sl;	2246	packet sl;
2409
2410	sl << "addspell ";	2247	sl << "addspell ";
2411		2248
2412	if (!spell)	2249	if (!spell)
2413	{	2250	{
2414	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2251	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.37 by root, Thu Dec 14 20:39:54 2006 UTC vs. Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.37 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC