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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 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.
…		…
88	-1, /* life stealing */	83	-1, /* life stealing */
89	-1 /* Disease - not fully done yet */	84	-1 /* Disease - not fully done yet */
90	};	85	};
91		86
92	static void	87	static void
93	socket_map_scroll (client_socket * ns, int dx, int dy)	88	socket_map_scroll (client *ns, int dx, int dy)
94	{	89	{
95	struct Map newmap;	90	struct Map newmap;
96	int x, y, mx, my;	91	int x, y, mx, my;
97		92
98	{
99	packet sl;
100
101	sl.printf ("map_scroll %d %d", dx, dy);	93	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102	ns->send_packet (sl);
103	}
104		94
105	/* If we are using the Map1aCmd, we may in fact send	95	/* If we are using the Map1aCmd, we may in fact send
106	* head information that is outside the viewable map.	96	* head information that is outside the viewable map.
107	* 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
108	* look for. Removed code to do so - it caused extra	98	* look for. Removed code to do so - it caused extra
…		…
148	}	138	}
149		139
150	static void	140	static void
151	clear_map (player *pl)	141	clear_map (player *pl)
152	{	142	{
153	client_socket &socket = *pl->socket;
154
155	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	143	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156		144
157	if (socket.newmapcmd == 1)	145	if (pl->ns->newmapcmd == 1)
158	socket.send_packet ("newmap");	146	pl->ns->send_packet ("newmap");
159		147
160	socket.update_look = 1;	148	pl->ns->floorbox_reset ();
161	socket.look_position = 0;
162	}	149	}
163		150
164	/** check for map change and send new map data */	151	/** check for map change and send new map data */
165	static void	152	static void
166	check_map_change (player *pl)	153	check_map_change (player *pl)
167	{	154	{
168	client_socket &socket = *pl->socket;	155	client &socket = *pl->ns;
169	object *ob = pl->ob;	156	object *ob = pl->ob;
170	char buf[MAX_BUF]; /* eauugggh */	157	char buf[MAX_BUF]; /* eauugggh */
171		158
172	if (socket.current_map != ob->map)	159	if (socket.current_map != ob->map)
173	{	160	{
…		…
207	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))	194	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
208	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
209	else	196	else
210	{	197	{
211	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);
212	socket.update_look = 1;	199	socket.floorbox_reset ();
213	socket.look_position = 0;
214	}	200	}
215	}	201	}
216		202
217	socket.current_x = ob->x;	203	socket.current_x = ob->x;
218	socket.current_y = ob->y;	204	socket.current_y = ob->y;
219	}	205	}
220		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
221	void	251	void
222	ExtCmd (char buf, int len, player pl)	252	ExtCmd (char buf, int len, player pl)
223	{	253	{
224	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));
225	}	261	}
226		262
227	void	263	void
228	MapInfoCmd (char buf, int len, player pl)	264	MapInfoCmd (char buf, int len, player pl)
229	{	265	{
…		…
244	buf += 8;	280	buf += 8;
245		281
246	// initial map and its origin	282	// initial map and its origin
247	maptile *map = pl->ob->map;	283	maptile *map = pl->ob->map;
248	sint16 dx, dy;	284	sint16 dx, dy;
249	int mapx = pl->socket->mapx / 2 - pl->ob->x;	285	int mapx = pl->ns->mapx / 2 - pl->ob->x;
250	int mapy = pl->socket->mapy / 2 - pl->ob->y;	286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
251	int max_distance = 8; // limit maximum path length to something generous	287	int max_distance = 8; // limit maximum path length to something generous
252		288
253	while (*buf && map && max_distance)	289	while (*buf && map && max_distance)
254	{	290	{
255	int dir = *buf++;	291	int dir = *buf++;
…		…
306	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
307	}	343	}
308	else	344	else
309	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
310		346
311	pl->socket->send_packet (bigbuf);	347	pl->ns->send_packet (bigbuf);
312	}	348	}
313		349
314	/** This is the Setup cmd - easy first implementation */	350	/** This is the Setup cmd - easy first implementation */
315	void	351	void
316	SetUp (char buf, int len, client_socket ns)	352	SetUp (char buf, int len, client ns)
317	{	353	{
318	int s, slen;	354	int s, slen;
319	char cmd, param, cmdback[HUGE_BUF];	355	char cmd, param, cmdback[HUGE_BUF];
320		356
321	/* run through the cmds of setup	357	/* run through the cmds of setup
…		…
531	* 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.
532	* 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,
533	* 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.
534	*/	570	*/
535	void	571	void
536	AddMeCmd (char buf, int len, client_socket ns)	572	AddMeCmd (char buf, int len, client ns)
537	{	573	{
538	Settings oldsettings;	574	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
539
540	oldsettings = settings;
541	if (ns->status != Ns_Add \|\| add_player (ns))
542	ns->send_packet ("addme_failed");
543	else
544	ns->send_packet ("addme_success");
545
546	settings = oldsettings;
547	}	575	}
548		576
549	/** Reply to ExtendedInfos command */	577	/** Reply to ExtendedInfos command */
550	void	578	void
551	ToggleExtendedInfos (char buf, int len, client_socket ns)	579	ToggleExtendedInfos (char buf, int len, client ns)
552	{	580	{
553	char cmdback[MAX_BUF];	581	char cmdback[MAX_BUF];
554	char command[50];	582	char command[50];
555	int info, nextinfo;	583	int info, nextinfo;
556		584
…		…
607	#define MSG_TYPE_MONUMENT 5	635	#define MSG_TYPE_MONUMENT 5
608	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	636	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609		637
610	/** Reply to ExtendedInfos command */	638	/** Reply to ExtendedInfos command */
611	void	639	void
612	ToggleExtendedText (char buf, int len, client_socket ns)	640	ToggleExtendedText (char buf, int len, client ns)
613	{	641	{
614	char cmdback[MAX_BUF];	642	char cmdback[MAX_BUF];
615	char temp[10];	643	char temp[10];
616	char command[50];	644	char command[50];
617	int info, nextinfo, i, flag;	645	int info, nextinfo, i, flag;
…		…
668	* a piece of data from us that we know the client wants. So	696	* a piece of data from us that we know the client wants. So
669	* if we know the client wants it, might as well push it to the	697	* if we know the client wants it, might as well push it to the
670	* client.	698	* client.
671	*/	699	*/
672	static void	700	static void
673	SendSmooth (client_socket * ns, uint16 face)	701	SendSmooth (client *ns, uint16 face)
674	{	702	{
675	uint16 smoothface;	703	uint16 smoothface;
676		704
677	/* If we can't find a face, return and set it so we won't try to send this	705	/* If we can't find a face, return and set it so we won't try to send this
678	* again.	706	* again.
…		…
688	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	716	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
689	esrv_send_face (ns, smoothface, 0);	717	esrv_send_face (ns, smoothface, 0);
690		718
691	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	719	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
692		720
693	packet sl;	721	packet sl ("smooth");
694		722
695	sl << "smooth "
696	<< uint16 (face)	723	sl << uint16 (face)
697	<< uint16 (smoothface);	724	<< uint16 (smoothface);
698		725
699	ns->send_packet (sl);	726	ns->send_packet (sl);
700	}	727	}
701		728
702	/**	729	/**
703	* Tells client the picture it has to use	730	* Tells client the picture it has to use
704	* to smooth a picture number given as argument.	731	* to smooth a picture number given as argument.
705	*/	732	*/
706	void	733	void
707	AskSmooth (char buf, int len, client_socket ns)	734	AskSmooth (char buf, int len, client ns)
708	{	735	{
709	uint16 facenbr;	736	SendSmooth (ns, atoi (buf));
710
711	facenbr = atoi (buf);
712	SendSmooth (ns, facenbr);
713	}	737	}
714		738
715	/**	739	/**
716	* This handles the general commands from the client (ie, north, fire, cast,	740	* This handles the general commands from the client (ie, north, fire, cast,
717	* etc.)	741	* etc.)
718	*/	742	*/
719	void	743	void
720	PlayerCmd (char buf, int len, player pl)	744	PlayerCmd (char buf, int len, player pl)
721	{	745	{
722
723	/* The following should never happen with a proper or honest client.
724	* Therefore, the error message doesn't have to be too clear - if
725	* someone is playing with a hacked/non working client, this gives them
726	* an idea of the problem, but they deserve what they get
727	*/
728	if (pl->state != ST_PLAYING)
729	{
730	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731	return;
732	}
733	/* Check if there is a count. In theory, a zero count could also be	746	/* Check if there is a count. In theory, a zero count could also be
734	* sent, so check for that also.	747	* sent, so check for that also.
735	*/	748	*/
736	if (atoi (buf) \|\| buf[0] == '0')	749	if (atoi (buf) \|\| buf[0] == '0')
737	{	750	{
738	pl->count = atoi ((char *) buf);	751	pl->count = atoi ((char *) buf);
		752
739	buf = strchr (buf, ' '); /* advance beyond the numbers */	753	buf = strchr (buf, ' '); /* advance beyond the numbers */
740	if (!buf)	754	if (!buf)
741	{
742	#ifdef ESRV_DEBUG
743	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744	#endif
745	return;	755	return;
746	}	756
747	buf++;	757	buf++;
748	}	758	}
749	/* This should not happen anymore. */	759
750	if (pl->ob->speed_left < -1.0)
751	{
752	LOG (llevError, "Player has negative time - shouldn't do command.\n");
753	}
754	/* In c_new.c */
755	execute_newserver_command (pl->ob, (char *) buf);	760	execute_newserver_command (pl->ob, (char *) buf);
		761
756	/* Perhaps something better should be done with a left over count.	762	/* Perhaps something better should be done with a left over count.
757	* Cleaning up the input should probably be done first - all actions	763	* Cleaning up the input should probably be done first - all actions
758	* for the command that issued the count should be done before any other	764	* for the command that issued the count should be done before any other
759	* commands.	765	* commands.
760	*/	766	*/
761
762	pl->count = 0;	767	pl->count = 0;
763
764	}	768	}
765		769
766		770
767	/**	771	/**
768	* This handles the general commands from the client (ie, north, fire, cast,	772	* This handles the general commands from the client (ie, north, fire, cast,
…		…
771	* can throttle.	775	* can throttle.
772	*/	776	*/
773	void	777	void
774	NewPlayerCmd (char buf, int len, player pl)	778	NewPlayerCmd (char buf, int len, player pl)
775	{	779	{
776	int time, repeat;
777	char command[MAX_BUF];
778	int pktlen;
779
780	if (len < 7)	780	if (len <= 6)
781	{	781	{
782	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	782	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
783	return;	783	return;
784	}	784	}
785		785
786	pktlen = net_uint16 ((uint8 *)buf);	786	uint16 cmdid = net_uint16 ((uint8 *)buf);
787	repeat = net_uint32 ((uint8 *)buf + 2);	787	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788		788
789	/* -1 is special - no repeat, but don't update */	789	/* -1 is special - no repeat, but don't update */
790	if (repeat != -1)	790	if (repeat != -1)
791	pl->count = repeat;	791	pl->count = repeat;
792		792
793	if ((len - 4) >= MAX_BUF)	793	buf += 6; //len -= 6;
794	len = MAX_BUF - 5;
795		794
796	strncpy ((char ) command, (char ) buf + 6, len - 4);
797	command[len - 4] = 0;
798
799	/* This should not happen anymore. */
800	if (pl->ob->speed_left < -1.0)
801	LOG (llevError, "Player has negative time - shouldn't do command.\n");
802
803	/* In c_new.c */
804	execute_newserver_command (pl->ob, (char *) command);	795	execute_newserver_command (pl->ob, buf);
		796
805	/* Perhaps something better should be done with a left over count.	797	/* Perhaps something better should be done with a left over count.
806	* Cleaning up the input should probably be done first - all actions	798	* Cleaning up the input should probably be done first - all actions
807	* for the command that issued the count should be done before any other	799	* for the command that issued the count should be done before any other
808	* commands.	800	* commands.
809	*/	801	*/
810	pl->count = 0;	802	pl->count = 0;
811		803
		804	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
812	if (FABS (pl->ob->speed) < 0.001)	805	int time = FABS (pl->ob->speed) < 0.001
813	time = MAX_TIME * 100;	806	? time = MAX_TIME * 100
814	else
815	time = (int) (MAX_TIME / FABS (pl->ob->speed));	807	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
816		808
817	/* Send confirmation of command execution now */	809	/* Send confirmation of command execution now */
818		810	packet sl ("comc");
819	packet sl;
820	sl << "comc " << uint16 (pktlen) << uint32 (time);	811	sl << uint16 (cmdid) << uint32 (time);
821	pl->socket->send_packet (sl);	812	pl->ns->send_packet (sl);
822	}	813	}
823
824		814
825	/** This is a reply to a previous query. */	815	/** This is a reply to a previous query. */
826	void	816	void
827	ReplyCmd (char buf, int len, player pl)	817	ReplyCmd (char buf, int len, client ns)
828	{	818	{
		819	if (ns->state == ST_CUSTOM)
		820	{
		821	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		822	return;
		823	}
		824
		825	if (!ns->pl)
		826	return; //TODO: depends on the exact reply we are after
		827	//TODO: but right now, we always have a ns->pl
		828
		829	player *pl = ns->pl;
		830
829	/* This is to synthesize how the data would be stored if it	831	/* This is to synthesize how the data would be stored if it
830	* was normally entered. A bit of a hack, and should be cleaned up	832	* was normally entered. A bit of a hack, and should be cleaned up
831	* once all the X11 code is removed from the server.	833	* once all the X11 code is removed from the server.
832	*	834	*
833	* We pass 13 to many of the functions because this way they	835	* We pass 13 to many of the functions because this way they
834	* think it was the carriage return that was entered, and the	836	* think it was the carriage return that was entered, and the
835	* function then does not try to do additional input.	837	* function then does not try to do additional input.
836	*/	838	*/
837	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	839	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
838		840
839	/* this avoids any hacking here */	841	/* this avoids any hacking here */
840		842
841	switch (pl->state)	843	switch (ns->state)
842	{	844	{
843	case ST_PLAYING:	845	case ST_PLAYING:
844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	846	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845	break;	847	break;
846		848
847	case ST_PLAY_AGAIN:
848	/* We can check this for return value (2==quit). Maybe we
849	* should, and do something appropriate?
850	*/
851	receive_play_again (pl->ob, buf[0]);
852	break;
853
854	case ST_ROLL_STAT:
855	key_roll_stat (pl->ob, buf[0]);
856	break;
857
858	case ST_CHANGE_CLASS:	849	case ST_CHANGE_CLASS:
859
860	key_change_class (pl->ob, buf[0]);	850	key_change_class (pl->ob, buf[0]);
861	break;	851	break;
862		852
863	case ST_CONFIRM_QUIT:	853	case ST_CONFIRM_QUIT:
864	key_confirm_quit (pl->ob, buf[0]);	854	key_confirm_quit (pl->ob, buf[0]);
865	break;	855	break;
866		856
867	case ST_CONFIGURE:
868	LOG (llevError, "In client input handling, but into configure state\n");
869	pl->state = ST_PLAYING;
870	break;
871
872	case ST_GET_NAME:
873	receive_player_name (pl->ob, 13);
874	break;
875
876	case ST_GET_PASSWORD:
877	case ST_CONFIRM_PASSWORD:
878	receive_player_password (pl->ob, 13);
879	break;
880
881	case ST_GET_PARTY_PASSWORD: /* Get password for party */	857	case ST_GET_PARTY_PASSWORD: /* Get password for party */
882	receive_party_password (pl->ob, 13);	858	receive_party_password (pl->ob, 13);
883	break;	859	break;
884		860
885	default:	861	default:
886	LOG (llevError, "Unknown input state: %d\n", pl->state);	862	LOG (llevError, "Unknown input state: %d\n", ns->state);
887	}	863	}
888	}	864	}
889		865
890	/**	866	/**
891	* Client tells its version. If there is a mismatch, we close the	867	* Client tells its version. If there is a mismatch, we close the
…		…
893	* something older than the server. If we assume the client will be	869	* something older than the server. If we assume the client will be
894	* backwards compatible, having it be a later version should not be a	870	* backwards compatible, having it be a later version should not be a
895	* problem.	871	* problem.
896	*/	872	*/
897	void	873	void
898	VersionCmd (char buf, int len, client_socket ns)	874	VersionCmd (char buf, int len, client ns)
899	{	875	{
900	char *cp;
901	char version_warning[256];
902
903	if (!buf)	876	if (!buf)
904	{	877	{
905	LOG (llevError, "CS: received corrupted version command\n");	878	LOG (llevError, "CS: received corrupted version command\n");
906	return;	879	return;
907	}	880	}
908		881
909	ns->cs_version = atoi (buf);	882	ns->cs_version = atoi (buf);
910	ns->sc_version = ns->cs_version;	883	ns->sc_version = ns->cs_version;
		884
		885	LOG (llevDebug, "connection from client <%s>\n", buf);
		886
		887
		888	//TODO: should log here just for statistics
		889
911	if (VERSION_CS != ns->cs_version)	890	//if (VERSION_CS != ns->cs_version)
912	{	891	// unchecked;
913	#ifdef ESRV_DEBUG	892
914	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
915	#endif
916	}
917	cp = strchr (buf + 1, ' ');	893	char *cp = strchr (buf + 1, ' ');
918	if (!cp)	894	if (!cp)
919	return;	895	return;
		896
920	ns->sc_version = atoi (cp);	897	ns->sc_version = atoi (cp);
		898
921	if (VERSION_SC != ns->sc_version)	899	//if (VERSION_SC != ns->sc_version)
922	{	900	// unchecked;
923	#ifdef ESRV_DEBUG	901
924	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
925	#endif
926	}
927	cp = strchr (cp + 1, ' ');	902	cp = strchr (cp + 1, ' ');
		903
928	if (cp)	904	if (cp)
929	{	905	{
930	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	906	assign (ns->version, cp + 1);
931		907
932	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
933
934	/* This is first implementation - i skip all beta DX clients with it
935	* Add later stuff here for other clients
936	*/
937
938	/* these are old dxclients */
939	/* Version 1024 added support for singular + plural name values -
940	* requiing this minimal value reduces complexity of that code, and it
941	* has been around for a long time.
942	*/
943	if (ns->sc_version < 1026)	908	if (ns->sc_version < 1026)
944	{	909	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
945	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
946	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");	910	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
947	ns->send_packet (version_warning);
948	}
949
950	}	911	}
951	}	912	}
952		913
953	/** sound related functions. */	914	/** sound related functions. */
954
955	void	915	void
956	SetSound (char buf, int len, client_socket ns)	916	SetSound (char buf, int len, client ns)
957	{	917	{
958	ns->sound = atoi (buf);	918	ns->sound = atoi (buf);
959	}	919	}
960		920
961	/** client wants the map resent */	921	/** client wants the map resent */
962		922
963	void	923	void
964	MapRedrawCmd (char buf, int len, player pl)	924	MapRedrawCmd (char buf, int len, player pl)
965	{	925	{
966
967	/* This function is currently disabled; just clearing the map state results in	926	/* This function is currently disabled; just clearing the map state results in
968	* display errors. It should clear the cache and send a newmap command.	927	* display errors. It should clear the cache and send a newmap command.
969	* Unfortunately this solution does not work because some client versions send	928	* Unfortunately this solution does not work because some client versions send
970	* a mapredraw command after receiving a newmap command.	929	* a mapredraw command after receiving a newmap command.
971	*/	930	*/
972	#if 0
973	/* Okay, this is MAJOR UGLY. but the only way I know how to
974	* clear the "cache"
975	*/
976	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
977	draw_client_map (pl->ob);
978	#endif
979	}	931	}
980		932
981	/**	933	/**
982	* Moves an object (typically, container to inventory).	934	* Moves an object (typically, container to inventory).
983	* syntax is: move (to) (tag) (nrof)	935	* syntax is: move (to) (tag) (nrof)
…		…
986	MoveCmd (char buf, int len, player pl)	938	MoveCmd (char buf, int len, player pl)
987	{	939	{
988	int vals[3], i;	940	int vals[3], i;
989		941
990	/* A little funky here. We only cycle for 2 records, because	942	/* A little funky here. We only cycle for 2 records, because
991	* we obviously am not going to find a space after the third	943	* we obviously are not going to find a space after the third
992	* record. Perhaps we should just replace this with a	944	* record. Perhaps we should just replace this with a
993	* sscanf?	945	* sscanf?
994	*/	946	*/
995	for (i = 0; i < 2; i++)	947	for (i = 0; i < 2; i++)
996	{	948	{
997	vals[i] = atoi (buf);	949	vals[i] = atoi (buf);
		950
998	if (!(buf = strchr (buf, ' ')))	951	if (!(buf = strchr (buf, ' ')))
999	{	952	{
1000	LOG (llevError, "Incomplete move command: %s\n", buf);	953	LOG (llevError, "Incomplete move command: %s\n", buf);
1001	return;	954	return;
1002	}	955	}
		956
1003	buf++;	957	buf++;
1004	}	958	}
		959
1005	vals[2] = atoi (buf);	960	vals[2] = atoi (buf);
1006		961
1007	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	962	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1008	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	963	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1009	}	964	}
1010
1011
1012		965
1013	/******************************************************************************	966	/******************************************************************************
1014	*	967	*
1015	* Start of commands the server sends to the client.	968	* Start of commands the server sends to the client.
1016	*	969	*
…		…
1019	/**	972	/**
1020	* Asks the client to query the user. This way, the client knows	973	* Asks the client to query the user. This way, the client knows
1021	* it needs to send something back (vs just printing out a message)	974	* it needs to send something back (vs just printing out a message)
1022	*/	975	*/
1023	void	976	void
1024	send_query (client_socket * ns, uint8 flags, char *text)	977	send_query (client ns, uint8 flags, char text)
1025	{	978	{
1026	char buf[MAX_BUF];
1027
1028	sprintf (buf, "query %d %s", flags, text ? text : "");	979	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1029	ns->send_packet (buf);
1030	}	980	}
1031		981
1032	#define AddIfInt64(Old,New,Type) if (Old != New) {\	982	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1033	Old = New; \	983	Old = New; \
1034	sl << uint8 (Type) << uint64 (New); \	984	sl << uint8 (Type) << uint64 (New); \
…		…
1064	esrv_update_stats (player *pl)	1014	esrv_update_stats (player *pl)
1065	{	1015	{
1066	char buf[MAX_BUF];	1016	char buf[MAX_BUF];
1067	uint16 flags;	1017	uint16 flags;
1068		1018
1069	packet sl;	1019	packet sl ("stats");
1070	sl << "stats ";
1071		1020
1072	if (pl->ob != NULL)	1021	if (pl->ob)
1073	{	1022	{
1074	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1023	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1075	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1024	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1076	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1025	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1077	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1026	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1078	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1027	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1079	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1028	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1080	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1029	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1081	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1082	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1083	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1084	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1030	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1085	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1031	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
		1032	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
		1033	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
		1034	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1086	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1035	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1087	}	1036	}
1088		1037
1089	if (pl->socket->exp64)	1038	if (pl->ns->exp64)
1090	{
1091	uint8 s;
1092
1093	for (s = 0; s < NUM_SKILLS; s++)	1039	for (int s = 0; s < NUM_SKILLS; s++)
1094	{
1095	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1040	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1096	{	1041	{
1097	/* Always send along the level if exp changes. This is only	1042	/* Always send along the level if exp changes. This is only
1098	* 1 extra byte, but keeps processing simpler.	1043	* 1 extra byte, but keeps processing simpler.
1099	*/	1044	*/
1100	sl << uint8 (s + CS_STAT_SKILLINFO)	1045	sl << uint8 (s + CS_STAT_SKILLINFO)
1101	<< uint8 (pl->last_skill_ob[s]->level)	1046	<< uint8 (pl->last_skill_ob[s]->level)
1102	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1047	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1103		1048
1104	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;	1049	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105	}	1050	}
1106	}
1107	}
1108		1051
1109	if (pl->socket->exp64)	1052	if (pl->ns->exp64)
1110	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1053	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1111	else	1054	else
1112	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }	1055	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1113		1056
1114	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1057	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
…		…
1127	if (pl->run_on)	1070	if (pl->run_on)
1128	flags \|= SF_RUNON;	1071	flags \|= SF_RUNON;
1129		1072
1130	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1073	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1131		1074
1132	if (pl->socket->sc_version < 1025)	1075	if (pl->ns->sc_version < 1025)
1133	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1076	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1134	else	1077	else
1135	{
1136	int i;
1137
1138	for (i = 0; i < NROFATTACKS; i++)	1078	for (int i = 0; i < NROFATTACKS; i++)
1139	{	1079	{
1140	/* Skip ones we won't send */	1080	/* Skip ones we won't send */
1141	if (atnr_cs_stat[i] == -1)	1081	if (atnr_cs_stat[i] == -1)
1142	continue;	1082	continue;
1143		1083
1144	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1084	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1145	}	1085	}
1146	}
1147		1086
1148	if (pl->socket->monitor_spells)	1087	if (pl->ns->monitor_spells)
1149	{	1088	{
1150	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1089	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1151	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1090	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1152	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1091	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1153	}	1092	}
1154		1093
1155	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1094	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1156	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1095	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1157	set_title (pl->ob, buf);	1096	set_title (pl->ob, buf);
1158	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1097	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1159		1098
1160	/* Only send it away if we have some actual data */	1099	/* Only send it away if we have some actual data */
1161	if (sl.length () > 6)	1100	if (sl.length () > 6)
1162	pl->socket->send_packet (sl);	1101	pl->ns->send_packet (sl);
1163	}	1102	}
1164		1103
1165	/**	1104	/**
1166	* Tells the client that here is a player it should start using.	1105	* Tells the client that here is a player it should start using.
1167	*/	1106	*/
1168	void	1107	void
1169	esrv_new_player (player *pl, uint32 weight)	1108	esrv_new_player (player *pl, uint32 weight)
1170	{	1109	{
1171	pl->last_weight = weight;	1110	pl->last_weight = weight;
1172		1111
1173	packet sl;	1112	packet sl ("player");
1174	sl << "player ";
1175		1113
1176	sl << uint32 (pl->ob->count)	1114	sl << uint32 (pl->ob->count)
1177	<< uint32 (weight)	1115	<< uint32 (weight)
1178	<< uint32 (pl->ob->face->number)	1116	<< uint32 (pl->ob->face->number)
1179	<< data8 (pl->ob->name);	1117	<< data8 (pl->ob->name);
1180		1118
1181	pl->socket->send_packet (sl);	1119	pl->ns->send_packet (sl);
1182	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1120	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1183	}	1121	}
1184		1122
1185	/**	1123	/**
1186	* Need to send an animation sequence to the client.	1124	* Need to send an animation sequence to the client.
…		…
1188	* sent them the face yet (this can become quite costly in terms of	1126	* sent them the face yet (this can become quite costly in terms of
1189	* how much we are sending - on the other hand, this should only happen	1127	* how much we are sending - on the other hand, this should only happen
1190	* when the player logs in and picks stuff up.	1128	* when the player logs in and picks stuff up.
1191	*/	1129	*/
1192	void	1130	void
1193	esrv_send_animation (client_socket * ns, short anim_num)	1131	esrv_send_animation (client * ns, short anim_num)
1194	{	1132	{
1195	int i;
1196
1197	/* Do some checking on the anim_num we got. Note that the animations	1133	/* Do some checking on the anim_num we got. Note that the animations
1198	* are added in contigous order, so if the number is in the valid	1134	* are added in contigous order, so if the number is in the valid
1199	* range, it must be a valid animation.	1135	* range, it must be a valid animation.
1200	*/	1136	*/
1201	if (anim_num < 0 \|\| anim_num > num_animations)	1137	if (anim_num < 0 \|\| anim_num > num_animations)
1202	{	1138	{
1203	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1139	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1204	return;	1140	return;
1205	}	1141	}
1206		1142
1207	packet sl;	1143	packet sl ("anim");
1208		1144
1209	sl << "anim "
1210	<< uint16 (anim_num)	1145	sl << uint16 (anim_num)
1211	<< uint16 (0); /* flags - not used right now */	1146	<< uint16 (0); /* flags - not used right now */
1212		1147
1213	/* Build up the list of faces. Also, send any information (ie, the	1148	/* Build up the list of faces. Also, send any information (ie, the
1214	* the face itself) down to the client.	1149	* the face itself) down to the client.
1215	*/	1150	*/
1216	for (i = 0; i < animations[anim_num].num_animations; i++)	1151	for (int i = 0; i < animations[anim_num].num_animations; i++)
1217	{	1152	{
1218	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1153	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1219	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1154	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1155
1220	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1156	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1221	}	1157	}
1222		1158
1223	ns->send_packet (sl);	1159	ns->send_packet (sl);
1224		1160
…		…
1235	/**	1171	/**
1236	* This adds face_num to a map cell at x,y. If the client doesn't have	1172	* This adds face_num to a map cell at x,y. If the client doesn't have
1237	* the face yet, we will also send it.	1173	* the face yet, we will also send it.
1238	*/	1174	*/
1239	static void	1175	static void
1240	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)	1176	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1241	{	1177	{
1242	if (newmap->cells[x][y].count >= MAP_LAYERS)	1178	if (newmap->cells[x][y].count >= MAP_LAYERS)
1243	{	1179	{
		1180	//TODO: one or the other, can't both have abort and return, verify and act
1244	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1181	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1245	return;	1182	return;
1246	abort ();	1183	abort ();
1247	}	1184	}
1248		1185
1249	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1186	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1250	newmap->cells[x][y].count++;	1187	newmap->cells[x][y].count++;
1251		1188
1252	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1189	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1253	esrv_send_face (ns, face_num, 0);	1190	esrv_send_face (ns, face_num, 0);
1254	}
1255
1256	struct LayerCell
1257	{
1258	uint16 xy;
1259	short face;
1260	};
1261
1262	struct MapLayer
1263	{
1264	int count;
1265	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1266	};
1267
1268	/** Checkes if map cells have changed */
1269	static int
1270	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1271	{
1272	int k;
1273
1274	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1275	return 1;
1276	for (k = 0; k < newmap->cells[i][j].count; k++)
1277	{
1278	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1279	{
1280	return 1;
1281	}
1282	}
1283	return 0;
1284	}
1285
1286	/**
1287	* Basically, what this does is pack the data into layers.
1288	* cnum is the client number, cur is the the buffer we put all of
1289	* this data into. we return the end of the data. layers is
1290	* how many layers of data we should back.
1291	*/
1292	static uint8 *
1293	compactlayer (client_socket * ns, unsigned char cur, int numlayers, struct Map newmap)
1294	{
1295	int x, y, k;
1296	int face;
1297	unsigned char *fcur;
1298	struct MapLayer layers[MAP_LAYERS];
1299
1300	for (k = 0; k < MAP_LAYERS; k++)
1301	layers[k].count = 0;
1302	fcur = cur;
1303	for (x = 0; x < ns->mapx; x++)
1304	{
1305	for (y = 0; y < ns->mapy; y++)
1306	{
1307	if (!mapcellchanged (ns, x, y, newmap))
1308	continue;
1309	if (newmap->cells[x][y].count == 0)
1310	{
1311	cur = x ns->mapy + y; /* mark empty space */
1312	cur++;
1313	continue;
1314	}
1315	for (k = 0; k < newmap->cells[x][y].count; k++)
1316	{
1317	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1318	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1319	layers[k].count++;
1320	}
1321	}
1322	}
1323	/* If no data, return now. */
1324	if (fcur == cur && layers[0].count == 0)
1325	return cur;
1326	cur = 255; / mark end of explicitly cleared cells */
1327	cur++;
1328	/* First pack by layers. */
1329	for (k = 0; k < numlayers; k++)
1330	{
1331	if (layers[k].count == 0)
1332	break; /* once a layer is entirely empty, no layer below it can
1333	have anything in it either */
1334	/* Pack by entries in thie layer */
1335	for (x = 0; x < layers[k].count;)
1336	{
1337	fcur = cur;
1338	*cur = layers[k].lcells[x].face >> 8;
1339	cur++;
1340	*cur = layers[k].lcells[x].face & 0xFF;
1341	cur++;
1342	face = layers[k].lcells[x].face;
1343	/* Now, we back the redundant data into 1 byte xy pairings */
1344	for (y = x; y < layers[k].count; y++)
1345	{
1346	if (layers[k].lcells[y].face == face)
1347	{
1348	*cur = (uint8) layers[k].lcells[y].xy;
1349	cur++;
1350	layers[k].lcells[y].face = -1;
1351	}
1352	}
1353	(cur - 1) = (cur - 1) \| 128; /* mark for end of xy's; 1111 < 128 /
1354	/* forward over the now redundant data */
1355	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1356	x++;
1357	}
1358	fcur = fcur \| 128; /* mark for end of faces at this layer */
1359	}
1360	return cur;
1361	}	1191	}
1362		1192
1363	/** Clears a map cell */	1193	/** Clears a map cell */
1364	static void	1194	static void
1365	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1195	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
…		…
1377	#define MAX_LAYERS 3	1207	#define MAX_LAYERS 3
1378		1208
1379	/* Using a global really isn't a good approach, but saves the over head of	1209	/* Using a global really isn't a good approach, but saves the over head of
1380	* allocating and deallocating such a block of data each time run through,	1210	* allocating and deallocating such a block of data each time run through,
1381	* and saves the space of allocating this in the socket object when we only	1211	* and saves the space of allocating this in the socket object when we only
1382	* need it for this cycle. If the serve is ever threaded, this needs to be	1212	* need it for this cycle. If the server is ever threaded, this needs to be
1383	* re-examined.	1213	* re-examined.
1384	*/	1214	*/
1385
1386	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];	1215	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1387		1216
1388	/**	1217	/**
1389	* Returns true if any of the heads for this	1218	* Returns true if any of the heads for this
1390	* space is set. Returns false if all are blank - this is used	1219	* space is set. Returns false if all are blank - this is used
1391	* for empty space checking.	1220	* for empty space checking.
1392	*/	1221	*/
1393	static inline int	1222	static inline int
1394	have_head (int ax, int ay)	1223	have_head (int ax, int ay)
1395	{	1224	{
1396
1397	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|	1225	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1398	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1226	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1399	return 1;	1227	return 1;
		1228
1400	return 0;	1229	return 0;
1401	}	1230	}
1402		1231
1403	/**	1232	/**
1404	* check_head is a bit simplistic version of update_space below.	1233	* check_head is a bit simplistic version of update_space below.
1405	* basically, it only checks the that the head on space ax,ay at layer	1234	* basically, it only checks the that the head on space ax,ay at layer
1406	* needs to get sent - if so, it adds the data, sending the head	1235	* needs to get sent - if so, it adds the data, sending the head
1407	* if needed, and returning 1. If this no data needs to get	1236	* if needed, and returning 1. If this no data needs to get
1408	* sent, it returns zero.	1237	* sent, it returns zero.
1409	*/	1238	*/
1410	static int	1239	static int
1411	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1240	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1412	{	1241	{
1413	short face_num;	1242	short face_num;
1414		1243
1415	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1244	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1416	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1245	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
…		…
1448	* numbers the spaces differently - I think this was a leftover from	1277	* numbers the spaces differently - I think this was a leftover from
1449	* the map command, where the faces stack up. Sinces that is no longer	1278	* the map command, where the faces stack up. Sinces that is no longer
1450	* the case, it seems to make more sense to have these layer values	1279	* the case, it seems to make more sense to have these layer values
1451	* actually match.	1280	* actually match.
1452	*/	1281	*/
1453
1454	static int	1282	static int
1455	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1283	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1456	{	1284	{
1457	object ob, head;	1285	object ob, head;
1458	uint16 face_num;	1286	uint16 face_num;
1459	int bx, by, i;	1287	int bx, by, i;
1460		1288
…		…
1673	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1501	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1674	* take.	1502	* take.
1675	*/	1503	*/
1676		1504
1677	static inline int	1505	static inline int
1678	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1506	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1679	{	1507	{
1680	object *ob;	1508	object *ob;
1681	int smoothlevel; /* old face_num; */	1509	int smoothlevel; /* old face_num; */
1682		1510
1683	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1511	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1717	* Returns the size of a data for a map square as returned by	1545	* Returns the size of a data for a map square as returned by
1718	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries	1546	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
1719	* available.	1547	* available.
1720	*/	1548	*/
1721	int	1549	int
1722	getExtendedMapInfoSize (client_socket * ns)	1550	getExtendedMapInfoSize (client * ns)
1723	{	1551	{
1724	int result = 0;	1552	int result = 0;
1725		1553
1726	if (ns->ext_mapinfos)	1554	if (ns->ext_mapinfos)
1727	{	1555	{
1728	if (ns->EMI_smooth)	1556	if (ns->EMI_smooth)
1729	result += 1; /One byte for smoothlevel /	1557	result += 1; /One byte for smoothlevel /
1730	}	1558	}
		1559
1731	return result;	1560	return result;
1732	}	1561	}
1733		1562
1734	/**	1563	/**
1735	* This function uses the new map1 protocol command to send the map	1564	* This function uses the new map1 protocol command to send the map
…		…
1742	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1571	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1743	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1572	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1744	* and use the other 4 bits for other informatiion. For full documentation	1573	* and use the other 4 bits for other informatiion. For full documentation
1745	* of what we send, see the doc/Protocol file.	1574	* of what we send, see the doc/Protocol file.
1746	* I will describe internally what we do:	1575	* I will describe internally what we do:
1747	* the socket->lastmap shows how the map last looked when sent to the client.	1576	* the ns->lastmap shows how the map last looked when sent to the client.
1748	* in the lastmap structure, there is a cells array, which is set to the	1577	* in the lastmap structure, there is a cells array, which is set to the
1749	* maximum viewable size (As set in config.h).	1578	* maximum viewable size (As set in config.h).
1750	* in the cells, there are faces and a count value.	1579	* in the cells, there are faces and a count value.
1751	* we use the count value to hold the darkness value. If -1, then this space	1580	* we use the count value to hold the darkness value. If -1, then this space
1752	* is not viewable.	1581	* is not viewable.
…		…
1763	uint8 eentrysize;	1592	uint8 eentrysize;
1764	uint16 ewhatstart, ewhatflag;	1593	uint16 ewhatstart, ewhatflag;
1765	uint8 extendedinfos;	1594	uint8 extendedinfos;
1766	maptile *m;	1595	maptile *m;
1767		1596
1768	client_socket &socket = *pl->contr->socket;	1597	client &socket = *pl->contr->ns;
1769		1598
1770	check_map_change (pl->contr);	1599	check_map_change (pl->contr);
1771		1600
1772	packet sl;	1601	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1773	packet esl;	1602	packet esl;
1774		1603
1775	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1776	startlen = sl.length ();	1604	startlen = sl.length ();
1777		1605
1778	/Extendedmapinfo structure initialisation /	1606	/Extendedmapinfo structure initialisation /
1779	if (socket.ext_mapinfos)	1607	if (socket.ext_mapinfos)
1780	{	1608	{
…		…
1824	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1652	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1825	{	1653	{
1826	ax = 0;	1654	ax = 0;
1827	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1655	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1828	{	1656	{
1829
1830	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1657	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1831		1658
1832	/* If this space is out of the normal viewable area, we only check	1659	/* If this space is out of the normal viewable area, we only check
1833	* the heads value ax or ay will only be greater than what	1660	* the heads value ax or ay will only be greater than what
1834	* the client wants if using the map1a command - this is because	1661	* the client wants if using the map1a command - this is because
…		…
2164	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1991	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2165	return;	1992	return;
2166		1993
2167	memset (&newmap, 0, sizeof (struct Map));	1994	memset (&newmap, 0, sizeof (struct Map));
2168		1995
2169	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1996	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2170	{
2171	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1997	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2172	{	1998	{
2173	ax = i;	1999	ax = i;
2174	ay = j;	2000	ay = j;
2175	m = pm;	2001	m = pm;
2176	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2002	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2003
2177	if (mflags & P_OUT_OF_MAP)	2004	if (mflags & P_OUT_OF_MAP)
2178	continue;	2005	continue;
2179	if (mflags & P_NEED_UPDATE)	2006
2180	update_position (m, ax, ay);
2181	/* If a map is visible to the player, we don't want to swap it out	2007	/* If a map is visible to the player, we don't want to swap it out
2182	* just to reload it. This should really call something like	2008	* just to reload it. This should really call something like
2183	* swap_map, but this is much more efficient and 'good enough'	2009	* swap_map, but this is much more efficient and 'good enough'
2184	*/	2010	*/
2185	if (mflags & P_NEW_MAP)	2011	if (mflags & P_NEW_MAP)
2186	m->timeout = 50;	2012	m->timeout = 50;
2187	}	2013	}
2188	}	2014
2189	/* do LOS after calls to update_position */	2015	/* do LOS after calls to update_position */
2190	if (pl->contr->do_los)	2016	if (pl->contr->do_los)
2191	{	2017	{
2192	update_los (pl);	2018	update_los (pl);
2193	pl->contr->do_los = 0;	2019	pl->contr->do_los = 0;
…		…
2208		2034
2209	/*****************************************************************************/	2035	/*****************************************************************************/
2210	void	2036	void
2211	send_plugin_custom_message (object pl, char buf)	2037	send_plugin_custom_message (object pl, char buf)
2212	{	2038	{
2213	pl->contr->socket->send_packet (buf);	2039	pl->contr->ns->send_packet (buf);
2214	}	2040	}
2215		2041
2216	/**	2042	/**
2217	* This sends the skill number to name mapping. We ignore	2043	* This sends the skill number to name mapping. We ignore
2218	* the params - we always send the same info no matter what.	2044	* the params - we always send the same info no matter what.
2219	*/	2045	*/
2220	void	2046	void
2221	send_skill_info (client_socket ns, char params)	2047	send_skill_info (client ns, char params)
2222	{	2048	{
2223	packet sl;	2049	packet sl;
2224	sl << "replyinfo skill_info\n";	2050	sl << "replyinfo skill_info\n";
2225		2051
2226	for (int i = 1; i < NUM_SKILLS; i++)	2052	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2238	/**	2064	/**
2239	* This sends the spell path to name mapping. We ignore	2065	* This sends the spell path to name mapping. We ignore
2240	* the params - we always send the same info no matter what.	2066	* the params - we always send the same info no matter what.
2241	*/	2067	*/
2242	void	2068	void
2243	send_spell_paths (client_socket * ns, char *params)	2069	send_spell_paths (client * ns, char *params)
2244	{	2070	{
2245	packet sl;	2071	packet sl;
2246		2072
2247	sl << "replyinfo spell_paths\n";	2073	sl << "replyinfo spell_paths\n";
2248		2074
…		…
2263	* it then sends an updspell packet for each spell that has changed in this way	2089	* it then sends an updspell packet for each spell that has changed in this way
2264	*/	2090	*/
2265	void	2091	void
2266	esrv_update_spells (player *pl)	2092	esrv_update_spells (player *pl)
2267	{	2093	{
2268	if (!pl->socket->monitor_spells)	2094	if (!pl->ns->monitor_spells)
2269	return;	2095	return;
2270		2096
2271	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2097	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2272	{	2098	{
2273	if (spell->type == SPELL)	2099	if (spell->type == SPELL)
…		…
2303		2129
2304	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2130	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2305	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2131	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2306	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2132	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2307		2133
2308	pl->socket->send_packet (sl);	2134	pl->ns->send_packet (sl);
2309	}	2135	}
2310	}	2136	}
2311	}	2137	}
2312	}	2138	}
2313		2139
2314	void	2140	void
2315	esrv_remove_spell (player pl, object spell)	2141	esrv_remove_spell (player pl, object spell)
2316	{	2142	{
2317	if (!pl->socket->monitor_spells)	2143	if (!pl->ns->monitor_spells)
2318	return;	2144	return;
2319		2145
2320	if (!pl \|\| !spell \|\| spell->env != pl->ob)	2146	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2321	{	2147	{
2322	LOG (llevError, "Invalid call to esrv_remove_spell");	2148	LOG (llevError, "Invalid call to esrv_remove_spell");
2323	return;	2149	return;
2324	}	2150	}
2325		2151
2326	packet sl;	2152	packet sl ("delspell");
2327		2153
2328	sl << "delspell "
2329	<< uint32 (spell->count);	2154	sl << uint32 (spell->count);
2330		2155
2331	pl->socket->send_packet (sl);	2156	pl->ns->send_packet (sl);
2332	}	2157	}
2333		2158
2334	/* appends the spell spell to the Socklist we will send the data to. /	2159	/* appends the spell spell to the Socklist we will send the data to. /
2335	static void	2160	static void
2336	append_spell (player pl, packet &sl, object spell)	2161	append_spell (player pl, packet &sl, object spell)
…		…
2384	{	2209	{
2385	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2210	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2386	return;	2211	return;
2387	}	2212	}
2388		2213
2389	if (!pl->socket->monitor_spells)	2214	if (!pl->ns->monitor_spells)
2390	return;	2215	return;
2391		2216
2392	packet sl;	2217	packet sl ("addspell");
2393
2394	sl << "addspell ";
2395		2218
2396	if (!spell)	2219	if (!spell)
2397	{	2220	{
2398	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2221	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2399	{	2222	{
…		…
2413	if (spell->type != SPELL)	2236	if (spell->type != SPELL)
2414	continue;	2237	continue;
2415		2238
2416	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2239	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2417	{	2240	{
2418	pl->socket->send_packet (sl);	2241	pl->ns->send_packet (sl);
2419		2242
2420	sl.reset ();	2243	sl.reset ();
2421	sl << "addspell ";	2244	sl << "addspell ";
2422	}	2245	}
2423		2246
…		…
2437	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2260	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2438	fatal (0);	2261	fatal (0);
2439	}	2262	}
2440		2263
2441	/* finally, we can send the packet */	2264	/* finally, we can send the packet */
2442	pl->socket->send_packet (sl);	2265	pl->ns->send_packet (sl);
2443	}	2266	}
2444		2267

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs. Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC