ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.32 by root, Thu Dec 14 01:12:35 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	* esrv_map_doneredraw finishes the map update, and ships across the
47	* map updates.
48	*
49	*/	43	*/
50		44
51	#include <global.h>	45	#include <global.h>
52	#include <sproto.h>	46	#include <sproto.h>
53		47
54	#include <newclient.h>
55	#include <newserver.h>
56	#include <living.h>	48	#include <living.h>
57	#include <commands.h>	49	#include <commands.h>
58		50
59	/* 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,
60	* it should work here.	52	* it should work here.
…		…
63	#include <sys/time.h>	55	#include <sys/time.h>
64	#include <sys/socket.h>	56	#include <sys/socket.h>
65	#include <netinet/in.h>	57	#include <netinet/in.h>
66	#include <netdb.h>	58	#include <netdb.h>
67		59
68	#ifdef HAVE_UNISTD_H
69	# include <unistd.h>	60	#include <unistd.h>
70	#endif
71
72	#ifdef HAVE_SYS_TIME_H
73	# include <sys/time.h>	61	#include <sys/time.h>
74	#endif
75		62
76	#include "sounds.h"	63	#include "sounds.h"
77		64
78	/**	65	/**
79	* This table translates the attack numbers as used within the	66	* This table translates the attack numbers as used within the
…		…
96	-1, /* life stealing */	83	-1, /* life stealing */
97	-1 /* Disease - not fully done yet */	84	-1 /* Disease - not fully done yet */
98	};	85	};
99		86
100	static void	87	static void
101	socket_map_scroll (NewSocket * ns, int dx, int dy)	88	socket_map_scroll (client *ns, int dx, int dy)
102	{	89	{
103	struct Map newmap;	90	struct Map newmap;
104	int x, y, mx, my;	91	int x, y, mx, my;
105		92
106	{
107	SockList sl (MAXSOCKBUF);
108
109	sl.printf ("map_scroll %d %d", dx, dy);	93	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110	ns->send_packet (sl);
111	sl.free ();
112	}
113		94
114	/* If we are using the Map1aCmd, we may in fact send	95	/* If we are using the Map1aCmd, we may in fact send
115	* head information that is outside the viewable map.	96	* head information that is outside the viewable map.
116	* 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
117	* look for. Removed code to do so - it caused extra	98	* look for. Removed code to do so - it caused extra
…		…
157	}	138	}
158		139
159	static void	140	static void
160	clear_map (player *pl)	141	clear_map (player *pl)
161	{	142	{
162	NewSocket & socket = pl->socket;
163
164	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	143	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
165		144
166	if (socket.newmapcmd == 1)	145	if (pl->ns->newmapcmd == 1)
167	socket.send_packet ("newmap");	146	pl->ns->send_packet ("newmap");
168		147
169	socket.update_look = 1;	148	pl->ns->floorbox_reset ();
170	socket.look_position = 0;
171	}	149	}
172		150
173	/** check for map change and send new map data */	151	/** check for map change and send new map data */
174	static void	152	static void
175	check_map_change (player *pl)	153	check_map_change (player *pl)
176	{	154	{
177	NewSocket & socket = pl->socket;	155	client &socket = *pl->ns;
178	object *ob = pl->ob;	156	object *ob = pl->ob;
179	char buf[MAX_BUF]; /* eauugggh */	157	char buf[MAX_BUF]; /* eauugggh */
180		158
181	if (socket.current_map != ob->map)	159	if (socket.current_map != ob->map)
182	{	160	{
…		…
216	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	194	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
217	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
218	else	196	else
219	{	197	{
220	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);
221	socket.update_look = 1;	199	socket.floorbox_reset ();
222	socket.look_position = 0;
223	}	200	}
224	}	201	}
225		202
226	socket.current_x = ob->x;	203	socket.current_x = ob->x;
227	socket.current_y = ob->y;	204	socket.current_y = ob->y;
228	}	205	}
229		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
230	void	251	void
231	ExtCmd (char *buf, int len, player *pl)	252	ExtCmd (char *buf, int len, player *pl)
232	{	253	{
233	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));
234	}	261	}
235		262
236	void	263	void
237	MapInfoCmd (char *buf, int len, player *pl)	264	MapInfoCmd (char *buf, int len, player *pl)
238	{	265	{
…		…
253	buf += 8;	280	buf += 8;
254		281
255	// initial map and its origin	282	// initial map and its origin
256	maptile *map = pl->ob->map;	283	maptile *map = pl->ob->map;
257	sint16 dx, dy;	284	sint16 dx, dy;
258	int mapx = pl->socket.mapx / 2 - pl->ob->x;	285	int mapx = pl->ns->mapx / 2 - pl->ob->x;
259	int mapy = pl->socket.mapy / 2 - pl->ob->y;	286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
260	int max_distance = 8; // limit maximum path length to something generous	287	int max_distance = 8; // limit maximum path length to something generous
261		288
262	while (*buf && map && max_distance)	289	while (*buf && map && max_distance)
263	{	290	{
264	int dir = *buf++;	291	int dir = *buf++;
…		…
315	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316	}	343	}
317	else	344	else
318	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319		346
320	pl->socket.send_packet (bigbuf);	347	pl->ns->send_packet (bigbuf);
321	}	348	}
322		349
323	/** This is the Setup cmd - easy first implementation */	350	/** This is the Setup cmd - easy first implementation */
324	void	351	void
325	SetUp (char *buf, int len, NewSocket * ns)	352	SetUp (char *buf, int len, client * ns)
326	{	353	{
327	int s, slen;	354	int s, slen;
328	char *cmd, *param, cmdback[HUGE_BUF];	355	char *cmd, *param, cmdback[HUGE_BUF];
329		356
330	/* run through the cmds of setup	357	/* run through the cmds of setup
…		…
540	* 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.
541	* 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,
542	* 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.
543	*/	570	*/
544	void	571	void
545	AddMeCmd (char *buf, int len, NewSocket * ns)	572	AddMeCmd (char *buf, int len, client * ns)
546	{	573	{
547	Settings oldsettings;	574	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
548
549	oldsettings = settings;
550	if (ns->status != Ns_Add || add_player (ns))
551	ns->send_packet ("addme_failed");
552	else
553	{
554	/* Basically, the add_player copies the socket structure into
555	* the player structure, so this one (which is from init_sockets)
556	* is not needed anymore. The write below should still work, as the
557	* stuff in ns is still relevant.
558	*/
559	ns->send_packet ("addme_success");
560	socket_info.nconns--;
561	ns->status = Ns_Avail;
562	}
563
564	settings = oldsettings;
565	}	575	}
566		576
567	/** Reply to ExtendedInfos command */	577	/** Reply to ExtendedInfos command */
568	void	578	void
569	ToggleExtendedInfos (char *buf, int len, NewSocket * ns)	579	ToggleExtendedInfos (char *buf, int len, client * ns)
570	{	580	{
571	char cmdback[MAX_BUF];	581	char cmdback[MAX_BUF];
572	char command[50];	582	char command[50];
573	int info, nextinfo;	583	int info, nextinfo;
574		584
…		…
625	#define MSG_TYPE_MONUMENT 5	635	#define MSG_TYPE_MONUMENT 5
626	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	636	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627		637
628	/** Reply to ExtendedInfos command */	638	/** Reply to ExtendedInfos command */
629	void	639	void
630	ToggleExtendedText (char *buf, int len, NewSocket * ns)	640	ToggleExtendedText (char *buf, int len, client * ns)
631	{	641	{
632	char cmdback[MAX_BUF];	642	char cmdback[MAX_BUF];
633	char temp[10];	643	char temp[10];
634	char command[50];	644	char command[50];
635	int info, nextinfo, i, flag;	645	int info, nextinfo, i, flag;
…		…
686	* 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
687	* 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
688	* client.	698	* client.
689	*/	699	*/
690	static void	700	static void
691	SendSmooth (NewSocket * ns, uint16 face)	701	SendSmooth (client *ns, uint16 face)
692	{	702	{
693	uint16 smoothface;	703	uint16 smoothface;
694		704
695	/* 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
696	* again.	706	* again.
…		…
706	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	716	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707	esrv_send_face (ns, smoothface, 0);	717	esrv_send_face (ns, smoothface, 0);
708		718
709	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	719	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710		720
711	SockList sl (MAXSOCKBUF);	721	packet sl ("smooth");
712		722
713	sl << "smooth "
714	<< uint16 (face)	723	sl << uint16 (face)
715	<< uint16 (smoothface);	724	<< uint16 (smoothface);
716		725
717	Send_With_Handling (ns, &sl);	726	ns->send_packet (sl);
718	sl.free ();
719	}	727	}
720		728
721	/**	729	/**
722	* Tells client the picture it has to use	730	* Tells client the picture it has to use
723	* to smooth a picture number given as argument.	731	* to smooth a picture number given as argument.
724	*/	732	*/
725	void	733	void
726	AskSmooth (char *buf, int len, NewSocket * ns)	734	AskSmooth (char *buf, int len, client *ns)
727	{	735	{
728	uint16 facenbr;	736	SendSmooth (ns, atoi (buf));
729
730	facenbr = atoi (buf);
731	SendSmooth (ns, facenbr);
732	}	737	}
733		738
734	/**	739	/**
735	* 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,
736	* etc.)	741	* etc.)
737	*/	742	*/
738	void	743	void
739	PlayerCmd (char *buf, int len, player *pl)	744	PlayerCmd (char *buf, int len, player *pl)
740	{	745	{
741
742	/* The following should never happen with a proper or honest client.
743	* Therefore, the error message doesn't have to be too clear - if
744	* someone is playing with a hacked/non working client, this gives them
745	* an idea of the problem, but they deserve what they get
746	*/
747	if (pl->state != ST_PLAYING)
748	{
749	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
750	return;
751	}
752	/* 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
753	* sent, so check for that also.	747	* sent, so check for that also.
754	*/	748	*/
755	if (atoi (buf) || buf[0] == '0')	749	if (atoi (buf) || buf[0] == '0')
756	{	750	{
757	pl->count = atoi ((char *) buf);	751	pl->count = atoi ((char *) buf);
		752
758	buf = strchr (buf, ' '); /* advance beyond the numbers */	753	buf = strchr (buf, ' '); /* advance beyond the numbers */
759	if (!buf)	754	if (!buf)
760	{
761	#ifdef ESRV_DEBUG
762	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
763	#endif
764	return;	755	return;
765	}	756
766	buf++;	757	buf++;
767	}	758	}
768	/* This should not happen anymore. */	759
769	if (pl->ob->speed_left < -1.0)
770	{
771	LOG (llevError, "Player has negative time - shouldn't do command.\n");
772	}
773	/* In c_new.c */
774	execute_newserver_command (pl->ob, (char *) buf);	760	execute_newserver_command (pl->ob, (char *) buf);
		761
775	/* Perhaps something better should be done with a left over count.	762	/* Perhaps something better should be done with a left over count.
776	* Cleaning up the input should probably be done first - all actions	763	* Cleaning up the input should probably be done first - all actions
777	* 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
778	* commands.	765	* commands.
779	*/	766	*/
780
781	pl->count = 0;	767	pl->count = 0;
782
783	}	768	}
784		769
785		770
786	/**	771	/**
787	* 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,
788	* etc.). It is a lot like PlayerCmd above, but is called with the	773	* etc.). It is a lot like PlayerCmd above, but is called with the
789	* 'ncom' method which gives more information back to the client so it	774	* 'ncom' method which gives more information back to the client so it
790	* can throttle.	775	* can throttle.
791	*/	776	*/
792	void	777	void
793	NewPlayerCmd (uint8 * buf, int len, player *pl)	778	NewPlayerCmd (char *buf, int len, player *pl)
794	{	779	{
795	int time, repeat;
796	char command[MAX_BUF];
797	short packet;
798
799	if (len < 7)	780	if (len <= 6)
800	{	781	{
801	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);
802	return;	783	return;
803	}	784	}
804		785
805	packet = net_uint16 (buf);	786	uint16 cmdid = net_uint16 ((uint8 *)buf);
806	repeat = net_uint32 (buf + 2);	787	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
807		788
808	/* -1 is special - no repeat, but don't update */	789	/* -1 is special - no repeat, but don't update */
809	if (repeat != -1)	790	if (repeat != -1)
810	pl->count = repeat;	791	pl->count = repeat;
811		792
812	if ((len - 4) >= MAX_BUF)	793	buf += 6; //len -= 6;
813	len = MAX_BUF - 5;
814		794
815	strncpy ((char *) command, (char *) buf + 6, len - 4);
816	command[len - 4] = '\0';
817
818	/* The following should never happen with a proper or honest client.
819	* Therefore, the error message doesn't have to be too clear - if
820	* someone is playing with a hacked/non working client, this gives them
821	* an idea of the problem, but they deserve what they get
822	*/
823	if (pl->state != ST_PLAYING)
824	{
825	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
826	return;
827	}
828
829	/* This should not happen anymore. */
830	if (pl->ob->speed_left < -1.0)
831	LOG (llevError, "Player has negative time - shouldn't do command.\n");
832
833	/* In c_new.c */
834	execute_newserver_command (pl->ob, (char *) command);	795	execute_newserver_command (pl->ob, buf);
		796
835	/* Perhaps something better should be done with a left over count.	797	/* Perhaps something better should be done with a left over count.
836	* Cleaning up the input should probably be done first - all actions	798	* Cleaning up the input should probably be done first - all actions
837	* 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
838	* commands.	800	* commands.
839	*/	801	*/
840	pl->count = 0;	802	pl->count = 0;
841		803
		804	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
842	if (FABS (pl->ob->speed) < 0.001)	805	int time = FABS (pl->ob->speed) < 0.001
843	time = MAX_TIME * 100;	806	? time = MAX_TIME * 100
844	else
845	time = (int) (MAX_TIME / FABS (pl->ob->speed));	807	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
846		808
847	/* Send confirmation of command execution now */	809	/* Send confirmation of command execution now */
848		810	packet sl ("comc");
849	SockList sl (MAXSOCKBUF);
850	sl << "comc " << uint16 (packet) << uint32 (time);	811	sl << uint16 (cmdid) << uint32 (time);
851	Send_With_Handling (&pl->socket, &sl);	812	pl->ns->send_packet (sl);
852	sl.free ();
853	}	813	}
854
855		814
856	/** This is a reply to a previous query. */	815	/** This is a reply to a previous query. */
857	void	816	void
858	ReplyCmd (char *buf, int len, player *pl)	817	ReplyCmd (char *buf, int len, client *ns)
859	{	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
860	/* 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
861	* 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
862	* once all the X11 code is removed from the server.	833	* once all the X11 code is removed from the server.
863	*	834	*
864	* 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
865	* think it was the carriage return that was entered, and the	836	* think it was the carriage return that was entered, and the
866	* function then does not try to do additional input.	837	* function then does not try to do additional input.
867	*/	838	*/
868	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	839	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
869		840
870	/* this avoids any hacking here */	841	/* this avoids any hacking here */
871		842
872	switch (pl->state)	843	switch (ns->state)
873	{	844	{
874	case ST_PLAYING:	845	case ST_PLAYING:
875	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	846	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
876	break;	847	break;
877		848
878	case ST_PLAY_AGAIN:
879	/* We can check this for return value (2==quit). Maybe we
880	* should, and do something appropriate?
881	*/
882	receive_play_again (pl->ob, buf[0]);
883	break;
884
885	case ST_ROLL_STAT:
886	key_roll_stat (pl->ob, buf[0]);
887	break;
888
889	case ST_CHANGE_CLASS:	849	case ST_CHANGE_CLASS:
890
891	key_change_class (pl->ob, buf[0]);	850	key_change_class (pl->ob, buf[0]);
892	break;	851	break;
893		852
894	case ST_CONFIRM_QUIT:	853	case ST_CONFIRM_QUIT:
895	key_confirm_quit (pl->ob, buf[0]);	854	key_confirm_quit (pl->ob, buf[0]);
896	break;	855	break;
897		856
898	case ST_CONFIGURE:
899	LOG (llevError, "In client input handling, but into configure state\n");
900	pl->state = ST_PLAYING;
901	break;
902
903	case ST_GET_NAME:
904	receive_player_name (pl->ob, 13);
905	break;
906
907	case ST_GET_PASSWORD:
908	case ST_CONFIRM_PASSWORD:
909	receive_player_password (pl->ob, 13);
910	break;
911
912	case ST_GET_PARTY_PASSWORD: /* Get password for party */	857	case ST_GET_PARTY_PASSWORD: /* Get password for party */
913	receive_party_password (pl->ob, 13);	858	receive_party_password (pl->ob, 13);
914	break;	859	break;
915		860
916	default:	861	default:
917	LOG (llevError, "Unknown input state: %d\n", pl->state);	862	LOG (llevError, "Unknown input state: %d\n", ns->state);
918	}	863	}
919	}	864	}
920		865
921	/**	866	/**
922	* 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
…		…
924	* 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
925	* 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
926	* problem.	871	* problem.
927	*/	872	*/
928	void	873	void
929	VersionCmd (char *buf, int len, NewSocket * ns)	874	VersionCmd (char *buf, int len, client * ns)
930	{	875	{
931	char *cp;
932	char version_warning[256];
933
934	if (!buf)	876	if (!buf)
935	{	877	{
936	LOG (llevError, "CS: received corrupted version command\n");	878	LOG (llevError, "CS: received corrupted version command\n");
937	return;	879	return;
938	}	880	}
939		881
940	ns->cs_version = atoi (buf);	882	ns->cs_version = atoi (buf);
941	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
942	if (VERSION_CS != ns->cs_version)	890	//if (VERSION_CS != ns->cs_version)
943	{	891	// unchecked;
944	#ifdef ESRV_DEBUG	892
945	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
946	#endif
947	}
948	cp = strchr (buf + 1, ' ');	893	char *cp = strchr (buf + 1, ' ');
949	if (!cp)	894	if (!cp)
950	return;	895	return;
		896
951	ns->sc_version = atoi (cp);	897	ns->sc_version = atoi (cp);
		898
952	if (VERSION_SC != ns->sc_version)	899	//if (VERSION_SC != ns->sc_version)
953	{	900	// unchecked;
954	#ifdef ESRV_DEBUG	901
955	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
956	#endif
957	}
958	cp = strchr (cp + 1, ' ');	902	cp = strchr (cp + 1, ' ');
		903
959	if (cp)	904	if (cp)
960	{	905	{
961	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	906	assign (ns->version, cp + 1);
962		907
963	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
964
965	/* This is first implementation - i skip all beta DX clients with it
966	* Add later stuff here for other clients
967	*/
968
969	/* these are old dxclients */
970	/* Version 1024 added support for singular + plural name values -
971	* requiing this minimal value reduces complexity of that code, and it
972	* has been around for a long time.
973	*/
974	if (ns->sc_version < 1026)	908	if (ns->sc_version < 1026)
975	{	909	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
976	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
977	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	910	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
978	ns->send_packet (version_warning);
979	}
980
981	}	911	}
982	}	912	}
983		913
984	/** sound related functions. */	914	/** sound related functions. */
985
986	void	915	void
987	SetSound (char *buf, int len, NewSocket * ns)	916	SetSound (char *buf, int len, client * ns)
988	{	917	{
989	ns->sound = atoi (buf);	918	ns->sound = atoi (buf);
990	}	919	}
991		920
992	/** client wants the map resent */	921	/** client wants the map resent */
993		922
994	void	923	void
995	MapRedrawCmd (char *buf, int len, player *pl)	924	MapRedrawCmd (char *buf, int len, player *pl)
996	{	925	{
997
998	/* 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
999	* 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.
1000	* Unfortunately this solution does not work because some client versions send	928	* Unfortunately this solution does not work because some client versions send
1001	* a mapredraw command after receiving a newmap command.	929	* a mapredraw command after receiving a newmap command.
1002	*/	930	*/
1003	#if 0
1004	/* Okay, this is MAJOR UGLY. but the only way I know how to
1005	* clear the "cache"
1006	*/
1007	memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1008	draw_client_map (pl->ob);
1009	#endif
1010	}	931	}
1011		932
1012	/**	933	/**
1013	* Moves an object (typically, container to inventory).	934	* Moves an object (typically, container to inventory).
1014	* syntax is: move (to) (tag) (nrof)	935	* syntax is: move (to) (tag) (nrof)
…		…
1017	MoveCmd (char *buf, int len, player *pl)	938	MoveCmd (char *buf, int len, player *pl)
1018	{	939	{
1019	int vals[3], i;	940	int vals[3], i;
1020		941
1021	/* A little funky here. We only cycle for 2 records, because	942	/* A little funky here. We only cycle for 2 records, because
1022	* 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
1023	* record. Perhaps we should just replace this with a	944	* record. Perhaps we should just replace this with a
1024	* sscanf?	945	* sscanf?
1025	*/	946	*/
1026	for (i = 0; i < 2; i++)	947	for (i = 0; i < 2; i++)
1027	{	948	{
1028	vals[i] = atoi (buf);	949	vals[i] = atoi (buf);
		950
1029	if (!(buf = strchr (buf, ' ')))	951	if (!(buf = strchr (buf, ' ')))
1030	{	952	{
1031	LOG (llevError, "Incomplete move command: %s\n", buf);	953	LOG (llevError, "Incomplete move command: %s\n", buf);
1032	return;	954	return;
1033	}	955	}
		956
1034	buf++;	957	buf++;
1035	}	958	}
		959
1036	vals[2] = atoi (buf);	960	vals[2] = atoi (buf);
1037		961
1038	/* 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]);*/
1039	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	963	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1040	}	964	}
1041
1042
1043		965
1044	/******************************************************************************	966	/******************************************************************************
1045	*	967	*
1046	* Start of commands the server sends to the client.	968	* Start of commands the server sends to the client.
1047	*	969	*
…		…
1050	/**	972	/**
1051	* 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
1052	* 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)
1053	*/	975	*/
1054	void	976	void
1055	send_query (NewSocket * ns, uint8 flags, char *text)	977	send_query (client *ns, uint8 flags, char *text)
1056	{	978	{
1057	char buf[MAX_BUF];
1058
1059	sprintf (buf, "query %d %s", flags, text ? text : "");	979	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1060	ns->send_packet (buf);
1061	}	980	}
1062		981
1063	#define AddIfInt64(Old,New,Type) if (Old != New) {\	982	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1064	Old = New; \	983	Old = New; \
1065	sl << uint8 (Type) << uint64 (New); \	984	sl << uint8 (Type) << uint64 (New); \
…		…
1095	esrv_update_stats (player *pl)	1014	esrv_update_stats (player *pl)
1096	{	1015	{
1097	char buf[MAX_BUF];	1016	char buf[MAX_BUF];
1098	uint16 flags;	1017	uint16 flags;
1099		1018
1100	SockList sl (MAXSOCKBUF);	1019	packet sl ("stats");
1101	sl << "stats ";
1102		1020
1103	if (pl->ob != NULL)	1021	if (pl->ob)
1104	{	1022	{
1105	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);
1106	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);
1107	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);
1108	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);
1109	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);
1110	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);
1111	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);
1112	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1113	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1114	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1115	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);
1116	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);
1117	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);
1118	}	1036	}
1119		1037
1120	if (pl->socket.exp64)	1038	if (pl->ns->exp64)
1121	{
1122	uint8 s;
1123
1124	for (s = 0; s < NUM_SKILLS; s++)	1039	for (int s = 0; s < NUM_SKILLS; s++)
1125	{
1126	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)
1127	{	1041	{
1128	/* Always send along the level if exp changes. This is only	1042	/* Always send along the level if exp changes. This is only
1129	* 1 extra byte, but keeps processing simpler.	1043	* 1 extra byte, but keeps processing simpler.
1130	*/	1044	*/
1131	sl << uint8 (s + CS_STAT_SKILLINFO)	1045	sl << uint8 (s + CS_STAT_SKILLINFO)
1132	<< uint8 (pl->last_skill_ob[s]->level)	1046	<< uint8 (pl->last_skill_ob[s]->level)
1133	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1047	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1134		1048
1135	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;
1136	}	1050	}
1137	}
1138	}
1139		1051
1140	if (pl->socket.exp64)	1052	if (pl->ns->exp64)
1141	{ 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) }
1142	else	1054	else
1143	{ 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) }
1144		1056
1145	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1057	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
…		…
1158	if (pl->run_on)	1070	if (pl->run_on)
1159	flags |= SF_RUNON;	1071	flags |= SF_RUNON;
1160		1072
1161	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1073	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162		1074
1163	if (pl->socket.sc_version < 1025)	1075	if (pl->ns->sc_version < 1025)
1164	{ 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) }
1165	else	1077	else
1166	{
1167	int i;
1168
1169	for (i = 0; i < NROFATTACKS; i++)	1078	for (int i = 0; i < NROFATTACKS; i++)
1170	{	1079	{
1171	/* Skip ones we won't send */	1080	/* Skip ones we won't send */
1172	if (atnr_cs_stat[i] == -1)	1081	if (atnr_cs_stat[i] == -1)
1173	continue;	1082	continue;
1174		1083
1175	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]);
1176	}	1085	}
1177	}
1178		1086
1179	if (pl->socket.monitor_spells)	1087	if (pl->ns->monitor_spells)
1180	{	1088	{
1181	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);
1182	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);
1183	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);
1184	}	1092	}
1185		1093
1186	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 */
1187	AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);	1095	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1188	set_title (pl->ob, buf);	1096	set_title (pl->ob, buf);
1189	AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);	1097	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1190		1098
1191	/* Only send it away if we have some actual data */	1099	/* Only send it away if we have some actual data */
1192	if (sl.len > 6)	1100	if (sl.length () > 6)
1193	{	1101	pl->ns->send_packet (sl);
1194	#ifdef ESRV_DEBUG
1195	LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1196	#endif
1197	Send_With_Handling (&pl->socket, &sl);
1198	}
1199
1200	sl.free ();
1201	}	1102	}
1202		1103
1203	/**	1104	/**
1204	* 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.
1205	*/	1106	*/
1206	void	1107	void
1207	esrv_new_player (player *pl, uint32 weight)	1108	esrv_new_player (player *pl, uint32 weight)
1208	{	1109	{
1209	pl->last_weight = weight;	1110	pl->last_weight = weight;
1210		1111
1211	SockList sl (MAXSOCKBUF);	1112	packet sl ("player");
1212	sl << "player ";
1213		1113
1214	sl << uint32 (pl->ob->count)	1114	sl << uint32 (pl->ob->count)
1215	<< uint32 (weight)	1115	<< uint32 (weight)
1216	<< uint32 (pl->ob->face->number)	1116	<< uint32 (pl->ob->face->number)
1217	<< data8 (pl->ob->name);	1117	<< data8 (pl->ob->name);
1218		1118
1219	Send_With_Handling (&pl->socket, &sl);	1119	pl->ns->send_packet (sl);
1220	sl.free ();
1221	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1120	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222	}	1121	}
1223		1122
1224	/**	1123	/**
1225	* Need to send an animation sequence to the client.	1124	* Need to send an animation sequence to the client.
…		…
1227	* 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
1228	* 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
1229	* when the player logs in and picks stuff up.	1128	* when the player logs in and picks stuff up.
1230	*/	1129	*/
1231	void	1130	void
1232	esrv_send_animation (NewSocket * ns, short anim_num)	1131	esrv_send_animation (client * ns, short anim_num)
1233	{	1132	{
1234	int i;
1235
1236	/* 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
1237	* 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
1238	* range, it must be a valid animation.	1135	* range, it must be a valid animation.
1239	*/	1136	*/
1240	if (anim_num < 0 || anim_num > num_animations)	1137	if (anim_num < 0 || anim_num > num_animations)
1241	{	1138	{
1242	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);
1243	return;	1140	return;
1244	}	1141	}
1245		1142
1246	SockList sl (MAXSOCKBUF);	1143	packet sl ("anim");
1247		1144
1248	sl << "anim "
1249	<< uint16 (anim_num)	1145	sl << uint16 (anim_num)
1250	<< uint16 (0); /* flags - not used right now */	1146	<< uint16 (0); /* flags - not used right now */
1251		1147
1252	/* 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
1253	* the face itself) down to the client.	1149	* the face itself) down to the client.
1254	*/	1150	*/
1255	for (i = 0; i < animations[anim_num].num_animations; i++)	1151	for (int i = 0; i < animations[anim_num].num_animations; i++)
1256	{	1152	{
1257	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))
1258	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1154	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1155
1259	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 */
1260	}	1157	}
1261		1158
1262	Send_With_Handling (ns, &sl);	1159	ns->send_packet (sl);
1263	sl.free ();
1264		1160
1265	ns->anims_sent[anim_num] = 1;	1161	ns->anims_sent[anim_num] = 1;
1266	}	1162	}
1267		1163
1268		1164
…		…
1275	/**	1171	/**
1276	* 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
1277	* the face yet, we will also send it.	1173	* the face yet, we will also send it.
1278	*/	1174	*/
1279	static void	1175	static void
1280	esrv_map_setbelow (NewSocket * 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)
1281	{	1177	{
1282	if (newmap->cells[x][y].count >= MAP_LAYERS)	1178	if (newmap->cells[x][y].count >= MAP_LAYERS)
1283	{	1179	{
		1180	//TODO: one or the other, can't both have abort and return, verify and act
1284	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);
1285	return;	1182	return;
1286	abort ();	1183	abort ();
1287	}	1184	}
1288		1185
…		…
1290	newmap->cells[x][y].count++;	1187	newmap->cells[x][y].count++;
1291		1188
1292	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1189	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1293	esrv_send_face (ns, face_num, 0);	1190	esrv_send_face (ns, face_num, 0);
1294	}	1191	}
1295
1296	struct LayerCell
1297	{
1298	uint16 xy;
1299	short face;
1300	};
1301
1302	struct MapLayer
1303	{
1304	int count;
1305	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1306	};
1307
1308	/** Checkes if map cells have changed */
1309	static int
1310	mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1311	{
1312	int k;
1313
1314	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1315	return 1;
1316	for (k = 0; k < newmap->cells[i][j].count; k++)
1317	{
1318	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1319	{
1320	return 1;
1321	}
1322	}
1323	return 0;
1324	}
1325
1326	/**
1327	* Basically, what this does is pack the data into layers.
1328	* cnum is the client number, cur is the the buffer we put all of
1329	* this data into. we return the end of the data. layers is
1330	* how many layers of data we should back.
1331	*/
1332	static uint8 *
1333	compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1334	{
1335	int x, y, k;
1336	int face;
1337	unsigned char *fcur;
1338	struct MapLayer layers[MAP_LAYERS];
1339
1340	for (k = 0; k < MAP_LAYERS; k++)
1341	layers[k].count = 0;
1342	fcur = cur;
1343	for (x = 0; x < ns->mapx; x++)
1344	{
1345	for (y = 0; y < ns->mapy; y++)
1346	{
1347	if (!mapcellchanged (ns, x, y, newmap))
1348	continue;
1349	if (newmap->cells[x][y].count == 0)
1350	{
1351	*cur = x * ns->mapy + y; /* mark empty space */
1352	cur++;
1353	continue;
1354	}
1355	for (k = 0; k < newmap->cells[x][y].count; k++)
1356	{
1357	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1358	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1359	layers[k].count++;
1360	}
1361	}
1362	}
1363	/* If no data, return now. */
1364	if (fcur == cur && layers[0].count == 0)
1365	return cur;
1366	*cur = 255; /* mark end of explicitly cleared cells */
1367	cur++;
1368	/* First pack by layers. */
1369	for (k = 0; k < numlayers; k++)
1370	{
1371	if (layers[k].count == 0)
1372	break; /* once a layer is entirely empty, no layer below it can
1373	have anything in it either */
1374	/* Pack by entries in thie layer */
1375	for (x = 0; x < layers[k].count;)
1376	{
1377	fcur = cur;
1378	*cur = layers[k].lcells[x].face >> 8;
1379	cur++;
1380	*cur = layers[k].lcells[x].face & 0xFF;
1381	cur++;
1382	face = layers[k].lcells[x].face;
1383	/* Now, we back the redundant data into 1 byte xy pairings */
1384	for (y = x; y < layers[k].count; y++)
1385	{
1386	if (layers[k].lcells[y].face == face)
1387	{
1388	*cur = (uint8) layers[k].lcells[y].xy;
1389	cur++;
1390	layers[k].lcells[y].face = -1;
1391	}
1392	}
1393	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1394	/* forward over the now redundant data */
1395	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1396	x++;
1397	}
1398	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1399	}
1400	return cur;
1401	}
1402
1403	static void
1404	esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1405	{
1406	static long frames, bytes, tbytes, tframes;
1407	char *cur;
1408
1409	SockList sl (MAXSOCKBUF);
1410	sl << "map ";
1411
1412	cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1413	sl.len = cur - (char *) sl.buf;
1414
1415	/* LOG(llevDebug, "Sending map command.\n");*/
1416
1417	if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1418	{
1419	/* All of this is just accounting stuff */
1420	if (tframes > 100)
1421	tframes = tbytes = 0;
1422
1423	tframes++;
1424	frames++;
1425	tbytes += sl.len;
1426	bytes += sl.len;
1427	memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1428	Send_With_Handling (ns, &sl);
1429	ns->sent_scroll = 0;
1430	}
1431
1432	sl.free ();
1433	}
1434
1435		1192
1436	/** Clears a map cell */	1193	/** Clears a map cell */
1437	static void	1194	static void
1438	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)
1439	{	1196	{
…		…
1450	#define MAX_LAYERS 3	1207	#define MAX_LAYERS 3
1451		1208
1452	/* 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
1453	* 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,
1454	* 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
1455	* 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
1456	* re-examined.	1213	* re-examined.
1457	*/	1214	*/
1458
1459	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];	1215	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1460		1216
1461	/**	1217	/**
1462	* Returns true if any of the heads for this	1218	* Returns true if any of the heads for this
1463	* 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
1464	* for empty space checking.	1220	* for empty space checking.
1465	*/	1221	*/
1466	static inline int	1222	static inline int
1467	have_head (int ax, int ay)	1223	have_head (int ax, int ay)
1468	{	1224	{
1469
1470	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||	1225	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1471	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])
1472	return 1;	1227	return 1;
		1228
1473	return 0;	1229	return 0;
1474	}	1230	}
1475		1231
1476	/**	1232	/**
1477	* check_head is a bit simplistic version of update_space below.	1233	* check_head is a bit simplistic version of update_space below.
1478	* 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
1479	* 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
1480	* 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
1481	* sent, it returns zero.	1237	* sent, it returns zero.
1482	*/	1238	*/
1483	static int	1239	static int
1484	check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)	1240	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1485	{	1241	{
1486	short face_num;	1242	short face_num;
1487		1243
1488	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1244	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489	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;
…		…
1521	* numbers the spaces differently - I think this was a leftover from	1277	* numbers the spaces differently - I think this was a leftover from
1522	* 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
1523	* 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
1524	* actually match.	1280	* actually match.
1525	*/	1281	*/
1526
1527	static int	1282	static int
1528	update_space (SockList &sl, NewSocket &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)
1529	{	1284	{
1530	object *ob, *head;	1285	object *ob, *head;
1531	uint16 face_num;	1286	uint16 face_num;
1532	int bx, by, i;	1287	int bx, by, i;
1533		1288
…		…
1746	* 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
1747	* take.	1502	* take.
1748	*/	1503	*/
1749		1504
1750	static inline int	1505	static inline int
1751	update_smooth (SockList &sl, NewSocket &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)
1752	{	1507	{
1753	object *ob;	1508	object *ob;
1754	int smoothlevel; /* old face_num; */	1509	int smoothlevel; /* old face_num; */
1755		1510
1756	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1511	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1790	* 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
1791	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1546	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792	* available.	1547	* available.
1793	*/	1548	*/
1794	int	1549	int
1795	getExtendedMapInfoSize (NewSocket * ns)	1550	getExtendedMapInfoSize (client * ns)
1796	{	1551	{
1797	int result = 0;	1552	int result = 0;
1798		1553
1799	if (ns->ext_mapinfos)	1554	if (ns->ext_mapinfos)
1800	{	1555	{
1801	if (ns->EMI_smooth)	1556	if (ns->EMI_smooth)
1802	result += 1; /*One byte for smoothlevel */	1557	result += 1; /*One byte for smoothlevel */
1803	}	1558	}
		1559
1804	return result;	1560	return result;
1805	}	1561	}
1806		1562
1807	/**	1563	/**
1808	* 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
…		…
1815	* 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
1816	* 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,
1817	* 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
1818	* of what we send, see the doc/Protocol file.	1574	* of what we send, see the doc/Protocol file.
1819	* I will describe internally what we do:	1575	* I will describe internally what we do:
1820	* 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.
1821	* 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
1822	* maximum viewable size (As set in config.h).	1578	* maximum viewable size (As set in config.h).
1823	* in the cells, there are faces and a count value.	1579	* in the cells, there are faces and a count value.
1824	* 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
1825	* is not viewable.	1581	* is not viewable.
…		…
1836	uint8 eentrysize;	1592	uint8 eentrysize;
1837	uint16 ewhatstart, ewhatflag;	1593	uint16 ewhatstart, ewhatflag;
1838	uint8 extendedinfos;	1594	uint8 extendedinfos;
1839	maptile *m;	1595	maptile *m;
1840		1596
1841	NewSocket &socket = pl->contr->socket;	1597	client &socket = *pl->contr->ns;
1842		1598
1843	check_map_change (pl->contr);	1599	check_map_change (pl->contr);
1844		1600
1845	SockList sl (MAXSOCKBUF);
1846	SockList esl (MAXSOCKBUF);
1847
1848	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");	1601	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
		1602	packet esl;
		1603
1849	startlen = sl.len;	1604	startlen = sl.length ();
1850		1605
1851	/*Extendedmapinfo structure initialisation */	1606	/*Extendedmapinfo structure initialisation */
1852	if (socket.ext_mapinfos)	1607	if (socket.ext_mapinfos)
1853	{	1608	{
1854	extendedinfos = EMI_NOREDRAW;	1609	extendedinfos = EMI_NOREDRAW;
1855		1610
1856	if (socket.EMI_smooth)	1611	if (socket.EMI_smooth)
1857	extendedinfos |= EMI_SMOOTH;	1612	extendedinfos |= EMI_SMOOTH;
1858		1613
1859	ewhatstart = esl.len;	1614	ewhatstart = esl.length ();
1860	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1615	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861	could need to be taken away */	1616	could need to be taken away */
1862	eentrysize = getExtendedMapInfoSize (&socket);	1617	eentrysize = getExtendedMapInfoSize (&socket);
1863	esl << "mapextended "	1618	esl << "mapextended "
1864	<< uint8 (extendedinfos)	1619	<< uint8 (extendedinfos)
1865	<< uint8 (eentrysize);	1620	<< uint8 (eentrysize);
		1621
1866	estartlen = esl.len;	1622	estartlen = esl.length ();
1867	}	1623	}
1868	else	1624	else
1869	{	1625	{
1870	/* suppress compiler warnings */	1626	/* suppress compiler warnings */
1871	ewhatstart = 0;	1627	ewhatstart = 0;
…		…
1896	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++)
1897	{	1653	{
1898	ax = 0;	1654	ax = 0;
1899	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++)
1900	{	1656	{
1901
1902	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1657	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1903		1658
1904	/* 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
1905	* 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
1906	* the client wants if using the map1a command - this is because	1661	* the client wants if using the map1a command - this is because
…		…
1909	*/	1664	*/
1910	if (ax >= socket.mapx || ay >= socket.mapy)	1665	if (ax >= socket.mapx || ay >= socket.mapy)
1911	{	1666	{
1912	int i, got_one;	1667	int i, got_one;
1913		1668
1914	oldlen = sl.len;	1669	oldlen = sl.length ();
1915		1670
1916	sl << uint16 (mask);	1671	sl << uint16 (mask);
1917		1672
1918	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;	1673	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;	1674	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
…		…
1923	* actually need to send that - just the coordinates	1678	* actually need to send that - just the coordinates
1924	* with no faces tells the client to blank out the	1679	* with no faces tells the client to blank out the
1925	* space.	1680	* space.
1926	*/	1681	*/
1927	got_one = 0;	1682	got_one = 0;
1928	for (i = oldlen + 2; i < sl.len; i++)	1683	for (i = oldlen + 2; i < sl.length (); i++)
1929	if (sl.buf[i])	1684	if (sl[i])
1930	got_one = 1;	1685	got_one = 1;
1931		1686
1932	if (got_one && (mask & 0xf))	1687	if (got_one && (mask & 0xf))
1933	sl.buf[oldlen + 1] = mask & 0xff;	1688	sl[oldlen + 1] = mask & 0xff;
1934	else	1689	else
1935	{ /*either all faces blank, either no face at all */	1690	{ /*either all faces blank, either no face at all */
1936	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */	1691	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937	sl.len = oldlen + 2;	1692	sl.reset (oldlen + 2);
1938	else	1693	else
1939	sl.len = oldlen;	1694	sl.reset (oldlen);
1940	}	1695	}
1941		1696
1942	/*What concerns extendinfos, nothing to be done for now	1697	/*What concerns extendinfos, nothing to be done for now
1943	* (perhaps effects layer later)	1698	* (perhaps effects layer later)
1944	*/	1699	*/
…		…
1974		1729
1975	/* This block deals with spaces that are not visible for whatever	1730	/* This block deals with spaces that are not visible for whatever
1976	* reason. Still may need to send the head for this space.	1731	* reason. Still may need to send the head for this space.
1977	*/	1732	*/
1978		1733
1979	oldlen = sl.len;	1734	oldlen = sl.length ();
1980		1735
1981	sl << uint16 (mask);	1736	sl << uint16 (mask);
1982		1737
1983	if (lastcell.count != -1)	1738	if (lastcell.count != -1)
1984	need_send = 1;	1739	need_send = 1;
…		…
2004		1759
2005	map_clearcell (&lastcell, 0, 0, 0, count);	1760	map_clearcell (&lastcell, 0, 0, 0, count);
2006	}	1761	}
2007		1762
2008	if ((mask & 0xf) || need_send)	1763	if ((mask & 0xf) || need_send)
2009	sl.buf[oldlen + 1] = mask & 0xff;	1764	sl[oldlen + 1] = mask & 0xff;
2010	else	1765	else
2011	sl.len = oldlen;	1766	sl.reset (oldlen);
2012	}	1767	}
2013	else	1768	else
2014	{	1769	{
2015	/* In this block, the space is visible or there are head objects	1770	/* In this block, the space is visible or there are head objects
2016	* we need to send.	1771	* we need to send.
…		…
2018		1773
2019	/* Rather than try to figure out what everything that we might	1774	/* Rather than try to figure out what everything that we might
2020	* need to send is, then form the packet after that,	1775	* need to send is, then form the packet after that,
2021	* we presume that we will in fact form a packet, and update	1776	* we presume that we will in fact form a packet, and update
2022	* the bits by what we do actually send. If we send nothing,	1777	* the bits by what we do actually send. If we send nothing,
2023	* we just back out sl.len to the old value, and no harm	1778	* we just back out sl.length () to the old value, and no harm
2024	* is done.	1779	* is done.
2025	* I think this is simpler than doing a bunch of checks to see	1780	* I think this is simpler than doing a bunch of checks to see
2026	* what if anything we need to send, setting the bits, then	1781	* what if anything we need to send, setting the bits, then
2027	* doing those checks again to add the real data.	1782	* doing those checks again to add the real data.
2028	*/	1783	*/
2029	oldlen = sl.len;	1784	oldlen = sl.length ();
2030	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1785	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031	eoldlen = esl.len;	1786	eoldlen = esl.length ();
2032	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1787	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033	sl << uint16 (mask);	1788	sl << uint16 (mask);
2034		1789
2035	if (socket.ext_mapinfos)	1790	if (socket.ext_mapinfos)
2036	esl << uint16 (emask);	1791	esl << uint16 (emask);
…		…
2044	mask |= 0x8;	1799	mask |= 0x8;
2045		1800
2046	if (socket.extmap)	1801	if (socket.extmap)
2047	{	1802	{
2048	*last_ext |= 0x80;	1803	*last_ext |= 0x80;
2049	last_ext = sl.buf + sl.len;	1804	last_ext = &sl[sl.length ()];
2050	sl << uint8 (d);	1805	sl << uint8 (d);
2051	}	1806	}
2052	else	1807	else
2053	sl << uint8 (255 - 64 * d);	1808	sl << uint8 (255 - 64 * d);
2054	}	1809	}
…		…
2088	{	1843	{
2089	lastcell.stat_hp = stat_hp;	1844	lastcell.stat_hp = stat_hp;
2090		1845
2091	mask |= 0x8;	1846	mask |= 0x8;
2092	*last_ext |= 0x80;	1847	*last_ext |= 0x80;
2093	last_ext = sl.buf + sl.len;	1848	last_ext = &sl[sl.length ()];
2094		1849
2095	sl << uint8 (5) << uint8 (stat_hp);	1850	sl << uint8 (5) << uint8 (stat_hp);
2096		1851
2097	if (stat_width > 1)	1852	if (stat_width > 1)
2098	{	1853	{
2099	*last_ext |= 0x80;	1854	*last_ext |= 0x80;
2100	last_ext = sl.buf + sl.len;	1855	last_ext = &sl[sl.length ()];
2101		1856
2102	sl << uint8 (6) << uint8 (stat_width);	1857	sl << uint8 (6) << uint8 (stat_width);
2103	}	1858	}
2104	}	1859	}
2105		1860
…		…
2107	{	1862	{
2108	lastcell.player = player;	1863	lastcell.player = player;
2109		1864
2110	mask |= 0x8;	1865	mask |= 0x8;
2111	*last_ext |= 0x80;	1866	*last_ext |= 0x80;
2112	last_ext = sl.buf + sl.len;	1867	last_ext = &sl[sl.length ()];
2113		1868
2114	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1869	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115	}	1870	}
2116		1871
2117	if (lastcell.flags != flags)	1872	if (lastcell.flags != flags)
2118	{	1873	{
2119	lastcell.flags = flags;	1874	lastcell.flags = flags;
2120		1875
2121	mask |= 0x8;	1876	mask |= 0x8;
2122	*last_ext |= 0x80;	1877	*last_ext |= 0x80;
2123	last_ext = sl.buf + sl.len;	1878	last_ext = &sl[sl.length ()];
2124		1879
2125	sl << uint8 (8) << uint8 (flags);	1880	sl << uint8 (8) << uint8 (flags);
2126	}	1881	}
2127	}	1882	}
2128		1883
…		…
2170	* space by checking the mask. If so, update the mask.	1925	* space by checking the mask. If so, update the mask.
2171	* if not, reset the len to that from before adding the mask	1926	* if not, reset the len to that from before adding the mask
2172	* value, so we don't send those bits.	1927	* value, so we don't send those bits.
2173	*/	1928	*/
2174	if (mask & 0xf)	1929	if (mask & 0xf)
2175	sl.buf[oldlen + 1] = mask & 0xff;	1930	sl[oldlen + 1] = mask & 0xff;
2176	else	1931	else
2177	sl.len = oldlen;	1932	sl.reset (oldlen);
2178		1933
2179	if (emask & 0xf)	1934	if (emask & 0xf)
2180	esl.buf[eoldlen + 1] = emask & 0xff;	1935	esl[eoldlen + 1] = emask & 0xff;
2181	else	1936	else
2182	esl.len = eoldlen;	1937	esl.reset (eoldlen);
2183	} /* else this is a viewable space */	1938	} /* else this is a viewable space */
2184	} /* for x loop */	1939	} /* for x loop */
2185	} /* for y loop */	1940	} /* for y loop */
2186		1941
2187	/* Verify that we in fact do need to send this */	1942	/* Verify that we in fact do need to send this */
2188	if (socket.ext_mapinfos)	1943	if (socket.ext_mapinfos)
2189	{	1944	{
2190	if (!(sl.len > startlen || socket.sent_scroll))	1945	if (!(sl.length () > startlen || socket.sent_scroll))
2191	{	1946	{
2192	/* No map data will follow, so don't say the client	1947	/* No map data will follow, so don't say the client
2193	* it doesn't need draw!	1948	* it doesn't need draw!
2194	*/	1949	*/
2195	ewhatflag &= (~EMI_NOREDRAW);	1950	ewhatflag &= (~EMI_NOREDRAW);
2196	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	1951	esl[ewhatstart + 1] = ewhatflag & 0xff;
2197	}	1952	}
2198		1953
2199	if (esl.len > estartlen)	1954	if (esl.length () > estartlen)
2200	Send_With_Handling (&socket, &esl);	1955	socket.send_packet (esl);
2201	}	1956	}
2202		1957
2203	if (sl.len > startlen || socket.sent_scroll)	1958	if (sl.length () > startlen || socket.sent_scroll)
2204	{	1959	{
2205	Send_With_Handling (&socket, &sl);	1960	socket.send_packet (sl);
2206	socket.sent_scroll = 0;	1961	socket.sent_scroll = 0;
2207	}	1962	}
2208
2209	sl.free ();
2210	esl.free ();
2211	}	1963	}
2212		1964
2213	/**	1965	/**
2214	* Draws client map.	1966	* Draws client map.
2215	*/	1967	*/
…		…
2239	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1991	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240	return;	1992	return;
2241		1993
2242	memset (&newmap, 0, sizeof (struct Map));	1994	memset (&newmap, 0, sizeof (struct Map));
2243		1995
2244	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++)
2245	{
2246	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++)
2247	{	1998	{
2248	ax = i;	1999	ax = i;
2249	ay = j;	2000	ay = j;
2250	m = pm;	2001	m = pm;
2251	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2002	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2003
2252	if (mflags & P_OUT_OF_MAP)	2004	if (mflags & P_OUT_OF_MAP)
2253	continue;	2005	continue;
2254	if (mflags & P_NEED_UPDATE)	2006
2255	update_position (m, ax, ay);
2256	/* 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
2257	* just to reload it. This should really call something like	2008	* just to reload it. This should really call something like
2258	* swap_map, but this is much more efficient and 'good enough'	2009	* swap_map, but this is much more efficient and 'good enough'
2259	*/	2010	*/
2260	if (mflags & P_NEW_MAP)	2011	if (mflags & P_NEW_MAP)
2261	m->timeout = 50;	2012	m->timeout = 50;
2262	}	2013	}
2263	}	2014
2264	/* do LOS after calls to update_position */	2015	/* do LOS after calls to update_position */
2265	if (pl->contr->do_los)	2016	if (pl->contr->do_los)
2266	{	2017	{
2267	update_los (pl);	2018	update_los (pl);
2268	pl->contr->do_los = 0;	2019	pl->contr->do_los = 0;
2269	}	2020	}
2270		2021
2271	if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272	{
2273	/* Big maps need a different drawing mechanism to work */	2022	/* Big maps need a different drawing mechanism to work */
2274	draw_client_map1 (pl);	2023	draw_client_map1 (pl);
2275	return;
2276	}
2277
2278	if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2279	{
2280	esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2281	}
2282
2283	/* j and i are the y and x coordinates of the real map (which is
2284	* basically some number of spaces around the player)
2285	* ax and ay are values from within the viewport (ie, 0, 0 is upper
2286	* left corner) and are thus disconnected from the map values.
2287	* Subtract 1 from the max values so that we properly handle cases where
2288	* player has specified an even map. Otherwise, we try to send them too
2289	* much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2290	* 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2291	* odd, this still works fine.
2292	*/
2293	ay = 0;
2294	for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2295	{
2296	ax = 0;
2297	for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2298	{
2299
2300	d = pl->contr->blocked_los[ax][ay];
2301	/* note the out_of_map and d>3 checks are both within the same
2302	* negation check.
2303	*/
2304	nx = i;
2305	ny = j;
2306	m = get_map_from_coord (pm, &nx, &ny);
2307	if (m && d < 4)
2308	{
2309	face = GET_MAP_FACE (m, nx, ny, 0);
2310	floor2 = GET_MAP_FACE (m, nx, ny, 1);
2311	floor = GET_MAP_FACE (m, nx, ny, 2);
2312
2313	/* If all is blank, send a blank face. */
2314	if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2315	{
2316	esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2317	}
2318	else
2319	{ /* actually have something interesting */
2320	/* send the darkness mask, if any. */
2321	if (d && pl->contr->socket.darkness)
2322	esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2323
2324	if (face && face != blank_face)
2325	esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2326	if (floor2 && floor2 != blank_face)
2327	esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2328	if (floor && floor != blank_face)
2329	esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2330	}
2331	} /* Is a valid space */
2332	}
2333	}
2334
2335	esrv_map_doneredraw (&pl->contr->socket, &newmap);
2336
2337	check_map_change (pl->contr);
2338	}	2024	}
2339		2025
2340		2026
2341	/*****************************************************************************/	2027	/*****************************************************************************/
2342		2028
…		…
2348		2034
2349	/*****************************************************************************/	2035	/*****************************************************************************/
2350	void	2036	void
2351	send_plugin_custom_message (object *pl, char *buf)	2037	send_plugin_custom_message (object *pl, char *buf)
2352	{	2038	{
2353	pl->contr->socket.send_packet (buf);	2039	pl->contr->ns->send_packet (buf);
2354	}	2040	}
2355		2041
2356	/**	2042	/**
2357	* This sends the skill number to name mapping. We ignore	2043	* This sends the skill number to name mapping. We ignore
2358	* the params - we always send the same info no matter what.	2044	* the params - we always send the same info no matter what.
2359	*/	2045	*/
2360	void	2046	void
2361	send_skill_info (NewSocket *ns, char *params)	2047	send_skill_info (client *ns, char *params)
2362	{	2048	{
2363	SockList sl (MAXSOCKBUF);	2049	packet sl;
2364	sl << "replyinfo skill_info\n";	2050	sl << "replyinfo skill_info\n";
2365		2051
2366	for (int i = 1; i < NUM_SKILLS; i++)	2052	for (int i = 1; i < NUM_SKILLS; i++)
2367	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	2053	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368		2054
2369	if (sl.len >= MAXSOCKBUF)	2055	if (sl.length () >= MAXSOCKBUF)
2370	{	2056	{
2371	LOG (llevError, "Buffer overflow in send_skill_info!\n");	2057	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372	fatal (0);	2058	fatal (0);
2373	}	2059	}
2374		2060
2375	Send_With_Handling (ns, &sl);	2061	ns->send_packet (sl);
2376	sl.free ();
2377	}	2062	}
2378		2063
2379	/**	2064	/**
2380	* This sends the spell path to name mapping. We ignore	2065	* This sends the spell path to name mapping. We ignore
2381	* the params - we always send the same info no matter what.	2066	* the params - we always send the same info no matter what.
2382	*/	2067	*/
2383	void	2068	void
2384	send_spell_paths (NewSocket * ns, char *params)	2069	send_spell_paths (client * ns, char *params)
2385	{	2070	{
2386	SockList sl (MAXSOCKBUF);	2071	packet sl;
2387		2072
2388	sl << "replyinfo spell_paths\n";	2073	sl << "replyinfo spell_paths\n";
2389		2074
2390	for (int i = 0; i < NRSPELLPATHS; i++)	2075	for (int i = 0; i < NRSPELLPATHS; i++)
2391	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	2076	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392		2077
2393	if (sl.len >= MAXSOCKBUF)	2078	if (sl.length () >= MAXSOCKBUF)
2394	{	2079	{
2395	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	2080	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396	fatal (0);	2081	fatal (0);
2397	}	2082	}
2398		2083
2399	Send_With_Handling (ns, &sl);	2084	ns->send_packet (sl);
2400	sl.free ();
2401	}	2085	}
2402		2086
2403	/**	2087	/**
2404	* This looks for any spells the player may have that have changed their stats.	2088	* This looks for any spells the player may have that have changed their stats.
2405	* 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
2406	*/	2090	*/
2407	void	2091	void
2408	esrv_update_spells (player *pl)	2092	esrv_update_spells (player *pl)
2409	{	2093	{
2410	if (!pl->socket.monitor_spells)	2094	if (!pl->ns->monitor_spells)
2411	return;	2095	return;
2412		2096
2413	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2097	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414	{	2098	{
2415	if (spell->type == SPELL)	2099	if (spell->type == SPELL)
…		…
2435	flags |= UPD_SP_DAMAGE;	2119	flags |= UPD_SP_DAMAGE;
2436	}	2120	}
2437		2121
2438	if (flags)	2122	if (flags)
2439	{	2123	{
2440	SockList sl (MAXSOCKBUF);	2124	packet sl;
2441		2125
2442	sl << "updspell "	2126	sl << "updspell "
2443	<< uint8 (flags)	2127	<< uint8 (flags)
2444	<< uint32 (spell->count);	2128	<< uint32 (spell->count);
2445		2129
2446	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2130	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2131	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2132	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449		2133
2450	Send_With_Handling (&pl->socket, &sl);	2134	pl->ns->send_packet (sl);
2451	sl.free ();
2452	}	2135	}
2453	}	2136	}
2454	}	2137	}
2455	}	2138	}
2456		2139
2457	void	2140	void
2458	esrv_remove_spell (player *pl, object *spell)	2141	esrv_remove_spell (player *pl, object *spell)
2459	{	2142	{
2460	if (!pl->socket.monitor_spells)	2143	if (!pl->ns->monitor_spells)
2461	return;	2144	return;
2462		2145
2463	if (!pl || !spell || spell->env != pl->ob)	2146	if (!pl || !spell || spell->env != pl->ob)
2464	{	2147	{
2465	LOG (llevError, "Invalid call to esrv_remove_spell");	2148	LOG (llevError, "Invalid call to esrv_remove_spell");
2466	return;	2149	return;
2467	}	2150	}
2468		2151
2469	SockList sl (MAXSOCKBUF);	2152	packet sl ("delspell");
2470		2153
2471	sl << "delspell "
2472	<< uint32 (spell->count);	2154	sl << uint32 (spell->count);
2473		2155
2474	Send_With_Handling (&pl->socket, &sl);	2156	pl->ns->send_packet (sl);
2475	sl.free ();
2476	}	2157	}
2477		2158
2478	/* 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. */
2479	static void	2160	static void
2480	append_spell (player *pl, SockList &sl, object *spell)	2161	append_spell (player *pl, packet &sl, object *spell)
2481	{	2162	{
2482	int len, i, skill = 0;	2163	int len, i, skill = 0;
2483		2164
2484	if (!(spell->name))	2165	if (!(spell->name))
2485	{	2166	{
…		…
2528	{	2209	{
2529	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");
2530	return;	2211	return;
2531	}	2212	}
2532		2213
2533	if (!pl->socket.monitor_spells)	2214	if (!pl->ns->monitor_spells)
2534	return;	2215	return;
2535		2216
2536	SockList sl (MAXSOCKBUF);	2217	packet sl ("addspell");
2537
2538	sl << "addspell ";
2539		2218
2540	if (!spell)	2219	if (!spell)
2541	{	2220	{
2542	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2221	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2543	{	2222	{
…		…
2555	* like it will fix this	2234	* like it will fix this
2556	*/	2235	*/
2557	if (spell->type != SPELL)	2236	if (spell->type != SPELL)
2558	continue;	2237	continue;
2559		2238
2560	if (sl.len >= (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))))
2561	{	2240	{
2562	Send_With_Handling (&pl->socket, &sl);	2241	pl->ns->send_packet (sl);
2563	strcpy ((char *) sl.buf, "addspell ");	2242
2564	sl.len = strlen ((char *) sl.buf);	2243	sl.reset ();
		2244	sl << "addspell ";
2565	}	2245	}
2566		2246
2567	append_spell (pl, sl, spell);	2247	append_spell (pl, sl, spell);
2568	}	2248	}
2569	}	2249	}
…		…
2580	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2260	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581	fatal (0);	2261	fatal (0);
2582	}	2262	}
2583		2263
2584	/* finally, we can send the packet */	2264	/* finally, we can send the packet */
2585	Send_With_Handling (&pl->socket, &sl);	2265	pl->ns->send_packet (sl);
2586
2587	sl.free ();
2588	}	2266	}
2589		2267

Diff Legend

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