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

Diff Legend

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