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

Diff Legend

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