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

Diff Legend

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