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.40 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.69 by root, Sun Mar 11 02:12:45 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	*
…		…
35	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
37	*	38	*
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	* if a face has not already been sent to the client, it is sent now.
42	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	41	*/
47		42
48	#include <global.h>	43	#include <global.h>
49	#include <sproto.h>	44	#include <sproto.h>
50		45
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	46	#include <living.h>
54	#include <commands.h>	47	#include <commands.h>
55		48
56	/* This block is basically taken from socket.c - I assume if it works there,	49	/* This block is basically taken from socket.c - I assume if it works there,
57	* it should work here.	50	* it should work here.
…		…
88	-1, /* life stealing */	81	-1, /* life stealing */
89	-1 /* Disease - not fully done yet */	82	-1 /* Disease - not fully done yet */
90	};	83	};
91		84
92	static void	85	static void
93	socket_map_scroll (client_socket * ns, int dx, int dy)	86	socket_map_scroll (client *ns, int dx, int dy)
94	{	87	{
95	struct Map newmap;	88	struct Map newmap;
96	int x, y, mx, my;	89	int x, y, mx, my;
97		90
98	{
99	packet sl;
100
101	sl.printf ("map_scroll %d %d", dx, dy);	91	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102	ns->send_packet (sl);
103	}
104		92
105	/* If we are using the Map1aCmd, we may in fact send	93	/* If we are using the Map1aCmd, we may in fact send
106	* head information that is outside the viewable map.	94	* head information that is outside the viewable map.
107	* So set the mx,my to the max value we want to	95	* So set the mx,my to the max value we want to
108	* look for. Removed code to do so - it caused extra	96	* look for. Removed code to do so - it caused extra
…		…
148	}	136	}
149		137
150	static void	138	static void
151	clear_map (player *pl)	139	clear_map (player *pl)
152	{	140	{
153	client_socket &socket = *pl->socket;
154
155	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	141	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156		142
157	if (socket.newmapcmd == 1)	143	if (pl->ns->newmapcmd == 1)
158	socket.send_packet ("newmap");	144	pl->ns->send_packet ("newmap");
159		145
160	socket.update_look = 1;	146	pl->ns->floorbox_reset ();
161	socket.look_position = 0;
162	}	147	}
163		148
164	/** check for map change and send new map data */	149	/** check for map/region change and send new map data */
165	static void	150	static void
166	check_map_change (player *pl)	151	check_map_change (player *pl)
167	{	152	{
168	client_socket &socket = *pl->socket;	153	client &socket = *pl->ns;
169	object *ob = pl->ob;	154	object *ob = pl->ob;
170	char buf[MAX_BUF]; /* eauugggh */	155	char buf[MAX_BUF]; /* eauugggh */
171		156
172	if (socket.current_map != ob->map)	157	if (socket.current_map != ob->map)
173	{	158	{
…		…
189	flags |= 4;	174	flags |= 4;
190	if (ob->map->tile_path[3])	175	if (ob->map->tile_path[3])
191	flags |= 8;	176	flags |= 8;
192		177
193	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	178	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
194	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	179	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
195	}	180	}
196	else	181	else
197	snprintf (buf, MAX_BUF, "mapinfo current");	182	snprintf (buf, MAX_BUF, "mapinfo current");
198		183
199	socket.send_packet (buf);	184	socket.send_packet (buf);
…		…
207	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	192	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	193	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209	else	194	else
210	{	195	{
211	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	196	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212	socket.update_look = 1;	197	socket.floorbox_reset ();
213	socket.look_position = 0;
214	}	198	}
215	}	199	}
216		200
217	socket.current_x = ob->x;	201	socket.current_x = ob->x;
218	socket.current_y = ob->y;	202	socket.current_y = ob->y;
		203
		204	region *reg = ob->region ();
		205	if (socket.current_region != reg)
		206	{
		207	socket.current_region = reg;
		208	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		209	}
219	}	210	}
220		211
221	/**	212	/**
222	* RequestInfo is sort of a meta command. There is some specific	213	* RequestInfo is sort of a meta command. There is some specific
223	* request of information, but we call other functions to provide	214	* request of information, but we call other functions to provide
224	* that information.	215	* that information.
225	*/	216	*/
226	void	217	void
227	RequestInfo (char *buf, int len, client_socket * ns)	218	RequestInfo (char *buf, int len, client * ns)
228	{	219	{
229	char *params = NULL, *cp;	220	char *params = NULL, *cp;
230		221
231	/* No match */	222	/* No match */
232	char bigbuf[MAX_BUF];	223	char bigbuf[MAX_BUF];
…		…
267	{	258	{
268	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	259	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
269	}	260	}
270		261
271	void	262	void
		263	ExtiCmd (char *buf, int len, client *ns)
		264	{
		265	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		266	}
		267
		268	void
272	MapInfoCmd (char *buf, int len, player *pl)	269	MapInfoCmd (char *buf, int len, player *pl)
273	{	270	{
274	// <mapinfo tag spatial tile-path	271	// <mapinfo tag spatial tile-path
275	// >mapinfo tag spatial flags x y w h hash	272	// >mapinfo tag spatial flags x y w h hash
276		273
…		…
288	buf += 8;	285	buf += 8;
289		286
290	// initial map and its origin	287	// initial map and its origin
291	maptile *map = pl->ob->map;	288	maptile *map = pl->ob->map;
292	sint16 dx, dy;	289	sint16 dx, dy;
293	int mapx = pl->socket->mapx / 2 - pl->ob->x;	290	int mapx = pl->ns->mapx / 2 - pl->ob->x;
294	int mapy = pl->socket->mapy / 2 - pl->ob->y;	291	int mapy = pl->ns->mapy / 2 - pl->ob->y;
295	int max_distance = 8; // limit maximum path length to something generous	292	int max_distance = 8; // limit maximum path length to something generous
296		293
297	while (*buf && map && max_distance)	294	while (*buf && map && max_distance)
298	{	295	{
299	int dir = *buf++;	296	int dir = *buf++;
300		297
301	switch (dir)	298	switch (dir)
302	{	299	{
303	case '1':	300	case '1':
304	dx = 0;	301	dx = 0;
305	dy = -1;	302	dy = -1;
306	map = get_map_from_coord (map, &dx, &dy);	303	map = map->xy_find (dx, dy);
307	map && (mapy -= map->height);	304	map && (mapy -= map->height);
308	break;	305	break;
309	case '2':	306	case '2':
310	mapx += map->width;	307	mapx += map->width;
311	dx = map->width;	308	dx = map->width;
312	dy = 0;	309	dy = 0;
313	map = get_map_from_coord (map, &dx, &dy);	310	map = map->xy_find (dx, dy);
314	break;	311	break;
315	case '3':	312	case '3':
316	mapy += map->height;	313	mapy += map->height;
317	dx = 0;	314	dx = 0;
318	dy = map->height;	315	dy = map->height;
319	map = get_map_from_coord (map, &dx, &dy);	316	map = map->xy_find (dx, dy);
320	break;	317	break;
321	case '4':	318	case '4':
322	dx = -1;	319	dx = -1;
323	dy = 0;	320	dy = 0;
324	map = get_map_from_coord (map, &dx, &dy);	321	map = map->xy_find (dx, dy);
325	map && (mapx -= map->width);	322	map && (mapx -= map->width);
326	break;	323	break;
327	}	324	}
328		325
329	--max_distance;	326	--max_distance;
330	}	327	}
331		328
…		…
342	if (map->tile_path[2])	339	if (map->tile_path[2])
343	flags |= 4;	340	flags |= 4;
344	if (map->tile_path[3])	341	if (map->tile_path[3])
345	flags |= 8;	342	flags |= 8;
346		343
347	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	344	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
348	}	345	}
349	else	346	else
350	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	347	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
351	}	348	}
352	else	349	else
353	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	350	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354		351
355	pl->socket->send_packet (bigbuf);	352	pl->ns->send_packet (bigbuf);
356	}	353	}
357		354
358	/** This is the Setup cmd - easy first implementation */	355	/** This is the Setup cmd - easy first implementation */
359	void	356	void
360	SetUp (char *buf, int len, client_socket * ns)	357	SetUp (char *buf, int len, client * ns)
361	{	358	{
362	int s, slen;	359	int s, slen;
363	char *cmd, *param, cmdback[HUGE_BUF];	360	char *cmd, *param, cmdback[HUGE_BUF];
364		361
365	/* run through the cmds of setup	362	/* run through the cmds of setup
…		…
407	{	404	{
408	ns->sound = atoi (param);	405	ns->sound = atoi (param);
409	safe_strcat (cmdback, param, &slen, HUGE_BUF);	406	safe_strcat (cmdback, param, &slen, HUGE_BUF);
410	}	407	}
411	else if (!strcmp (cmd, "exp64"))	408	else if (!strcmp (cmd, "exp64"))
412	{
413	ns->exp64 = atoi (param);
414	safe_strcat (cmdback, param, &slen, HUGE_BUF);	409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
415	}
416	else if (!strcmp (cmd, "spellmon"))	410	else if (!strcmp (cmd, "spellmon"))
417	{	411	{
418	ns->monitor_spells = atoi (param);	412	ns->monitor_spells = atoi (param);
419	safe_strcat (cmdback, param, &slen, HUGE_BUF);	413	safe_strcat (cmdback, param, &slen, HUGE_BUF);
420	}	414	}
…		…
575	* This is what takes care of it. We tell the client how things worked out.	569	* This is what takes care of it. We tell the client how things worked out.
576	* I am not sure if this file is the best place for this function. however,	570	* I am not sure if this file is the best place for this function. however,
577	* it either has to be here or init_sockets needs to be exported.	571	* it either has to be here or init_sockets needs to be exported.
578	*/	572	*/
579	void	573	void
580	AddMeCmd (char *buf, int len, client_socket * ns)	574	AddMeCmd (char *buf, int len, client * ns)
581	{	575	{
582	Settings oldsettings;	576	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
583
584	oldsettings = settings;
585	if (ns->status != Ns_Add || add_player (ns))
586	ns->send_packet ("addme_failed");
587	else
588	ns->send_packet ("addme_success");
589
590	settings = oldsettings;
591	}	577	}
592		578
593	/** Reply to ExtendedInfos command */	579	/** Reply to ExtendedInfos command */
594	void	580	void
595	ToggleExtendedInfos (char *buf, int len, client_socket * ns)	581	ToggleExtendedInfos (char *buf, int len, client * ns)
596	{	582	{
597	char cmdback[MAX_BUF];	583	char cmdback[MAX_BUF];
598	char command[50];	584	char command[50];
599	int info, nextinfo;	585	int info, nextinfo;
600		586
…		…
651	#define MSG_TYPE_MONUMENT 5	637	#define MSG_TYPE_MONUMENT 5
652	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	638	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653		639
654	/** Reply to ExtendedInfos command */	640	/** Reply to ExtendedInfos command */
655	void	641	void
656	ToggleExtendedText (char *buf, int len, client_socket * ns)	642	ToggleExtendedText (char *buf, int len, client * ns)
657	{	643	{
658	char cmdback[MAX_BUF];	644	char cmdback[MAX_BUF];
659	char temp[10];	645	char temp[10];
660	char command[50];	646	char command[50];
661	int info, nextinfo, i, flag;	647	int info, nextinfo, i, flag;
…		…
712	* a piece of data from us that we know the client wants. So	698	* a piece of data from us that we know the client wants. So
713	* if we know the client wants it, might as well push it to the	699	* if we know the client wants it, might as well push it to the
714	* client.	700	* client.
715	*/	701	*/
716	static void	702	static void
717	SendSmooth (client_socket * ns, uint16 face)	703	SendSmooth (client *ns, uint16 face)
718	{	704	{
719	uint16 smoothface;	705	uint16 smoothface;
720		706
721	/* If we can't find a face, return and set it so we won't try to send this	707	/* If we can't find a face, return and set it so we won't try to send this
722	* again.	708	* again.
723	*/	709	*/
724	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	710	if (!FindSmooth (face, &smoothface))
725	{	711	{
726		712
727	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	713	LOG (llevError, "could not findsmooth for %d.\n", face);
728	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	714	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729	return;	715	return;
730	}	716	}
731		717
732	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	718	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
733	esrv_send_face (ns, smoothface, 0);	719	esrv_send_face (ns, smoothface, 0);
734		720
735	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	721	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
736		722
737	packet sl;	723	packet sl ("smooth");
738		724
739	sl << "smooth "
740	<< uint16 (face)	725	sl << uint16 (face)
741	<< uint16 (smoothface);	726	<< uint16 (smoothface);
742		727
743	ns->send_packet (sl);	728	ns->send_packet (sl);
744	}	729	}
745		730
746	/**	731	/**
747	* Tells client the picture it has to use	732	* Tells client the picture it has to use
748	* to smooth a picture number given as argument.	733	* to smooth a picture number given as argument.
749	*/	734	*/
750	void	735	void
751	AskSmooth (char *buf, int len, client_socket * ns)	736	AskSmooth (char *buf, int len, client *ns)
752	{	737	{
753	uint16 facenbr;	738	SendSmooth (ns, atoi (buf));
754
755	facenbr = atoi (buf);
756	SendSmooth (ns, facenbr);
757	}	739	}
758		740
759	/**	741	/**
760	* This handles the general commands from the client (ie, north, fire, cast,	742	* This handles the general commands from the client (ie, north, fire, cast,
761	* etc.)	743	* etc.)
762	*/	744	*/
763	void	745	void
764	PlayerCmd (char *buf, int len, player *pl)	746	PlayerCmd (char *buf, int len, player *pl)
765	{	747	{
766
767	/* The following should never happen with a proper or honest client.
768	* Therefore, the error message doesn't have to be too clear - if
769	* someone is playing with a hacked/non working client, this gives them
770	* an idea of the problem, but they deserve what they get
771	*/
772	if (pl->state != ST_PLAYING)
773	{
774	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
775	return;
776	}
777	/* Check if there is a count. In theory, a zero count could also be	748	/* Check if there is a count. In theory, a zero count could also be
778	* sent, so check for that also.	749	* sent, so check for that also.
779	*/	750	*/
780	if (atoi (buf) || buf[0] == '0')	751	if (atoi (buf) || buf[0] == '0')
781	{	752	{
782	pl->count = atoi ((char *) buf);	753	pl->count = atoi ((char *) buf);
		754
783	buf = strchr (buf, ' '); /* advance beyond the numbers */	755	buf = strchr (buf, ' '); /* advance beyond the numbers */
784	if (!buf)	756	if (!buf)
785	{
786	#ifdef ESRV_DEBUG
787	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788	#endif
789	return;	757	return;
790	}	758
791	buf++;	759	buf++;
792	}	760	}
793	/* This should not happen anymore. */	761
794	if (pl->ob->speed_left < -1.0)
795	{
796	LOG (llevError, "Player has negative time - shouldn't do command.\n");
797	}
798	/* In c_new.c */
799	execute_newserver_command (pl->ob, (char *) buf);	762	execute_newserver_command (pl->ob, (char *) buf);
		763
800	/* Perhaps something better should be done with a left over count.	764	/* Perhaps something better should be done with a left over count.
801	* Cleaning up the input should probably be done first - all actions	765	* Cleaning up the input should probably be done first - all actions
802	* for the command that issued the count should be done before any other	766	* for the command that issued the count should be done before any other
803	* commands.	767	* commands.
804	*/	768	*/
805
806	pl->count = 0;	769	pl->count = 0;
807
808	}	770	}
809		771
810		772
811	/**	773	/**
812	* This handles the general commands from the client (ie, north, fire, cast,	774	* This handles the general commands from the client (ie, north, fire, cast,
…		…
815	* can throttle.	777	* can throttle.
816	*/	778	*/
817	void	779	void
818	NewPlayerCmd (char *buf, int len, player *pl)	780	NewPlayerCmd (char *buf, int len, player *pl)
819	{	781	{
820	int time, repeat;
821	char command[MAX_BUF];
822	int pktlen;
823
824	if (len < 7)	782	if (len <= 6)
825	{	783	{
826	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	784	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
827	return;	785	return;
828	}	786	}
829		787
830	pktlen = net_uint16 ((uint8 *)buf);	788	uint16 cmdid = net_uint16 ((uint8 *)buf);
831	repeat = net_uint32 ((uint8 *)buf + 2);	789	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
832		790
833	/* -1 is special - no repeat, but don't update */	791	/* -1 is special - no repeat, but don't update */
834	if (repeat != -1)	792	if (repeat != -1)
835	pl->count = repeat;	793	pl->count = repeat;
836		794
837	if ((len - 4) >= MAX_BUF)	795	buf += 6; //len -= 6;
838	len = MAX_BUF - 5;
839		796
840	strncpy ((char *) command, (char *) buf + 6, len - 4);
841	command[len - 4] = 0;
842
843	/* This should not happen anymore. */
844	if (pl->ob->speed_left < -1.0)
845	LOG (llevError, "Player has negative time - shouldn't do command.\n");
846
847	/* In c_new.c */
848	execute_newserver_command (pl->ob, (char *) command);	797	execute_newserver_command (pl->ob, buf);
		798
849	/* Perhaps something better should be done with a left over count.	799	/* Perhaps something better should be done with a left over count.
850	* Cleaning up the input should probably be done first - all actions	800	* Cleaning up the input should probably be done first - all actions
851	* for the command that issued the count should be done before any other	801	* for the command that issued the count should be done before any other
852	* commands.	802	* commands.
853	*/	803	*/
854	pl->count = 0;	804	pl->count = 0;
855		805
856	if (FABS (pl->ob->speed) < 0.001)	806	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
		807	int time = fabs (pl->ob->speed) < 0.001
857	time = MAX_TIME * 100;	808	? time = MAX_TIME * 100
858	else
859	time = (int) (MAX_TIME / FABS (pl->ob->speed));	809	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
860		810
861	/* Send confirmation of command execution now */	811	/* Send confirmation of command execution now */
862		812	packet sl ("comc");
863	packet sl;
864	sl << "comc " << uint16 (pktlen) << uint32 (time);	813	sl << uint16 (cmdid) << uint32 (time);
865	pl->socket->send_packet (sl);	814	pl->ns->send_packet (sl);
866	}	815	}
867
868		816
869	/** This is a reply to a previous query. */	817	/** This is a reply to a previous query. */
870	void	818	void
871	ReplyCmd (char *buf, int len, player *pl)	819	ReplyCmd (char *buf, int len, client *ns)
872	{	820	{
		821	if (ns->state == ST_CUSTOM)
		822	{
		823	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		824	return;
		825	}
		826
		827	if (!ns->pl)
		828	return; //TODO: depends on the exact reply we are after
		829	//TODO: but right now, we always have a ns->pl
		830
		831	player *pl = ns->pl;
		832
873	/* This is to synthesize how the data would be stored if it	833	/* This is to synthesize how the data would be stored if it
874	* was normally entered. A bit of a hack, and should be cleaned up	834	* was normally entered. A bit of a hack, and should be cleaned up
875	* once all the X11 code is removed from the server.	835	* once all the X11 code is removed from the server.
876	*	836	*
877	* We pass 13 to many of the functions because this way they	837	* We pass 13 to many of the functions because this way they
878	* think it was the carriage return that was entered, and the	838	* think it was the carriage return that was entered, and the
879	* function then does not try to do additional input.	839	* function then does not try to do additional input.
880	*/	840	*/
881	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	841	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882		842
883	/* this avoids any hacking here */	843	/* this avoids any hacking here */
884		844
885	switch (pl->state)	845	switch (ns->state)
886	{	846	{
887	case ST_PLAYING:	847	case ST_PLAYING:
888	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	848	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889	break;	849	break;
890		850
891	case ST_PLAY_AGAIN:
892	/* We can check this for return value (2==quit). Maybe we
893	* should, and do something appropriate?
894	*/
895	receive_play_again (pl->ob, buf[0]);
896	break;
897
898	case ST_ROLL_STAT:
899	key_roll_stat (pl->ob, buf[0]);
900	break;
901
902	case ST_CHANGE_CLASS:	851	case ST_CHANGE_CLASS:
903
904	key_change_class (pl->ob, buf[0]);	852	key_change_class (pl->ob, buf[0]);
905	break;	853	break;
906		854
907	case ST_CONFIRM_QUIT:
908	key_confirm_quit (pl->ob, buf[0]);
909	break;
910
911	case ST_CONFIGURE:
912	LOG (llevError, "In client input handling, but into configure state\n");
913	pl->state = ST_PLAYING;
914	break;
915
916	case ST_GET_NAME:
917	receive_player_name (pl->ob, 13);
918	break;
919
920	case ST_GET_PASSWORD:
921	case ST_CONFIRM_PASSWORD:
922	receive_player_password (pl->ob, 13);
923	break;
924
925	case ST_GET_PARTY_PASSWORD: /* Get password for party */	855	case ST_GET_PARTY_PASSWORD: /* Get password for party */
926	receive_party_password (pl->ob, 13);	856	receive_party_password (pl->ob, 13);
927	break;	857	break;
928		858
929	default:	859	default:
930	LOG (llevError, "Unknown input state: %d\n", pl->state);	860	LOG (llevError, "Unknown input state: %d\n", ns->state);
931	}	861	}
932	}	862	}
933		863
934	/**	864	/**
935	* Client tells its version. If there is a mismatch, we close the	865	* Client tells its version. If there is a mismatch, we close the
…		…
937	* something older than the server. If we assume the client will be	867	* something older than the server. If we assume the client will be
938	* backwards compatible, having it be a later version should not be a	868	* backwards compatible, having it be a later version should not be a
939	* problem.	869	* problem.
940	*/	870	*/
941	void	871	void
942	VersionCmd (char *buf, int len, client_socket * ns)	872	VersionCmd (char *buf, int len, client * ns)
943	{	873	{
944	char *cp;
945	char version_warning[256];
946
947	if (!buf)	874	if (!buf)
948	{	875	{
949	LOG (llevError, "CS: received corrupted version command\n");	876	LOG (llevError, "CS: received corrupted version command\n");
950	return;	877	return;
951	}	878	}
952		879
953	ns->cs_version = atoi (buf);	880	ns->cs_version = atoi (buf);
954	ns->sc_version = ns->cs_version;	881	ns->sc_version = ns->cs_version;
		882
		883	LOG (llevDebug, "connection from client <%s>\n", buf);
		884
		885
		886	//TODO: should log here just for statistics
		887
955	if (VERSION_CS != ns->cs_version)	888	//if (VERSION_CS != ns->cs_version)
956	{	889	// unchecked;
957	#ifdef ESRV_DEBUG	890
958	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959	#endif
960	}
961	cp = strchr (buf + 1, ' ');	891	char *cp = strchr (buf + 1, ' ');
962	if (!cp)	892	if (!cp)
963	return;	893	return;
		894
964	ns->sc_version = atoi (cp);	895	ns->sc_version = atoi (cp);
		896
965	if (VERSION_SC != ns->sc_version)	897	//if (VERSION_SC != ns->sc_version)
966	{	898	// unchecked;
967	#ifdef ESRV_DEBUG	899
968	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969	#endif
970	}
971	cp = strchr (cp + 1, ' ');	900	cp = strchr (cp + 1, ' ');
		901
972	if (cp)	902	if (cp)
973	{	903	{
974	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	904	assign (ns->version, cp + 1);
975		905
976	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
977
978	/* This is first implementation - i skip all beta DX clients with it
979	* Add later stuff here for other clients
980	*/
981
982	/* these are old dxclients */
983	/* Version 1024 added support for singular + plural name values -
984	* requiing this minimal value reduces complexity of that code, and it
985	* has been around for a long time.
986	*/
987	if (ns->sc_version < 1026)	906	if (ns->sc_version < 1026)
988	{	907	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
989	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	908	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991	ns->send_packet (version_warning);
992	}
993
994	}	909	}
995	}	910	}
996		911
997	/** sound related functions. */	912	/** sound related functions. */
998
999	void	913	void
1000	SetSound (char *buf, int len, client_socket * ns)	914	SetSound (char *buf, int len, client * ns)
1001	{	915	{
1002	ns->sound = atoi (buf);	916	ns->sound = atoi (buf);
1003	}	917	}
1004		918
1005	/** client wants the map resent */	919	/** client wants the map resent */
1006
1007	void	920	void
1008	MapRedrawCmd (char *buf, int len, player *pl)	921	MapRedrawCmd (char *buf, int len, player *pl)
1009	{	922	{
1010
1011	/* This function is currently disabled; just clearing the map state results in	923	/* This function is currently disabled; just clearing the map state results in
1012	* display errors. It should clear the cache and send a newmap command.	924	* display errors. It should clear the cache and send a newmap command.
1013	* Unfortunately this solution does not work because some client versions send	925	* Unfortunately this solution does not work because some client versions send
1014	* a mapredraw command after receiving a newmap command.	926	* a mapredraw command after receiving a newmap command.
1015	*/	927	*/
1016	#if 0
1017	/* Okay, this is MAJOR UGLY. but the only way I know how to
1018	* clear the "cache"
1019	*/
1020	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1021	draw_client_map (pl->ob);
1022	#endif
1023	}	928	}
1024		929
1025	/**	930	/**
1026	* Moves an object (typically, container to inventory).	931	* Moves an object (typically, container to inventory).
1027	* syntax is: move (to) (tag) (nrof)	932	* syntax is: move (to) (tag) (nrof)
…		…
1030	MoveCmd (char *buf, int len, player *pl)	935	MoveCmd (char *buf, int len, player *pl)
1031	{	936	{
1032	int vals[3], i;	937	int vals[3], i;
1033		938
1034	/* A little funky here. We only cycle for 2 records, because	939	/* A little funky here. We only cycle for 2 records, because
1035	* we obviously am not going to find a space after the third	940	* we obviously are not going to find a space after the third
1036	* record. Perhaps we should just replace this with a	941	* record. Perhaps we should just replace this with a
1037	* sscanf?	942	* sscanf?
1038	*/	943	*/
1039	for (i = 0; i < 2; i++)	944	for (i = 0; i < 2; i++)
1040	{	945	{
1041	vals[i] = atoi (buf);	946	vals[i] = atoi (buf);
		947
1042	if (!(buf = strchr (buf, ' ')))	948	if (!(buf = strchr (buf, ' ')))
1043	{	949	{
1044	LOG (llevError, "Incomplete move command: %s\n", buf);	950	LOG (llevError, "Incomplete move command: %s\n", buf);
1045	return;	951	return;
1046	}	952	}
		953
1047	buf++;	954	buf++;
1048	}	955	}
		956
1049	vals[2] = atoi (buf);	957	vals[2] = atoi (buf);
1050		958
1051	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	959	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1052	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	960	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053	}	961	}
1054
1055
1056		962
1057	/******************************************************************************	963	/******************************************************************************
1058	*	964	*
1059	* Start of commands the server sends to the client.	965	* Start of commands the server sends to the client.
1060	*	966	*
…		…
1063	/**	969	/**
1064	* Asks the client to query the user. This way, the client knows	970	* Asks the client to query the user. This way, the client knows
1065	* it needs to send something back (vs just printing out a message)	971	* it needs to send something back (vs just printing out a message)
1066	*/	972	*/
1067	void	973	void
1068	send_query (client_socket * ns, uint8 flags, char *text)	974	send_query (client *ns, uint8 flags, char *text)
1069	{	975	{
1070	char buf[MAX_BUF];
1071
1072	sprintf (buf, "query %d %s", flags, text ? text : "");	976	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073	ns->send_packet (buf);
1074	}	977	}
1075		978
1076	#define AddIfInt64(Old,New,Type) if (Old != New) {\	979	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077	Old = New; \	980	Old = New; \
1078	sl << uint8 (Type) << uint64 (New); \	981	sl << uint8 (Type) << uint64 (New); \
…		…
1108	esrv_update_stats (player *pl)	1011	esrv_update_stats (player *pl)
1109	{	1012	{
1110	char buf[MAX_BUF];	1013	char buf[MAX_BUF];
1111	uint16 flags;	1014	uint16 flags;
1112		1015
1113	packet sl;	1016	client *ns = pl->ns;
1114	sl << "stats ";	1017	if (!ns)
		1018	return;
1115		1019
1116	if (pl->ob != NULL)	1020	object *ob = pl->ob;
1117	{	1021	if (!ob)
		1022	return;
		1023
		1024	packet sl ("stats");
		1025
1118	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1026	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1119	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1027	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1120	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1028	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1121	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1029	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1122	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1030	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1123	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1031	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1124	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1032	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1125	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1126	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1127	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1128	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1033	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1129	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1034	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1035	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1036	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1037	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1130	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1038	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1131	}
1132		1039
1133	if (pl->socket->exp64)
1134	{
1135	uint8 s;
1136
1137	for (s = 0; s < NUM_SKILLS; s++)	1040	for (int s = 0; s < NUM_SKILLS; s++)
1138	{	1041	if (object *skill = pl->last_skill_ob[s])
1139	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1042	if (skill->stats.exp != ns->last_skill_exp [s])
1140	{	1043	{
		1044	ns->last_skill_exp [s] = skill->stats.exp;
		1045
1141	/* Always send along the level if exp changes. This is only	1046	/* Always send along the level if exp changes. This is only
1142	* 1 extra byte, but keeps processing simpler.	1047	* 1 extra byte, but keeps processing simpler.
1143	*/	1048	*/
1144	sl << uint8 (s + CS_STAT_SKILLINFO)	1049	sl << uint8 (s + CS_STAT_SKILLINFO)
1145	<< uint8 (pl->last_skill_ob[s]->level)	1050	<< uint8 (skill->level)
1146	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1051	<< uint64 (skill->stats.exp);
1147
1148	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149	}	1052	}
1150	}
1151	}
1152		1053
1153	if (pl->socket->exp64)
1154	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1054	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1155	else
1156	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1157
1158	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1055	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1159	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1056	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1160	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1057	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1161	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1058	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1162	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1059	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1163	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1060	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1164	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1061	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1165	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1062	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1063
1166	flags = 0;	1064	flags = 0;
1167		1065
1168	if (pl->fire_on)	1066	if (pl->fire_on)
1169	flags |= SF_FIREON;	1067	flags |= SF_FIREON;
1170		1068
1171	if (pl->run_on)	1069	if (pl->run_on)
1172	flags |= SF_RUNON;	1070	flags |= SF_RUNON;
1173		1071
1174	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1072	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1175		1073
1176	if (pl->socket->sc_version < 1025)	1074	if (ns->sc_version < 1025)
1177	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1075	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1178	else	1076	else
1179	{
1180	int i;
1181
1182	for (i = 0; i < NROFATTACKS; i++)	1077	for (int i = 0; i < NROFATTACKS; i++)
1183	{	1078	{
1184	/* Skip ones we won't send */	1079	/* Skip ones we won't send */
1185	if (atnr_cs_stat[i] == -1)	1080	if (atnr_cs_stat[i] == -1)
1186	continue;	1081	continue;
1187		1082
1188	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1083	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1189	}	1084	}
1190	}
1191		1085
1192	if (pl->socket->monitor_spells)	1086	if (pl->ns->monitor_spells)
1193	{	1087	{
1194	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1088	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1195	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1089	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1196	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1090	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1197	}	1091	}
1198		1092
1199	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1093	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1200	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1094	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1201	set_title (pl->ob, buf);	1095	set_title (ob, buf);
1202	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1096	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1203		1097
1204	/* Only send it away if we have some actual data */	1098	/* Only send it away if we have some actual data */
1205	if (sl.length () > 6)	1099	if (sl.length () > 6)
1206	pl->socket->send_packet (sl);	1100	ns->send_packet (sl);
1207	}	1101	}
1208		1102
1209	/**	1103	/**
1210	* Tells the client that here is a player it should start using.	1104	* Tells the client that here is a player it should start using.
1211	*/	1105	*/
1212	void	1106	void
1213	esrv_new_player (player *pl, uint32 weight)	1107	esrv_new_player (player *pl, uint32 weight)
1214	{	1108	{
1215	pl->last_weight = weight;	1109	packet sl ("player");
1216
1217	packet sl;
1218	sl << "player ";
1219		1110
1220	sl << uint32 (pl->ob->count)	1111	sl << uint32 (pl->ob->count)
1221	<< uint32 (weight)	1112	<< uint32 (weight)
1222	<< uint32 (pl->ob->face->number)	1113	<< uint32 (pl->ob->face)
1223	<< data8 (pl->ob->name);	1114	<< data8 (pl->ob->name);
1224		1115
		1116	pl->ns->last_weight = weight;
1225	pl->socket->send_packet (sl);	1117	pl->ns->send_packet (sl);
1226	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1118	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227	}	1119	}
1228		1120
1229	/**	1121	/**
1230	* Need to send an animation sequence to the client.	1122	* Need to send an animation sequence to the client.
…		…
1232	* sent them the face yet (this can become quite costly in terms of	1124	* sent them the face yet (this can become quite costly in terms of
1233	* how much we are sending - on the other hand, this should only happen	1125	* how much we are sending - on the other hand, this should only happen
1234	* when the player logs in and picks stuff up.	1126	* when the player logs in and picks stuff up.
1235	*/	1127	*/
1236	void	1128	void
1237	esrv_send_animation (client_socket * ns, short anim_num)	1129	esrv_send_animation (client * ns, short anim_num)
1238	{	1130	{
1239	int i;
1240
1241	/* Do some checking on the anim_num we got. Note that the animations	1131	/* Do some checking on the anim_num we got. Note that the animations
1242	* are added in contigous order, so if the number is in the valid	1132	* are added in contigous order, so if the number is in the valid
1243	* range, it must be a valid animation.	1133	* range, it must be a valid animation.
1244	*/	1134	*/
1245	if (anim_num < 0 || anim_num > num_animations)	1135	if (anim_num < 0 || anim_num > num_animations)
1246	{	1136	{
1247	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1137	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1248	return;	1138	return;
1249	}	1139	}
1250		1140
1251	packet sl;	1141	packet sl ("anim");
1252		1142
1253	sl << "anim "
1254	<< uint16 (anim_num)	1143	sl << uint16 (anim_num)
1255	<< uint16 (0); /* flags - not used right now */	1144	<< uint16 (0); /* flags - not used right now */
1256		1145
1257	/* Build up the list of faces. Also, send any information (ie, the	1146	/* Build up the list of faces. Also, send any information (ie, the
1258	* the face itself) down to the client.	1147	* the face itself) down to the client.
1259	*/	1148	*/
1260	for (i = 0; i < animations[anim_num].num_animations; i++)	1149	for (int i = 0; i < animations[anim_num].num_animations; i++)
1261	{	1150	{
1262	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1151	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1263	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1152	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1153
1264	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1154	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1265	}	1155	}
1266		1156
1267	ns->send_packet (sl);	1157	ns->send_packet (sl);
1268		1158
…		…
1273	/******************************************************************************	1163	/******************************************************************************
1274	*	1164	*
1275	* Start of map related commands.	1165	* Start of map related commands.
1276	*	1166	*
1277	******************************************************************************/	1167	******************************************************************************/
1278
1279	/**
1280	* This adds face_num to a map cell at x,y. If the client doesn't have
1281	* the face yet, we will also send it.
1282	*/
1283	static void
1284	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1285	{
1286	if (newmap->cells[x][y].count >= MAP_LAYERS)
1287	{
1288	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1289	return;
1290	abort ();
1291	}
1292
1293	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1294	newmap->cells[x][y].count++;
1295
1296	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1297	esrv_send_face (ns, face_num, 0);
1298	}
1299
1300	struct LayerCell
1301	{
1302	uint16 xy;
1303	short face;
1304	};
1305
1306	struct MapLayer
1307	{
1308	int count;
1309	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1310	};
1311
1312	/** Checkes if map cells have changed */
1313	static int
1314	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1315	{
1316	int k;
1317
1318	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1319	return 1;
1320	for (k = 0; k < newmap->cells[i][j].count; k++)
1321	{
1322	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1323	{
1324	return 1;
1325	}
1326	}
1327	return 0;
1328	}
1329
1330	/**
1331	* Basically, what this does is pack the data into layers.
1332	* cnum is the client number, cur is the the buffer we put all of
1333	* this data into. we return the end of the data. layers is
1334	* how many layers of data we should back.
1335	*/
1336	static uint8 *
1337	compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1338	{
1339	int x, y, k;
1340	int face;
1341	unsigned char *fcur;
1342	struct MapLayer layers[MAP_LAYERS];
1343
1344	for (k = 0; k < MAP_LAYERS; k++)
1345	layers[k].count = 0;
1346	fcur = cur;
1347	for (x = 0; x < ns->mapx; x++)
1348	{
1349	for (y = 0; y < ns->mapy; y++)
1350	{
1351	if (!mapcellchanged (ns, x, y, newmap))
1352	continue;
1353	if (newmap->cells[x][y].count == 0)
1354	{
1355	*cur = x * ns->mapy + y; /* mark empty space */
1356	cur++;
1357	continue;
1358	}
1359	for (k = 0; k < newmap->cells[x][y].count; k++)
1360	{
1361	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1362	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1363	layers[k].count++;
1364	}
1365	}
1366	}
1367	/* If no data, return now. */
1368	if (fcur == cur && layers[0].count == 0)
1369	return cur;
1370	*cur = 255; /* mark end of explicitly cleared cells */
1371	cur++;
1372	/* First pack by layers. */
1373	for (k = 0; k < numlayers; k++)
1374	{
1375	if (layers[k].count == 0)
1376	break; /* once a layer is entirely empty, no layer below it can
1377	have anything in it either */
1378	/* Pack by entries in thie layer */
1379	for (x = 0; x < layers[k].count;)
1380	{
1381	fcur = cur;
1382	*cur = layers[k].lcells[x].face >> 8;
1383	cur++;
1384	*cur = layers[k].lcells[x].face & 0xFF;
1385	cur++;
1386	face = layers[k].lcells[x].face;
1387	/* Now, we back the redundant data into 1 byte xy pairings */
1388	for (y = x; y < layers[k].count; y++)
1389	{
1390	if (layers[k].lcells[y].face == face)
1391	{
1392	*cur = (uint8) layers[k].lcells[y].xy;
1393	cur++;
1394	layers[k].lcells[y].face = -1;
1395	}
1396	}
1397	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1398	/* forward over the now redundant data */
1399	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1400	x++;
1401	}
1402	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1403	}
1404	return cur;
1405	}
1406		1168
1407	/** Clears a map cell */	1169	/** Clears a map cell */
1408	static void	1170	static void
1409	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1171	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1410	{	1172	{
…		…
1421	#define MAX_LAYERS 3	1183	#define MAX_LAYERS 3
1422		1184
1423	/* Using a global really isn't a good approach, but saves the over head of	1185	/* Using a global really isn't a good approach, but saves the over head of
1424	* allocating and deallocating such a block of data each time run through,	1186	* allocating and deallocating such a block of data each time run through,
1425	* and saves the space of allocating this in the socket object when we only	1187	* and saves the space of allocating this in the socket object when we only
1426	* need it for this cycle. If the serve is ever threaded, this needs to be	1188	* need it for this cycle. If the server is ever threaded, this needs to be
1427	* re-examined.	1189	* re-examined.
1428	*/	1190	*/
1429
1430	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];	1191	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1431		1192
1432	/**	1193	/**
1433	* Returns true if any of the heads for this	1194	* Returns true if any of the heads for this
1434	* space is set. Returns false if all are blank - this is used	1195	* space is set. Returns false if all are blank - this is used
1435	* for empty space checking.	1196	* for empty space checking.
1436	*/	1197	*/
1437	static inline int	1198	static inline int
1438	have_head (int ax, int ay)	1199	have_head (int ax, int ay)
1439	{	1200	{
1440
1441	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||	1201	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1442	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1202	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1443	return 1;	1203	return 1;
		1204
1444	return 0;	1205	return 0;
1445	}	1206	}
1446		1207
1447	/**	1208	/**
1448	* check_head is a bit simplistic version of update_space below.	1209	* check_head is a bit simplistic version of update_space below.
1449	* basically, it only checks the that the head on space ax,ay at layer	1210	* basically, it only checks the that the head on space ax,ay at layer
1450	* needs to get sent - if so, it adds the data, sending the head	1211	* needs to get sent - if so, it adds the data, sending the head
1451	* if needed, and returning 1. If this no data needs to get	1212	* if needed, and returning 1. If this no data needs to get
1452	* sent, it returns zero.	1213	* sent, it returns zero.
1453	*/	1214	*/
1454	static int	1215	static int
1455	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1216	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1456	{	1217	{
1457	short face_num;	1218	short face_num;
1458		1219
1459	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1220	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1460	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1221	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face;
1461	else	1222	else
1462	face_num = 0;	1223	face_num = 0;
1463		1224
1464	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])	1225	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1465	{	1226	{
…		…
1492	* numbers the spaces differently - I think this was a leftover from	1253	* numbers the spaces differently - I think this was a leftover from
1493	* the map command, where the faces stack up. Sinces that is no longer	1254	* the map command, where the faces stack up. Sinces that is no longer
1494	* the case, it seems to make more sense to have these layer values	1255	* the case, it seems to make more sense to have these layer values
1495	* actually match.	1256	* actually match.
1496	*/	1257	*/
1497
1498	static int	1258	static int
1499	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1259	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1500	{	1260	{
1501	object *ob, *head;	1261	object *ob, *head;
1502	uint16 face_num;	1262	uint16 face_num;
1503	int bx, by, i;	1263	int bx, by, i;
1504		1264
…		…
1551	if (!ob || ob->face == blank_face)	1311	if (!ob || ob->face == blank_face)
1552	face_num = 0;	1312	face_num = 0;
1553	else if (head)	1313	else if (head)
1554	{	1314	{
1555	/* if this is a head that had previously been stored */	1315	/* if this is a head that had previously been stored */
1556	face_num = ob->face->number;	1316	face_num = ob->face;
1557	}	1317	}
1558	else	1318	else
1559	{	1319	{
1560	/* if the faces for the different parts of a multipart object	1320	/* if the faces for the different parts of a multipart object
1561	* are the same, we only want to send the bottom right most	1321	* are the same, we only want to send the bottom right most
…		…
1603	/* single part object, multipart object with non merged faces,	1363	/* single part object, multipart object with non merged faces,
1604	* of multipart object already at lower right.	1364	* of multipart object already at lower right.
1605	*/	1365	*/
1606	else if (bx == sx && by == sy)	1366	else if (bx == sx && by == sy)
1607	{	1367	{
1608	face_num = ob->face->number;	1368	face_num = ob->face;
1609		1369
1610	/* if this face matches one stored away, clear that one away.	1370	/* if this face matches one stored away, clear that one away.
1611	* this code relies on the fact that the map1 commands	1371	* this code relies on the fact that the map1 commands
1612	* goes from 2 down to 0.	1372	* goes from 2 down to 0.
1613	*/	1373	*/
1614	for (i = 0; i < MAP_LAYERS; i++)	1374	for (i = 0; i < MAP_LAYERS; i++)
1615	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&	1375	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1616	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)	1376	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num)
1617	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;	1377	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1618	}	1378	}
1619	else	1379	else
1620	{	1380	{
1621	/* If this head is stored away, clear it - otherwise,	1381	/* If this head is stored away, clear it - otherwise,
1622	* there can be cases where a object is on multiple layers -	1382	* there can be cases where a object is on multiple layers -
1623	* we only want to send it once.	1383	* we only want to send it once.
1624	*/	1384	*/
1625	face_num = head->face->number;	1385	face_num = head->face;
1626	for (i = 0; i < MAP_LAYERS; i++)	1386	for (i = 0; i < MAP_LAYERS; i++)
1627	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&	1387	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1628	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)	1388	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num)
1629	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;	1389	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1630		1390
1631	/* First, try to put the new head on the same layer. If that is used up,	1391	/* First, try to put the new head on the same layer. If that is used up,
1632	* then find another layer.	1392	* then find another layer.
1633	*/	1393	*/
…		…
1650	else	1410	else
1651	{	1411	{
1652	/* In this case, we are already at the lower right or single part object,	1412	/* In this case, we are already at the lower right or single part object,
1653	* so nothing special	1413	* so nothing special
1654	*/	1414	*/
1655	face_num = ob->face->number;	1415	face_num = ob->face;
1656		1416
1657	/* clear out any head entries that have the same face as this one */	1417	/* clear out any head entries that have the same face as this one */
1658	for (bx = 0; bx < layer; bx++)	1418	for (bx = 0; bx < layer; bx++)
1659	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&	1419	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1660	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)	1420	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num)
1661	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;	1421	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1662	}	1422	}
1663	} /* else not already head object or blank face */	1423	} /* else not already head object or blank face */
1664		1424
1665	/* This is a real hack. Basically, if we have nothing to send for this layer,	1425	/* This is a real hack. Basically, if we have nothing to send for this layer,
…		…
1669	* of the same type, what happens then is it doesn't think it needs to send	1429	* of the same type, what happens then is it doesn't think it needs to send
1670	* This tends to make stacking also work/look better.	1430	* This tends to make stacking also work/look better.
1671	*/	1431	*/
1672	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])	1432	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1673	{	1433	{
1674	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;	1434	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face;
1675	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;	1435	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1676	}	1436	}
1677		1437
1678	/* Another hack - because of heads and whatnot, this face may match one	1438	/* Another hack - because of heads and whatnot, this face may match one
1679	* we already sent for a lower layer. In that case, don't send	1439	* we already sent for a lower layer. In that case, don't send
…		…
1717	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1477	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1718	* take.	1478	* take.
1719	*/	1479	*/
1720		1480
1721	static inline int	1481	static inline int
1722	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1482	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1723	{	1483	{
1724	object *ob;	1484	object *ob;
1725	int smoothlevel; /* old face_num; */	1485	int smoothlevel; /* old face_num; */
1726		1486
1727	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1487	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1728		1488
1729	/* If there is no object for this space, or if the face for the object	1489	/* If there is no object for this space, or if the face for the object
1730	* is the blank face, set the smoothlevel to zero.	1490	* is the blank face, set the smoothlevel to zero.
1731	*/	1491	*/
1732	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))	1492	if (!ob || ob->face == blank_face)
1733	smoothlevel = 0;	1493	smoothlevel = 0;
1734	else	1494	else
1735	{	1495	{
1736	smoothlevel = ob->smoothlevel;	1496	smoothlevel = ob->smoothlevel;
1737	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1497	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1738	SendSmooth (&ns, ob->face->number);	1498	SendSmooth (&ns, ob->face);
1739	} /* else not already head object or blank face */	1499	} /* else not already head object or blank face */
1740		1500
1741	/* We've gotten what face we want to use for the object. Now see if	1501	/* We've gotten what face we want to use for the object. Now see if
1742	* if it has changed since we last sent it to the client.	1502	* if it has changed since we last sent it to the client.
1743	*/	1503	*/
…		…
1761	* Returns the size of a data for a map square as returned by	1521	* Returns the size of a data for a map square as returned by
1762	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1522	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763	* available.	1523	* available.
1764	*/	1524	*/
1765	int	1525	int
1766	getExtendedMapInfoSize (client_socket * ns)	1526	getExtendedMapInfoSize (client * ns)
1767	{	1527	{
1768	int result = 0;	1528	int result = 0;
1769		1529
1770	if (ns->ext_mapinfos)	1530	if (ns->ext_mapinfos)
1771	{	1531	{
1772	if (ns->EMI_smooth)	1532	if (ns->EMI_smooth)
1773	result += 1; /*One byte for smoothlevel */	1533	result += 1; /*One byte for smoothlevel */
1774	}	1534	}
		1535
1775	return result;	1536	return result;
		1537	}
		1538
		1539	// prefetch (and touch) all maps within a specific distancd
		1540	static void
		1541	prefetch_surrounding_maps (maptile *map, int distance)
		1542	{
		1543	map->last_access = runtime;
		1544
		1545	if (--distance)
		1546	for (int dir = 4; --dir; )
		1547	if (const shstr &path = map->tile_path [dir])
		1548	if (maptile *&neigh = map->tile_map [dir])
		1549	prefetch_surrounding_maps (neigh, distance);
		1550	else
		1551	neigh = maptile::find_async (path, map);
		1552	}
		1553
		1554	// prefetch a generous area around the player
		1555	static void
		1556	prefetch_surrounding_maps (object *op)
		1557	{
		1558	prefetch_surrounding_maps (op->map, 3);
1776	}	1559	}
1777		1560
1778	/**	1561	/**
1779	* This function uses the new map1 protocol command to send the map	1562	* This function uses the new map1 protocol command to send the map
1780	* to the client. It is necessary because the old map command supports	1563	* to the client. It is necessary because the old map command supports
…		…
1786	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1569	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1787	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1570	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1788	* and use the other 4 bits for other informatiion. For full documentation	1571	* and use the other 4 bits for other informatiion. For full documentation
1789	* of what we send, see the doc/Protocol file.	1572	* of what we send, see the doc/Protocol file.
1790	* I will describe internally what we do:	1573	* I will describe internally what we do:
1791	* the socket->lastmap shows how the map last looked when sent to the client.	1574	* the ns->lastmap shows how the map last looked when sent to the client.
1792	* in the lastmap structure, there is a cells array, which is set to the	1575	* in the lastmap structure, there is a cells array, which is set to the
1793	* maximum viewable size (As set in config.h).	1576	* maximum viewable size (As set in config.h).
1794	* in the cells, there are faces and a count value.	1577	* in the cells, there are faces and a count value.
1795	* we use the count value to hold the darkness value. If -1, then this space	1578	* we use the count value to hold the darkness value. If -1, then this space
1796	* is not viewable.	1579	* is not viewable.
…		…
1807	uint8 eentrysize;	1590	uint8 eentrysize;
1808	uint16 ewhatstart, ewhatflag;	1591	uint16 ewhatstart, ewhatflag;
1809	uint8 extendedinfos;	1592	uint8 extendedinfos;
1810	maptile *m;	1593	maptile *m;
1811		1594
1812	client_socket &socket = *pl->contr->socket;	1595	client &socket = *pl->contr->ns;
		1596
		1597	if (!pl->active)
		1598	return;
1813		1599
1814	check_map_change (pl->contr);	1600	check_map_change (pl->contr);
		1601	prefetch_surrounding_maps (pl);
1815		1602
1816	packet sl;	1603	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817	packet esl;	1604	packet esl;
1818		1605
1819	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820	startlen = sl.length ();	1606	startlen = sl.length ();
1821		1607
1822	/*Extendedmapinfo structure initialisation */	1608	/*Extendedmapinfo structure initialisation */
1823	if (socket.ext_mapinfos)	1609	if (socket.ext_mapinfos)
1824	{	1610	{
…		…
1868	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1654	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1869	{	1655	{
1870	ax = 0;	1656	ax = 0;
1871	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1657	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1872	{	1658	{
1873
1874	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1659	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875		1660
1876	/* If this space is out of the normal viewable area, we only check	1661	/* If this space is out of the normal viewable area, we only check
1877	* the heads value ax or ay will only be greater than what	1662	* the heads value ax or ay will only be greater than what
1878	* the client wants if using the map1a command - this is because	1663	* the client wants if using the map1a command - this is because
…		…
1940	map_clearcell (&lastcell, 0, 0, 0, -1);	1725	map_clearcell (&lastcell, 0, 0, 0, -1);
1941	}	1726	}
1942	}	1727	}
1943	else if (d > 3)	1728	else if (d > 3)
1944	{	1729	{
		1730	m->touch ();
		1731
1945	int need_send = 0, count;	1732	int need_send = 0, count;
1946		1733
1947	/* This block deals with spaces that are not visible for whatever	1734	/* This block deals with spaces that are not visible for whatever
1948	* reason. Still may need to send the head for this space.	1735	* reason. Still may need to send the head for this space.
1949	*/	1736	*/
…		…
1982	else	1769	else
1983	sl.reset (oldlen);	1770	sl.reset (oldlen);
1984	}	1771	}
1985	else	1772	else
1986	{	1773	{
		1774	m->touch ();
		1775
1987	/* In this block, the space is visible or there are head objects	1776	/* In this block, the space is visible or there are head objects
1988	* we need to send.	1777	* we need to send.
1989	*/	1778	*/
1990		1779
1991	/* Rather than try to figure out what everything that we might	1780	/* Rather than try to figure out what everything that we might
…		…
2114	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1903	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2115	emask |= 0x2;	1904	emask |= 0x2;
2116		1905
2117	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	1906	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2118	{	1907	{
2119	if (lastcell.faces[0] != pl->face->number)	1908	if (lastcell.faces[0] != pl->face)
2120	{	1909	{
2121	lastcell.faces[0] = pl->face->number;	1910	lastcell.faces[0] = pl->face;
2122	mask |= 0x1;	1911	mask |= 0x1;
2123		1912
2124	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1913	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
2125	esrv_send_face (&socket, pl->face->number, 0);	1914	esrv_send_face (&socket, pl->face, 0);
2126		1915
2127	sl << uint16 (pl->face->number);	1916	sl << uint16 (pl->face);
2128	}	1917	}
2129	}	1918	}
2130	else	1919	else
2131	{	1920	{
2132	/* Top face */	1921	/* Top face */
…		…
2184	*/	1973	*/
2185	void	1974	void
2186	draw_client_map (object *pl)	1975	draw_client_map (object *pl)
2187	{	1976	{
2188	int i, j;	1977	int i, j;
2189	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1978	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2190	New_Face *face, *floor;
2191	New_Face *floor2;
2192	int d, mflags;	1979	int mflags;
2193	struct Map newmap;	1980	struct Map newmap;
2194	maptile *m, *pm;	1981	maptile *m, *pm;
2195		1982
2196	if (pl->type != PLAYER)	1983	if (pl->type != PLAYER)
2197	{	1984	{
…		…
2208	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1995	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2209	return;	1996	return;
2210		1997
2211	memset (&newmap, 0, sizeof (struct Map));	1998	memset (&newmap, 0, sizeof (struct Map));
2212		1999
2213	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	2000	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2214	{
2215	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	2001	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2216	{	2002	{
2217	ax = i;	2003	ax = i;
2218	ay = j;	2004	ay = j;
2219	m = pm;	2005	m = pm;
2220	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2006	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2007
2221	if (mflags & P_OUT_OF_MAP)	2008	if (mflags & P_OUT_OF_MAP)
2222	continue;	2009	continue;
2223	if (mflags & P_NEED_UPDATE)	2010
2224	update_position (m, ax, ay);
2225	/* If a map is visible to the player, we don't want to swap it out	2011	/* If a map is visible to the player, we don't want to swap it out
2226	* just to reload it. This should really call something like	2012	* just to reload it. This should really call something like
2227	* swap_map, but this is much more efficient and 'good enough'	2013	* swap_map, but this is much more efficient and 'good enough'
2228	*/	2014	*/
2229	if (mflags & P_NEW_MAP)	2015	if (mflags & P_NEW_MAP)
2230	m->timeout = 50;	2016	m->timeout = 50;
2231	}	2017	}
2232	}	2018
2233	/* do LOS after calls to update_position */	2019	/* do LOS after calls to update_position */
2234	if (pl->contr->do_los)	2020	if (pl->contr->do_los)
2235	{	2021	{
2236	update_los (pl);	2022	update_los (pl);
2237	pl->contr->do_los = 0;	2023	pl->contr->do_los = 0;
…		…
2252		2038
2253	/*****************************************************************************/	2039	/*****************************************************************************/
2254	void	2040	void
2255	send_plugin_custom_message (object *pl, char *buf)	2041	send_plugin_custom_message (object *pl, char *buf)
2256	{	2042	{
2257	pl->contr->socket->send_packet (buf);	2043	pl->contr->ns->send_packet (buf);
2258	}	2044	}
2259		2045
2260	/**	2046	/**
2261	* This sends the skill number to name mapping. We ignore	2047	* This sends the skill number to name mapping. We ignore
2262	* the params - we always send the same info no matter what.	2048	* the params - we always send the same info no matter what.
2263	*/	2049	*/
2264	void	2050	void
2265	send_skill_info (client_socket *ns, char *params)	2051	send_skill_info (client *ns, char *params)
2266	{	2052	{
2267	packet sl;	2053	packet sl;
2268	sl << "replyinfo skill_info\n";	2054	sl << "replyinfo skill_info\n";
2269		2055
2270	for (int i = 1; i < NUM_SKILLS; i++)	2056	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2282	/**	2068	/**
2283	* This sends the spell path to name mapping. We ignore	2069	* This sends the spell path to name mapping. We ignore
2284	* the params - we always send the same info no matter what.	2070	* the params - we always send the same info no matter what.
2285	*/	2071	*/
2286	void	2072	void
2287	send_spell_paths (client_socket * ns, char *params)	2073	send_spell_paths (client * ns, char *params)
2288	{	2074	{
2289	packet sl;	2075	packet sl;
2290		2076
2291	sl << "replyinfo spell_paths\n";	2077	sl << "replyinfo spell_paths\n";
2292		2078
…		…
2307	* it then sends an updspell packet for each spell that has changed in this way	2093	* it then sends an updspell packet for each spell that has changed in this way
2308	*/	2094	*/
2309	void	2095	void
2310	esrv_update_spells (player *pl)	2096	esrv_update_spells (player *pl)
2311	{	2097	{
		2098	if (!pl->ns)
		2099	return;
		2100
2312	if (!pl->socket->monitor_spells)	2101	if (!pl->ns->monitor_spells)
2313	return;	2102	return;
2314		2103
2315	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2104	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316	{	2105	{
2317	if (spell->type == SPELL)	2106	if (spell->type == SPELL)
…		…
2347		2136
2348	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2137	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2349	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2138	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2350	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2139	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2351		2140
2352	pl->socket->send_packet (sl);	2141	pl->ns->send_packet (sl);
2353	}	2142	}
2354	}	2143	}
2355	}	2144	}
2356	}	2145	}
2357		2146
2358	void	2147	void
2359	esrv_remove_spell (player *pl, object *spell)	2148	esrv_remove_spell (player *pl, object *spell)
2360	{	2149	{
2361	if (!pl->socket->monitor_spells)	2150	if (!pl->ns->monitor_spells)
2362	return;	2151	return;
2363		2152
2364	if (!pl || !spell || spell->env != pl->ob)	2153	if (!pl || !spell || spell->env != pl->ob)
2365	{	2154	{
2366	LOG (llevError, "Invalid call to esrv_remove_spell");	2155	LOG (llevError, "Invalid call to esrv_remove_spell");
2367	return;	2156	return;
2368	}	2157	}
2369		2158
2370	packet sl;	2159	packet sl ("delspell");
2371		2160
2372	sl << "delspell "
2373	<< uint32 (spell->count);	2161	sl << uint32 (spell->count);
2374		2162
2375	pl->socket->send_packet (sl);	2163	pl->ns->send_packet (sl);
2376	}	2164	}
2377		2165
2378	/* appends the spell *spell to the Socklist we will send the data to. */	2166	/* appends the spell *spell to the Socklist we will send the data to. */
2379	static void	2167	static void
2380	append_spell (player *pl, packet &sl, object *spell)	2168	append_spell (player *pl, packet &sl, object *spell)
2381	{	2169	{
2382	int len, i, skill = 0;	2170	int i, skill = 0;
2383		2171
2384	if (!(spell->name))	2172	if (!(spell->name))
2385	{	2173	{
2386	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	2174	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2387	return;	2175	return;
…		…
2399	if (!strcmp (spell->skill, skill_names[i]))	2187	if (!strcmp (spell->skill, skill_names[i]))
2400	{	2188	{
2401	skill = i + CS_STAT_SKILLINFO;	2189	skill = i + CS_STAT_SKILLINFO;
2402	break;	2190	break;
2403	}	2191	}
		2192	}
		2193
		2194	// spells better have a face
		2195	if (!spell->face)
		2196	{
		2197	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		2198	spell->face = face_find ("burnout.x11", blank_face);
2404	}	2199	}
2405		2200
2406	/* send the current values */	2201	/* send the current values */
2407	sl << uint32 (spell->count)	2202	sl << uint32 (spell->count)
2408	<< uint16 (spell->level)	2203	<< uint16 (spell->level)
…		…
2410	<< uint16 (spell->last_sp)	2205	<< uint16 (spell->last_sp)
2411	<< uint16 (spell->last_grace)	2206	<< uint16 (spell->last_grace)
2412	<< uint16 (spell->last_eat)	2207	<< uint16 (spell->last_eat)
2413	<< uint8 (skill)	2208	<< uint8 (skill)
2414	<< uint32 (spell->path_attuned)	2209	<< uint32 (spell->path_attuned)
2415	<< uint32 (spell->face ? spell->face->number : 0)	2210	<< uint32 (spell->face)
2416	<< data8 (spell->name)	2211	<< data8 (spell->name)
2417	<< data16 (spell->msg);	2212	<< data16 (spell->msg);
2418	}	2213	}
2419		2214
2420	/**	2215	/**
…		…
2428	{	2223	{
2429	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2224	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2430	return;	2225	return;
2431	}	2226	}
2432		2227
2433	if (!pl->socket->monitor_spells)	2228	if (!pl->ns->monitor_spells)
2434	return;	2229	return;
2435		2230
2436	packet sl;	2231	packet sl ("addspell");
2437
2438	sl << "addspell ";
2439		2232
2440	if (!spell)	2233	if (!spell)
2441	{	2234	{
2442	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2235	for (spell = pl->ob->inv; spell; spell = spell->below)
2443	{	2236	{
2444	/* were we to simply keep appending data here, we could exceed	2237	/* were we to simply keep appending data here, we could exceed
2445	* MAXSOCKBUF if the player has enough spells to add, we know that	2238	* MAXSOCKBUF if the player has enough spells to add, we know that
2446	* append_spells will always append 19 data bytes, plus 4 length	2239	* append_spells will always append 19 data bytes, plus 4 length
2447	* bytes and 3 strings (because that is the spec) so we need to	2240	* bytes and 3 strings (because that is the spec) so we need to
…		…
2457	if (spell->type != SPELL)	2250	if (spell->type != SPELL)
2458	continue;	2251	continue;
2459		2252
2460	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2253	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2461	{	2254	{
2462	pl->socket->send_packet (sl);	2255	pl->ns->send_packet (sl);
2463		2256
2464	sl.reset ();	2257	sl.reset ();
2465	sl << "addspell ";	2258	sl << "addspell ";
2466	}	2259	}
2467		2260
…		…
2481	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2274	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482	fatal (0);	2275	fatal (0);
2483	}	2276	}
2484		2277
2485	/* finally, we can send the packet */	2278	/* finally, we can send the packet */
2486	pl->socket->send_packet (sl);	2279	pl->ns->send_packet (sl);
2487	}	2280	}
2488		2281

Diff Legend

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