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.34 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.64 by pippijn, Sat Jan 20 13:47:17 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/**	25	/**
25	* \file	26	* \file
26	* Client handling.	27	* Client handling.
27	*	28	*
…		…
38	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
39	*	40	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.	41	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.	42	* if a face has not already been sent to the client, it is sent now.
42	*	43	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	44	*/
47		45
48	#include <global.h>	46	#include <global.h>
49	#include <sproto.h>	47	#include <sproto.h>
50		48
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	49	#include <living.h>
54	#include <commands.h>	50	#include <commands.h>
55		51
56	/* This block is basically taken from socket.c - I assume if it works there,	52	/* This block is basically taken from socket.c - I assume if it works there,
57	* it should work here.	53	* it should work here.
…		…
60	#include <sys/time.h>	56	#include <sys/time.h>
61	#include <sys/socket.h>	57	#include <sys/socket.h>
62	#include <netinet/in.h>	58	#include <netinet/in.h>
63	#include <netdb.h>	59	#include <netdb.h>
64		60
65	#ifdef HAVE_UNISTD_H
66	# include <unistd.h>	61	#include <unistd.h>
67	#endif
68
69	#ifdef HAVE_SYS_TIME_H
70	# include <sys/time.h>	62	#include <sys/time.h>
71	#endif
72		63
73	#include "sounds.h"	64	#include "sounds.h"
74		65
75	/**	66	/**
76	* This table translates the attack numbers as used within the	67	* This table translates the attack numbers as used within the
…		…
93	-1, /* life stealing */	84	-1, /* life stealing */
94	-1 /* Disease - not fully done yet */	85	-1 /* Disease - not fully done yet */
95	};	86	};
96		87
97	static void	88	static void
98	socket_map_scroll (NewSocket * ns, int dx, int dy)	89	socket_map_scroll (client *ns, int dx, int dy)
99	{	90	{
100	struct Map newmap;	91	struct Map newmap;
101	int x, y, mx, my;	92	int x, y, mx, my;
102		93
103	{
104	packet sl;
105
106	sl.printf ("map_scroll %d %d", dx, dy);	94	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107	ns->send_packet (sl);
108	}
109		95
110	/* If we are using the Map1aCmd, we may in fact send	96	/* If we are using the Map1aCmd, we may in fact send
111	* head information that is outside the viewable map.	97	* head information that is outside the viewable map.
112	* So set the mx,my to the max value we want to	98	* So set the mx,my to the max value we want to
113	* look for. Removed code to do so - it caused extra	99	* look for. Removed code to do so - it caused extra
…		…
153	}	139	}
154		140
155	static void	141	static void
156	clear_map (player *pl)	142	clear_map (player *pl)
157	{	143	{
158	NewSocket & socket = pl->socket;
159
160	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
161		145
162	if (socket.newmapcmd == 1)	146	if (pl->ns->newmapcmd == 1)
163	socket.send_packet ("newmap");	147	pl->ns->send_packet ("newmap");
164		148
165	socket.update_look = 1;	149	pl->ns->floorbox_reset ();
166	socket.look_position = 0;
167	}	150	}
168		151
169	/** check for map change and send new map data */	152	/** check for map change and send new map data */
170	static void	153	static void
171	check_map_change (player *pl)	154	check_map_change (player *pl)
172	{	155	{
173	NewSocket & socket = pl->socket;	156	client &socket = *pl->ns;
174	object *ob = pl->ob;	157	object *ob = pl->ob;
175	char buf[MAX_BUF]; /* eauugggh */	158	char buf[MAX_BUF]; /* eauugggh */
176		159
177	if (socket.current_map != ob->map)	160	if (socket.current_map != ob->map)
178	{	161	{
…		…
194	flags |= 4;	177	flags |= 4;
195	if (ob->map->tile_path[3])	178	if (ob->map->tile_path[3])
196	flags |= 8;	179	flags |= 8;
197		180
198	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	181	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
199	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	182	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
200	}	183	}
201	else	184	else
202	snprintf (buf, MAX_BUF, "mapinfo current");	185	snprintf (buf, MAX_BUF, "mapinfo current");
203		186
204	socket.send_packet (buf);	187	socket.send_packet (buf);
…		…
212	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	195	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	196	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
214	else	197	else
215	{	198	{
216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	199	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
217	socket.update_look = 1;	200	socket.floorbox_reset ();
218	socket.look_position = 0;
219	}	201	}
220	}	202	}
221		203
222	socket.current_x = ob->x;	204	socket.current_x = ob->x;
223	socket.current_y = ob->y;	205	socket.current_y = ob->y;
224	}	206	}
225		207
		208	/**
		209	* RequestInfo is sort of a meta command. There is some specific
		210	* request of information, but we call other functions to provide
		211	* that information.
		212	*/
		213	void
		214	RequestInfo (char *buf, int len, client * ns)
		215	{
		216	char *params = NULL, *cp;
		217
		218	/* No match */
		219	char bigbuf[MAX_BUF];
		220	int slen;
		221
		222	/* Set up replyinfo before we modify any of the buffers - this is used
		223	* if we don't find a match.
		224	*/
		225	strcpy (bigbuf, "replyinfo ");
		226	slen = strlen (bigbuf);
		227	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		228
		229	/* find the first space, make it null, and update the
		230	* params pointer.
		231	*/
		232	for (cp = buf; *cp != '\0'; cp++)
		233	if (*cp == ' ')
		234	{
		235	*cp = '\0';
		236	params = cp + 1;
		237	break;
		238	}
		239
		240	if (!strcmp (buf, "image_info"))
		241	send_image_info (ns, params);
		242	else if (!strcmp (buf, "image_sums"))
		243	send_image_sums (ns, params);
		244	else if (!strcmp (buf, "skill_info"))
		245	send_skill_info (ns, params);
		246	else if (!strcmp (buf, "spell_paths"))
		247	send_spell_paths (ns, params);
		248	else
		249	ns->send_packet (bigbuf, len);
		250	}
		251
226	void	252	void
227	ExtCmd (char *buf, int len, player *pl)	253	ExtCmd (char *buf, int len, player *pl)
228	{	254	{
229	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	255	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
		256	}
		257
		258	void
		259	ExtiCmd (char *buf, int len, client *ns)
		260	{
		261	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230	}	262	}
231		263
232	void	264	void
233	MapInfoCmd (char *buf, int len, player *pl)	265	MapInfoCmd (char *buf, int len, player *pl)
234	{	266	{
…		…
249	buf += 8;	281	buf += 8;
250		282
251	// initial map and its origin	283	// initial map and its origin
252	maptile *map = pl->ob->map;	284	maptile *map = pl->ob->map;
253	sint16 dx, dy;	285	sint16 dx, dy;
254	int mapx = pl->socket.mapx / 2 - pl->ob->x;	286	int mapx = pl->ns->mapx / 2 - pl->ob->x;
255	int mapy = pl->socket.mapy / 2 - pl->ob->y;	287	int mapy = pl->ns->mapy / 2 - pl->ob->y;
256	int max_distance = 8; // limit maximum path length to something generous	288	int max_distance = 8; // limit maximum path length to something generous
257		289
258	while (*buf && map && max_distance)	290	while (*buf && map && max_distance)
259	{	291	{
260	int dir = *buf++;	292	int dir = *buf++;
261		293
262	switch (dir)	294	switch (dir)
263	{	295	{
264	case '1':	296	case '1':
265	dx = 0;	297	dx = 0;
266	dy = -1;	298	dy = -1;
267	map = get_map_from_coord (map, &dx, &dy);	299	map = map->xy_find (dx, dy);
268	map && (mapy -= map->height);	300	map && (mapy -= map->height);
269	break;	301	break;
270	case '2':	302	case '2':
271	mapx += map->width;	303	mapx += map->width;
272	dx = map->width;	304	dx = map->width;
273	dy = 0;	305	dy = 0;
274	map = get_map_from_coord (map, &dx, &dy);	306	map = map->xy_find (dx, dy);
275	break;	307	break;
276	case '3':	308	case '3':
277	mapy += map->height;	309	mapy += map->height;
278	dx = 0;	310	dx = 0;
279	dy = map->height;	311	dy = map->height;
280	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
281	break;	313	break;
282	case '4':	314	case '4':
283	dx = -1;	315	dx = -1;
284	dy = 0;	316	dy = 0;
285	map = get_map_from_coord (map, &dx, &dy);	317	map = map->xy_find (dx, dy);
286	map && (mapx -= map->width);	318	map && (mapx -= map->width);
287	break;	319	break;
288	}	320	}
289		321
290	--max_distance;	322	--max_distance;
291	}	323	}
292		324
…		…
303	if (map->tile_path[2])	335	if (map->tile_path[2])
304	flags |= 4;	336	flags |= 4;
305	if (map->tile_path[3])	337	if (map->tile_path[3])
306	flags |= 8;	338	flags |= 8;
307		339
308	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	340	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
309	}	341	}
310	else	342	else
311	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	343	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312	}	344	}
313	else	345	else
314	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	346	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315		347
316	pl->socket.send_packet (bigbuf);	348	pl->ns->send_packet (bigbuf);
317	}	349	}
318		350
319	/** This is the Setup cmd - easy first implementation */	351	/** This is the Setup cmd - easy first implementation */
320	void	352	void
321	SetUp (char *buf, int len, NewSocket * ns)	353	SetUp (char *buf, int len, client * ns)
322	{	354	{
323	int s, slen;	355	int s, slen;
324	char *cmd, *param, cmdback[HUGE_BUF];	356	char *cmd, *param, cmdback[HUGE_BUF];
325		357
326	/* run through the cmds of setup	358	/* run through the cmds of setup
…		…
368	{	400	{
369	ns->sound = atoi (param);	401	ns->sound = atoi (param);
370	safe_strcat (cmdback, param, &slen, HUGE_BUF);	402	safe_strcat (cmdback, param, &slen, HUGE_BUF);
371	}	403	}
372	else if (!strcmp (cmd, "exp64"))	404	else if (!strcmp (cmd, "exp64"))
373	{
374	ns->exp64 = atoi (param);
375	safe_strcat (cmdback, param, &slen, HUGE_BUF);	405	safe_strcat (cmdback, param, &slen, HUGE_BUF);
376	}
377	else if (!strcmp (cmd, "spellmon"))	406	else if (!strcmp (cmd, "spellmon"))
378	{	407	{
379	ns->monitor_spells = atoi (param);	408	ns->monitor_spells = atoi (param);
380	safe_strcat (cmdback, param, &slen, HUGE_BUF);	409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
381	}	410	}
…		…
536	* This is what takes care of it. We tell the client how things worked out.	565	* This is what takes care of it. We tell the client how things worked out.
537	* I am not sure if this file is the best place for this function. however,	566	* I am not sure if this file is the best place for this function. however,
538	* it either has to be here or init_sockets needs to be exported.	567	* it either has to be here or init_sockets needs to be exported.
539	*/	568	*/
540	void	569	void
541	AddMeCmd (char *buf, int len, NewSocket * ns)	570	AddMeCmd (char *buf, int len, client * ns)
542	{	571	{
543	Settings oldsettings;	572	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
544
545	oldsettings = settings;
546	if (ns->status != Ns_Add || add_player (ns))
547	ns->send_packet ("addme_failed");
548	else
549	{
550	/* Basically, the add_player copies the socket structure into
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	ns->send_packet ("addme_success");
556	socket_info.nconns--;
557	ns->status = Ns_Avail;
558	}
559
560	settings = oldsettings;
561	}	573	}
562		574
563	/** Reply to ExtendedInfos command */	575	/** Reply to ExtendedInfos command */
564	void	576	void
565	ToggleExtendedInfos (char *buf, int len, NewSocket * ns)	577	ToggleExtendedInfos (char *buf, int len, client * ns)
566	{	578	{
567	char cmdback[MAX_BUF];	579	char cmdback[MAX_BUF];
568	char command[50];	580	char command[50];
569	int info, nextinfo;	581	int info, nextinfo;
570		582
…		…
621	#define MSG_TYPE_MONUMENT 5	633	#define MSG_TYPE_MONUMENT 5
622	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	634	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623		635
624	/** Reply to ExtendedInfos command */	636	/** Reply to ExtendedInfos command */
625	void	637	void
626	ToggleExtendedText (char *buf, int len, NewSocket * ns)	638	ToggleExtendedText (char *buf, int len, client * ns)
627	{	639	{
628	char cmdback[MAX_BUF];	640	char cmdback[MAX_BUF];
629	char temp[10];	641	char temp[10];
630	char command[50];	642	char command[50];
631	int info, nextinfo, i, flag;	643	int info, nextinfo, i, flag;
…		…
682	* a piece of data from us that we know the client wants. So	694	* a piece of data from us that we know the client wants. So
683	* if we know the client wants it, might as well push it to the	695	* if we know the client wants it, might as well push it to the
684	* client.	696	* client.
685	*/	697	*/
686	static void	698	static void
687	SendSmooth (NewSocket * ns, uint16 face)	699	SendSmooth (client *ns, uint16 face)
688	{	700	{
689	uint16 smoothface;	701	uint16 smoothface;
690		702
691	/* If we can't find a face, return and set it so we won't try to send this	703	/* If we can't find a face, return and set it so we won't try to send this
692	* again.	704	* again.
…		…
702	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	714	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
703	esrv_send_face (ns, smoothface, 0);	715	esrv_send_face (ns, smoothface, 0);
704		716
705	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	717	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
706		718
707	packet sl;	719	packet sl ("smooth");
708		720
709	sl << "smooth "
710	<< uint16 (face)	721	sl << uint16 (face)
711	<< uint16 (smoothface);	722	<< uint16 (smoothface);
712		723
713	Send_With_Handling (ns, &sl);	724	ns->send_packet (sl);
714	}	725	}
715		726
716	/**	727	/**
717	* Tells client the picture it has to use	728	* Tells client the picture it has to use
718	* to smooth a picture number given as argument.	729	* to smooth a picture number given as argument.
719	*/	730	*/
720	void	731	void
721	AskSmooth (char *buf, int len, NewSocket * ns)	732	AskSmooth (char *buf, int len, client *ns)
722	{	733	{
723	uint16 facenbr;	734	SendSmooth (ns, atoi (buf));
724
725	facenbr = atoi (buf);
726	SendSmooth (ns, facenbr);
727	}	735	}
728		736
729	/**	737	/**
730	* This handles the general commands from the client (ie, north, fire, cast,	738	* This handles the general commands from the client (ie, north, fire, cast,
731	* etc.)	739	* etc.)
732	*/	740	*/
733	void	741	void
734	PlayerCmd (char *buf, int len, player *pl)	742	PlayerCmd (char *buf, int len, player *pl)
735	{	743	{
736
737	/* The following should never happen with a proper or honest client.
738	* Therefore, the error message doesn't have to be too clear - if
739	* someone is playing with a hacked/non working client, this gives them
740	* an idea of the problem, but they deserve what they get
741	*/
742	if (pl->state != ST_PLAYING)
743	{
744	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
745	return;
746	}
747	/* Check if there is a count. In theory, a zero count could also be	744	/* Check if there is a count. In theory, a zero count could also be
748	* sent, so check for that also.	745	* sent, so check for that also.
749	*/	746	*/
750	if (atoi (buf) || buf[0] == '0')	747	if (atoi (buf) || buf[0] == '0')
751	{	748	{
752	pl->count = atoi ((char *) buf);	749	pl->count = atoi ((char *) buf);
		750
753	buf = strchr (buf, ' '); /* advance beyond the numbers */	751	buf = strchr (buf, ' '); /* advance beyond the numbers */
754	if (!buf)	752	if (!buf)
755	{
756	#ifdef ESRV_DEBUG
757	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758	#endif
759	return;	753	return;
760	}	754
761	buf++;	755	buf++;
762	}	756	}
763	/* This should not happen anymore. */	757
764	if (pl->ob->speed_left < -1.0)
765	{
766	LOG (llevError, "Player has negative time - shouldn't do command.\n");
767	}
768	/* In c_new.c */
769	execute_newserver_command (pl->ob, (char *) buf);	758	execute_newserver_command (pl->ob, (char *) buf);
		759
770	/* Perhaps something better should be done with a left over count.	760	/* Perhaps something better should be done with a left over count.
771	* Cleaning up the input should probably be done first - all actions	761	* Cleaning up the input should probably be done first - all actions
772	* for the command that issued the count should be done before any other	762	* for the command that issued the count should be done before any other
773	* commands.	763	* commands.
774	*/	764	*/
775
776	pl->count = 0;	765	pl->count = 0;
777
778	}	766	}
779		767
780		768
781	/**	769	/**
782	* This handles the general commands from the client (ie, north, fire, cast,	770	* This handles the general commands from the client (ie, north, fire, cast,
783	* etc.). It is a lot like PlayerCmd above, but is called with the	771	* etc.). It is a lot like PlayerCmd above, but is called with the
784	* 'ncom' method which gives more information back to the client so it	772	* 'ncom' method which gives more information back to the client so it
785	* can throttle.	773	* can throttle.
786	*/	774	*/
787	void	775	void
788	NewPlayerCmd (uint8 * buf, int len, player *pl)	776	NewPlayerCmd (char *buf, int len, player *pl)
789	{	777	{
790	int time, repeat;
791	char command[MAX_BUF];
792	int pktlen;
793
794	if (len < 7)	778	if (len <= 6)
795	{	779	{
796	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	780	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
797	return;	781	return;
798	}	782	}
799		783
800	pktlen = net_uint16 (buf);	784	uint16 cmdid = net_uint16 ((uint8 *)buf);
801	repeat = net_uint32 (buf + 2);	785	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
802		786
803	/* -1 is special - no repeat, but don't update */	787	/* -1 is special - no repeat, but don't update */
804	if (repeat != -1)	788	if (repeat != -1)
805	pl->count = repeat;	789	pl->count = repeat;
806		790
807	if ((len - 4) >= MAX_BUF)	791	buf += 6; //len -= 6;
808	len = MAX_BUF - 5;
809		792
810	strncpy ((char *) command, (char *) buf + 6, len - 4);
811	command[len - 4] = '\0';
812
813	/* The following should never happen with a proper or honest client.
814	* Therefore, the error message doesn't have to be too clear - if
815	* someone is playing with a hacked/non working client, this gives them
816	* an idea of the problem, but they deserve what they get
817	*/
818	if (pl->state != ST_PLAYING)
819	{
820	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
821	return;
822	}
823
824	/* This should not happen anymore. */
825	if (pl->ob->speed_left < -1.0)
826	LOG (llevError, "Player has negative time - shouldn't do command.\n");
827
828	/* In c_new.c */
829	execute_newserver_command (pl->ob, (char *) command);	793	execute_newserver_command (pl->ob, buf);
		794
830	/* Perhaps something better should be done with a left over count.	795	/* Perhaps something better should be done with a left over count.
831	* Cleaning up the input should probably be done first - all actions	796	* Cleaning up the input should probably be done first - all actions
832	* for the command that issued the count should be done before any other	797	* for the command that issued the count should be done before any other
833	* commands.	798	* commands.
834	*/	799	*/
835	pl->count = 0;	800	pl->count = 0;
836		801
		802	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
837	if (FABS (pl->ob->speed) < 0.001)	803	int time = FABS (pl->ob->speed) < 0.001
838	time = MAX_TIME * 100;	804	? time = MAX_TIME * 100
839	else
840	time = (int) (MAX_TIME / FABS (pl->ob->speed));	805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
841		806
842	/* Send confirmation of command execution now */	807	/* Send confirmation of command execution now */
843		808	packet sl ("comc");
844	packet sl;
845	sl << "comc " << uint16 (pktlen) << uint32 (time);	809	sl << uint16 (cmdid) << uint32 (time);
846	Send_With_Handling (&pl->socket, &sl);	810	pl->ns->send_packet (sl);
847	}	811	}
848
849		812
850	/** This is a reply to a previous query. */	813	/** This is a reply to a previous query. */
851	void	814	void
852	ReplyCmd (char *buf, int len, player *pl)	815	ReplyCmd (char *buf, int len, client *ns)
853	{	816	{
		817	if (ns->state == ST_CUSTOM)
		818	{
		819	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		820	return;
		821	}
		822
		823	if (!ns->pl)
		824	return; //TODO: depends on the exact reply we are after
		825	//TODO: but right now, we always have a ns->pl
		826
		827	player *pl = ns->pl;
		828
854	/* This is to synthesize how the data would be stored if it	829	/* This is to synthesize how the data would be stored if it
855	* was normally entered. A bit of a hack, and should be cleaned up	830	* was normally entered. A bit of a hack, and should be cleaned up
856	* once all the X11 code is removed from the server.	831	* once all the X11 code is removed from the server.
857	*	832	*
858	* We pass 13 to many of the functions because this way they	833	* We pass 13 to many of the functions because this way they
859	* think it was the carriage return that was entered, and the	834	* think it was the carriage return that was entered, and the
860	* function then does not try to do additional input.	835	* function then does not try to do additional input.
861	*/	836	*/
862	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	837	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
863		838
864	/* this avoids any hacking here */	839	/* this avoids any hacking here */
865		840
866	switch (pl->state)	841	switch (ns->state)
867	{	842	{
868	case ST_PLAYING:	843	case ST_PLAYING:
869	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
870	break;	845	break;
871		846
872	case ST_PLAY_AGAIN:
873	/* We can check this for return value (2==quit). Maybe we
874	* should, and do something appropriate?
875	*/
876	receive_play_again (pl->ob, buf[0]);
877	break;
878
879	case ST_ROLL_STAT:
880	key_roll_stat (pl->ob, buf[0]);
881	break;
882
883	case ST_CHANGE_CLASS:	847	case ST_CHANGE_CLASS:
884
885	key_change_class (pl->ob, buf[0]);	848	key_change_class (pl->ob, buf[0]);
886	break;	849	break;
887		850
888	case ST_CONFIRM_QUIT:
889	key_confirm_quit (pl->ob, buf[0]);
890	break;
891
892	case ST_CONFIGURE:
893	LOG (llevError, "In client input handling, but into configure state\n");
894	pl->state = ST_PLAYING;
895	break;
896
897	case ST_GET_NAME:
898	receive_player_name (pl->ob, 13);
899	break;
900
901	case ST_GET_PASSWORD:
902	case ST_CONFIRM_PASSWORD:
903	receive_player_password (pl->ob, 13);
904	break;
905
906	case ST_GET_PARTY_PASSWORD: /* Get password for party */	851	case ST_GET_PARTY_PASSWORD: /* Get password for party */
907	receive_party_password (pl->ob, 13);	852	receive_party_password (pl->ob, 13);
908	break;	853	break;
909		854
910	default:	855	default:
911	LOG (llevError, "Unknown input state: %d\n", pl->state);	856	LOG (llevError, "Unknown input state: %d\n", ns->state);
912	}	857	}
913	}	858	}
914		859
915	/**	860	/**
916	* Client tells its version. If there is a mismatch, we close the	861	* Client tells its version. If there is a mismatch, we close the
…		…
918	* something older than the server. If we assume the client will be	863	* something older than the server. If we assume the client will be
919	* backwards compatible, having it be a later version should not be a	864	* backwards compatible, having it be a later version should not be a
920	* problem.	865	* problem.
921	*/	866	*/
922	void	867	void
923	VersionCmd (char *buf, int len, NewSocket * ns)	868	VersionCmd (char *buf, int len, client * ns)
924	{	869	{
925	char *cp;
926	char version_warning[256];
927
928	if (!buf)	870	if (!buf)
929	{	871	{
930	LOG (llevError, "CS: received corrupted version command\n");	872	LOG (llevError, "CS: received corrupted version command\n");
931	return;	873	return;
932	}	874	}
933		875
934	ns->cs_version = atoi (buf);	876	ns->cs_version = atoi (buf);
935	ns->sc_version = ns->cs_version;	877	ns->sc_version = ns->cs_version;
		878
		879	LOG (llevDebug, "connection from client <%s>\n", buf);
		880
		881
		882	//TODO: should log here just for statistics
		883
936	if (VERSION_CS != ns->cs_version)	884	//if (VERSION_CS != ns->cs_version)
937	{	885	// unchecked;
938	#ifdef ESRV_DEBUG	886
939	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
940	#endif
941	}
942	cp = strchr (buf + 1, ' ');	887	char *cp = strchr (buf + 1, ' ');
943	if (!cp)	888	if (!cp)
944	return;	889	return;
		890
945	ns->sc_version = atoi (cp);	891	ns->sc_version = atoi (cp);
		892
946	if (VERSION_SC != ns->sc_version)	893	//if (VERSION_SC != ns->sc_version)
947	{	894	// unchecked;
948	#ifdef ESRV_DEBUG	895
949	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
950	#endif
951	}
952	cp = strchr (cp + 1, ' ');	896	cp = strchr (cp + 1, ' ');
		897
953	if (cp)	898	if (cp)
954	{	899	{
955	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	900	assign (ns->version, cp + 1);
956		901
957	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
958
959	/* This is first implementation - i skip all beta DX clients with it
960	* Add later stuff here for other clients
961	*/
962
963	/* these are old dxclients */
964	/* Version 1024 added support for singular + plural name values -
965	* requiing this minimal value reduces complexity of that code, and it
966	* has been around for a long time.
967	*/
968	if (ns->sc_version < 1026)	902	if (ns->sc_version < 1026)
969	{	903	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
970	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
971	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	904	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
972	ns->send_packet (version_warning);
973	}
974
975	}	905	}
976	}	906	}
977		907
978	/** sound related functions. */	908	/** sound related functions. */
979
980	void	909	void
981	SetSound (char *buf, int len, NewSocket * ns)	910	SetSound (char *buf, int len, client * ns)
982	{	911	{
983	ns->sound = atoi (buf);	912	ns->sound = atoi (buf);
984	}	913	}
985		914
986	/** client wants the map resent */	915	/** client wants the map resent */
987
988	void	916	void
989	MapRedrawCmd (char *buf, int len, player *pl)	917	MapRedrawCmd (char *buf, int len, player *pl)
990	{	918	{
991
992	/* This function is currently disabled; just clearing the map state results in	919	/* This function is currently disabled; just clearing the map state results in
993	* display errors. It should clear the cache and send a newmap command.	920	* display errors. It should clear the cache and send a newmap command.
994	* Unfortunately this solution does not work because some client versions send	921	* Unfortunately this solution does not work because some client versions send
995	* a mapredraw command after receiving a newmap command.	922	* a mapredraw command after receiving a newmap command.
996	*/	923	*/
997	#if 0
998	/* Okay, this is MAJOR UGLY. but the only way I know how to
999	* clear the "cache"
1000	*/
1001	memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1002	draw_client_map (pl->ob);
1003	#endif
1004	}	924	}
1005		925
1006	/**	926	/**
1007	* Moves an object (typically, container to inventory).	927	* Moves an object (typically, container to inventory).
1008	* syntax is: move (to) (tag) (nrof)	928	* syntax is: move (to) (tag) (nrof)
…		…
1011	MoveCmd (char *buf, int len, player *pl)	931	MoveCmd (char *buf, int len, player *pl)
1012	{	932	{
1013	int vals[3], i;	933	int vals[3], i;
1014		934
1015	/* A little funky here. We only cycle for 2 records, because	935	/* A little funky here. We only cycle for 2 records, because
1016	* we obviously am not going to find a space after the third	936	* we obviously are not going to find a space after the third
1017	* record. Perhaps we should just replace this with a	937	* record. Perhaps we should just replace this with a
1018	* sscanf?	938	* sscanf?
1019	*/	939	*/
1020	for (i = 0; i < 2; i++)	940	for (i = 0; i < 2; i++)
1021	{	941	{
1022	vals[i] = atoi (buf);	942	vals[i] = atoi (buf);
		943
1023	if (!(buf = strchr (buf, ' ')))	944	if (!(buf = strchr (buf, ' ')))
1024	{	945	{
1025	LOG (llevError, "Incomplete move command: %s\n", buf);	946	LOG (llevError, "Incomplete move command: %s\n", buf);
1026	return;	947	return;
1027	}	948	}
		949
1028	buf++;	950	buf++;
1029	}	951	}
		952
1030	vals[2] = atoi (buf);	953	vals[2] = atoi (buf);
1031		954
1032	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	955	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1033	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	956	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1034	}	957	}
1035
1036
1037		958
1038	/******************************************************************************	959	/******************************************************************************
1039	*	960	*
1040	* Start of commands the server sends to the client.	961	* Start of commands the server sends to the client.
1041	*	962	*
…		…
1044	/**	965	/**
1045	* Asks the client to query the user. This way, the client knows	966	* Asks the client to query the user. This way, the client knows
1046	* it needs to send something back (vs just printing out a message)	967	* it needs to send something back (vs just printing out a message)
1047	*/	968	*/
1048	void	969	void
1049	send_query (NewSocket * ns, uint8 flags, char *text)	970	send_query (client *ns, uint8 flags, char *text)
1050	{	971	{
1051	char buf[MAX_BUF];
1052
1053	sprintf (buf, "query %d %s", flags, text ? text : "");	972	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1054	ns->send_packet (buf);
1055	}	973	}
1056		974
1057	#define AddIfInt64(Old,New,Type) if (Old != New) {\	975	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1058	Old = New; \	976	Old = New; \
1059	sl << uint8 (Type) << uint64 (New); \	977	sl << uint8 (Type) << uint64 (New); \
…		…
1089	esrv_update_stats (player *pl)	1007	esrv_update_stats (player *pl)
1090	{	1008	{
1091	char buf[MAX_BUF];	1009	char buf[MAX_BUF];
1092	uint16 flags;	1010	uint16 flags;
1093		1011
1094	packet sl;	1012	client *ns = pl->ns;
1095	sl << "stats ";	1013	if (!ns)
		1014	return;
1096		1015
1097	if (pl->ob != NULL)	1016	object *ob = pl->ob;
1098	{	1017	if (!ob)
		1018	return;
		1019
		1020	packet sl ("stats");
		1021
1099	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1022	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1100	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1023	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1101	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1024	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1102	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1025	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1103	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1026	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1104	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1027	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1105	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1028	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1106	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1107	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1108	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1109	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1029	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1110	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1030	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1031	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1032	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1033	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1111	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1034	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1112	}
1113		1035
1114	if (pl->socket.exp64)
1115	{
1116	uint8 s;
1117
1118	for (s = 0; s < NUM_SKILLS; s++)	1036	for (int s = 0; s < NUM_SKILLS; s++)
1119	{	1037	if (object *skill = pl->last_skill_ob[s])
1120	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1038	if (skill->stats.exp != ns->last_skill_exp [s])
1121	{	1039	{
		1040	ns->last_skill_exp [s] = skill->stats.exp;
		1041
1122	/* Always send along the level if exp changes. This is only	1042	/* Always send along the level if exp changes. This is only
1123	* 1 extra byte, but keeps processing simpler.	1043	* 1 extra byte, but keeps processing simpler.
1124	*/	1044	*/
1125	sl << uint8 (s + CS_STAT_SKILLINFO)	1045	sl << uint8 (s + CS_STAT_SKILLINFO)
1126	<< uint8 (pl->last_skill_ob[s]->level)	1046	<< uint8 (skill->level)
1127	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1047	<< uint64 (skill->stats.exp);
1128
1129	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1130	}	1048	}
1131	}
1132	}
1133		1049
1134	if (pl->socket.exp64)
1135	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1050	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1136	else
1137	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1138
1139	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1051	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1140	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1052	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1141	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1053	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1142	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1054	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1143	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1055	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1144	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1056	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1145	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1057	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1146	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1058	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1059
1147	flags = 0;	1060	flags = 0;
1148		1061
1149	if (pl->fire_on)	1062	if (pl->fire_on)
1150	flags |= SF_FIREON;	1063	flags |= SF_FIREON;
1151		1064
1152	if (pl->run_on)	1065	if (pl->run_on)
1153	flags |= SF_RUNON;	1066	flags |= SF_RUNON;
1154		1067
1155	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1068	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1156		1069
1157	if (pl->socket.sc_version < 1025)	1070	if (ns->sc_version < 1025)
1158	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1071	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1159	else	1072	else
1160	{
1161	int i;
1162
1163	for (i = 0; i < NROFATTACKS; i++)	1073	for (int i = 0; i < NROFATTACKS; i++)
1164	{	1074	{
1165	/* Skip ones we won't send */	1075	/* Skip ones we won't send */
1166	if (atnr_cs_stat[i] == -1)	1076	if (atnr_cs_stat[i] == -1)
1167	continue;	1077	continue;
1168		1078
1169	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1079	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1170	}	1080	}
1171	}
1172		1081
1173	if (pl->socket.monitor_spells)	1082	if (pl->ns->monitor_spells)
1174	{	1083	{
1175	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1084	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1176	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1085	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1177	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1086	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1178	}	1087	}
1179		1088
1180	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1089	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1181	AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);	1090	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1182	set_title (pl->ob, buf);	1091	set_title (ob, buf);
1183	AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);	1092	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1184		1093
1185	/* Only send it away if we have some actual data */	1094	/* Only send it away if we have some actual data */
1186	if (sl.length () > 6)	1095	if (sl.length () > 6)
1187	Send_With_Handling (&pl->socket, &sl);	1096	ns->send_packet (sl);
1188	}	1097	}
1189		1098
1190	/**	1099	/**
1191	* Tells the client that here is a player it should start using.	1100	* Tells the client that here is a player it should start using.
1192	*/	1101	*/
1193	void	1102	void
1194	esrv_new_player (player *pl, uint32 weight)	1103	esrv_new_player (player *pl, uint32 weight)
1195	{	1104	{
1196	pl->last_weight = weight;	1105	packet sl ("player");
1197
1198	packet sl;
1199	sl << "player ";
1200		1106
1201	sl << uint32 (pl->ob->count)	1107	sl << uint32 (pl->ob->count)
1202	<< uint32 (weight)	1108	<< uint32 (weight)
1203	<< uint32 (pl->ob->face->number)	1109	<< uint32 (pl->ob->face->number)
1204	<< data8 (pl->ob->name);	1110	<< data8 (pl->ob->name);
1205		1111
1206	Send_With_Handling (&pl->socket, &sl);	1112	pl->ns->last_weight = weight;
		1113	pl->ns->send_packet (sl);
1207	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1114	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208	}	1115	}
1209		1116
1210	/**	1117	/**
1211	* Need to send an animation sequence to the client.	1118	* Need to send an animation sequence to the client.
…		…
1213	* sent them the face yet (this can become quite costly in terms of	1120	* sent them the face yet (this can become quite costly in terms of
1214	* how much we are sending - on the other hand, this should only happen	1121	* how much we are sending - on the other hand, this should only happen
1215	* when the player logs in and picks stuff up.	1122	* when the player logs in and picks stuff up.
1216	*/	1123	*/
1217	void	1124	void
1218	esrv_send_animation (NewSocket * ns, short anim_num)	1125	esrv_send_animation (client * ns, short anim_num)
1219	{	1126	{
1220	int i;
1221
1222	/* Do some checking on the anim_num we got. Note that the animations	1127	/* Do some checking on the anim_num we got. Note that the animations
1223	* are added in contigous order, so if the number is in the valid	1128	* are added in contigous order, so if the number is in the valid
1224	* range, it must be a valid animation.	1129	* range, it must be a valid animation.
1225	*/	1130	*/
1226	if (anim_num < 0 || anim_num > num_animations)	1131	if (anim_num < 0 || anim_num > num_animations)
1227	{	1132	{
1228	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1133	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1229	return;	1134	return;
1230	}	1135	}
1231		1136
1232	packet sl;	1137	packet sl ("anim");
1233		1138
1234	sl << "anim "
1235	<< uint16 (anim_num)	1139	sl << uint16 (anim_num)
1236	<< uint16 (0); /* flags - not used right now */	1140	<< uint16 (0); /* flags - not used right now */
1237		1141
1238	/* Build up the list of faces. Also, send any information (ie, the	1142	/* Build up the list of faces. Also, send any information (ie, the
1239	* the face itself) down to the client.	1143	* the face itself) down to the client.
1240	*/	1144	*/
1241	for (i = 0; i < animations[anim_num].num_animations; i++)	1145	for (int i = 0; i < animations[anim_num].num_animations; i++)
1242	{	1146	{
1243	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1147	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1244	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1148	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1149
1245	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1150	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1246	}	1151	}
1247		1152
1248	Send_With_Handling (ns, &sl);	1153	ns->send_packet (sl);
1249		1154
1250	ns->anims_sent[anim_num] = 1;	1155	ns->anims_sent[anim_num] = 1;
1251	}	1156	}
1252		1157
1253		1158
…		…
1260	/**	1165	/**
1261	* This adds face_num to a map cell at x,y. If the client doesn't have	1166	* This adds face_num to a map cell at x,y. If the client doesn't have
1262	* the face yet, we will also send it.	1167	* the face yet, we will also send it.
1263	*/	1168	*/
1264	static void	1169	static void
1265	esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)	1170	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1266	{	1171	{
1267	if (newmap->cells[x][y].count >= MAP_LAYERS)	1172	if (newmap->cells[x][y].count >= MAP_LAYERS)
1268	{	1173	{
		1174	//TODO: one or the other, can't both have abort and return, verify and act
1269	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1175	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270	return;	1176	return;
1271	abort ();	1177	abort ();
1272	}	1178	}
1273		1179
1274	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1180	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1275	newmap->cells[x][y].count++;	1181	newmap->cells[x][y].count++;
1276		1182
1277	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1183	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1278	esrv_send_face (ns, face_num, 0);	1184	esrv_send_face (ns, face_num, 0);
1279	}
1280
1281	struct LayerCell
1282	{
1283	uint16 xy;
1284	short face;
1285	};
1286
1287	struct MapLayer
1288	{
1289	int count;
1290	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1291	};
1292
1293	/** Checkes if map cells have changed */
1294	static int
1295	mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1296	{
1297	int k;
1298
1299	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1300	return 1;
1301	for (k = 0; k < newmap->cells[i][j].count; k++)
1302	{
1303	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1304	{
1305	return 1;
1306	}
1307	}
1308	return 0;
1309	}
1310
1311	/**
1312	* Basically, what this does is pack the data into layers.
1313	* cnum is the client number, cur is the the buffer we put all of
1314	* this data into. we return the end of the data. layers is
1315	* how many layers of data we should back.
1316	*/
1317	static uint8 *
1318	compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1319	{
1320	int x, y, k;
1321	int face;
1322	unsigned char *fcur;
1323	struct MapLayer layers[MAP_LAYERS];
1324
1325	for (k = 0; k < MAP_LAYERS; k++)
1326	layers[k].count = 0;
1327	fcur = cur;
1328	for (x = 0; x < ns->mapx; x++)
1329	{
1330	for (y = 0; y < ns->mapy; y++)
1331	{
1332	if (!mapcellchanged (ns, x, y, newmap))
1333	continue;
1334	if (newmap->cells[x][y].count == 0)
1335	{
1336	*cur = x * ns->mapy + y; /* mark empty space */
1337	cur++;
1338	continue;
1339	}
1340	for (k = 0; k < newmap->cells[x][y].count; k++)
1341	{
1342	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1343	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1344	layers[k].count++;
1345	}
1346	}
1347	}
1348	/* If no data, return now. */
1349	if (fcur == cur && layers[0].count == 0)
1350	return cur;
1351	*cur = 255; /* mark end of explicitly cleared cells */
1352	cur++;
1353	/* First pack by layers. */
1354	for (k = 0; k < numlayers; k++)
1355	{
1356	if (layers[k].count == 0)
1357	break; /* once a layer is entirely empty, no layer below it can
1358	have anything in it either */
1359	/* Pack by entries in thie layer */
1360	for (x = 0; x < layers[k].count;)
1361	{
1362	fcur = cur;
1363	*cur = layers[k].lcells[x].face >> 8;
1364	cur++;
1365	*cur = layers[k].lcells[x].face & 0xFF;
1366	cur++;
1367	face = layers[k].lcells[x].face;
1368	/* Now, we back the redundant data into 1 byte xy pairings */
1369	for (y = x; y < layers[k].count; y++)
1370	{
1371	if (layers[k].lcells[y].face == face)
1372	{
1373	*cur = (uint8) layers[k].lcells[y].xy;
1374	cur++;
1375	layers[k].lcells[y].face = -1;
1376	}
1377	}
1378	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1379	/* forward over the now redundant data */
1380	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1381	x++;
1382	}
1383	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1384	}
1385	return cur;
1386	}	1185	}
1387		1186
1388	/** Clears a map cell */	1187	/** Clears a map cell */
1389	static void	1188	static void
1390	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1189	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
…		…
1402	#define MAX_LAYERS 3	1201	#define MAX_LAYERS 3
1403		1202
1404	/* Using a global really isn't a good approach, but saves the over head of	1203	/* Using a global really isn't a good approach, but saves the over head of
1405	* allocating and deallocating such a block of data each time run through,	1204	* allocating and deallocating such a block of data each time run through,
1406	* and saves the space of allocating this in the socket object when we only	1205	* and saves the space of allocating this in the socket object when we only
1407	* need it for this cycle. If the serve is ever threaded, this needs to be	1206	* need it for this cycle. If the server is ever threaded, this needs to be
1408	* re-examined.	1207	* re-examined.
1409	*/	1208	*/
1410
1411	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];	1209	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1412		1210
1413	/**	1211	/**
1414	* Returns true if any of the heads for this	1212	* Returns true if any of the heads for this
1415	* space is set. Returns false if all are blank - this is used	1213	* space is set. Returns false if all are blank - this is used
1416	* for empty space checking.	1214	* for empty space checking.
1417	*/	1215	*/
1418	static inline int	1216	static inline int
1419	have_head (int ax, int ay)	1217	have_head (int ax, int ay)
1420	{	1218	{
1421
1422	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||	1219	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1423	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1220	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1424	return 1;	1221	return 1;
		1222
1425	return 0;	1223	return 0;
1426	}	1224	}
1427		1225
1428	/**	1226	/**
1429	* check_head is a bit simplistic version of update_space below.	1227	* check_head is a bit simplistic version of update_space below.
1430	* basically, it only checks the that the head on space ax,ay at layer	1228	* basically, it only checks the that the head on space ax,ay at layer
1431	* needs to get sent - if so, it adds the data, sending the head	1229	* needs to get sent - if so, it adds the data, sending the head
1432	* if needed, and returning 1. If this no data needs to get	1230	* if needed, and returning 1. If this no data needs to get
1433	* sent, it returns zero.	1231	* sent, it returns zero.
1434	*/	1232	*/
1435	static int	1233	static int
1436	check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)	1234	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1437	{	1235	{
1438	short face_num;	1236	short face_num;
1439		1237
1440	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1238	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1239	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
…		…
1473	* numbers the spaces differently - I think this was a leftover from	1271	* numbers the spaces differently - I think this was a leftover from
1474	* the map command, where the faces stack up. Sinces that is no longer	1272	* the map command, where the faces stack up. Sinces that is no longer
1475	* the case, it seems to make more sense to have these layer values	1273	* the case, it seems to make more sense to have these layer values
1476	* actually match.	1274	* actually match.
1477	*/	1275	*/
1478
1479	static int	1276	static int
1480	update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1277	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1481	{	1278	{
1482	object *ob, *head;	1279	object *ob, *head;
1483	uint16 face_num;	1280	uint16 face_num;
1484	int bx, by, i;	1281	int bx, by, i;
1485		1282
…		…
1698	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1495	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699	* take.	1496	* take.
1700	*/	1497	*/
1701		1498
1702	static inline int	1499	static inline int
1703	update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1500	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704	{	1501	{
1705	object *ob;	1502	object *ob;
1706	int smoothlevel; /* old face_num; */	1503	int smoothlevel; /* old face_num; */
1707		1504
1708	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1505	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1709		1506
1710	/* If there is no object for this space, or if the face for the object	1507	/* If there is no object for this space, or if the face for the object
1711	* is the blank face, set the smoothlevel to zero.	1508	* is the blank face, set the smoothlevel to zero.
1712	*/	1509	*/
1713	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))	1510	if (!ob || ob->face == blank_face)
1714	smoothlevel = 0;	1511	smoothlevel = 0;
1715	else	1512	else
1716	{	1513	{
1717	smoothlevel = ob->smoothlevel;	1514	smoothlevel = ob->smoothlevel;
1718	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1515	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
…		…
1742	* Returns the size of a data for a map square as returned by	1539	* Returns the size of a data for a map square as returned by
1743	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1540	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744	* available.	1541	* available.
1745	*/	1542	*/
1746	int	1543	int
1747	getExtendedMapInfoSize (NewSocket * ns)	1544	getExtendedMapInfoSize (client * ns)
1748	{	1545	{
1749	int result = 0;	1546	int result = 0;
1750		1547
1751	if (ns->ext_mapinfos)	1548	if (ns->ext_mapinfos)
1752	{	1549	{
1753	if (ns->EMI_smooth)	1550	if (ns->EMI_smooth)
1754	result += 1; /*One byte for smoothlevel */	1551	result += 1; /*One byte for smoothlevel */
1755	}	1552	}
		1553
1756	return result;	1554	return result;
		1555	}
		1556
		1557	// prefetch (and touch) all maps within a specific distancd
		1558	static void
		1559	prefetch_surrounding_maps (maptile *map, int distance)
		1560	{
		1561	map->last_access = runtime;
		1562
		1563	if (--distance)
		1564	for (int dir = 4; --dir; )
		1565	if (const shstr &path = map->tile_path [dir])
		1566	if (maptile *&neigh = map->tile_map [dir])
		1567	prefetch_surrounding_maps (neigh, distance);
		1568	else
		1569	neigh = maptile::find_async (path, map);
		1570	}
		1571
		1572	// prefetch a generous area around the player
		1573	static void
		1574	prefetch_surrounding_maps (object *op)
		1575	{
		1576	prefetch_surrounding_maps (op->map, 3);
1757	}	1577	}
1758		1578
1759	/**	1579	/**
1760	* This function uses the new map1 protocol command to send the map	1580	* This function uses the new map1 protocol command to send the map
1761	* to the client. It is necessary because the old map command supports	1581	* to the client. It is necessary because the old map command supports
…		…
1767	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1587	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1768	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1588	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1769	* and use the other 4 bits for other informatiion. For full documentation	1589	* and use the other 4 bits for other informatiion. For full documentation
1770	* of what we send, see the doc/Protocol file.	1590	* of what we send, see the doc/Protocol file.
1771	* I will describe internally what we do:	1591	* I will describe internally what we do:
1772	* the socket->lastmap shows how the map last looked when sent to the client.	1592	* the ns->lastmap shows how the map last looked when sent to the client.
1773	* in the lastmap structure, there is a cells array, which is set to the	1593	* in the lastmap structure, there is a cells array, which is set to the
1774	* maximum viewable size (As set in config.h).	1594	* maximum viewable size (As set in config.h).
1775	* in the cells, there are faces and a count value.	1595	* in the cells, there are faces and a count value.
1776	* we use the count value to hold the darkness value. If -1, then this space	1596	* we use the count value to hold the darkness value. If -1, then this space
1777	* is not viewable.	1597	* is not viewable.
…		…
1788	uint8 eentrysize;	1608	uint8 eentrysize;
1789	uint16 ewhatstart, ewhatflag;	1609	uint16 ewhatstart, ewhatflag;
1790	uint8 extendedinfos;	1610	uint8 extendedinfos;
1791	maptile *m;	1611	maptile *m;
1792		1612
1793	NewSocket &socket = pl->contr->socket;	1613	client &socket = *pl->contr->ns;
		1614
		1615	if (!pl->active)
		1616	return;
1794		1617
1795	check_map_change (pl->contr);	1618	check_map_change (pl->contr);
		1619	prefetch_surrounding_maps (pl);
1796		1620
1797	packet sl;	1621	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1798	packet esl;	1622	packet esl;
1799		1623
1800	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1801	startlen = sl.length ();	1624	startlen = sl.length ();
1802		1625
1803	/*Extendedmapinfo structure initialisation */	1626	/*Extendedmapinfo structure initialisation */
1804	if (socket.ext_mapinfos)	1627	if (socket.ext_mapinfos)
1805	{	1628	{
…		…
1849	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1672	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1850	{	1673	{
1851	ax = 0;	1674	ax = 0;
1852	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1675	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1853	{	1676	{
1854
1855	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1677	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1856		1678
1857	/* If this space is out of the normal viewable area, we only check	1679	/* If this space is out of the normal viewable area, we only check
1858	* the heads value ax or ay will only be greater than what	1680	* the heads value ax or ay will only be greater than what
1859	* the client wants if using the map1a command - this is because	1681	* the client wants if using the map1a command - this is because
…		…
1877	* with no faces tells the client to blank out the	1699	* with no faces tells the client to blank out the
1878	* space.	1700	* space.
1879	*/	1701	*/
1880	got_one = 0;	1702	got_one = 0;
1881	for (i = oldlen + 2; i < sl.length (); i++)	1703	for (i = oldlen + 2; i < sl.length (); i++)
1882	if (sl.buf[i])	1704	if (sl[i])
1883	got_one = 1;	1705	got_one = 1;
1884		1706
1885	if (got_one && (mask & 0xf))	1707	if (got_one && (mask & 0xf))
1886	sl.buf[oldlen + 1] = mask & 0xff;	1708	sl[oldlen + 1] = mask & 0xff;
1887	else	1709	else
1888	{ /*either all faces blank, either no face at all */	1710	{ /*either all faces blank, either no face at all */
1889	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */	1711	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890	sl.reset (oldlen + 2);	1712	sl.reset (oldlen + 2);
1891	else	1713	else
…		…
1921	map_clearcell (&lastcell, 0, 0, 0, -1);	1743	map_clearcell (&lastcell, 0, 0, 0, -1);
1922	}	1744	}
1923	}	1745	}
1924	else if (d > 3)	1746	else if (d > 3)
1925	{	1747	{
		1748	m->touch ();
		1749
1926	int need_send = 0, count;	1750	int need_send = 0, count;
1927		1751
1928	/* This block deals with spaces that are not visible for whatever	1752	/* This block deals with spaces that are not visible for whatever
1929	* reason. Still may need to send the head for this space.	1753	* reason. Still may need to send the head for this space.
1930	*/	1754	*/
…		…
1957		1781
1958	map_clearcell (&lastcell, 0, 0, 0, count);	1782	map_clearcell (&lastcell, 0, 0, 0, count);
1959	}	1783	}
1960		1784
1961	if ((mask & 0xf) || need_send)	1785	if ((mask & 0xf) || need_send)
1962	sl.buf[oldlen + 1] = mask & 0xff;	1786	sl[oldlen + 1] = mask & 0xff;
1963	else	1787	else
1964	sl.reset (oldlen);	1788	sl.reset (oldlen);
1965	}	1789	}
1966	else	1790	else
1967	{	1791	{
		1792	m->touch ();
		1793
1968	/* In this block, the space is visible or there are head objects	1794	/* In this block, the space is visible or there are head objects
1969	* we need to send.	1795	* we need to send.
1970	*/	1796	*/
1971		1797
1972	/* Rather than try to figure out what everything that we might	1798	/* Rather than try to figure out what everything that we might
…		…
1997	mask |= 0x8;	1823	mask |= 0x8;
1998		1824
1999	if (socket.extmap)	1825	if (socket.extmap)
2000	{	1826	{
2001	*last_ext |= 0x80;	1827	*last_ext |= 0x80;
2002	last_ext = sl.buf + sl.length ();	1828	last_ext = &sl[sl.length ()];
2003	sl << uint8 (d);	1829	sl << uint8 (d);
2004	}	1830	}
2005	else	1831	else
2006	sl << uint8 (255 - 64 * d);	1832	sl << uint8 (255 - 64 * d);
2007	}	1833	}
…		…
2041	{	1867	{
2042	lastcell.stat_hp = stat_hp;	1868	lastcell.stat_hp = stat_hp;
2043		1869
2044	mask |= 0x8;	1870	mask |= 0x8;
2045	*last_ext |= 0x80;	1871	*last_ext |= 0x80;
2046	last_ext = sl.buf + sl.length ();	1872	last_ext = &sl[sl.length ()];
2047		1873
2048	sl << uint8 (5) << uint8 (stat_hp);	1874	sl << uint8 (5) << uint8 (stat_hp);
2049		1875
2050	if (stat_width > 1)	1876	if (stat_width > 1)
2051	{	1877	{
2052	*last_ext |= 0x80;	1878	*last_ext |= 0x80;
2053	last_ext = sl.buf + sl.length ();	1879	last_ext = &sl[sl.length ()];
2054		1880
2055	sl << uint8 (6) << uint8 (stat_width);	1881	sl << uint8 (6) << uint8 (stat_width);
2056	}	1882	}
2057	}	1883	}
2058		1884
…		…
2060	{	1886	{
2061	lastcell.player = player;	1887	lastcell.player = player;
2062		1888
2063	mask |= 0x8;	1889	mask |= 0x8;
2064	*last_ext |= 0x80;	1890	*last_ext |= 0x80;
2065	last_ext = sl.buf + sl.length ();	1891	last_ext = &sl[sl.length ()];
2066		1892
2067	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1893	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068	}	1894	}
2069		1895
2070	if (lastcell.flags != flags)	1896	if (lastcell.flags != flags)
2071	{	1897	{
2072	lastcell.flags = flags;	1898	lastcell.flags = flags;
2073		1899
2074	mask |= 0x8;	1900	mask |= 0x8;
2075	*last_ext |= 0x80;	1901	*last_ext |= 0x80;
2076	last_ext = sl.buf + sl.length ();	1902	last_ext = &sl[sl.length ()];
2077		1903
2078	sl << uint8 (8) << uint8 (flags);	1904	sl << uint8 (8) << uint8 (flags);
2079	}	1905	}
2080	}	1906	}
2081		1907
…		…
2123	* space by checking the mask. If so, update the mask.	1949	* space by checking the mask. If so, update the mask.
2124	* if not, reset the len to that from before adding the mask	1950	* if not, reset the len to that from before adding the mask
2125	* value, so we don't send those bits.	1951	* value, so we don't send those bits.
2126	*/	1952	*/
2127	if (mask & 0xf)	1953	if (mask & 0xf)
2128	sl.buf[oldlen + 1] = mask & 0xff;	1954	sl[oldlen + 1] = mask & 0xff;
2129	else	1955	else
2130	sl.reset (oldlen);	1956	sl.reset (oldlen);
2131		1957
2132	if (emask & 0xf)	1958	if (emask & 0xf)
2133	esl.buf[eoldlen + 1] = emask & 0xff;	1959	esl[eoldlen + 1] = emask & 0xff;
2134	else	1960	else
2135	esl.reset (eoldlen);	1961	esl.reset (eoldlen);
2136	} /* else this is a viewable space */	1962	} /* else this is a viewable space */
2137	} /* for x loop */	1963	} /* for x loop */
2138	} /* for y loop */	1964	} /* for y loop */
…		…
2144	{	1970	{
2145	/* No map data will follow, so don't say the client	1971	/* No map data will follow, so don't say the client
2146	* it doesn't need draw!	1972	* it doesn't need draw!
2147	*/	1973	*/
2148	ewhatflag &= (~EMI_NOREDRAW);	1974	ewhatflag &= (~EMI_NOREDRAW);
2149	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	1975	esl[ewhatstart + 1] = ewhatflag & 0xff;
2150	}	1976	}
2151		1977
2152	if (esl.length () > estartlen)	1978	if (esl.length () > estartlen)
2153	Send_With_Handling (&socket, &esl);	1979	socket.send_packet (esl);
2154	}	1980	}
2155		1981
2156	if (sl.length () > startlen || socket.sent_scroll)	1982	if (sl.length () > startlen || socket.sent_scroll)
2157	{	1983	{
2158	Send_With_Handling (&socket, &sl);	1984	socket.send_packet (sl);
2159	socket.sent_scroll = 0;	1985	socket.sent_scroll = 0;
2160	}	1986	}
2161	}	1987	}
2162		1988
2163	/**	1989	/**
…		…
2166	void	1992	void
2167	draw_client_map (object *pl)	1993	draw_client_map (object *pl)
2168	{	1994	{
2169	int i, j;	1995	int i, j;
2170	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1996	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2171	New_Face *face, *floor;	1997	facetile *face, *floor;
2172	New_Face *floor2;	1998	facetile *floor2;
2173	int d, mflags;	1999	int d, mflags;
2174	struct Map newmap;	2000	struct Map newmap;
2175	maptile *m, *pm;	2001	maptile *m, *pm;
2176		2002
2177	if (pl->type != PLAYER)	2003	if (pl->type != PLAYER)
…		…
2189	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	2015	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190	return;	2016	return;
2191		2017
2192	memset (&newmap, 0, sizeof (struct Map));	2018	memset (&newmap, 0, sizeof (struct Map));
2193		2019
2194	for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++)	2020	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2195	{
2196	for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++)	2021	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2197	{	2022	{
2198	ax = i;	2023	ax = i;
2199	ay = j;	2024	ay = j;
2200	m = pm;	2025	m = pm;
2201	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2026	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2027
2202	if (mflags & P_OUT_OF_MAP)	2028	if (mflags & P_OUT_OF_MAP)
2203	continue;	2029	continue;
2204	if (mflags & P_NEED_UPDATE)	2030
2205	update_position (m, ax, ay);
2206	/* If a map is visible to the player, we don't want to swap it out	2031	/* If a map is visible to the player, we don't want to swap it out
2207	* just to reload it. This should really call something like	2032	* just to reload it. This should really call something like
2208	* swap_map, but this is much more efficient and 'good enough'	2033	* swap_map, but this is much more efficient and 'good enough'
2209	*/	2034	*/
2210	if (mflags & P_NEW_MAP)	2035	if (mflags & P_NEW_MAP)
2211	m->timeout = 50;	2036	m->timeout = 50;
2212	}	2037	}
2213	}	2038
2214	/* do LOS after calls to update_position */	2039	/* do LOS after calls to update_position */
2215	if (pl->contr->do_los)	2040	if (pl->contr->do_los)
2216	{	2041	{
2217	update_los (pl);	2042	update_los (pl);
2218	pl->contr->do_los = 0;	2043	pl->contr->do_los = 0;
…		…
2233		2058
2234	/*****************************************************************************/	2059	/*****************************************************************************/
2235	void	2060	void
2236	send_plugin_custom_message (object *pl, char *buf)	2061	send_plugin_custom_message (object *pl, char *buf)
2237	{	2062	{
2238	pl->contr->socket.send_packet (buf);	2063	pl->contr->ns->send_packet (buf);
2239	}	2064	}
2240		2065
2241	/**	2066	/**
2242	* This sends the skill number to name mapping. We ignore	2067	* This sends the skill number to name mapping. We ignore
2243	* the params - we always send the same info no matter what.	2068	* the params - we always send the same info no matter what.
2244	*/	2069	*/
2245	void	2070	void
2246	send_skill_info (NewSocket *ns, char *params)	2071	send_skill_info (client *ns, char *params)
2247	{	2072	{
2248	packet sl;	2073	packet sl;
2249	sl << "replyinfo skill_info\n";	2074	sl << "replyinfo skill_info\n";
2250		2075
2251	for (int i = 1; i < NUM_SKILLS; i++)	2076	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2255	{	2080	{
2256	LOG (llevError, "Buffer overflow in send_skill_info!\n");	2081	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257	fatal (0);	2082	fatal (0);
2258	}	2083	}
2259		2084
2260	Send_With_Handling (ns, &sl);	2085	ns->send_packet (sl);
2261	}	2086	}
2262		2087
2263	/**	2088	/**
2264	* This sends the spell path to name mapping. We ignore	2089	* This sends the spell path to name mapping. We ignore
2265	* the params - we always send the same info no matter what.	2090	* the params - we always send the same info no matter what.
2266	*/	2091	*/
2267	void	2092	void
2268	send_spell_paths (NewSocket * ns, char *params)	2093	send_spell_paths (client * ns, char *params)
2269	{	2094	{
2270	packet sl;	2095	packet sl;
2271		2096
2272	sl << "replyinfo spell_paths\n";	2097	sl << "replyinfo spell_paths\n";
2273		2098
…		…
2278	{	2103	{
2279	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	2104	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280	fatal (0);	2105	fatal (0);
2281	}	2106	}
2282		2107
2283	Send_With_Handling (ns, &sl);	2108	ns->send_packet (sl);
2284	}	2109	}
2285		2110
2286	/**	2111	/**
2287	* This looks for any spells the player may have that have changed their stats.	2112	* This looks for any spells the player may have that have changed their stats.
2288	* it then sends an updspell packet for each spell that has changed in this way	2113	* it then sends an updspell packet for each spell that has changed in this way
2289	*/	2114	*/
2290	void	2115	void
2291	esrv_update_spells (player *pl)	2116	esrv_update_spells (player *pl)
2292	{	2117	{
		2118	if (!pl->ns)
		2119	return;
		2120
2293	if (!pl->socket.monitor_spells)	2121	if (!pl->ns->monitor_spells)
2294	return;	2122	return;
2295		2123
2296	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2124	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297	{	2125	{
2298	if (spell->type == SPELL)	2126	if (spell->type == SPELL)
…		…
2328		2156
2329	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2157	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2158	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2159	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332		2160
2333	Send_With_Handling (&pl->socket, &sl);	2161	pl->ns->send_packet (sl);
2334	}	2162	}
2335	}	2163	}
2336	}	2164	}
2337	}	2165	}
2338		2166
2339	void	2167	void
2340	esrv_remove_spell (player *pl, object *spell)	2168	esrv_remove_spell (player *pl, object *spell)
2341	{	2169	{
2342	if (!pl->socket.monitor_spells)	2170	if (!pl->ns->monitor_spells)
2343	return;	2171	return;
2344		2172
2345	if (!pl || !spell || spell->env != pl->ob)	2173	if (!pl || !spell || spell->env != pl->ob)
2346	{	2174	{
2347	LOG (llevError, "Invalid call to esrv_remove_spell");	2175	LOG (llevError, "Invalid call to esrv_remove_spell");
2348	return;	2176	return;
2349	}	2177	}
2350		2178
2351	packet sl;	2179	packet sl ("delspell");
2352		2180
2353	sl << "delspell "
2354	<< uint32 (spell->count);	2181	sl << uint32 (spell->count);
2355		2182
2356	Send_With_Handling (&pl->socket, &sl);	2183	pl->ns->send_packet (sl);
2357	}	2184	}
2358		2185
2359	/* appends the spell *spell to the Socklist we will send the data to. */	2186	/* appends the spell *spell to the Socklist we will send the data to. */
2360	static void	2187	static void
2361	append_spell (player *pl, packet &sl, object *spell)	2188	append_spell (player *pl, packet &sl, object *spell)
…		…
2409	{	2236	{
2410	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2237	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411	return;	2238	return;
2412	}	2239	}
2413		2240
2414	if (!pl->socket.monitor_spells)	2241	if (!pl->ns->monitor_spells)
2415	return;	2242	return;
2416		2243
2417	packet sl;	2244	packet sl ("addspell");
2418
2419	sl << "addspell ";
2420		2245
2421	if (!spell)	2246	if (!spell)
2422	{	2247	{
2423	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2248	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2424	{	2249	{
…		…
2438	if (spell->type != SPELL)	2263	if (spell->type != SPELL)
2439	continue;	2264	continue;
2440		2265
2441	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2266	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442	{	2267	{
2443	Send_With_Handling (&pl->socket, &sl);	2268	pl->ns->send_packet (sl);
2444		2269
2445	sl.reset ();	2270	sl.reset ();
2446	sl << "addspell ";	2271	sl << "addspell ";
2447	}	2272	}
2448		2273
…		…
2462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2287	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463	fatal (0);	2288	fatal (0);
2464	}	2289	}
2465		2290
2466	/* finally, we can send the packet */	2291	/* finally, we can send the packet */
2467	Send_With_Handling (&pl->socket, &sl);	2292	pl->ns->send_packet (sl);
2468
2469	}	2293	}
2470		2294

Diff Legend

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