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

Diff Legend

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