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.25 by root, Thu Sep 21 14:51:16 2006 UTC vs.
Revision 1.41 by root, Fri Dec 15 19:59:20 2006 UTC

…		…
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	43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations	44	* operations
45	*	45	*
46	* esrv_map_doneredraw finishes the map update, and ships across the
47	* map updates.
48	*
49	*/	46	*/
50		47
51	#include <global.h>	48	#include <global.h>
52	#include <sproto.h>	49	#include <sproto.h>
53		50
54	#include <newclient.h>
55	#include <newserver.h>
56	#include <living.h>	51	#include <living.h>
57	#include <commands.h>	52	#include <commands.h>
58		53
59	/* This block is basically taken from socket.c - I assume if it works there,	54	/* This block is basically taken from socket.c - I assume if it works there,
60	* it should work here.	55	* it should work here.
61	*/	56	*/
62	#ifndef WIN32 /* ---win32 exclude unix headers */
63	# include <sys/types.h>	57	#include <sys/types.h>
64	# include <sys/time.h>	58	#include <sys/time.h>
65	# include <sys/socket.h>	59	#include <sys/socket.h>
66	# include <netinet/in.h>	60	#include <netinet/in.h>
67	# include <netdb.h>	61	#include <netdb.h>
68	#endif /* win32 */
69		62
70	#ifdef HAVE_UNISTD_H
71	# include <unistd.h>	63	#include <unistd.h>
72	#endif
73
74	#ifdef HAVE_SYS_TIME_H
75	# include <sys/time.h>	64	#include <sys/time.h>
76	#endif
77		65
78	#include "sounds.h"	66	#include "sounds.h"
79		67
80	/**	68	/**
81	* This table translates the attack numbers as used within the	69	* This table translates the attack numbers as used within the
…		…
98	-1, /* life stealing */	86	-1, /* life stealing */
99	-1 /* Disease - not fully done yet */	87	-1 /* Disease - not fully done yet */
100	};	88	};
101		89
102	static void	90	static void
103	socket_map_scroll (NewSocket * ns, int dx, int dy)	91	socket_map_scroll (client * ns, int dx, int dy)
104	{	92	{
105	struct Map newmap;	93	struct Map newmap;
106	int x, y, mx, my;	94	int x, y, mx, my;
107		95
108	{	96	{
109	char buf[MAXSOCKBUF];	97	packet sl;
110		98
111	sprintf (buf, "map_scroll %d %d", dx, dy);	99	sl.printf ("map_scroll %d %d", dx, dy);
112	Write_String_To_Socket (ns, buf, strlen (buf));	100	ns->send_packet (sl);
113	}	101	}
114		102
115	/* If we are using the Map1aCmd, we may in fact send	103	/* If we are using the Map1aCmd, we may in fact send
116	* head information that is outside the viewable map.	104	* head information that is outside the viewable map.
117	* So set the mx,my to the max value we want to	105	* So set the mx,my to the max value we want to
…		…
158	}	146	}
159		147
160	static void	148	static void
161	clear_map (player *pl)	149	clear_map (player *pl)
162	{	150	{
163	NewSocket & socket = pl->socket;	151	client &socket = *pl->socket;
164		152
165	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	153	memset (&socket.lastmap, 0, sizeof (socket.lastmap));
166		154
167	if (socket.newmapcmd == 1)	155	if (socket.newmapcmd == 1)
168	Write_String_To_Socket (&socket, "newmap", 6);	156	socket.send_packet ("newmap");
169		157
170	socket.update_look = 1;	158	socket.update_look = 1;
171	socket.look_position = 0;	159	socket.look_position = 0;
172	}	160	}
173		161
174	/** check for map change and send new map data */	162	/** check for map change and send new map data */
175	static void	163	static void
176	check_map_change (player *pl)	164	check_map_change (player *pl)
177	{	165	{
178	NewSocket & socket = pl->socket;	166	client &socket = *pl->socket;
179	object *ob = pl->ob;	167	object *ob = pl->ob;
180	char buf[MAX_BUF]; /* eauugggh */	168	char buf[MAX_BUF]; /* eauugggh */
181		169
182	if (socket.current_map != ob->map)	170	if (socket.current_map != ob->map)
183	{	171	{
…		…
204	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	192	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
205	}	193	}
206	else	194	else
207	snprintf (buf, MAX_BUF, "mapinfo current");	195	snprintf (buf, MAX_BUF, "mapinfo current");
208		196
209	Write_String_To_Socket (&socket, buf, strlen (buf));	197	socket.send_packet (buf);
210	}	198	}
211	}	199	}
212	else if (socket.current_x != ob->x || socket.current_y != ob->y)	200	else if (socket.current_x != ob->x || socket.current_y != ob->y)
213	{	201	{
214	int dx = ob->x - socket.current_x;	202	int dx = ob->x - socket.current_x;
…		…
224	}	212	}
225	}	213	}
226		214
227	socket.current_x = ob->x;	215	socket.current_x = ob->x;
228	socket.current_y = ob->y;	216	socket.current_y = ob->y;
		217	}
		218
		219	/**
		220	* RequestInfo is sort of a meta command. There is some specific
		221	* request of information, but we call other functions to provide
		222	* that information.
		223	*/
		224	void
		225	RequestInfo (char *buf, int len, client * ns)
		226	{
		227	char *params = NULL, *cp;
		228
		229	/* No match */
		230	char bigbuf[MAX_BUF];
		231	int slen;
		232
		233	/* Set up replyinfo before we modify any of the buffers - this is used
		234	* if we don't find a match.
		235	*/
		236	strcpy (bigbuf, "replyinfo ");
		237	slen = strlen (bigbuf);
		238	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		239
		240	/* find the first space, make it null, and update the
		241	* params pointer.
		242	*/
		243	for (cp = buf; *cp != '\0'; cp++)
		244	if (*cp == ' ')
		245	{
		246	*cp = '\0';
		247	params = cp + 1;
		248	break;
		249	}
		250
		251	if (!strcmp (buf, "image_info"))
		252	send_image_info (ns, params);
		253	else if (!strcmp (buf, "image_sums"))
		254	send_image_sums (ns, params);
		255	else if (!strcmp (buf, "skill_info"))
		256	send_skill_info (ns, params);
		257	else if (!strcmp (buf, "spell_paths"))
		258	send_spell_paths (ns, params);
		259	else
		260	ns->send_packet (bigbuf, len);
229	}	261	}
230		262
231	void	263	void
232	ExtCmd (char *buf, int len, player *pl)	264	ExtCmd (char *buf, int len, player *pl)
233	{	265	{
…		…
254	buf += 8;	286	buf += 8;
255		287
256	// initial map and its origin	288	// initial map and its origin
257	maptile *map = pl->ob->map;	289	maptile *map = pl->ob->map;
258	sint16 dx, dy;	290	sint16 dx, dy;
259	int mapx = pl->socket.mapx / 2 - pl->ob->x;	291	int mapx = pl->socket->mapx / 2 - pl->ob->x;
260	int mapy = pl->socket.mapy / 2 - pl->ob->y;	292	int mapy = pl->socket->mapy / 2 - pl->ob->y;
261	int max_distance = 8; // limit maximum path length to something generous	293	int max_distance = 8; // limit maximum path length to something generous
262		294
263	while (*buf && map && max_distance)	295	while (*buf && map && max_distance)
264	{	296	{
265	int dir = *buf++;	297	int dir = *buf++;
…		…
316	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	348	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
317	}	349	}
318	else	350	else
319	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	351	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
320		352
321	Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf));	353	pl->socket->send_packet (bigbuf);
322	}	354	}
323		355
324	/** This is the Setup cmd - easy first implementation */	356	/** This is the Setup cmd - easy first implementation */
325	void	357	void
326	SetUp (char *buf, int len, NewSocket * ns)	358	SetUp (char *buf, int len, client * ns)
327	{	359	{
328	int s, slen;	360	int s, slen;
329	char *cmd, *param, cmdback[HUGE_BUF];	361	char *cmd, *param, cmdback[HUGE_BUF];
330		362
331	/* run through the cmds of setup	363	/* run through the cmds of setup
…		…
333	*	365	*
334	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown	366	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
335	* The client then must sort this out	367	* The client then must sort this out
336	*/	368	*/
337		369
338	LOG (llevInfo, "Get SetupCmd:: %s\n", buf);	370	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
		371
339	strcpy (cmdback, "setup");	372	strcpy (cmdback, "setup");
340	for (s = 0; s < len;)	373	for (s = 0; s < len; )
341	{	374	{
342
343	cmd = &buf[s];	375	cmd = &buf[s];
344		376
345	/* find the next space, and put a null there */	377	/* find the next space, and put a null there */
346	for (; buf[s] && buf[s] != ' '; s++);	378	for (; buf[s] && buf[s] != ' '; s++)
		379	;
		380
347	buf[s++] = 0;	381	buf[s++] = 0;
		382
348	while (buf[s] == ' ')	383	while (buf[s] == ' ')
349	s++;	384	s++;
350		385
351	if (s >= len)	386	if (s >= len)
352	break;	387	break;
353		388
354	param = &buf[s];	389	param = &buf[s];
355		390
356	for (; buf[s] && buf[s] != ' '; s++);	391	for (; buf[s] && buf[s] != ' '; s++)
		392	;
		393
357	buf[s++] = 0;	394	buf[s++] = 0;
		395
358	while (buf[s] == ' ')	396	while (buf[s] == ' ')
359	s++;	397	s++;
360		398
361	slen = strlen (cmdback);	399	slen = strlen (cmdback);
362	safe_strcat (cmdback, " ", &slen, HUGE_BUF);	400	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
…		…
523	* report a failure to the client.	561	* report a failure to the client.
524	*/	562	*/
525	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);	563	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
526	}	564	}
527	} /* for processing all the setup commands */	565	} /* for processing all the setup commands */
		566
528	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);	567	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
529	Write_String_To_Socket (ns, cmdback, strlen (cmdback));	568	ns->send_packet (cmdback);
530	}	569	}
531		570
532	/**	571	/**
533	* The client has requested to be added to the game.	572	* The client has requested to be added to the game.
534	* This is what takes care of it. We tell the client how things worked out.	573	* This is what takes care of it. We tell the client how things worked out.
535	* I am not sure if this file is the best place for this function. however,	574	* I am not sure if this file is the best place for this function. however,
536	* it either has to be here or init_sockets needs to be exported.	575	* it either has to be here or init_sockets needs to be exported.
537	*/	576	*/
538	void	577	void
539	AddMeCmd (char *buf, int len, NewSocket * ns)	578	AddMeCmd (char *buf, int len, client * ns)
540	{	579	{
541	Settings oldsettings;	580	Settings oldsettings;
542		581
543	oldsettings = settings;	582	oldsettings = settings;
544	if (ns->status != Ns_Add || add_player (ns))	583	if (ns->status != Ns_Add || add_player (ns))
545	{	584	ns->send_packet ("addme_failed");
546	Write_String_To_Socket (ns, "addme_failed", 12);
547	}
548	else	585	else
549	{	586	ns->send_packet ("addme_success");
550	/* Basically, the add_player copies the socket structure into	587
551	* the player structure, so this one (which is from init_sockets)
552	* is not needed anymore. The write below should still work, as the
553	* stuff in ns is still relevant.
554	*/
555	Write_String_To_Socket (ns, "addme_success", 13);
556	socket_info.nconns--;
557	ns->status = Ns_Avail;
558	}
559	settings = oldsettings;	588	settings = oldsettings;
560	}	589	}
561		590
562	/** Reply to ExtendedInfos command */	591	/** Reply to ExtendedInfos command */
563	void	592	void
564	ToggleExtendedInfos (char *buf, int len, NewSocket * ns)	593	ToggleExtendedInfos (char *buf, int len, client * ns)
565	{	594	{
566	char cmdback[MAX_BUF];	595	char cmdback[MAX_BUF];
567	char command[50];	596	char command[50];
568	int info, nextinfo;	597	int info, nextinfo;
569		598
…		…
607	{	636	{
608	strcat (cmdback, " ");	637	strcat (cmdback, " ");
609	strcat (cmdback, "smoothing");	638	strcat (cmdback, "smoothing");
610	}	639	}
611		640
612	Write_String_To_Socket (ns, cmdback, strlen (cmdback));	641	ns->send_packet (cmdback);
613	}	642	}
614		643
615	/*	644	/*
616	#define MSG_TYPE_BOOK 1	645	#define MSG_TYPE_BOOK 1
617	#define MSG_TYPE_CARD 2	646	#define MSG_TYPE_CARD 2
…		…
620	#define MSG_TYPE_MONUMENT 5	649	#define MSG_TYPE_MONUMENT 5
621	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	650	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
622		651
623	/** Reply to ExtendedInfos command */	652	/** Reply to ExtendedInfos command */
624	void	653	void
625	ToggleExtendedText (char *buf, int len, NewSocket * ns)	654	ToggleExtendedText (char *buf, int len, client * ns)
626	{	655	{
627	char cmdback[MAX_BUF];	656	char cmdback[MAX_BUF];
628	char temp[10];	657	char temp[10];
629	char command[50];	658	char command[50];
630	int info, nextinfo, i, flag;	659	int info, nextinfo, i, flag;
…		…
670	strcat (cmdback, " ");	699	strcat (cmdback, " ");
671	snprintf (temp, sizeof (temp), "%d", i);	700	snprintf (temp, sizeof (temp), "%d", i);
672	strcat (cmdback, temp);	701	strcat (cmdback, temp);
673	}	702	}
674		703
675	Write_String_To_Socket (ns, cmdback, strlen (cmdback));	704	ns->send_packet (cmdback);
676	}	705	}
677		706
678	/**	707	/**
679	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	708	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
680	* Basically, it makes no sense to wait for the client to request a	709	* Basically, it makes no sense to wait for the client to request a
681	* a piece of data from us that we know the client wants. So	710	* a piece of data from us that we know the client wants. So
682	* if we know the client wants it, might as well push it to the	711	* if we know the client wants it, might as well push it to the
683	* client.	712	* client.
684	*/	713	*/
685	static void	714	static void
686	SendSmooth (NewSocket * ns, uint16 face)	715	SendSmooth (client * ns, uint16 face)
687	{	716	{
688	uint16 smoothface;	717	uint16 smoothface;
689	unsigned char reply[MAX_BUF];
690	SockList sl;
691		718
692	/* If we can't find a face, return and set it so we won't try to send this	719	/* If we can't find a face, return and set it so we won't try to send this
693	* again.	720	* again.
694	*/	721	*/
695	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	722	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
…		…
703	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	730	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
704	esrv_send_face (ns, smoothface, 0);	731	esrv_send_face (ns, smoothface, 0);
705		732
706	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	733	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707		734
708	sl.buf = reply;	735	packet sl;
709	strcpy ((char *) sl.buf, "smooth ");	736
710	sl.len = strlen ((char *) sl.buf);	737	sl << "smooth "
711	SockList_AddShort (&sl, face);	738	<< uint16 (face)
712	SockList_AddShort (&sl, smoothface);	739	<< uint16 (smoothface);
713	Send_With_Handling (ns, &sl);	740
		741	ns->send_packet (sl);
714	}	742	}
715		743
716	/**	744	/**
717	* Tells client the picture it has to use	745	* Tells client the picture it has to use
718	* to smooth a picture number given as argument.	746	* to smooth a picture number given as argument.
719	*/	747	*/
720	void	748	void
721	AskSmooth (char *buf, int len, NewSocket * ns)	749	AskSmooth (char *buf, int len, client * ns)
722	{	750	{
723	uint16 facenbr;	751	uint16 facenbr;
724		752
725	facenbr = atoi (buf);	753	facenbr = atoi (buf);
726	SendSmooth (ns, facenbr);	754	SendSmooth (ns, facenbr);
727	}	755	}
728
729
730
731
732		756
733	/**	757	/**
734	* This handles the general commands from the client (ie, north, fire, cast,	758	* This handles the general commands from the client (ie, north, fire, cast,
735	* etc.)	759	* etc.)
736	*/	760	*/
…		…
787	* etc.). It is a lot like PlayerCmd above, but is called with the	811	* etc.). It is a lot like PlayerCmd above, but is called with the
788	* 'ncom' method which gives more information back to the client so it	812	* 'ncom' method which gives more information back to the client so it
789	* can throttle.	813	* can throttle.
790	*/	814	*/
791	void	815	void
792	NewPlayerCmd (uint8 * buf, int len, player *pl)	816	NewPlayerCmd (char *buf, int len, player *pl)
793	{	817	{
794	int time, repeat;	818	int time, repeat;
795	short packet;
796	unsigned char command[MAX_BUF];	819	char command[MAX_BUF];
797	SockList sl;	820	int pktlen;
798		821
799	if (len < 7)	822	if (len < 7)
800	{	823	{
801	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	824	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802	return;	825	return;
803	}	826	}
804		827
805	packet = GetShort_String (buf);	828	pktlen = net_uint16 ((uint8 *)buf);
806	repeat = GetInt_String (buf + 2);	829	repeat = net_uint32 ((uint8 *)buf + 2);
		830
807	/* -1 is special - no repeat, but don't update */	831	/* -1 is special - no repeat, but don't update */
808	if (repeat != -1)	832	if (repeat != -1)
809	{
810	pl->count = repeat;	833	pl->count = repeat;
811	}	834
812	if ((len - 4) >= MAX_BUF)	835	if ((len - 4) >= MAX_BUF)
813	len = MAX_BUF - 5;	836	len = MAX_BUF - 5;
814		837
815	strncpy ((char *) command, (char *) buf + 6, len - 4);	838	strncpy ((char *) command, (char *) buf + 6, len - 4);
816	command[len - 4] = '\0';	839	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		840
829	/* This should not happen anymore. */	841	/* This should not happen anymore. */
830	if (pl->ob->speed_left < -1.0)	842	if (pl->ob->speed_left < -1.0)
831	{
832	LOG (llevError, "Player has negative time - shouldn't do command.\n");	843	LOG (llevError, "Player has negative time - shouldn't do command.\n");
833	}	844
834	/* In c_new.c */	845	/* In c_new.c */
835	execute_newserver_command (pl->ob, (char *) command);	846	execute_newserver_command (pl->ob, (char *) command);
836	/* Perhaps something better should be done with a left over count.	847	/* Perhaps something better should be done with a left over count.
837	* Cleaning up the input should probably be done first - all actions	848	* Cleaning up the input should probably be done first - all actions
838	* for the command that issued the count should be done before any other	849	* for the command that issued the count should be done before any other
839	* commands.	850	* commands.
840	*/	851	*/
841	pl->count = 0;	852	pl->count = 0;
842		853
843	/* Send confirmation of command execution now */
844	sl.buf = command;
845	strcpy ((char *) sl.buf, "comc ");
846	sl.len = 5;
847	SockList_AddShort (&sl, packet);
848	if (FABS (pl->ob->speed) < 0.001)	854	if (FABS (pl->ob->speed) < 0.001)
849	time = MAX_TIME * 100;	855	time = MAX_TIME * 100;
850	else	856	else
851	time = (int) (MAX_TIME / FABS (pl->ob->speed));	857	time = (int) (MAX_TIME / FABS (pl->ob->speed));
852	SockList_AddInt (&sl, time);	858
853	Send_With_Handling (&pl->socket, &sl);	859	/* Send confirmation of command execution now */
		860
		861	packet sl;
		862	sl << "comc " << uint16 (pktlen) << uint32 (time);
		863	pl->socket->send_packet (sl);
854	}	864	}
855		865
856		866
857	/** This is a reply to a previous query. */	867	/** This is a reply to a previous query. */
858	void	868	void
…		…
925	* something older than the server. If we assume the client will be	935	* something older than the server. If we assume the client will be
926	* backwards compatible, having it be a later version should not be a	936	* backwards compatible, having it be a later version should not be a
927	* problem.	937	* problem.
928	*/	938	*/
929	void	939	void
930	VersionCmd (char *buf, int len, NewSocket * ns)	940	VersionCmd (char *buf, int len, client * ns)
931	{	941	{
932	char *cp;	942	char *cp;
933	char version_warning[256];	943	char version_warning[256];
934		944
935	if (!buf)	945	if (!buf)
…		…
959	cp = strchr (cp + 1, ' ');	969	cp = strchr (cp + 1, ' ');
960	if (cp)	970	if (cp)
961	{	971	{
962	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	972	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
963		973
964	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);	974	assign (ns->version, cp + 1);
965		975
966	/* This is first implementation - i skip all beta DX clients with it	976	if (ns->sc_version < 1026)
967	* Add later stuff here for other clients
968	*/
969
970	/* these are old dxclients */
971	/* Version 1024 added support for singular + plural name values -
972	* requiing this minimal value reduces complexity of that code, and it
973	* has been around for a long time.
974	*/
975	if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
976	{	977	{
977	sprintf (version_warning, "drawinfo %d %s", NDI_RED,	978	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
978	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	979	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
979	Write_String_To_Socket (ns, version_warning, strlen (version_warning));	980	ns->send_packet (version_warning);
980	}	981	}
981		982
982	}	983	}
983	}	984	}
984		985
985	/** sound related functions. */	986	/** sound related functions. */
986
987	void	987	void
988	SetSound (char *buf, int len, NewSocket * ns)	988	SetSound (char *buf, int len, client * ns)
989	{	989	{
990	ns->sound = atoi (buf);	990	ns->sound = atoi (buf);
991	}	991	}
992		992
993	/** client wants the map resent */	993	/** client wants the map resent */
…		…
1003	*/	1003	*/
1004	#if 0	1004	#if 0
1005	/* Okay, this is MAJOR UGLY. but the only way I know how to	1005	/* Okay, this is MAJOR UGLY. but the only way I know how to
1006	* clear the "cache"	1006	* clear the "cache"
1007	*/	1007	*/
1008	memset (&pl->socket.lastmap, 0, sizeof (struct Map));	1008	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009	draw_client_map (pl->ob);	1009	draw_client_map (pl->ob);
1010	#endif	1010	#endif
1011	}	1011	}
1012		1012
1013	/**	1013	/**
…		…
1051	/**	1051	/**
1052	* Asks the client to query the user. This way, the client knows	1052	* Asks the client to query the user. This way, the client knows
1053	* it needs to send something back (vs just printing out a message)	1053	* it needs to send something back (vs just printing out a message)
1054	*/	1054	*/
1055	void	1055	void
1056	send_query (NewSocket * ns, uint8 flags, char *text)	1056	send_query (client * ns, uint8 flags, char *text)
1057	{	1057	{
1058	char buf[MAX_BUF];	1058	char buf[MAX_BUF];
1059		1059
1060	sprintf (buf, "query %d %s", flags, text ? text : "");	1060	sprintf (buf, "query %d %s", flags, text ? text : "");
1061	Write_String_To_Socket (ns, buf, strlen (buf));	1061	ns->send_packet (buf);
1062	}	1062	}
1063		1063
1064	#define AddIfInt64(Old,New,Type) if (Old != New) {\	1064	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065	Old = New; \	1065	Old = New; \
1066	SockList_AddChar(&sl, Type); \	1066	sl << uint8 (Type) << uint64 (New); \
1067	SockList_AddInt64(&sl, New); \
1068	}	1067	}
1069		1068
1070	#define AddIfInt(Old,New,Type) if (Old != New) {\	1069	#define AddIfInt(Old,New,Type) if (Old != New) {\
1071	Old = New; \	1070	Old = New; \
1072	SockList_AddChar(&sl, Type); \	1071	sl << uint8 (Type) << uint32 (New); \
1073	SockList_AddInt(&sl, New); \
1074	}	1072	}
1075		1073
1076	#define AddIfShort(Old,New,Type) if (Old != New) {\	1074	#define AddIfShort(Old,New,Type) if (Old != New) {\
1077	Old = New; \	1075	Old = New; \
1078	SockList_AddChar(&sl, Type); \	1076	sl << uint8 (Type) << uint16 (New); \
1079	SockList_AddShort(&sl, New); \
1080	}	1077	}
1081		1078
1082	#define AddIfFloat(Old,New,Type) if (Old != New) {\	1079	#define AddIfFloat(Old,New,Type) if (Old != New) {\
1083	Old = New; \	1080	Old = New; \
1084	SockList_AddChar(&sl, Type); \	1081	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1085	SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1086	}	1082	}
1087		1083
1088	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	1084	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1089	if (Old) free(Old);\
1090	Old = strdup_local(New);\	1085	free(Old); Old = strdup (New);\
1091	SockList_AddChar(&sl, Type); \	1086	sl << uint8 (Type) << data8 (New); \
1092	SockList_AddChar(&sl, ( char )strlen(New)); \
1093	strcpy((char*)sl.buf + sl.len, New); \
1094	sl.len += strlen(New); \
1095	}	1087	}
1096		1088
1097	/**	1089	/**
1098	* Sends a statistics update. We look at the old values,	1090	* Sends a statistics update. We look at the old values,
1099	* and only send what has changed. Stat mapping values are in newclient.h	1091	* and only send what has changed. Stat mapping values are in newclient.h
…		…
1101	* commands for now.	1093	* commands for now.
1102	*/	1094	*/
1103	void	1095	void
1104	esrv_update_stats (player *pl)	1096	esrv_update_stats (player *pl)
1105	{	1097	{
1106	SockList sl;
1107	char buf[MAX_BUF];	1098	char buf[MAX_BUF];
1108	uint16 flags;	1099	uint16 flags;
1109		1100
1110	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	1101	packet sl;
1111	strcpy ((char *) sl.buf, "stats ");	1102	sl << "stats ";
1112	sl.len = strlen ((char *) sl.buf);
1113		1103
1114	if (pl->ob != NULL)	1104	if (pl->ob != NULL)
1115	{	1105	{
1116	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1106	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1117	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1107	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1126	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1116	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1127	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1117	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1128	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1118	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1129	}	1119	}
1130		1120
1131	if (pl->socket.exp64)	1121	if (pl->socket->exp64)
1132	{	1122	{
1133	uint8 s;	1123	uint8 s;
1134		1124
1135	for (s = 0; s < NUM_SKILLS; s++)	1125	for (s = 0; s < NUM_SKILLS; s++)
1136	{	1126	{
1137	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1127	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1138	{	1128	{
1139
1140	/* Always send along the level if exp changes. This is only	1129	/* Always send along the level if exp changes. This is only
1141	* 1 extra byte, but keeps processing simpler.	1130	* 1 extra byte, but keeps processing simpler.
1142	*/	1131	*/
1143	SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO));	1132	sl << uint8 (s + CS_STAT_SKILLINFO)
1144	SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level);	1133	<< uint8 (pl->last_skill_ob[s]->level)
1145	SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp);	1134	<< uint64 (pl->last_skill_ob[s]->stats.exp);
		1135
1146	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;	1136	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1147	}	1137	}
1148	}	1138	}
1149	}	1139	}
1150		1140
1151	if (pl->socket.exp64)	1141	if (pl->socket->exp64)
1152	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1142	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1153	else	1143	else
1154	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }	1144	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1155		1145
1156	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1146	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
…		…
1169	if (pl->run_on)	1159	if (pl->run_on)
1170	flags |= SF_RUNON;	1160	flags |= SF_RUNON;
1171		1161
1172	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1162	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1173		1163
1174	if (pl->socket.sc_version < 1025)	1164	if (pl->socket->sc_version < 1025)
1175	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1165	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1176	else	1166	else
1177	{	1167	{
1178	int i;	1168	int i;
1179		1169
…		…
1185		1175
1186	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1176	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1187	}	1177	}
1188	}	1178	}
1189		1179
1190	if (pl->socket.monitor_spells)	1180	if (pl->socket->monitor_spells)
1191	{	1181	{
1192	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1182	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1193	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1183	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1194	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1184	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1195	}	1185	}
1196		1186
1197	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1187	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1198	AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);	1188	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1199	set_title (pl->ob, buf);	1189	set_title (pl->ob, buf);
1200	AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);	1190	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1201		1191
1202	/* Only send it away if we have some actual data */	1192	/* Only send it away if we have some actual data */
1203	if (sl.len > 6)	1193	if (sl.length () > 6)
1204	{	1194	pl->socket->send_packet (sl);
1205	#ifdef ESRV_DEBUG
1206	LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1207	#endif
1208	Send_With_Handling (&pl->socket, &sl);
1209	}
1210
1211	free (sl.buf);
1212	}	1195	}
1213		1196
1214	/**	1197	/**
1215	* Tells the client that here is a player it should start using.	1198	* Tells the client that here is a player it should start using.
1216	*/	1199	*/
1217	void	1200	void
1218	esrv_new_player (player *pl, uint32 weight)	1201	esrv_new_player (player *pl, uint32 weight)
1219	{	1202	{
1220	SockList sl;
1221
1222	pl->last_weight = weight;	1203	pl->last_weight = weight;
1223		1204
1224	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	1205	packet sl;
		1206	sl << "player ";
1225		1207
1226	strcpy ((char *) sl.buf, "player ");	1208	sl << uint32 (pl->ob->count)
1227	sl.len = strlen ((char *) sl.buf);	1209	<< uint32 (weight)
1228	SockList_AddInt (&sl, pl->ob->count);	1210	<< uint32 (pl->ob->face->number)
1229	SockList_AddInt (&sl, weight);	1211	<< data8 (pl->ob->name);
1230	SockList_AddInt (&sl, pl->ob->face->number);
1231		1212
1232	SockList_AddChar (&sl, (char) strlen (pl->ob->name));	1213	pl->socket->send_packet (sl);
1233	strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1234	sl.len += strlen (pl->ob->name);
1235
1236	Send_With_Handling (&pl->socket, &sl);
1237	free (sl.buf);
1238	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1214	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1239	}	1215	}
1240		1216
1241	/**	1217	/**
1242	* Need to send an animation sequence to the client.	1218	* Need to send an animation sequence to the client.
…		…
1244	* sent them the face yet (this can become quite costly in terms of	1220	* sent them the face yet (this can become quite costly in terms of
1245	* how much we are sending - on the other hand, this should only happen	1221	* how much we are sending - on the other hand, this should only happen
1246	* when the player logs in and picks stuff up.	1222	* when the player logs in and picks stuff up.
1247	*/	1223	*/
1248	void	1224	void
1249	esrv_send_animation (NewSocket * ns, short anim_num)	1225	esrv_send_animation (client * ns, short anim_num)
1250	{	1226	{
1251	SockList sl;
1252	int i;	1227	int i;
1253		1228
1254	/* Do some checking on the anim_num we got. Note that the animations	1229	/* Do some checking on the anim_num we got. Note that the animations
1255	* are added in contigous order, so if the number is in the valid	1230	* are added in contigous order, so if the number is in the valid
1256	* range, it must be a valid animation.	1231	* range, it must be a valid animation.
…		…
1259	{	1234	{
1260	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1235	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1261	return;	1236	return;
1262	}	1237	}
1263		1238
1264	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	1239	packet sl;
1265	strcpy ((char *) sl.buf, "anim ");	1240
1266	sl.len = 5;	1241	sl << "anim "
1267	SockList_AddShort (&sl, anim_num);	1242	<< uint16 (anim_num)
1268	SockList_AddShort (&sl, 0); /* flags - not used right now */	1243	<< uint16 (0); /* flags - not used right now */
		1244
1269	/* Build up the list of faces. Also, send any information (ie, the	1245	/* Build up the list of faces. Also, send any information (ie, the
1270	* the face itself) down to the client.	1246	* the face itself) down to the client.
1271	*/	1247	*/
1272	for (i = 0; i < animations[anim_num].num_animations; i++)	1248	for (i = 0; i < animations[anim_num].num_animations; i++)
1273	{	1249	{
1274	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1250	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1275	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1251	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1276	SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */	1252	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1277	}	1253	}
1278	Send_With_Handling (ns, &sl);	1254
1279	free (sl.buf);	1255	ns->send_packet (sl);
		1256
1280	ns->anims_sent[anim_num] = 1;	1257	ns->anims_sent[anim_num] = 1;
1281	}	1258	}
1282		1259
1283		1260
1284	/******************************************************************************	1261	/******************************************************************************
…		…
1290	/**	1267	/**
1291	* This adds face_num to a map cell at x,y. If the client doesn't have	1268	* This adds face_num to a map cell at x,y. If the client doesn't have
1292	* the face yet, we will also send it.	1269	* the face yet, we will also send it.
1293	*/	1270	*/
1294	static void	1271	static void
1295	esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)	1272	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1296	{	1273	{
1297	if (newmap->cells[x][y].count >= MAP_LAYERS)	1274	if (newmap->cells[x][y].count >= MAP_LAYERS)
1298	{	1275	{
1299	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1276	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1300	return;	1277	return;
1301	abort ();	1278	abort ();
1302	}	1279	}
		1280
1303	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1281	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1304	newmap->cells[x][y].count++;	1282	newmap->cells[x][y].count++;
		1283
1305	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1284	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1306	esrv_send_face (ns, face_num, 0);	1285	esrv_send_face (ns, face_num, 0);
1307	}	1286	}
1308		1287
1309	struct LayerCell	1288	struct LayerCell
…		…
1318	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];	1297	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1319	};	1298	};
1320		1299
1321	/** Checkes if map cells have changed */	1300	/** Checkes if map cells have changed */
1322	static int	1301	static int
1323	mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)	1302	mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1324	{	1303	{
1325	int k;	1304	int k;
1326		1305
1327	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)	1306	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1328	return 1;	1307	return 1;
…		…
1341	* cnum is the client number, cur is the the buffer we put all of	1320	* cnum is the client number, cur is the the buffer we put all of
1342	* this data into. we return the end of the data. layers is	1321	* this data into. we return the end of the data. layers is
1343	* how many layers of data we should back.	1322	* how many layers of data we should back.
1344	*/	1323	*/
1345	static uint8 *	1324	static uint8 *
1346	compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)	1325	compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1347	{	1326	{
1348	int x, y, k;	1327	int x, y, k;
1349	int face;	1328	int face;
1350	unsigned char *fcur;	1329	unsigned char *fcur;
1351	struct MapLayer layers[MAP_LAYERS];	1330	struct MapLayer layers[MAP_LAYERS];
…		…
1411	*fcur = *fcur | 128; /* mark for end of faces at this layer */	1390	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1412	}	1391	}
1413	return cur;	1392	return cur;
1414	}	1393	}
1415		1394
1416	static void
1417	esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1418	{
1419	static long frames, bytes, tbytes, tframes;
1420	char *cur;
1421	SockList sl;
1422
1423
1424	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1425	strcpy ((char *) sl.buf, "map ");
1426	sl.len = strlen ((char *) sl.buf);
1427
1428	cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1429	sl.len = cur - (char *) sl.buf;
1430
1431	/* LOG(llevDebug, "Sending map command.\n");*/
1432
1433	if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1434	{
1435	/* All of this is just accounting stuff */
1436	if (tframes > 100)
1437	tframes = tbytes = 0;
1438
1439	tframes++;
1440	frames++;
1441	tbytes += sl.len;
1442	bytes += sl.len;
1443	memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1444	Send_With_Handling (ns, &sl);
1445	ns->sent_scroll = 0;
1446	}
1447
1448	free (sl.buf);
1449	}
1450
1451
1452	/** Clears a map cell */	1395	/** Clears a map cell */
1453	static void	1396	static void
1454	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1397	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1455	{	1398	{
1456	cell->faces[0] = face0;	1399	cell->faces[0] = face0;
…		…
1495	* needs to get sent - if so, it adds the data, sending the head	1438	* needs to get sent - if so, it adds the data, sending the head
1496	* if needed, and returning 1. If this no data needs to get	1439	* if needed, and returning 1. If this no data needs to get
1497	* sent, it returns zero.	1440	* sent, it returns zero.
1498	*/	1441	*/
1499	static int	1442	static int
1500	check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer)	1443	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1501	{	1444	{
1502	short face_num;	1445	short face_num;
1503		1446
1504	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1447	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1505	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1448	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1506	else	1449	else
1507	face_num = 0;	1450	face_num = 0;
1508		1451
1509	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])	1452	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1510	{	1453	{
1511	SockList_AddShort (&sl, face_num);	1454	sl << uint16 (face_num);
1512	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))	1455	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1513	esrv_send_face (&ns, face_num, 0);	1456	esrv_send_face (&ns, face_num, 0);
		1457
1514	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;	1458	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1515	ns.lastmap.cells[ax][ay].faces[layer] = face_num;	1459	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1516	return 1;	1460	return 1;
1517	}	1461	}
1518		1462
…		…
1538	* the case, it seems to make more sense to have these layer values	1482	* the case, it seems to make more sense to have these layer values
1539	* actually match.	1483	* actually match.
1540	*/	1484	*/
1541		1485
1542	static int	1486	static int
1543	update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1487	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1544	{	1488	{
1545	object *ob, *head;	1489	object *ob, *head;
1546	uint16 face_num;	1490	uint16 face_num;
1547	int bx, by, i;	1491	int bx, by, i;
1548		1492
1549	/* If there is a multipart object stored away, treat that as more important.	1493	/* If there is a multipart object stored away, treat that as more important.
1550	* If not, then do the normal processing.	1494	* If not, then do the normal processing.
1551	*/	1495	*/
1552
1553	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];	1496	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1554		1497
1555	/* Check to see if this head is part of the set of objects	1498	/* Check to see if this head is part of the set of objects
1556	* we would normally send for this space. If so, then	1499	* we would normally send for this space. If so, then
1557	* don't use the head value. We need to do the check	1500	* don't use the head value. We need to do the check
…		…
1722		1665
1723	/* Another hack - because of heads and whatnot, this face may match one	1666	/* Another hack - because of heads and whatnot, this face may match one
1724	* we already sent for a lower layer. In that case, don't send	1667	* we already sent for a lower layer. In that case, don't send
1725	* this one.	1668	* this one.
1726	*/	1669	*/
1727	if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num)	1670	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1728	{
1729	face_num = 0;	1671	face_num = 0;
1730	}
1731		1672
1732	/* We've gotten what face we want to use for the object. Now see if	1673	/* We've gotten what face we want to use for the object. Now see if
1733	* if it has changed since we last sent it to the client.	1674	* if it has changed since we last sent it to the client.
1734	*/	1675	*/
1735	if (ns->lastmap.cells[sx][sy].faces[layer] != face_num)	1676	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1736	{	1677	{
1737	ns->lastmap.cells[sx][sy].faces[layer] = face_num;	1678	ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1738	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1679	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1739	esrv_send_face (ns, face_num, 0);	1680	esrv_send_face (&ns, face_num, 0);
1740	SockList_AddShort (sl, face_num);	1681
		1682	sl << uint16 (face_num);
1741	return 1;	1683	return 1;
1742	}	1684	}
		1685
1743	/* Nothing changed */	1686	/* Nothing changed */
1744	return 0;	1687	return 0;
1745	}	1688	}
1746		1689
1747	/**	1690	/**
…		…
1762	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1705	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1763	* take.	1706	* take.
1764	*/	1707	*/
1765		1708
1766	static inline int	1709	static inline int
1767	update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1710	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1768	{	1711	{
1769	object *ob;	1712	object *ob;
1770	int smoothlevel; /* old face_num; */	1713	int smoothlevel; /* old face_num; */
1771		1714
1772	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1715	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1777	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))	1720	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1778	smoothlevel = 0;	1721	smoothlevel = 0;
1779	else	1722	else
1780	{	1723	{
1781	smoothlevel = ob->smoothlevel;	1724	smoothlevel = ob->smoothlevel;
1782	if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1725	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1783	SendSmooth (ns, ob->face->number);	1726	SendSmooth (&ns, ob->face->number);
1784	} /* else not already head object or blank face */	1727	} /* else not already head object or blank face */
1785		1728
1786	/* We've gotten what face we want to use for the object. Now see if	1729	/* We've gotten what face we want to use for the object. Now see if
1787	* if it has changed since we last sent it to the client.	1730	* if it has changed since we last sent it to the client.
1788	*/	1731	*/
1789	if (smoothlevel > 255)	1732	if (smoothlevel > 255)
1790	smoothlevel = 255;	1733	smoothlevel = 255;
1791	else if (smoothlevel < 0)	1734	else if (smoothlevel < 0)
1792	smoothlevel = 0;	1735	smoothlevel = 0;
		1736
1793	if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel)	1737	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1794	{	1738	{
1795	ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel;	1739	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1796	SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF));	1740	sl << uint8 (smoothlevel);
1797	return 1;	1741	return 1;
1798	}	1742	}
		1743
1799	/* Nothing changed */	1744	/* Nothing changed */
1800	return 0;	1745	return 0;
1801	}	1746	}
1802		1747
1803	/**	1748	/**
1804	* Returns the size of a data for a map square as returned by	1749	* Returns the size of a data for a map square as returned by
1805	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1750	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1806	* available.	1751	* available.
1807	*/	1752	*/
1808	int	1753	int
1809	getExtendedMapInfoSize (NewSocket * ns)	1754	getExtendedMapInfoSize (client * ns)
1810	{	1755	{
1811	int result = 0;	1756	int result = 0;
1812		1757
1813	if (ns->ext_mapinfos)	1758	if (ns->ext_mapinfos)
1814	{	1759	{
…		…
1844	draw_client_map1 (object *pl)	1789	draw_client_map1 (object *pl)
1845	{	1790	{
1846	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1791	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1847	sint16 nx, ny;	1792	sint16 nx, ny;
1848	int estartlen, eoldlen;	1793	int estartlen, eoldlen;
1849	SockList sl;
1850	SockList esl; /*For extended Map info */
1851	uint16 mask, emask;	1794	uint16 mask, emask;
1852	uint8 eentrysize;	1795	uint8 eentrysize;
1853	uint16 ewhatstart, ewhatflag;	1796	uint16 ewhatstart, ewhatflag;
1854	uint8 extendedinfos;	1797	uint8 extendedinfos;
1855	maptile *m;	1798	maptile *m;
1856		1799
1857	NewSocket & socket = pl->contr->socket;	1800	client &socket = *pl->contr->socket;
1858		1801
1859	check_map_change (pl->contr);	1802	check_map_change (pl->contr);
1860		1803
1861	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	1804	packet sl;
1862	if (socket.mapmode == Map1Cmd)	1805	packet esl;
1863	strcpy ((char *) sl.buf, "map1 ");	1806
1864	else	1807	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1865	strcpy ((char *) sl.buf, "map1a ");
1866	sl.len = strlen ((char *) sl.buf);
1867	startlen = sl.len;	1808	startlen = sl.length ();
1868		1809
1869	/*Extendedmapinfo structure initialisation */	1810	/*Extendedmapinfo structure initialisation */
1870	if (socket.ext_mapinfos)	1811	if (socket.ext_mapinfos)
1871	{	1812	{
1872	esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1873	strcpy ((char *) esl.buf, "mapextended ");
1874	esl.len = strlen ((char *) esl.buf);
1875	extendedinfos = EMI_NOREDRAW;	1813	extendedinfos = EMI_NOREDRAW;
1876		1814
1877	if (socket.EMI_smooth)	1815	if (socket.EMI_smooth)
1878	extendedinfos |= EMI_SMOOTH;	1816	extendedinfos |= EMI_SMOOTH;
1879		1817
1880	ewhatstart = esl.len;	1818	ewhatstart = esl.length ();
1881	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1819	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1882	could need to be taken away */	1820	could need to be taken away */
1883	SockList_AddChar (&esl, extendedinfos);
1884	eentrysize = getExtendedMapInfoSize (&socket);	1821	eentrysize = getExtendedMapInfoSize (&socket);
1885	SockList_AddChar (&esl, eentrysize);	1822	esl << "mapextended "
		1823	<< uint8 (extendedinfos)
		1824	<< uint8 (eentrysize);
		1825
1886	estartlen = esl.len;	1826	estartlen = esl.length ();
1887	}	1827	}
1888	else	1828	else
1889	{	1829	{
1890	/* suppress compiler warnings */	1830	/* suppress compiler warnings */
1891	ewhatstart = 0;	1831	ewhatstart = 0;
…		…
1929	*/	1869	*/
1930	if (ax >= socket.mapx || ay >= socket.mapy)	1870	if (ax >= socket.mapx || ay >= socket.mapy)
1931	{	1871	{
1932	int i, got_one;	1872	int i, got_one;
1933		1873
1934	oldlen = sl.len;	1874	oldlen = sl.length ();
1935		1875
1936	SockList_AddShort (&sl, mask);	1876	sl << uint16 (mask);
1937		1877
1938	if (check_head (sl, socket, ax, ay, 2))	1878	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1939	mask |= 0x4;
1940	if (check_head (sl, socket, ax, ay, 1))	1879	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1941	mask |= 0x2;
1942	if (check_head (sl, socket, ax, ay, 0))	1880	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1943	mask |= 0x1;
1944		1881
1945	/* If all we are doing is sending 0 (blank) faces, we don't	1882	/* If all we are doing is sending 0 (blank) faces, we don't
1946	* actually need to send that - just the coordinates	1883	* actually need to send that - just the coordinates
1947	* with no faces tells the client to blank out the	1884	* with no faces tells the client to blank out the
1948	* space.	1885	* space.
1949	*/	1886	*/
1950	got_one = 0;	1887	got_one = 0;
1951	for (i = oldlen + 2; i < sl.len; i++)	1888	for (i = oldlen + 2; i < sl.length (); i++)
1952	if (sl.buf[i])	1889	if (sl[i])
1953	got_one = 1;	1890	got_one = 1;
1954		1891
1955	if (got_one && (mask & 0xf))	1892	if (got_one && (mask & 0xf))
1956	sl.buf[oldlen + 1] = mask & 0xff;	1893	sl[oldlen + 1] = mask & 0xff;
1957	else	1894	else
1958	{ /*either all faces blank, either no face at all */	1895	{ /*either all faces blank, either no face at all */
1959	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */	1896	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1960	sl.len = oldlen + 2;	1897	sl.reset (oldlen + 2);
1961	else	1898	else
1962	sl.len = oldlen;	1899	sl.reset (oldlen);
1963	}	1900	}
1964		1901
1965	/*What concerns extendinfos, nothing to be done for now	1902	/*What concerns extendinfos, nothing to be done for now
1966	* (perhaps effects layer later)	1903	* (perhaps effects layer later)
1967	*/	1904	*/
…		…
1985	* if this hasn't already been done. If the space is out	1922	* if this hasn't already been done. If the space is out
1986	* of the map, it shouldn't have a head	1923	* of the map, it shouldn't have a head
1987	*/	1924	*/
1988	if (lastcell.count != -1)	1925	if (lastcell.count != -1)
1989	{	1926	{
1990	SockList_AddShort (&sl, mask);	1927	sl << uint16 (mask);
1991	map_clearcell (&lastcell, 0, 0, 0, -1);	1928	map_clearcell (&lastcell, 0, 0, 0, -1);
1992	}	1929	}
1993	}	1930	}
1994	else if (d > 3)	1931	else if (d > 3)
1995	{	1932	{
…		…
1997		1934
1998	/* This block deals with spaces that are not visible for whatever	1935	/* This block deals with spaces that are not visible for whatever
1999	* reason. Still may need to send the head for this space.	1936	* reason. Still may need to send the head for this space.
2000	*/	1937	*/
2001		1938
2002	oldlen = sl.len;	1939	oldlen = sl.length ();
2003		1940
2004	SockList_AddShort (&sl, mask);	1941	sl << uint16 (mask);
2005		1942
2006	if (lastcell.count != -1)	1943	if (lastcell.count != -1)
2007	need_send = 1;	1944	need_send = 1;
2008		1945
2009	count = -1;	1946	count = -1;
2010		1947
2011	if (socket.mapmode == Map1aCmd && have_head (ax, ay))	1948	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2012	{	1949	{
2013	/* Now check to see if any heads need to be sent */	1950	/* Now check to see if any heads need to be sent */
2014		1951
2015	if (check_head (sl, socket, ax, ay, 2))	1952	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2016	mask |= 0x4;
2017	if (check_head (sl, socket, ax, ay, 1))	1953	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2018	mask |= 0x2;
2019	if (check_head (sl, socket, ax, ay, 0))	1954	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2020	mask |= 0x1;
2021		1955
2022	lastcell.count = count;	1956	lastcell.count = count;
2023	}	1957	}
2024	else	1958	else
2025	{	1959	{
…		…
2030		1964
2031	map_clearcell (&lastcell, 0, 0, 0, count);	1965	map_clearcell (&lastcell, 0, 0, 0, count);
2032	}	1966	}
2033		1967
2034	if ((mask & 0xf) || need_send)	1968	if ((mask & 0xf) || need_send)
2035	sl.buf[oldlen + 1] = mask & 0xff;	1969	sl[oldlen + 1] = mask & 0xff;
2036	else	1970	else
2037	sl.len = oldlen;	1971	sl.reset (oldlen);
2038	}	1972	}
2039	else	1973	else
2040	{	1974	{
2041	/* In this block, the space is visible or there are head objects	1975	/* In this block, the space is visible or there are head objects
2042	* we need to send.	1976	* we need to send.
…		…
2044		1978
2045	/* Rather than try to figure out what everything that we might	1979	/* Rather than try to figure out what everything that we might
2046	* need to send is, then form the packet after that,	1980	* need to send is, then form the packet after that,
2047	* we presume that we will in fact form a packet, and update	1981	* we presume that we will in fact form a packet, and update
2048	* the bits by what we do actually send. If we send nothing,	1982	* the bits by what we do actually send. If we send nothing,
2049	* we just back out sl.len to the old value, and no harm	1983	* we just back out sl.length () to the old value, and no harm
2050	* is done.	1984	* is done.
2051	* I think this is simpler than doing a bunch of checks to see	1985	* I think this is simpler than doing a bunch of checks to see
2052	* what if anything we need to send, setting the bits, then	1986	* what if anything we need to send, setting the bits, then
2053	* doing those checks again to add the real data.	1987	* doing those checks again to add the real data.
2054	*/	1988	*/
2055	oldlen = sl.len;	1989	oldlen = sl.length ();
2056	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1990	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2057	eoldlen = esl.len;	1991	eoldlen = esl.length ();
2058	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1992	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2059	SockList_AddShort (&sl, mask);	1993	sl << uint16 (mask);
2060		1994
2061	if (socket.ext_mapinfos)	1995	if (socket.ext_mapinfos)
2062	SockList_AddShort (&esl, emask);	1996	esl << uint16 (emask);
2063		1997
2064	unsigned char dummy;	1998	unsigned char dummy;
2065	unsigned char *last_ext = &dummy;	1999	unsigned char *last_ext = &dummy;
2066		2000
2067	/* Darkness changed */	2001	/* Darkness changed */
…		…
2070	mask |= 0x8;	2004	mask |= 0x8;
2071		2005
2072	if (socket.extmap)	2006	if (socket.extmap)
2073	{	2007	{
2074	*last_ext |= 0x80;	2008	*last_ext |= 0x80;
2075	last_ext = sl.buf + sl.len;	2009	last_ext = &sl[sl.length ()];
2076	SockList_AddChar (&sl, d);	2010	sl << uint8 (d);
2077	}	2011	}
2078	else	2012	else
2079	SockList_AddChar (&sl, 255 - 64 * d);	2013	sl << uint8 (255 - 64 * d);
2080	}	2014	}
2081		2015
2082	lastcell.count = d;	2016	lastcell.count = d;
2083		2017
2084	if (socket.extmap)	2018	if (socket.extmap)
2085	{	2019	{
2086	uint8 stat_hp = 0;	2020	uint8 stat_hp = 0;
2087	uint8 stat_width = 0;	2021	uint8 stat_width = 0;
2088	uint8 flags = 0;	2022	uint8 flags = 0;
2089	tag_t player = 0;	2023	UUID player = 0;
2090		2024
2091	// send hp information, if applicable	2025	// send hp information, if applicable
2092	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	2026	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2093	{	2027	{
2094	if (op->head || op->invisible)	2028	if (op->head || op->invisible)
…		…
2114	{	2048	{
2115	lastcell.stat_hp = stat_hp;	2049	lastcell.stat_hp = stat_hp;
2116		2050
2117	mask |= 0x8;	2051	mask |= 0x8;
2118	*last_ext |= 0x80;	2052	*last_ext |= 0x80;
2119	last_ext = sl.buf + sl.len;	2053	last_ext = &sl[sl.length ()];
2120	SockList_AddChar (&sl, 5);	2054
2121	SockList_AddChar (&sl, stat_hp);	2055	sl << uint8 (5) << uint8 (stat_hp);
2122		2056
2123	if (stat_width > 1)	2057	if (stat_width > 1)
2124	{	2058	{
2125	*last_ext |= 0x80;	2059	*last_ext |= 0x80;
2126	last_ext = sl.buf + sl.len;	2060	last_ext = &sl[sl.length ()];
2127	SockList_AddChar (&sl, 6);	2061
2128	SockList_AddChar (&sl, stat_width);	2062	sl << uint8 (6) << uint8 (stat_width);
2129	}	2063	}
2130	}	2064	}
2131		2065
2132	if (lastcell.player != player)	2066	if (lastcell.player != player)
2133	{	2067	{
2134	lastcell.player = player;	2068	lastcell.player = player;
2135		2069
2136	mask |= 0x8;	2070	mask |= 0x8;
2137	*last_ext |= 0x80;	2071	*last_ext |= 0x80;
2138	last_ext = sl.buf + sl.len;	2072	last_ext = &sl[sl.length ()];
2139	SockList_AddChar (&sl, 0x47);	2073
2140	SockList_AddChar (&sl, 4);	2074	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2141	SockList_AddInt (&sl, player);
2142	}	2075	}
2143		2076
2144	if (lastcell.flags != flags)	2077	if (lastcell.flags != flags)
2145	{	2078	{
2146	lastcell.flags = flags;	2079	lastcell.flags = flags;
2147		2080
2148	mask |= 0x8;	2081	mask |= 0x8;
2149	*last_ext |= 0x80;	2082	*last_ext |= 0x80;
2150	last_ext = sl.buf + sl.len;	2083	last_ext = &sl[sl.length ()];
2151	SockList_AddChar (&sl, 8);	2084
2152	SockList_AddChar (&sl, flags);	2085	sl << uint8 (8) << uint8 (flags);
2153	}	2086	}
2154	}	2087	}
2155		2088
2156	/* Floor face */	2089	/* Floor face */
2157	if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2))	2090	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2158	mask |= 0x4;	2091	mask |= 0x4;
2159		2092
2160	if (socket.EMI_smooth)	2093	if (socket.EMI_smooth)
2161	if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2))	2094	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2162	emask |= 0x4;	2095	emask |= 0x4;
2163		2096
2164	/* Middle face */	2097	/* Middle face */
2165	if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1))	2098	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2166	mask |= 0x2;	2099	mask |= 0x2;
2167		2100
2168	if (socket.EMI_smooth)	2101	if (socket.EMI_smooth)
2169	if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1))	2102	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2170	emask |= 0x2;	2103	emask |= 0x2;
2171		2104
2172	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	2105	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2173	{	2106	{
2174	if (lastcell.faces[0] != pl->face->number)	2107	if (lastcell.faces[0] != pl->face->number)
…		…
2177	mask |= 0x1;	2110	mask |= 0x1;
2178		2111
2179	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	2112	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2180	esrv_send_face (&socket, pl->face->number, 0);	2113	esrv_send_face (&socket, pl->face->number, 0);
2181		2114
2182	SockList_AddShort (&sl, pl->face->number);	2115	sl << uint16 (pl->face->number);
2183	}	2116	}
2184	}	2117	}
2185	else	2118	else
2186	{	2119	{
2187	/* Top face */	2120	/* Top face */
2188	if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0))	2121	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2189	mask |= 0x1;	2122	mask |= 0x1;
2190		2123
2191	if (socket.EMI_smooth)	2124	if (socket.EMI_smooth)
2192	if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0))	2125	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2193	emask |= 0x1;	2126	emask |= 0x1;
2194	}	2127	}
2195		2128
2196	/* Check to see if we are in fact sending anything for this	2129	/* Check to see if we are in fact sending anything for this
2197	* space by checking the mask. If so, update the mask.	2130	* space by checking the mask. If so, update the mask.
2198	* if not, reset the len to that from before adding the mask	2131	* if not, reset the len to that from before adding the mask
2199	* value, so we don't send those bits.	2132	* value, so we don't send those bits.
2200	*/	2133	*/
2201	if (mask & 0xf)	2134	if (mask & 0xf)
2202	sl.buf[oldlen + 1] = mask & 0xff;	2135	sl[oldlen + 1] = mask & 0xff;
2203	else	2136	else
2204	sl.len = oldlen;	2137	sl.reset (oldlen);
2205		2138
2206	if (emask & 0xf)	2139	if (emask & 0xf)
2207	esl.buf[eoldlen + 1] = emask & 0xff;	2140	esl[eoldlen + 1] = emask & 0xff;
2208	else	2141	else
2209	esl.len = eoldlen;	2142	esl.reset (eoldlen);
2210	} /* else this is a viewable space */	2143	} /* else this is a viewable space */
2211	} /* for x loop */	2144	} /* for x loop */
2212	} /* for y loop */	2145	} /* for y loop */
2213		2146
2214	/* Verify that we in fact do need to send this */	2147	/* Verify that we in fact do need to send this */
2215	if (socket.ext_mapinfos)	2148	if (socket.ext_mapinfos)
2216	{	2149	{
2217	if (!(sl.len > startlen || socket.sent_scroll))	2150	if (!(sl.length () > startlen || socket.sent_scroll))
2218	{	2151	{
2219	/* No map data will follow, so don't say the client	2152	/* No map data will follow, so don't say the client
2220	* it doesn't need draw!	2153	* it doesn't need draw!
2221	*/	2154	*/
2222	ewhatflag &= (~EMI_NOREDRAW);	2155	ewhatflag &= (~EMI_NOREDRAW);
2223	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	2156	esl[ewhatstart + 1] = ewhatflag & 0xff;
2224	}	2157	}
2225		2158
2226	if (esl.len > estartlen)	2159	if (esl.length () > estartlen)
2227	Send_With_Handling (&socket, &esl);	2160	socket.send_packet (esl);
2228
2229	free (esl.buf);
2230	}	2161	}
2231		2162
2232	if (sl.len > startlen || socket.sent_scroll)	2163	if (sl.length () > startlen || socket.sent_scroll)
2233	{	2164	{
2234	Send_With_Handling (&socket, &sl);	2165	socket.send_packet (sl);
2235	socket.sent_scroll = 0;	2166	socket.sent_scroll = 0;
2236	}	2167	}
2237
2238	free (sl.buf);
2239	}	2168	}
2240		2169
2241	/**	2170	/**
2242	* Draws client map.	2171	* Draws client map.
2243	*/	2172	*/
…		…
2267	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	2196	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2268	return;	2197	return;
2269		2198
2270	memset (&newmap, 0, sizeof (struct Map));	2199	memset (&newmap, 0, sizeof (struct Map));
2271		2200
2272	for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++)	2201	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2273	{	2202	{
2274	for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++)	2203	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2275	{	2204	{
2276	ax = i;	2205	ax = i;
2277	ay = j;	2206	ay = j;
2278	m = pm;	2207	m = pm;
2279	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2208	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
…		…
2294	{	2223	{
2295	update_los (pl);	2224	update_los (pl);
2296	pl->contr->do_los = 0;	2225	pl->contr->do_los = 0;
2297	}	2226	}
2298		2227
2299	if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2300	{
2301	/* Big maps need a different drawing mechanism to work */	2228	/* Big maps need a different drawing mechanism to work */
2302	draw_client_map1 (pl);	2229	draw_client_map1 (pl);
2303	return;
2304	}
2305
2306	if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2307	{
2308	esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2309	}
2310
2311	/* j and i are the y and x coordinates of the real map (which is
2312	* basically some number of spaces around the player)
2313	* ax and ay are values from within the viewport (ie, 0, 0 is upper
2314	* left corner) and are thus disconnected from the map values.
2315	* Subtract 1 from the max values so that we properly handle cases where
2316	* player has specified an even map. Otherwise, we try to send them too
2317	* much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2318	* 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2319	* odd, this still works fine.
2320	*/
2321	ay = 0;
2322	for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2323	{
2324	ax = 0;
2325	for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2326	{
2327
2328	d = pl->contr->blocked_los[ax][ay];
2329	/* note the out_of_map and d>3 checks are both within the same
2330	* negation check.
2331	*/
2332	nx = i;
2333	ny = j;
2334	m = get_map_from_coord (pm, &nx, &ny);
2335	if (m && d < 4)
2336	{
2337	face = GET_MAP_FACE (m, nx, ny, 0);
2338	floor2 = GET_MAP_FACE (m, nx, ny, 1);
2339	floor = GET_MAP_FACE (m, nx, ny, 2);
2340
2341	/* If all is blank, send a blank face. */
2342	if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2343	{
2344	esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2345	}
2346	else
2347	{ /* actually have something interesting */
2348	/* send the darkness mask, if any. */
2349	if (d && pl->contr->socket.darkness)
2350	esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2351
2352	if (face && face != blank_face)
2353	esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2354	if (floor2 && floor2 != blank_face)
2355	esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2356	if (floor && floor != blank_face)
2357	esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2358	}
2359	} /* Is a valid space */
2360	}
2361	}
2362	esrv_map_doneredraw (&pl->contr->socket, &newmap);
2363
2364	check_map_change (pl->contr);
2365	}	2230	}
2366		2231
2367		2232
2368	/*****************************************************************************/	2233	/*****************************************************************************/
2369		2234
…		…
2375		2240
2376	/*****************************************************************************/	2241	/*****************************************************************************/
2377	void	2242	void
2378	send_plugin_custom_message (object *pl, char *buf)	2243	send_plugin_custom_message (object *pl, char *buf)
2379	{	2244	{
2380	cs_write_string (&pl->contr->socket, buf, strlen (buf));	2245	pl->contr->socket->send_packet (buf);
2381	}	2246	}
2382		2247
2383	/**	2248	/**
2384	* This sends the skill number to name mapping. We ignore	2249	* This sends the skill number to name mapping. We ignore
2385	* the params - we always send the same info no matter what.	2250	* the params - we always send the same info no matter what.
2386	*/	2251	*/
2387	void	2252	void
2388	send_skill_info (NewSocket * ns, char *params)	2253	send_skill_info (client *ns, char *params)
2389	{	2254	{
2390	SockList sl;	2255	packet sl;
2391	int i;	2256	sl << "replyinfo skill_info\n";
2392		2257
2393	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2394	strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2395	for (i = 1; i < NUM_SKILLS; i++)	2258	for (int i = 1; i < NUM_SKILLS; i++)
2396	{	2259	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2397	sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	2260
2398	}
2399	sl.len = strlen ((char *) sl.buf);
2400	if (sl.len >= MAXSOCKBUF)	2261	if (sl.length () >= MAXSOCKBUF)
2401	{	2262	{
2402	LOG (llevError, "Buffer overflow in send_skill_info!\n");	2263	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2403	fatal (0);	2264	fatal (0);
2404	}	2265	}
2405	Send_With_Handling (ns, &sl);	2266
2406	free (sl.buf);	2267	ns->send_packet (sl);
2407	}	2268	}
2408		2269
2409	/**	2270	/**
2410	* This sends the spell path to name mapping. We ignore	2271	* This sends the spell path to name mapping. We ignore
2411	* the params - we always send the same info no matter what.	2272	* the params - we always send the same info no matter what.
2412	*/	2273	*/
2413	void	2274	void
2414	send_spell_paths (NewSocket * ns, char *params)	2275	send_spell_paths (client * ns, char *params)
2415	{	2276	{
2416	SockList sl;	2277	packet sl;
2417	int i;
2418		2278
2419	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	2279	sl << "replyinfo spell_paths\n";
2420	strcpy ((char *) sl.buf, "replyinfo spell_paths\n");	2280
2421	for (i = 0; i < NRSPELLPATHS; i++)	2281	for (int i = 0; i < NRSPELLPATHS; i++)
2422	sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]);	2282	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2423	sl.len = strlen ((char *) sl.buf);	2283
2424	if (sl.len >= MAXSOCKBUF)	2284	if (sl.length () >= MAXSOCKBUF)
2425	{	2285	{
2426	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	2286	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2427	fatal (0);	2287	fatal (0);
2428	}	2288	}
2429	Send_With_Handling (ns, &sl);	2289
2430	free (sl.buf);	2290	ns->send_packet (sl);
2431	}	2291	}
2432		2292
2433	/**	2293	/**
2434	* This looks for any spells the player may have that have changed their stats.	2294	* This looks for any spells the player may have that have changed their stats.
2435	* it then sends an updspell packet for each spell that has changed in this way	2295	* it then sends an updspell packet for each spell that has changed in this way
2436	*/	2296	*/
2437	void	2297	void
2438	esrv_update_spells (player *pl)	2298	esrv_update_spells (player *pl)
2439	{	2299	{
2440	SockList sl;
2441	int flags = 0;
2442	object *spell;
2443
2444	if (!pl->socket.monitor_spells)	2300	if (!pl->socket->monitor_spells)
2445	return;	2301	return;
		2302
2446	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2303	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2447	{	2304	{
2448	if (spell->type == SPELL)	2305	if (spell->type == SPELL)
2449	{	2306	{
		2307	int flags = 0;
		2308
2450	/* check if we need to update it */	2309	/* check if we need to update it */
2451	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	2310	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2452	{	2311	{
2453	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	2312	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2454	flags |= UPD_SP_MANA;	2313	flags |= UPD_SP_MANA;
2455	}	2314	}
		2315
2456	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	2316	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2457	{	2317	{
2458	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	2318	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2459	flags |= UPD_SP_GRACE;	2319	flags |= UPD_SP_GRACE;
2460	}	2320	}
		2321
2461	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	2322	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2462	{	2323	{
2463	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	2324	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2464	flags |= UPD_SP_DAMAGE;	2325	flags |= UPD_SP_DAMAGE;
2465	}	2326	}
		2327
2466	if (flags != 0)	2328	if (flags)
2467	{	2329	{
2468	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	2330	packet sl;
2469	strcpy ((char *) sl.buf, "updspell ");	2331
2470	sl.len = strlen ((char *) sl.buf);	2332	sl << "updspell "
2471	SockList_AddChar (&sl, flags);	2333	<< uint8 (flags)
2472	SockList_AddInt (&sl, spell->count);	2334	<< uint32 (spell->count);
2473	if (flags & UPD_SP_MANA)	2335
2474	SockList_AddShort (&sl, spell->last_sp);	2336	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2475	if (flags & UPD_SP_GRACE)	2337	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2476	SockList_AddShort (&sl, spell->last_grace);	2338	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2477	if (flags & UPD_SP_DAMAGE)	2339
2478	SockList_AddShort (&sl, spell->last_eat);	2340	pl->socket->send_packet (sl);
2479	flags = 0;
2480	Send_With_Handling (&pl->socket, &sl);
2481	free (sl.buf);
2482	}	2341	}
2483	}	2342	}
2484	}	2343	}
2485	}	2344	}
2486		2345
2487	void	2346	void
2488	esrv_remove_spell (player *pl, object *spell)	2347	esrv_remove_spell (player *pl, object *spell)
2489	{	2348	{
2490	SockList sl;
2491
2492	if (!pl->socket.monitor_spells)	2349	if (!pl->socket->monitor_spells)
2493	return;	2350	return;
		2351
2494	if (!pl || !spell || spell->env != pl->ob)	2352	if (!pl || !spell || spell->env != pl->ob)
2495	{	2353	{
2496	LOG (llevError, "Invalid call to esrv_remove_spell");	2354	LOG (llevError, "Invalid call to esrv_remove_spell");
2497	return;	2355	return;
2498	}	2356	}
2499	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	2357
2500	strcpy ((char *) sl.buf, "delspell ");	2358	packet sl;
2501	sl.len = strlen ((char *) sl.buf);	2359
2502	SockList_AddInt (&sl, spell->count);	2360	sl << "delspell "
2503	Send_With_Handling (&pl->socket, &sl);	2361	<< uint32 (spell->count);
2504	free (sl.buf);	2362
		2363	pl->socket->send_packet (sl);
2505	}	2364	}
2506		2365
2507	/* appends the spell *spell to the Socklist we will send the data to. */	2366	/* appends the spell *spell to the Socklist we will send the data to. */
2508	static void	2367	static void
2509	append_spell (player *pl, SockList * sl, object *spell)	2368	append_spell (player *pl, packet &sl, object *spell)
2510	{	2369	{
2511	int len, i, skill = 0;	2370	int len, i, skill = 0;
2512		2371
2513	if (!(spell->name))	2372	if (!(spell->name))
2514	{	2373	{
2515	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	2374	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2516	return;	2375	return;
2517	}	2376	}
2518	SockList_AddInt (sl, spell->count);	2377
2519	SockList_AddShort (sl, spell->level);
2520	SockList_AddShort (sl, spell->casting_time);
2521	/* store costs and damage in the object struct, to compare to later */	2378	/* store costs and damage in the object struct, to compare to later */
2522	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	2379	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2523	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	2380	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2524	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	2381	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2525	/* send the current values */
2526	SockList_AddShort (sl, spell->last_sp);
2527	SockList_AddShort (sl, spell->last_grace);
2528	SockList_AddShort (sl, spell->last_eat);
2529		2382
2530	/* figure out which skill it uses, if it uses one */	2383	/* figure out which skill it uses, if it uses one */
2531	if (spell->skill)	2384	if (spell->skill)
2532	{	2385	{
2533	for (i = 1; i < NUM_SKILLS; i++)	2386	for (i = 1; i < NUM_SKILLS; i++)
…		…
2535	{	2388	{
2536	skill = i + CS_STAT_SKILLINFO;	2389	skill = i + CS_STAT_SKILLINFO;
2537	break;	2390	break;
2538	}	2391	}
2539	}	2392	}
2540	SockList_AddChar (sl, skill);
2541		2393
2542	SockList_AddInt (sl, spell->path_attuned);	2394	/* send the current values */
		2395	sl << uint32 (spell->count)
		2396	<< uint16 (spell->level)
		2397	<< uint16 (spell->casting_time)
		2398	<< uint16 (spell->last_sp)
		2399	<< uint16 (spell->last_grace)
		2400	<< uint16 (spell->last_eat)
		2401	<< uint8 (skill)
		2402	<< uint32 (spell->path_attuned)
2543	SockList_AddInt (sl, (spell->face) ? spell->face->number : 0);	2403	<< uint32 (spell->face ? spell->face->number : 0)
2544		2404	<< data8 (spell->name)
2545	len = strlen (spell->name);	2405	<< data16 (spell->msg);
2546	SockList_AddChar (sl, (char) len);
2547	memcpy (sl->buf + sl->len, spell->name, len);
2548	sl->len += len;
2549
2550	if (!spell->msg)
2551	{
2552	SockList_AddShort (sl, 0);
2553	}
2554	else
2555	{
2556	len = strlen (spell->msg);
2557	SockList_AddShort (sl, len);
2558	memcpy (sl->buf + sl->len, spell->msg, len);
2559	sl->len += len;
2560	}
2561	}	2406	}
2562		2407
2563	/**	2408	/**
2564	* This tells the client to add the spell *ob, if *ob is NULL, then add	2409	* This tells the client to add the spell *ob, if *ob is NULL, then add
2565	* all spells in the player's inventory.	2410	* all spells in the player's inventory.
2566	*/	2411	*/
2567	void	2412	void
2568	esrv_add_spells (player *pl, object *spell)	2413	esrv_add_spells (player *pl, object *spell)
2569	{	2414	{
2570	SockList sl;
2571
2572	if (!pl)	2415	if (!pl)
2573	{	2416	{
2574	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2417	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2575	return;	2418	return;
2576	}	2419	}
		2420
2577	if (!pl->socket.monitor_spells)	2421	if (!pl->socket->monitor_spells)
2578	return;	2422	return;
2579	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	2423
2580	strcpy ((char *) sl.buf, "addspell ");	2424	packet sl;
2581	sl.len = strlen ((char *) sl.buf);	2425
		2426	sl << "addspell ";
		2427
2582	if (!spell)	2428	if (!spell)
2583	{	2429	{
2584	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2430	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2585	{	2431	{
2586	/* were we to simply keep appending data here, we could exceed	2432	/* were we to simply keep appending data here, we could exceed
…		…
2596	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	2442	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2597	* like it will fix this	2443	* like it will fix this
2598	*/	2444	*/
2599	if (spell->type != SPELL)	2445	if (spell->type != SPELL)
2600	continue;	2446	continue;
		2447
2601	if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2448	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2602	{	2449	{
2603	Send_With_Handling (&pl->socket, &sl);	2450	pl->socket->send_packet (sl);
2604	strcpy ((char *) sl.buf, "addspell ");	2451
2605	sl.len = strlen ((char *) sl.buf);	2452	sl.reset ();
		2453	sl << "addspell ";
2606	}	2454	}
		2455
2607	append_spell (pl, &sl, spell);	2456	append_spell (pl, sl, spell);
2608	}	2457	}
2609	}	2458	}
2610	else if (spell->type != SPELL)	2459	else if (spell->type != SPELL)
2611	{	2460	{
2612	LOG (llevError, "Asked to send a non-spell object as a spell");	2461	LOG (llevError, "Asked to send a non-spell object as a spell");
2613	return;	2462	return;
2614	}	2463	}
2615	else	2464	else
2616	append_spell (pl, &sl, spell);	2465	append_spell (pl, sl, spell);
		2466
2617	if (sl.len >= MAXSOCKBUF)	2467	if (sl.length () >= MAXSOCKBUF)
2618	{	2468	{
2619	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2469	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2620	fatal (0);	2470	fatal (0);
2621	}	2471	}
		2472
2622	/* finally, we can send the packet */	2473	/* finally, we can send the packet */
2623	Send_With_Handling (&pl->socket, &sl);	2474	pl->socket->send_packet (sl);
2624	free (sl.buf);
2625	}	2475	}
		2476

Diff Legend

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