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.42 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.70 by root, Sun Mar 11 21:26:05 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
…		…
86	-1, /* life stealing */	81	-1, /* life stealing */
87	-1 /* Disease - not fully done yet */	82	-1 /* Disease - not fully done yet */
88	};	83	};
89		84
90	static void	85	static void
91	socket_map_scroll (client * ns, int dx, int dy)	86	socket_map_scroll (client *ns, int dx, int dy)
92	{	87	{
93	struct Map newmap;	88	struct Map newmap;
94	int x, y, mx, my;	89	int x, y, mx, my;
95		90
96	ns->send_packet_printf ("map_scroll %d %d", dx, dy);	91	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
…		…
141	}	136	}
142		137
143	static void	138	static void
144	clear_map (player *pl)	139	clear_map (player *pl)
145	{	140	{
146	client &socket = *pl->socket;
147
148	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	141	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149		142
150	if (socket.newmapcmd == 1)	143	if (pl->ns->newmapcmd == 1)
151	socket.send_packet ("newmap");	144	pl->ns->send_packet ("newmap");
152		145
153	socket.update_look = 1;	146	pl->ns->floorbox_reset ();
154	socket.look_position = 0;
155	}	147	}
156		148
157	/** check for map change and send new map data */	149	/** check for map/region change and send new map data */
158	static void	150	static void
159	check_map_change (player *pl)	151	check_map_change (player *pl)
160	{	152	{
161	client &socket = *pl->socket;	153	client &socket = *pl->ns;
162	object *ob = pl->ob;	154	object *ob = pl->ob;
163	char buf[MAX_BUF]; /* eauugggh */	155	char buf[MAX_BUF]; /* eauugggh */
164		156
165	if (socket.current_map != ob->map)	157	if (socket.current_map != ob->map)
166	{	158	{
…		…
182	flags |= 4;	174	flags |= 4;
183	if (ob->map->tile_path[3])	175	if (ob->map->tile_path[3])
184	flags |= 8;	176	flags |= 8;
185		177
186	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",
187	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);
188	}	180	}
189	else	181	else
190	snprintf (buf, MAX_BUF, "mapinfo current");	182	snprintf (buf, MAX_BUF, "mapinfo current");
191		183
192	socket.send_packet (buf);	184	socket.send_packet (buf);
…		…
200	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	192	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201	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
202	else	194	else
203	{	195	{
204	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);
205	socket.update_look = 1;	197	socket.floorbox_reset ();
206	socket.look_position = 0;
207	}	198	}
208	}	199	}
209		200
210	socket.current_x = ob->x;	201	socket.current_x = ob->x;
211	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	}
212	}	210	}
213		211
214	/**	212	/**
215	* RequestInfo is sort of a meta command. There is some specific	213	* RequestInfo is sort of a meta command. There is some specific
216	* request of information, but we call other functions to provide	214	* request of information, but we call other functions to provide
…		…
260	{	258	{
261	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	259	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262	}	260	}
263		261
264	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
265	MapInfoCmd (char *buf, int len, player *pl)	269	MapInfoCmd (char *buf, int len, player *pl)
266	{	270	{
267	// <mapinfo tag spatial tile-path	271	// <mapinfo tag spatial tile-path
268	// >mapinfo tag spatial flags x y w h hash	272	// >mapinfo tag spatial flags x y w h hash
269		273
…		…
281	buf += 8;	285	buf += 8;
282		286
283	// initial map and its origin	287	// initial map and its origin
284	maptile *map = pl->ob->map;	288	maptile *map = pl->ob->map;
285	sint16 dx, dy;	289	sint16 dx, dy;
286	int mapx = pl->socket->mapx / 2 - pl->ob->x;	290	int mapx = pl->ns->mapx / 2 - pl->ob->x;
287	int mapy = pl->socket->mapy / 2 - pl->ob->y;	291	int mapy = pl->ns->mapy / 2 - pl->ob->y;
288	int max_distance = 8; // limit maximum path length to something generous	292	int max_distance = 8; // limit maximum path length to something generous
289		293
290	while (*buf && map && max_distance)	294	while (*buf && map && max_distance)
291	{	295	{
292	int dir = *buf++;	296	int dir = *buf++;
293		297
294	switch (dir)	298	switch (dir)
295	{	299	{
296	case '1':	300	case '1':
297	dx = 0;	301	dx = 0;
298	dy = -1;	302	dy = -1;
299	map = get_map_from_coord (map, &dx, &dy);	303	map = map->xy_find (dx, dy);
300	map && (mapy -= map->height);	304	map && (mapy -= map->height);
301	break;	305	break;
302	case '2':	306	case '2':
303	mapx += map->width;	307	mapx += map->width;
304	dx = map->width;	308	dx = map->width;
305	dy = 0;	309	dy = 0;
306	map = get_map_from_coord (map, &dx, &dy);	310	map = map->xy_find (dx, dy);
307	break;	311	break;
308	case '3':	312	case '3':
309	mapy += map->height;	313	mapy += map->height;
310	dx = 0;	314	dx = 0;
311	dy = map->height;	315	dy = map->height;
312	map = get_map_from_coord (map, &dx, &dy);	316	map = map->xy_find (dx, dy);
313	break;	317	break;
314	case '4':	318	case '4':
315	dx = -1;	319	dx = -1;
316	dy = 0;	320	dy = 0;
317	map = get_map_from_coord (map, &dx, &dy);	321	map = map->xy_find (dx, dy);
318	map && (mapx -= map->width);	322	map && (mapx -= map->width);
319	break;	323	break;
320	}	324	}
321		325
322	--max_distance;	326	--max_distance;
323	}	327	}
324		328
…		…
335	if (map->tile_path[2])	339	if (map->tile_path[2])
336	flags |= 4;	340	flags |= 4;
337	if (map->tile_path[3])	341	if (map->tile_path[3])
338	flags |= 8;	342	flags |= 8;
339		343
340	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);
341	}	345	}
342	else	346	else
343	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	347	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
344	}	348	}
345	else	349	else
346	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	350	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347		351
348	pl->socket->send_packet (bigbuf);	352	pl->ns->send_packet (bigbuf);
349	}	353	}
350		354
351	/** This is the Setup cmd - easy first implementation */	355	/** This is the Setup cmd - easy first implementation */
352	void	356	void
353	SetUp (char *buf, int len, client * ns)	357	SetUp (char *buf, int len, client * ns)
…		…
400	{	404	{
401	ns->sound = atoi (param);	405	ns->sound = atoi (param);
402	safe_strcat (cmdback, param, &slen, HUGE_BUF);	406	safe_strcat (cmdback, param, &slen, HUGE_BUF);
403	}	407	}
404	else if (!strcmp (cmd, "exp64"))	408	else if (!strcmp (cmd, "exp64"))
405	{
406	ns->exp64 = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);	409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "spellmon"))	410	else if (!strcmp (cmd, "spellmon"))
410	{	411	{
411	ns->monitor_spells = atoi (param);	412	ns->monitor_spells = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);	413	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}	414	}
…		…
570	* 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.
571	*/	572	*/
572	void	573	void
573	AddMeCmd (char *buf, int len, client * ns)	574	AddMeCmd (char *buf, int len, client * ns)
574	{	575	{
575	Settings oldsettings;	576	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
576
577	oldsettings = settings;
578	if (ns->status != Ns_Add || add_player (ns))
579	ns->send_packet ("addme_failed");
580	else
581	ns->send_packet ("addme_success");
582
583	settings = oldsettings;
584	}	577	}
585		578
586	/** Reply to ExtendedInfos command */	579	/** Reply to ExtendedInfos command */
587	void	580	void
588	ToggleExtendedInfos (char *buf, int len, client * ns)	581	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
705	* 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
706	* 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
707	* client.	700	* client.
708	*/	701	*/
709	static void	702	static void
710	SendSmooth (client * ns, uint16 face)	703	SendSmooth (client *ns, uint16 face)
711	{	704	{
712	uint16 smoothface;	705	uint16 smoothface;
713		706
714	/* 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
715	* again.	708	* again.
716	*/	709	*/
717	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	710	if (!FindSmooth (face, &smoothface))
718	{	711	{
719		712
720	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);
721	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	714	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722	return;	715	return;
723	}	716	}
724		717
725	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	718	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
726	esrv_send_face (ns, smoothface, 0);	719	esrv_send_face (ns, smoothface, 0);
727		720
728	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	721	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729		722
730	packet sl;	723	packet sl ("smooth");
731		724
732	sl << "smooth "
733	<< uint16 (face)	725	sl << uint16 (face)
734	<< uint16 (smoothface);	726	<< uint16 (smoothface);
735		727
736	ns->send_packet (sl);	728	ns->send_packet (sl);
737	}	729	}
738		730
739	/**	731	/**
740	* Tells client the picture it has to use	732	* Tells client the picture it has to use
741	* to smooth a picture number given as argument.	733	* to smooth a picture number given as argument.
742	*/	734	*/
743	void	735	void
744	AskSmooth (char *buf, int len, client * ns)	736	AskSmooth (char *buf, int len, client *ns)
745	{	737	{
746	uint16 facenbr;	738	SendSmooth (ns, atoi (buf));
747
748	facenbr = atoi (buf);
749	SendSmooth (ns, facenbr);
750	}	739	}
751		740
752	/**	741	/**
753	* 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,
754	* etc.)	743	* etc.)
755	*/	744	*/
756	void	745	void
757	PlayerCmd (char *buf, int len, player *pl)	746	PlayerCmd (char *buf, int len, player *pl)
758	{	747	{
759
760	/* The following should never happen with a proper or honest client.
761	* Therefore, the error message doesn't have to be too clear - if
762	* someone is playing with a hacked/non working client, this gives them
763	* an idea of the problem, but they deserve what they get
764	*/
765	if (pl->state != ST_PLAYING)
766	{
767	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
768	return;
769	}
770	/* 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
771	* sent, so check for that also.	749	* sent, so check for that also.
772	*/	750	*/
773	if (atoi (buf) || buf[0] == '0')	751	if (atoi (buf) || buf[0] == '0')
774	{	752	{
775	pl->count = atoi ((char *) buf);	753	pl->count = atoi ((char *) buf);
		754
776	buf = strchr (buf, ' '); /* advance beyond the numbers */	755	buf = strchr (buf, ' '); /* advance beyond the numbers */
777	if (!buf)	756	if (!buf)
778	{
779	#ifdef ESRV_DEBUG
780	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
781	#endif
782	return;	757	return;
783	}	758
784	buf++;	759	buf++;
785	}	760	}
786	/* This should not happen anymore. */	761
787	if (pl->ob->speed_left < -1.0)
788	{
789	LOG (llevError, "Player has negative time - shouldn't do command.\n");
790	}
791	/* In c_new.c */
792	execute_newserver_command (pl->ob, (char *) buf);	762	execute_newserver_command (pl->ob, (char *) buf);
793	/* Perhaps something better should be done with a left over count.
794	* Cleaning up the input should probably be done first - all actions
795	* for the command that issued the count should be done before any other
796	* commands.
797	*/
798		763
799	pl->count = 0;
800
801	}
802
803
804	/**
805	* This handles the general commands from the client (ie, north, fire, cast,
806	* etc.). It is a lot like PlayerCmd above, but is called with the
807	* 'ncom' method which gives more information back to the client so it
808	* can throttle.
809	*/
810	void
811	NewPlayerCmd (char *buf, int len, player *pl)
812	{
813	int time, repeat;
814	char command[MAX_BUF];
815	int pktlen;
816
817	if (len < 7)
818	{
819	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
820	return;
821	}
822
823	pktlen = net_uint16 ((uint8 *)buf);
824	repeat = net_uint32 ((uint8 *)buf + 2);
825
826	/* -1 is special - no repeat, but don't update */
827	if (repeat != -1)
828	pl->count = repeat;
829
830	if ((len - 4) >= MAX_BUF)
831	len = MAX_BUF - 5;
832
833	strncpy ((char *) command, (char *) buf + 6, len - 4);
834	command[len - 4] = 0;
835
836	/* This should not happen anymore. */
837	if (pl->ob->speed_left < -1.0)
838	LOG (llevError, "Player has negative time - shouldn't do command.\n");
839
840	/* In c_new.c */
841	execute_newserver_command (pl->ob, (char *) command);
842	/* Perhaps something better should be done with a left over count.	764	/* Perhaps something better should be done with a left over count.
843	* Cleaning up the input should probably be done first - all actions	765	* Cleaning up the input should probably be done first - all actions
844	* 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
845	* commands.	767	* commands.
846	*/	768	*/
847	pl->count = 0;	769	pl->count = 0;
		770	}
848		771
849	if (FABS (pl->ob->speed) < 0.001)	772
		773	/**
		774	* This handles the general commands from the client (ie, north, fire, cast,
		775	* etc.). It is a lot like PlayerCmd above, but is called with the
		776	* 'ncom' method which gives more information back to the client so it
		777	* can throttle.
		778	*/
		779	void
		780	NewPlayerCmd (char *buf, int len, player *pl)
		781	{
		782	if (len <= 6)
		783	{
		784	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
		785	return;
		786	}
		787
		788	uint16 cmdid = net_uint16 ((uint8 *)buf);
		789	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
		790
		791	/* -1 is special - no repeat, but don't update */
		792	if (repeat != -1)
		793	pl->count = repeat;
		794
		795	buf += 6; //len -= 6;
		796
		797	execute_newserver_command (pl->ob, buf);
		798
		799	/* Perhaps something better should be done with a left over count.
		800	* Cleaning up the input should probably be done first - all actions
		801	* for the command that issued the count should be done before any other
		802	* commands.
		803	*/
		804	pl->count = 0;
		805
		806	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
		807	int time = fabs (pl->ob->speed) < 0.001
850	time = MAX_TIME * 100;	808	? time = MAX_TIME * 100
851	else
852	time = (int) (MAX_TIME / FABS (pl->ob->speed));	809	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
853		810
854	/* Send confirmation of command execution now */	811	/* Send confirmation of command execution now */
855		812	packet sl ("comc");
856	packet sl;
857	sl << "comc " << uint16 (pktlen) << uint32 (time);	813	sl << uint16 (cmdid) << uint32 (time);
858	pl->socket->send_packet (sl);	814	pl->ns->send_packet (sl);
859	}	815	}
860
861		816
862	/** This is a reply to a previous query. */	817	/** This is a reply to a previous query. */
863	void	818	void
864	ReplyCmd (char *buf, int len, player *pl)	819	ReplyCmd (char *buf, int len, client *ns)
865	{	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
866	/* 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
867	* 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
868	* once all the X11 code is removed from the server.	835	* once all the X11 code is removed from the server.
869	*	836	*
870	* 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
871	* think it was the carriage return that was entered, and the	838	* think it was the carriage return that was entered, and the
872	* function then does not try to do additional input.	839	* function then does not try to do additional input.
873	*/	840	*/
874	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	841	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
875		842
876	/* this avoids any hacking here */	843	/* this avoids any hacking here */
877		844
878	switch (pl->state)	845	switch (ns->state)
879	{	846	{
880	case ST_PLAYING:	847	case ST_PLAYING:
881	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	848	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
882	break;	849	break;
883		850
884	case ST_PLAY_AGAIN:
885	/* We can check this for return value (2==quit). Maybe we
886	* should, and do something appropriate?
887	*/
888	receive_play_again (pl->ob, buf[0]);
889	break;
890
891	case ST_ROLL_STAT:
892	key_roll_stat (pl->ob, buf[0]);
893	break;
894
895	case ST_CHANGE_CLASS:	851	case ST_CHANGE_CLASS:
896
897	key_change_class (pl->ob, buf[0]);	852	key_change_class (pl->ob, buf[0]);
898	break;	853	break;
899		854
900	case ST_CONFIRM_QUIT:
901	key_confirm_quit (pl->ob, buf[0]);
902	break;
903
904	case ST_CONFIGURE:
905	LOG (llevError, "In client input handling, but into configure state\n");
906	pl->state = ST_PLAYING;
907	break;
908
909	case ST_GET_NAME:
910	receive_player_name (pl->ob, 13);
911	break;
912
913	case ST_GET_PASSWORD:
914	case ST_CONFIRM_PASSWORD:
915	receive_player_password (pl->ob, 13);
916	break;
917
918	case ST_GET_PARTY_PASSWORD: /* Get password for party */	855	case ST_GET_PARTY_PASSWORD: /* Get password for party */
919	receive_party_password (pl->ob, 13);	856	receive_party_password (pl->ob, 13);
920	break;	857	break;
921		858
922	default:	859	default:
923	LOG (llevError, "Unknown input state: %d\n", pl->state);	860	LOG (llevError, "Unknown input state: %d\n", ns->state);
924	}	861	}
925	}	862	}
926		863
927	/**	864	/**
928	* 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
…		…
932	* problem.	869	* problem.
933	*/	870	*/
934	void	871	void
935	VersionCmd (char *buf, int len, client * ns)	872	VersionCmd (char *buf, int len, client * ns)
936	{	873	{
937	char *cp;
938	char version_warning[256];
939
940	if (!buf)	874	if (!buf)
941	{	875	{
942	LOG (llevError, "CS: received corrupted version command\n");	876	LOG (llevError, "CS: received corrupted version command\n");
943	return;	877	return;
944	}	878	}
945		879
946	ns->cs_version = atoi (buf);	880	ns->cs_version = atoi (buf);
947	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
948	if (VERSION_CS != ns->cs_version)	888	//if (VERSION_CS != ns->cs_version)
949	{	889	// unchecked;
950	#ifdef ESRV_DEBUG	890
951	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
952	#endif
953	}
954	cp = strchr (buf + 1, ' ');	891	char *cp = strchr (buf + 1, ' ');
955	if (!cp)	892	if (!cp)
956	return;	893	return;
		894
957	ns->sc_version = atoi (cp);	895	ns->sc_version = atoi (cp);
		896
958	if (VERSION_SC != ns->sc_version)	897	//if (VERSION_SC != ns->sc_version)
959	{	898	// unchecked;
960	#ifdef ESRV_DEBUG	899
961	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
962	#endif
963	}
964	cp = strchr (cp + 1, ' ');	900	cp = strchr (cp + 1, ' ');
		901
965	if (cp)	902	if (cp)
966	{	903	{
967	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
968
969	assign (ns->version, cp + 1);	904	assign (ns->version, cp + 1);
970		905
971	if (ns->sc_version < 1026)	906	if (ns->sc_version < 1026)
972	{	907	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
973	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	908	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975	ns->send_packet (version_warning);
976	}
977
978	}	909	}
979	}	910	}
980		911
981	/** sound related functions. */	912	/** sound related functions. */
982	void	913	void
…		…
984	{	915	{
985	ns->sound = atoi (buf);	916	ns->sound = atoi (buf);
986	}	917	}
987		918
988	/** client wants the map resent */	919	/** client wants the map resent */
989
990	void	920	void
991	MapRedrawCmd (char *buf, int len, player *pl)	921	MapRedrawCmd (char *buf, int len, player *pl)
992	{	922	{
993
994	/* 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
995	* 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.
996	* Unfortunately this solution does not work because some client versions send	925	* Unfortunately this solution does not work because some client versions send
997	* a mapredraw command after receiving a newmap command.	926	* a mapredraw command after receiving a newmap command.
998	*/	927	*/
999	#if 0
1000	/* Okay, this is MAJOR UGLY. but the only way I know how to
1001	* clear the "cache"
1002	*/
1003	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1004	draw_client_map (pl->ob);
1005	#endif
1006	}	928	}
1007		929
1008	/**	930	/**
1009	* Moves an object (typically, container to inventory).	931	* Moves an object (typically, container to inventory).
1010	* syntax is: move (to) (tag) (nrof)	932	* syntax is: move (to) (tag) (nrof)
…		…
1013	MoveCmd (char *buf, int len, player *pl)	935	MoveCmd (char *buf, int len, player *pl)
1014	{	936	{
1015	int vals[3], i;	937	int vals[3], i;
1016		938
1017	/* A little funky here. We only cycle for 2 records, because	939	/* A little funky here. We only cycle for 2 records, because
1018	* 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
1019	* record. Perhaps we should just replace this with a	941	* record. Perhaps we should just replace this with a
1020	* sscanf?	942	* sscanf?
1021	*/	943	*/
1022	for (i = 0; i < 2; i++)	944	for (i = 0; i < 2; i++)
1023	{	945	{
1024	vals[i] = atoi (buf);	946	vals[i] = atoi (buf);
		947
1025	if (!(buf = strchr (buf, ' ')))	948	if (!(buf = strchr (buf, ' ')))
1026	{	949	{
1027	LOG (llevError, "Incomplete move command: %s\n", buf);	950	LOG (llevError, "Incomplete move command: %s\n", buf);
1028	return;	951	return;
1029	}	952	}
		953
1030	buf++;	954	buf++;
1031	}	955	}
		956
1032	vals[2] = atoi (buf);	957	vals[2] = atoi (buf);
1033		958
1034	/* 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]);*/
1035	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	960	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1036	}	961	}
1037
1038
1039		962
1040	/******************************************************************************	963	/******************************************************************************
1041	*	964	*
1042	* Start of commands the server sends to the client.	965	* Start of commands the server sends to the client.
1043	*	966	*
…		…
1046	/**	969	/**
1047	* 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
1048	* 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)
1049	*/	972	*/
1050	void	973	void
1051	send_query (client * ns, uint8 flags, char *text)	974	send_query (client *ns, uint8 flags, char *text)
1052	{	975	{
1053	char buf[MAX_BUF];
1054
1055	sprintf (buf, "query %d %s", flags, text ? text : "");	976	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1056	ns->send_packet (buf);
1057	}	977	}
1058		978
1059	#define AddIfInt64(Old,New,Type) if (Old != New) {\	979	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1060	Old = New; \	980	Old = New; \
1061	sl << uint8 (Type) << uint64 (New); \	981	sl << uint8 (Type) << uint64 (New); \
…		…
1091	esrv_update_stats (player *pl)	1011	esrv_update_stats (player *pl)
1092	{	1012	{
1093	char buf[MAX_BUF];	1013	char buf[MAX_BUF];
1094	uint16 flags;	1014	uint16 flags;
1095		1015
1096	packet sl;	1016	client *ns = pl->ns;
1097	sl << "stats ";	1017	if (!ns)
		1018	return;
1098		1019
1099	if (pl->ob != NULL)	1020	object *ob = pl->ob;
1100	{	1021	if (!ob)
		1022	return;
		1023
		1024	packet sl ("stats");
		1025
1101	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1026	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1102	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1027	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1103	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1028	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1104	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1029	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1105	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1030	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1106	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1031	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1107	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1032	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1108	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1109	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1110	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1111	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1033	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1112	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);
1113	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1038	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1114	}
1115		1039
1116	if (pl->socket->exp64)
1117	{
1118	uint8 s;
1119
1120	for (s = 0; s < NUM_SKILLS; s++)	1040	for (int s = 0; s < NUM_SKILLS; s++)
1121	{	1041	if (object *skill = pl->last_skill_ob[s])
1122	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])
1123	{	1043	{
		1044	ns->last_skill_exp [s] = skill->stats.exp;
		1045
1124	/* Always send along the level if exp changes. This is only	1046	/* Always send along the level if exp changes. This is only
1125	* 1 extra byte, but keeps processing simpler.	1047	* 1 extra byte, but keeps processing simpler.
1126	*/	1048	*/
1127	sl << uint8 (s + CS_STAT_SKILLINFO)	1049	sl << uint8 (s + CS_STAT_SKILLINFO)
1128	<< uint8 (pl->last_skill_ob[s]->level)	1050	<< uint8 (skill->level)
1129	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1051	<< uint64 (skill->stats.exp);
1130
1131	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1132	}	1052	}
1133	}
1134	}
1135		1053
1136	if (pl->socket->exp64)
1137	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1054	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1138	else
1139	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1140
1141	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1055	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1142	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1056	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1143	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1057	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1144	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1058	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1145	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1059	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1146	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1060	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1147	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);
1148	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
1149	flags = 0;	1064	flags = 0;
1150		1065
1151	if (pl->fire_on)	1066	if (pl->fire_on)
1152	flags |= SF_FIREON;	1067	flags |= SF_FIREON;
1153		1068
1154	if (pl->run_on)	1069	if (pl->run_on)
1155	flags |= SF_RUNON;	1070	flags |= SF_RUNON;
1156		1071
1157	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1072	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1158		1073
1159	if (pl->socket->sc_version < 1025)	1074	if (ns->sc_version < 1025)
1160	{ 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) }
1161	else	1076	else
1162	{
1163	int i;
1164
1165	for (i = 0; i < NROFATTACKS; i++)	1077	for (int i = 0; i < NROFATTACKS; i++)
1166	{	1078	{
1167	/* Skip ones we won't send */	1079	/* Skip ones we won't send */
1168	if (atnr_cs_stat[i] == -1)	1080	if (atnr_cs_stat[i] == -1)
1169	continue;	1081	continue;
1170		1082
1171	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]);
1172	}	1084	}
1173	}
1174		1085
1175	if (pl->socket->monitor_spells)	1086	if (pl->ns->monitor_spells)
1176	{	1087	{
1177	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);
1178	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);
1179	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);
1180	}	1091	}
1181		1092
1182	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 */
1183	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1094	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1184	set_title (pl->ob, buf);	1095	set_title (ob, buf);
1185	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1096	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1186		1097
1187	/* Only send it away if we have some actual data */	1098	/* Only send it away if we have some actual data */
1188	if (sl.length () > 6)	1099	if (sl.length () > 6)
1189	pl->socket->send_packet (sl);	1100	ns->send_packet (sl);
1190	}	1101	}
1191		1102
1192	/**	1103	/**
1193	* 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.
1194	*/	1105	*/
1195	void	1106	void
1196	esrv_new_player (player *pl, uint32 weight)	1107	esrv_new_player (player *pl, uint32 weight)
1197	{	1108	{
1198	pl->last_weight = weight;	1109	packet sl ("player");
1199
1200	packet sl;
1201	sl << "player ";
1202		1110
1203	sl << uint32 (pl->ob->count)	1111	sl << uint32 (pl->ob->count)
1204	<< uint32 (weight)	1112	<< uint32 (weight)
1205	<< uint32 (pl->ob->face->number)	1113	<< uint32 (pl->ob->face)
1206	<< data8 (pl->ob->name);	1114	<< data8 (pl->ob->name);
1207		1115
		1116	pl->ns->last_weight = weight;
1208	pl->socket->send_packet (sl);	1117	pl->ns->send_packet (sl);
1209	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1118	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1210	}	1119	}
1211		1120
1212	/**	1121	/**
1213	* Need to send an animation sequence to the client.	1122	* Need to send an animation sequence to the client.
…		…
1217	* when the player logs in and picks stuff up.	1126	* when the player logs in and picks stuff up.
1218	*/	1127	*/
1219	void	1128	void
1220	esrv_send_animation (client * ns, short anim_num)	1129	esrv_send_animation (client * ns, short anim_num)
1221	{	1130	{
1222	int i;
1223
1224	/* 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
1225	* 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
1226	* range, it must be a valid animation.	1133	* range, it must be a valid animation.
1227	*/	1134	*/
1228	if (anim_num < 0 || anim_num > num_animations)	1135	if (anim_num < 0 || anim_num > num_animations)
1229	{	1136	{
1230	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);
1231	return;	1138	return;
1232	}	1139	}
1233		1140
1234	packet sl;	1141	packet sl ("anim");
1235		1142
1236	sl << "anim "
1237	<< uint16 (anim_num)	1143	sl << uint16 (anim_num)
1238	<< uint16 (0); /* flags - not used right now */	1144	<< uint16 (0); /* flags - not used right now */
1239		1145
1240	/* 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
1241	* the face itself) down to the client.	1147	* the face itself) down to the client.
1242	*/	1148	*/
1243	for (i = 0; i < animations[anim_num].num_animations; i++)	1149	for (int i = 0; i < animations[anim_num].num_animations; i++)
1244	{	1150	{
1245	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))
1246	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1152	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1153
1247	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 */
1248	}	1155	}
1249		1156
1250	ns->send_packet (sl);	1157	ns->send_packet (sl);
1251		1158
…		…
1257	*	1164	*
1258	* Start of map related commands.	1165	* Start of map related commands.
1259	*	1166	*
1260	******************************************************************************/	1167	******************************************************************************/
1261		1168
1262	/**
1263	* This adds face_num to a map cell at x,y. If the client doesn't have
1264	* the face yet, we will also send it.
1265	*/
1266	static void
1267	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1268	{
1269	if (newmap->cells[x][y].count >= MAP_LAYERS)
1270	{
1271	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1272	return;
1273	abort ();
1274	}
1275
1276	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1277	newmap->cells[x][y].count++;
1278
1279	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1280	esrv_send_face (ns, face_num, 0);
1281	}
1282
1283	struct LayerCell
1284	{
1285	uint16 xy;
1286	short face;
1287	};
1288
1289	struct MapLayer
1290	{
1291	int count;
1292	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1293	};
1294
1295	/** Checkes if map cells have changed */
1296	static int
1297	mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1298	{
1299	int k;
1300
1301	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1302	return 1;
1303	for (k = 0; k < newmap->cells[i][j].count; k++)
1304	{
1305	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1306	{
1307	return 1;
1308	}
1309	}
1310	return 0;
1311	}
1312
1313	/**
1314	* Basically, what this does is pack the data into layers.
1315	* cnum is the client number, cur is the the buffer we put all of
1316	* this data into. we return the end of the data. layers is
1317	* how many layers of data we should back.
1318	*/
1319	static uint8 *
1320	compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1321	{
1322	int x, y, k;
1323	int face;
1324	unsigned char *fcur;
1325	struct MapLayer layers[MAP_LAYERS];
1326
1327	for (k = 0; k < MAP_LAYERS; k++)
1328	layers[k].count = 0;
1329	fcur = cur;
1330	for (x = 0; x < ns->mapx; x++)
1331	{
1332	for (y = 0; y < ns->mapy; y++)
1333	{
1334	if (!mapcellchanged (ns, x, y, newmap))
1335	continue;
1336	if (newmap->cells[x][y].count == 0)
1337	{
1338	*cur = x * ns->mapy + y; /* mark empty space */
1339	cur++;
1340	continue;
1341	}
1342	for (k = 0; k < newmap->cells[x][y].count; k++)
1343	{
1344	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1345	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1346	layers[k].count++;
1347	}
1348	}
1349	}
1350	/* If no data, return now. */
1351	if (fcur == cur && layers[0].count == 0)
1352	return cur;
1353	*cur = 255; /* mark end of explicitly cleared cells */
1354	cur++;
1355	/* First pack by layers. */
1356	for (k = 0; k < numlayers; k++)
1357	{
1358	if (layers[k].count == 0)
1359	break; /* once a layer is entirely empty, no layer below it can
1360	have anything in it either */
1361	/* Pack by entries in thie layer */
1362	for (x = 0; x < layers[k].count;)
1363	{
1364	fcur = cur;
1365	*cur = layers[k].lcells[x].face >> 8;
1366	cur++;
1367	*cur = layers[k].lcells[x].face & 0xFF;
1368	cur++;
1369	face = layers[k].lcells[x].face;
1370	/* Now, we back the redundant data into 1 byte xy pairings */
1371	for (y = x; y < layers[k].count; y++)
1372	{
1373	if (layers[k].lcells[y].face == face)
1374	{
1375	*cur = (uint8) layers[k].lcells[y].xy;
1376	cur++;
1377	layers[k].lcells[y].face = -1;
1378	}
1379	}
1380	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1381	/* forward over the now redundant data */
1382	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1383	x++;
1384	}
1385	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1386	}
1387	return cur;
1388	}
1389
1390	/** Clears a map cell */	1169	/** Clears a map cell */
1391	static void	1170	static void
1392	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1171	map_clearcell (struct MapCell *cell, int count)
1393	{	1172	{
1394	cell->faces[0] = face0;	1173	cell->faces[0] = 0;
1395	cell->faces[1] = face1;	1174	cell->faces[1] = 0;
1396	cell->faces[2] = face2;	1175	cell->faces[2] = 0;
1397	cell->count = count;	1176	cell->count = count;
1398	cell->stat_hp = 0;	1177	cell->stat_hp = 0;
1399	cell->flags = 0;	1178	cell->flags = 0;
1400	cell->player = 0;	1179	cell->player = 0;
1401	}	1180	}
1402		1181
1403	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1404	#define MAX_LAYERS 3	1182	#define MAX_LAYERS 3
1405
1406	/* Using a global really isn't a good approach, but saves the over head of
1407	* allocating and deallocating such a block of data each time run through,
1408	* and saves the space of allocating this in the socket object when we only
1409	* need it for this cycle. If the serve is ever threaded, this needs to be
1410	* re-examined.
1411	*/
1412
1413	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1414
1415	/**
1416	* Returns true if any of the heads for this
1417	* space is set. Returns false if all are blank - this is used
1418	* for empty space checking.
1419	*/
1420	static inline int
1421	have_head (int ax, int ay)
1422	{
1423
1424	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1425	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1426	return 1;
1427	return 0;
1428	}
1429
1430	/**
1431	* check_head is a bit simplistic version of update_space below.
1432	* basically, it only checks the that the head on space ax,ay at layer
1433	* needs to get sent - if so, it adds the data, sending the head
1434	* if needed, and returning 1. If this no data needs to get
1435	* sent, it returns zero.
1436	*/
1437	static int
1438	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1439	{
1440	short face_num;
1441
1442	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1443	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1444	else
1445	face_num = 0;
1446
1447	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1448	{
1449	sl << uint16 (face_num);
1450	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1451	esrv_send_face (&ns, face_num, 0);
1452
1453	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1454	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1455	return 1;
1456	}
1457
1458	return 0; /* No change */
1459	}
1460		1183
1461	/**	1184	/**
1462	* Removes the need to replicate the same code for each layer.	1185	* Removes the need to replicate the same code for each layer.
1463	* this returns true if this space is now in fact different than	1186	* this returns true if this space is now in fact different than
1464	* it was.	1187	* it was.
…		…
1475	* numbers the spaces differently - I think this was a leftover from	1198	* numbers the spaces differently - I think this was a leftover from
1476	* the map command, where the faces stack up. Sinces that is no longer	1199	* the map command, where the faces stack up. Sinces that is no longer
1477	* the case, it seems to make more sense to have these layer values	1200	* the case, it seems to make more sense to have these layer values
1478	* actually match.	1201	* actually match.
1479	*/	1202	*/
1480
1481	static int	1203	static int
1482	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1204	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483	{	1205	{
1484	object *ob, *head;
1485	uint16 face_num;	1206	uint16 face_num;
1486	int bx, by, i;	1207	int bx, by, i;
1487		1208
1488	/* If there is a multipart object stored away, treat that as more important.
1489	* If not, then do the normal processing.
1490	*/
1491	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1492
1493	/* Check to see if this head is part of the set of objects
1494	* we would normally send for this space. If so, then
1495	* don't use the head value. We need to do the check
1496	* here and not when setting up the heads[] value for two reasons -
1497	* 1) the heads[] values will get used even if the space is not visible.
1498	* 2) its possible the head is not on the same map as a part, and I'd
1499	* rather not need to do the map translation overhead.
1500	* 3) We need to do some extra checking to make sure that we will
1501	* otherwise send the image as this layer, eg, either it matches
1502	* the head value, or is not multipart.
1503	*/
1504	if (head && !head->more)
1505	{
1506	for (i = 0; i < MAP_LAYERS; i++)
1507	{
1508	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1509	if (!ob)
1510	continue;
1511
1512	if (ob->head)
1513	ob = ob->head;
1514
1515	if (ob == head)
1516	{
1517	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1518	head = NULL;
1519	break;
1520	}
1521	}
1522	}
1523
1524	ob = head;
1525	if (!ob)
1526	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1209	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1527		1210
1528	/* If there is no object for this space, or if the face for the object	1211	/* If there is no object for this space, or if the face for the object
1529	* is the blank face, set the face number to zero.	1212	* is the blank face, set the face number to zero.
1530	* else if we have the stored head object for this space, that takes	1213	* else if we have the stored head object for this space, that takes
1531	* precedence over the other object for this space.	1214	* precedence over the other object for this space.
1532	* otherwise, we do special head processing	1215	* otherwise, we do special head processing
1533	*/	1216	*/
1534	if (!ob || ob->face == blank_face)	1217	if (!ob || ob->face == blank_face)
1535	face_num = 0;	1218	face_num = 0;
1536	else if (head)
1537	{
1538	/* if this is a head that had previously been stored */
1539	face_num = ob->face->number;
1540	}
1541	else	1219	else
1542	{
1543	/* if the faces for the different parts of a multipart object
1544	* are the same, we only want to send the bottom right most
1545	* portion of the object. That info is in the tail_.. values
1546	* of the head. Note that for the head itself, ob->head will
1547	* be null, so we only do this block if we are working on
1548	* a tail piece.
1549	*/
1550
1551	/* tail_x and tail_y will only be set in the head object. If
1552	* this is the head object and these are set, we proceed
1553	* with logic to only send bottom right. Similarly, if
1554	* this is one of the more parts but the head has those values
1555	* set, we want to do the processing. There can be cases where
1556	* the head is not visible but one of its parts is, so we just
1557	* can always expect that ob->arch->tail_x will be true for all
1558	* object we may want to display.
1559	*/
1560	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1561	{
1562
1563	if (ob->head)
1564	head = ob->head;
1565	else
1566	head = ob;
1567
1568	/* Basically figure out where the offset is from where we are right
1569	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1570	* piece is from the head, and the tail is where the tail is from the
1571	* head. Note that bx and by will equal sx and sy if we are already working
1572	* on the bottom right corner. If ob is the head, the clone values
1573	* will be zero, so the right thing will still happen.
1574	*/
1575	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1576	by = sy + head->arch->tail_y - ob->arch->clone.y;
1577
1578	/* I don't think this can ever happen, but better to check for it just
1579	* in case.
1580	*/
1581	if (bx < sx || by < sy)
1582	{
1583	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1584	face_num = 0;
1585	}
1586	/* single part object, multipart object with non merged faces,
1587	* of multipart object already at lower right.
1588	*/
1589	else if (bx == sx && by == sy)
1590	{
1591	face_num = ob->face->number;
1592
1593	/* if this face matches one stored away, clear that one away.
1594	* this code relies on the fact that the map1 commands
1595	* goes from 2 down to 0.
1596	*/
1597	for (i = 0; i < MAP_LAYERS; i++)
1598	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1599	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1600	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1601	}
1602	else
1603	{
1604	/* If this head is stored away, clear it - otherwise,
1605	* there can be cases where a object is on multiple layers -
1606	* we only want to send it once.
1607	*/
1608	face_num = head->face->number;
1609	for (i = 0; i < MAP_LAYERS; i++)
1610	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1611	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1612	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1613
1614	/* First, try to put the new head on the same layer. If that is used up,
1615	* then find another layer.
1616	*/
1617	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1618	{
1619	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1620	}
1621	else
1622	for (i = 0; i < MAX_LAYERS; i++)
1623	{
1624	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1625	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1626	{
1627	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1628	}
1629	}
1630	face_num = 0; /* Don't send this object - we'll send the head later */
1631	}
1632	}
1633	else
1634	{
1635	/* In this case, we are already at the lower right or single part object,	1220	/* In this case, we are already at the lower right or single part object,
1636	* so nothing special	1221	* so nothing special
1637	*/
1638	face_num = ob->face->number;
1639
1640	/* clear out any head entries that have the same face as this one */
1641	for (bx = 0; bx < layer; bx++)
1642	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1643	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1644	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1645	}
1646	} /* else not already head object or blank face */
1647
1648	/* This is a real hack. Basically, if we have nothing to send for this layer,
1649	* but there is a head on the next layer, send that instead.
1650	* Without this, what happens is you can get the case where the player stands
1651	* on the same space as the head. However, if you have overlapping big objects
1652	* of the same type, what happens then is it doesn't think it needs to send
1653	* This tends to make stacking also work/look better.
1654	*/	1222	*/
1655	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1656	{
1657	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1658	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1659	}
1660
1661	/* Another hack - because of heads and whatnot, this face may match one
1662	* we already sent for a lower layer. In that case, don't send
1663	* this one.
1664	*/
1665	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1666	face_num = 0;	1223	face_num = ob->face;
1667		1224
1668	/* We've gotten what face we want to use for the object. Now see if	1225	/* We've gotten what face we want to use for the object. Now see if
1669	* if it has changed since we last sent it to the client.	1226	* if it has changed since we last sent it to the client.
1670	*/	1227	*/
1671	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1228	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
…		…
1710	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1267	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1711		1268
1712	/* If there is no object for this space, or if the face for the object	1269	/* If there is no object for this space, or if the face for the object
1713	* is the blank face, set the smoothlevel to zero.	1270	* is the blank face, set the smoothlevel to zero.
1714	*/	1271	*/
1715	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))	1272	if (!ob || ob->face == blank_face)
1716	smoothlevel = 0;	1273	smoothlevel = 0;
1717	else	1274	else
1718	{	1275	{
1719	smoothlevel = ob->smoothlevel;	1276	smoothlevel = ob->smoothlevel;
1720	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1277	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1721	SendSmooth (&ns, ob->face->number);	1278	SendSmooth (&ns, ob->face);
1722	} /* else not already head object or blank face */	1279	} /* else not already head object or blank face */
1723		1280
1724	/* We've gotten what face we want to use for the object. Now see if	1281	/* We've gotten what face we want to use for the object. Now see if
1725	* if it has changed since we last sent it to the client.	1282	* if it has changed since we last sent it to the client.
1726	*/	1283	*/
…		…
1753	if (ns->ext_mapinfos)	1310	if (ns->ext_mapinfos)
1754	{	1311	{
1755	if (ns->EMI_smooth)	1312	if (ns->EMI_smooth)
1756	result += 1; /*One byte for smoothlevel */	1313	result += 1; /*One byte for smoothlevel */
1757	}	1314	}
		1315
1758	return result;	1316	return result;
		1317	}
		1318
		1319	// prefetch (and touch) all maps within a specific distancd
		1320	static void
		1321	prefetch_surrounding_maps (maptile *map, int distance)
		1322	{
		1323	map->last_access = runtime;
		1324
		1325	if (--distance)
		1326	for (int dir = 4; --dir; )
		1327	if (const shstr &path = map->tile_path [dir])
		1328	if (maptile *&neigh = map->tile_map [dir])
		1329	prefetch_surrounding_maps (neigh, distance);
		1330	else
		1331	neigh = maptile::find_async (path, map);
		1332	}
		1333
		1334	// prefetch a generous area around the player
		1335	static void
		1336	prefetch_surrounding_maps (object *op)
		1337	{
		1338	prefetch_surrounding_maps (op->map, 3);
1759	}	1339	}
1760		1340
1761	/**	1341	/**
1762	* This function uses the new map1 protocol command to send the map	1342	* This function uses the new map1 protocol command to send the map
1763	* to the client. It is necessary because the old map command supports	1343	* to the client. It is necessary because the old map command supports
…		…
1769	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1349	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1770	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1350	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1771	* and use the other 4 bits for other informatiion. For full documentation	1351	* and use the other 4 bits for other informatiion. For full documentation
1772	* of what we send, see the doc/Protocol file.	1352	* of what we send, see the doc/Protocol file.
1773	* I will describe internally what we do:	1353	* I will describe internally what we do:
1774	* the socket->lastmap shows how the map last looked when sent to the client.	1354	* the ns->lastmap shows how the map last looked when sent to the client.
1775	* in the lastmap structure, there is a cells array, which is set to the	1355	* in the lastmap structure, there is a cells array, which is set to the
1776	* maximum viewable size (As set in config.h).	1356	* maximum viewable size (As set in config.h).
1777	* in the cells, there are faces and a count value.	1357	* in the cells, there are faces and a count value.
1778	* we use the count value to hold the darkness value. If -1, then this space	1358	* we use the count value to hold the darkness value. If -1, then this space
1779	* is not viewable.	1359	* is not viewable.
…		…
1790	uint8 eentrysize;	1370	uint8 eentrysize;
1791	uint16 ewhatstart, ewhatflag;	1371	uint16 ewhatstart, ewhatflag;
1792	uint8 extendedinfos;	1372	uint8 extendedinfos;
1793	maptile *m;	1373	maptile *m;
1794		1374
1795	client &socket = *pl->contr->socket;	1375	client &socket = *pl->contr->ns;
		1376
		1377	if (!pl->active)
		1378	return;
1796		1379
1797	check_map_change (pl->contr);	1380	check_map_change (pl->contr);
		1381	prefetch_surrounding_maps (pl);
1798		1382
1799	packet sl;	1383	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1800	packet esl;	1384	packet esl;
1801		1385
1802	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1803	startlen = sl.length ();	1386	startlen = sl.length ();
1804		1387
1805	/*Extendedmapinfo structure initialisation */	1388	/*Extendedmapinfo structure initialisation */
1806	if (socket.ext_mapinfos)	1389	if (socket.ext_mapinfos)
1807	{	1390	{
…		…
1826	ewhatstart = 0;	1409	ewhatstart = 0;
1827	ewhatflag = 0;	1410	ewhatflag = 0;
1828	estartlen = 0;	1411	estartlen = 0;
1829	}	1412	}
1830		1413
1831	/* Init data to zero */
1832	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1833
1834	/* x,y are the real map locations. ax, ay are viewport relative	1414	/* x,y are the real map locations. ax, ay are viewport relative
1835	* locations.	1415	* locations.
1836	*/	1416	*/
1837	ay = 0;	1417	ay = 0;
1838		1418
…		…
1851	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1431	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1852	{	1432	{
1853	ax = 0;	1433	ax = 0;
1854	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1434	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1855	{	1435	{
1856
1857	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1436	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1858		1437
1859	/* If this space is out of the normal viewable area, we only check	1438	/* If this space is out of the normal viewable area, we only check
1860	* the heads value ax or ay will only be greater than what	1439	* the heads value ax or ay will only be greater than what
1861	* the client wants if using the map1a command - this is because	1440	* the client wants if using the map1a command - this is because
…		…
1868		1447
1869	oldlen = sl.length ();	1448	oldlen = sl.length ();
1870		1449
1871	sl << uint16 (mask);	1450	sl << uint16 (mask);
1872		1451
1873	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1874	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1875	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1876
1877	/* If all we are doing is sending 0 (blank) faces, we don't	1452	/* If all we are doing is sending 0 (blank) faces, we don't
1878	* actually need to send that - just the coordinates	1453	* actually need to send that - just the coordinates
1879	* with no faces tells the client to blank out the	1454	* with no faces tells the client to blank out the
1880	* space.	1455	* space.
1881	*/	1456	*/
…		…
1918	* of the map, it shouldn't have a head	1493	* of the map, it shouldn't have a head
1919	*/	1494	*/
1920	if (lastcell.count != -1)	1495	if (lastcell.count != -1)
1921	{	1496	{
1922	sl << uint16 (mask);	1497	sl << uint16 (mask);
1923	map_clearcell (&lastcell, 0, 0, 0, -1);	1498	map_clearcell (&lastcell, -1);
1924	}	1499	}
1925	}	1500	}
1926	else if (d > 3)	1501	else if (d > 3)
1927	{	1502	{
		1503	m->touch ();
		1504
1928	int need_send = 0, count;	1505	int need_send = 0, count;
1929		1506
1930	/* This block deals with spaces that are not visible for whatever	1507	/* This block deals with spaces that are not visible for whatever
1931	* reason. Still may need to send the head for this space.	1508	* reason. Still may need to send the head for this space.
1932	*/	1509	*/
…		…
1938	if (lastcell.count != -1)	1515	if (lastcell.count != -1)
1939	need_send = 1;	1516	need_send = 1;
1940		1517
1941	count = -1;	1518	count = -1;
1942		1519
1943	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1944	{
1945	/* Now check to see if any heads need to be sent */
1946
1947	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1948	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1949	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1950
1951	lastcell.count = count;
1952	}
1953	else
1954	{
1955	/* properly clear a previously sent big face */	1520	/* properly clear a previously sent big face */
1956	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1521	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1957	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1522	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1958	need_send = 1;	1523	need_send = 1;
1959		1524
1960	map_clearcell (&lastcell, 0, 0, 0, count);	1525	map_clearcell (&lastcell, count);
1961	}
1962		1526
1963	if ((mask & 0xf) || need_send)	1527	if ((mask & 0xf) || need_send)
1964	sl[oldlen + 1] = mask & 0xff;	1528	sl[oldlen + 1] = mask & 0xff;
1965	else	1529	else
1966	sl.reset (oldlen);	1530	sl.reset (oldlen);
1967	}	1531	}
1968	else	1532	else
1969	{	1533	{
		1534	m->touch ();
		1535
1970	/* In this block, the space is visible or there are head objects	1536	/* In this block, the space is visible or there are head objects
1971	* we need to send.	1537	* we need to send.
1972	*/	1538	*/
1973		1539
1974	/* Rather than try to figure out what everything that we might	1540	/* Rather than try to figure out what everything that we might
…		…
2097	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1663	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2098	emask |= 0x2;	1664	emask |= 0x2;
2099		1665
2100	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	1666	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2101	{	1667	{
2102	if (lastcell.faces[0] != pl->face->number)	1668	if (lastcell.faces[0] != pl->face)
2103	{	1669	{
2104	lastcell.faces[0] = pl->face->number;	1670	lastcell.faces[0] = pl->face;
2105	mask |= 0x1;	1671	mask |= 0x1;
2106		1672
2107	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1673	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
2108	esrv_send_face (&socket, pl->face->number, 0);	1674	esrv_send_face (&socket, pl->face, 0);
2109		1675
2110	sl << uint16 (pl->face->number);	1676	sl << uint16 (pl->face);
2111	}	1677	}
2112	}	1678	}
2113	else	1679	else
2114	{	1680	{
2115	/* Top face */	1681	/* Top face */
…		…
2167	*/	1733	*/
2168	void	1734	void
2169	draw_client_map (object *pl)	1735	draw_client_map (object *pl)
2170	{	1736	{
2171	int i, j;	1737	int i, j;
2172	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1738	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2173	New_Face *face, *floor;
2174	New_Face *floor2;
2175	int d, mflags;	1739	int mflags;
2176	struct Map newmap;	1740	struct Map newmap;
2177	maptile *m, *pm;	1741	maptile *m, *pm;
2178		1742
2179	if (pl->type != PLAYER)	1743	if (pl->type != PLAYER)
2180	{	1744	{
…		…
2191	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1755	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2192	return;	1756	return;
2193		1757
2194	memset (&newmap, 0, sizeof (struct Map));	1758	memset (&newmap, 0, sizeof (struct Map));
2195		1759
2196	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1760	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2197	{
2198	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1761	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2199	{	1762	{
2200	ax = i;	1763	ax = i;
2201	ay = j;	1764	ay = j;
2202	m = pm;	1765	m = pm;
2203	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1766	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		1767
2204	if (mflags & P_OUT_OF_MAP)	1768	if (mflags & P_OUT_OF_MAP)
2205	continue;	1769	continue;
2206	if (mflags & P_NEED_UPDATE)	1770
2207	update_position (m, ax, ay);
2208	/* If a map is visible to the player, we don't want to swap it out	1771	/* If a map is visible to the player, we don't want to swap it out
2209	* just to reload it. This should really call something like	1772	* just to reload it. This should really call something like
2210	* swap_map, but this is much more efficient and 'good enough'	1773	* swap_map, but this is much more efficient and 'good enough'
2211	*/	1774	*/
2212	if (mflags & P_NEW_MAP)	1775	if (mflags & P_NEW_MAP)
2213	m->timeout = 50;	1776	m->timeout = 50;
2214	}	1777	}
2215	}	1778
2216	/* do LOS after calls to update_position */	1779	/* do LOS after calls to update_position */
2217	if (pl->contr->do_los)	1780	if (pl->contr->do_los)
2218	{	1781	{
2219	update_los (pl);	1782	update_los (pl);
2220	pl->contr->do_los = 0;	1783	pl->contr->do_los = 0;
…		…
2235		1798
2236	/*****************************************************************************/	1799	/*****************************************************************************/
2237	void	1800	void
2238	send_plugin_custom_message (object *pl, char *buf)	1801	send_plugin_custom_message (object *pl, char *buf)
2239	{	1802	{
2240	pl->contr->socket->send_packet (buf);	1803	pl->contr->ns->send_packet (buf);
2241	}	1804	}
2242		1805
2243	/**	1806	/**
2244	* This sends the skill number to name mapping. We ignore	1807	* This sends the skill number to name mapping. We ignore
2245	* the params - we always send the same info no matter what.	1808	* the params - we always send the same info no matter what.
…		…
2290	* it then sends an updspell packet for each spell that has changed in this way	1853	* it then sends an updspell packet for each spell that has changed in this way
2291	*/	1854	*/
2292	void	1855	void
2293	esrv_update_spells (player *pl)	1856	esrv_update_spells (player *pl)
2294	{	1857	{
		1858	if (!pl->ns)
		1859	return;
		1860
2295	if (!pl->socket->monitor_spells)	1861	if (!pl->ns->monitor_spells)
2296	return;	1862	return;
2297		1863
2298	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1864	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2299	{	1865	{
2300	if (spell->type == SPELL)	1866	if (spell->type == SPELL)
…		…
2330		1896
2331	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1897	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2332	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1898	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2333	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1899	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2334		1900
2335	pl->socket->send_packet (sl);	1901	pl->ns->send_packet (sl);
2336	}	1902	}
2337	}	1903	}
2338	}	1904	}
2339	}	1905	}
2340		1906
2341	void	1907	void
2342	esrv_remove_spell (player *pl, object *spell)	1908	esrv_remove_spell (player *pl, object *spell)
2343	{	1909	{
2344	if (!pl->socket->monitor_spells)	1910	if (!pl->ns->monitor_spells)
2345	return;	1911	return;
2346		1912
2347	if (!pl || !spell || spell->env != pl->ob)	1913	if (!pl || !spell || spell->env != pl->ob)
2348	{	1914	{
2349	LOG (llevError, "Invalid call to esrv_remove_spell");	1915	LOG (llevError, "Invalid call to esrv_remove_spell");
2350	return;	1916	return;
2351	}	1917	}
2352		1918
2353	packet sl;	1919	packet sl ("delspell");
2354		1920
2355	sl << "delspell "
2356	<< uint32 (spell->count);	1921	sl << uint32 (spell->count);
2357		1922
2358	pl->socket->send_packet (sl);	1923	pl->ns->send_packet (sl);
2359	}	1924	}
2360		1925
2361	/* appends the spell *spell to the Socklist we will send the data to. */	1926	/* appends the spell *spell to the Socklist we will send the data to. */
2362	static void	1927	static void
2363	append_spell (player *pl, packet &sl, object *spell)	1928	append_spell (player *pl, packet &sl, object *spell)
2364	{	1929	{
2365	int len, i, skill = 0;	1930	int i, skill = 0;
2366		1931
2367	if (!(spell->name))	1932	if (!(spell->name))
2368	{	1933	{
2369	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1934	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2370	return;	1935	return;
…		…
2382	if (!strcmp (spell->skill, skill_names[i]))	1947	if (!strcmp (spell->skill, skill_names[i]))
2383	{	1948	{
2384	skill = i + CS_STAT_SKILLINFO;	1949	skill = i + CS_STAT_SKILLINFO;
2385	break;	1950	break;
2386	}	1951	}
		1952	}
		1953
		1954	// spells better have a face
		1955	if (!spell->face)
		1956	{
		1957	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1958	spell->face = face_find ("burnout.x11", blank_face);
2387	}	1959	}
2388		1960
2389	/* send the current values */	1961	/* send the current values */
2390	sl << uint32 (spell->count)	1962	sl << uint32 (spell->count)
2391	<< uint16 (spell->level)	1963	<< uint16 (spell->level)
…		…
2393	<< uint16 (spell->last_sp)	1965	<< uint16 (spell->last_sp)
2394	<< uint16 (spell->last_grace)	1966	<< uint16 (spell->last_grace)
2395	<< uint16 (spell->last_eat)	1967	<< uint16 (spell->last_eat)
2396	<< uint8 (skill)	1968	<< uint8 (skill)
2397	<< uint32 (spell->path_attuned)	1969	<< uint32 (spell->path_attuned)
2398	<< uint32 (spell->face ? spell->face->number : 0)	1970	<< uint32 (spell->face)
2399	<< data8 (spell->name)	1971	<< data8 (spell->name)
2400	<< data16 (spell->msg);	1972	<< data16 (spell->msg);
2401	}	1973	}
2402		1974
2403	/**	1975	/**
…		…
2411	{	1983	{
2412	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1984	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2413	return;	1985	return;
2414	}	1986	}
2415		1987
2416	if (!pl->socket->monitor_spells)	1988	if (!pl->ns->monitor_spells)
2417	return;	1989	return;
2418		1990
2419	packet sl;	1991	packet sl ("addspell");
2420
2421	sl << "addspell ";
2422		1992
2423	if (!spell)	1993	if (!spell)
2424	{	1994	{
2425	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1995	for (spell = pl->ob->inv; spell; spell = spell->below)
2426	{	1996	{
2427	/* were we to simply keep appending data here, we could exceed	1997	/* were we to simply keep appending data here, we could exceed
2428	* MAXSOCKBUF if the player has enough spells to add, we know that	1998	* MAXSOCKBUF if the player has enough spells to add, we know that
2429	* append_spells will always append 19 data bytes, plus 4 length	1999	* append_spells will always append 19 data bytes, plus 4 length
2430	* bytes and 3 strings (because that is the spec) so we need to	2000	* bytes and 3 strings (because that is the spec) so we need to
…		…
2440	if (spell->type != SPELL)	2010	if (spell->type != SPELL)
2441	continue;	2011	continue;
2442		2012
2443	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2013	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2444	{	2014	{
2445	pl->socket->send_packet (sl);	2015	pl->ns->send_packet (sl);
2446		2016
2447	sl.reset ();	2017	sl.reset ();
2448	sl << "addspell ";	2018	sl << "addspell ";
2449	}	2019	}
2450		2020
…		…
2464	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2034	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2465	fatal (0);	2035	fatal (0);
2466	}	2036	}
2467		2037
2468	/* finally, we can send the packet */	2038	/* finally, we can send the packet */
2469	pl->socket->send_packet (sl);	2039	pl->ns->send_packet (sl);
2470	}	2040	}
2471		2041

Diff Legend

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