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

Diff Legend

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