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.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 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	*/	41	*/
44		42
45	#include <global.h>	43	#include <global.h>
46	#include <sproto.h>	44	#include <sproto.h>
47		45
…		…
100	* that much difference in bandwidth.	98	* that much difference in bandwidth.
101	*/	99	*/
102	mx = ns->mapx;	100	mx = ns->mapx;
103	my = ns->mapy;	101	my = ns->mapy;
104		102
105	if (ns->mapmode == Map1aCmd)
106	{
107	mx += MAX_HEAD_OFFSET;
108	my += MAX_HEAD_OFFSET;
109	}
110
111	/* 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
112	* (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,
113	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
114	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
115	* 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.
…		…
138	}	130	}
139		131
140	static void	132	static void
141	clear_map (player *pl)	133	clear_map (player *pl)
142	{	134	{
143	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		136
		137	pl->ns->force_newmap = false;
		138
145	if (pl->socket->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
147		141
148	pl->socket->floorbox_reset ();	142	pl->ns->floorbox_reset ();
149	}	143	}
150		144
151	/** check for map change and send new map data */	145	/** check for map/region change and send new map data */
152	static void	146	static void
153	check_map_change (player *pl)	147	check_map_change (player *pl)
154	{	148	{
155	client &socket = *pl->socket;	149	client &socket = *pl->ns;
156	object *ob = pl->ob;	150	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	151	char buf[MAX_BUF]; /* eauugggh */
158		152
159	if (socket.current_map != ob->map)	153	if (socket.force_newmap && 0)
160	{	154	{
		155	// force newmap is used for clients that do not redraw their map
		156	// after image uploads.
161	socket.current_map = ob->map;	157	socket.current_map = ob->map;
162
163	clear_map (pl);	158	clear_map (pl);
		159	}
		160	else if (socket.current_map != ob->map)
		161	{
		162	clear_map (pl);
		163	socket.current_map = ob->map;
164		164
165	if (socket.mapinfocmd)	165	if (socket.mapinfocmd)
166	{	166	{
167	if (ob->map && ob->map->path[0])	167	if (ob->map && ob->map->path[0])
168	{	168	{
…		…
176	flags |= 4;	176	flags |= 4;
177	if (ob->map->tile_path[3])	177	if (ob->map->tile_path[3])
178	flags |= 8;	178	flags |= 8;
179		179
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	182	}
183	else	183	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	184	snprintf (buf, MAX_BUF, "mapinfo current");
185		185
186	socket.send_packet (buf);	186	socket.send_packet (buf);
…		…
200	}	200	}
201	}	201	}
202		202
203	socket.current_x = ob->x;	203	socket.current_x = ob->x;
204	socket.current_y = ob->y;	204	socket.current_y = ob->y;
		205
		206	region *reg = ob->region ();
		207	if (socket.current_region != reg)
		208	{
		209	socket.current_region = reg;
		210	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		211	}
205	}	212	}
206		213
207	/**	214	/**
208	* RequestInfo is sort of a meta command. There is some specific	215	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	216	* request of information, but we call other functions to provide
…		…
280	buf += 8;	287	buf += 8;
281		288
282	// initial map and its origin	289	// initial map and its origin
283	maptile *map = pl->ob->map;	290	maptile *map = pl->ob->map;
284	sint16 dx, dy;	291	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	292	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	293	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	294	int max_distance = 8; // limit maximum path length to something generous
288		295
289	while (*buf && map && max_distance)	296	while (*buf && map && max_distance)
290	{	297	{
291	int dir = *buf++;	298	int dir = *buf++;
292		299
293	switch (dir)	300	switch (dir)
294	{	301	{
295	case '1':	302	case '1':
296	dx = 0;	303	dx = 0;
297	dy = -1;	304	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	305	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	306	map && (mapy -= map->height);
300	break;	307	break;
301	case '2':	308	case '2':
302	mapx += map->width;	309	mapx += map->width;
303	dx = map->width;	310	dx = map->width;
304	dy = 0;	311	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
306	break;	313	break;
307	case '3':	314	case '3':
308	mapy += map->height;	315	mapy += map->height;
309	dx = 0;	316	dx = 0;
310	dy = map->height;	317	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	318	map = map->xy_find (dx, dy);
312	break;	319	break;
313	case '4':	320	case '4':
314	dx = -1;	321	dx = -1;
315	dy = 0;	322	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	323	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	324	map && (mapx -= map->width);
318	break;	325	break;
319	}	326	}
320		327
321	--max_distance;	328	--max_distance;
322	}	329	}
323		330
…		…
334	if (map->tile_path[2])	341	if (map->tile_path[2])
335	flags |= 4;	342	flags |= 4;
336	if (map->tile_path[3])	343	if (map->tile_path[3])
337	flags |= 8;	344	flags |= 8;
338		345
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	346	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	347	}
341	else	348	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	349	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	350	}
344	else	351	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	352	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		353
347	pl->socket->send_packet (bigbuf);	354	pl->ns->send_packet (bigbuf);
348	}	355	}
349		356
350	/** This is the Setup cmd - easy first implementation */	357	/** This is the Setup cmd - easy first implementation */
351	void	358	void
352	SetUp (char *buf, int len, client * ns)	359	SetUp (char *buf, int len, client * ns)
…		…
399	{	406	{
400	ns->sound = atoi (param);	407	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);	408	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}	409	}
403	else if (!strcmp (cmd, "exp64"))	410	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);	411	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))	412	else if (!strcmp (cmd, "spellmon"))
409	{	413	{
410	ns->monitor_spells = atoi (param);	414	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);	415	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}	416	}
…		…
435	}	439	}
436	else if (!strcmp (cmd, "newmapcmd"))	440	else if (!strcmp (cmd, "newmapcmd"))
437	{	441	{
438	ns->newmapcmd = atoi (param);	442	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);	443	safe_strcat (cmdback, param, &slen, HUGE_BUF);
440	// } else if (!strcmp(cmd,"plugincmd")) {
441	// ns->plugincmd = atoi(param);
442	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443	}	444	}
444	else if (!strcmp (cmd, "mapinfocmd"))	445	else if (!strcmp (cmd, "mapinfocmd"))
445	{	446	{
446	ns->mapinfocmd = atoi (param);	447	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);	448	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
…		…
466	char tmpbuf[20];	467	char tmpbuf[20];
467	int q = atoi (param);	468	int q = atoi (param);
468		469
469	if (is_valid_faceset (q))	470	if (is_valid_faceset (q))
470	ns->faceset = q;	471	ns->faceset = q;
		472
471	sprintf (tmpbuf, "%d", ns->faceset);	473	sprintf (tmpbuf, "%d", ns->faceset);
472	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	474	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473	/* if the client is using faceset, it knows about image2 command */	475	/* if the client is using faceset, it knows about image2 command */
474	ns->image2 = 1;	476	ns->image2 = 1;
475	}	477	}
…		…
503	if (*cp == 'x' || *cp == 'X')	505	if (*cp == 'x' || *cp == 'X')
504	{	506	{
505	y = atoi (cp + 1);	507	y = atoi (cp + 1);
506	break;	508	break;
507	}	509	}
		510
508	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)	511	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509	{	512	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);	513	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	514	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}	515	}
…		…
567	* This is what takes care of it. We tell the client how things worked out.	570	* This is what takes care of it. We tell the client how things worked out.
568	* I am not sure if this file is the best place for this function. however,	571	* I am not sure if this file is the best place for this function. however,
569	* it either has to be here or init_sockets needs to be exported.	572	* it either has to be here or init_sockets needs to be exported.
570	*/	573	*/
571	void	574	void
572	AddMeCmd (char *buf, int len, client * ns)	575	AddMeCmd (char *buf, int len, client *ns)
573	{	576	{
574	if (ns->status != Ns_Add || add_player (ns))	577	// face caching is mandatory
575	ns->send_packet ("addme_failed");	578	if (!ns->facecache)
		579	{
		580	ns->send_drawinfo (
		581	"\n"
		582	"\n"
		583	"***\n"
		584	"*** WARNING:\n"
		585	"*** Your client does not support face/image caching,\n"
		586	"*** or it has been disabled. Face caching is mandatory\n"
		587	"*** so please enable it or use a newer client.\n"
		588	"***\n"
		589	"*** Look at your client preferences:\n"
		590	"***\n"
		591	"*** CFPlus: all known versions automatically enable the facecache.\n"
		592	"*** cfclient: use the -cache commandline option.\n"
		593	"*** cfclient: map will not redraw automatically (bug).\n"
		594	"*** gcfclient: use -cache commandline option, or enable\n"
		595	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
		596	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
		597	"***\n"
		598	"***\n",
		599	NDI_RED
		600	);
		601
		602	if (strstr (ns->version, "jcrossclient"))
		603	/* let them, for now*/;
576	else	604	else
577	ns->send_packet ("addme_success");	605	{
		606	ns->flush ();
		607	//ns->destroy ();
		608	}
		609	//ns->facecache = true;
		610	}
		611
		612	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
578	}	613	}
579		614
580	/** Reply to ExtendedInfos command */	615	/** Reply to ExtendedInfos command */
581	void	616	void
582	ToggleExtendedInfos (char *buf, int len, client * ns)	617	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
692		727
693	ns->send_packet (cmdback);	728	ns->send_packet (cmdback);
694	}	729	}
695		730
696	/**	731	/**
697	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	732	* client requested an image. send it rate-limited
698	* Basically, it makes no sense to wait for the client to request a	733	* before flushing.
699	* a piece of data from us that we know the client wants. So
700	* if we know the client wants it, might as well push it to the
701	* client.
702	*/
703	static void
704	SendSmooth (client *ns, uint16 face)
705	{
706	uint16 smoothface;
707
708	/* If we can't find a face, return and set it so we won't try to send this
709	* again.
710	*/	734	*/
711	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	735	void
712	{	736	AskFaceCmd (char *buf, int len, client *ns)
713		737	{
714	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	738	ns->askface.push_back (atoi (buf));
715	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
716	return;
717	}
718
719	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720	esrv_send_face (ns, smoothface, 0);
721
722	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
723
724	packet sl ("smooth");
725
726	sl << uint16 (face)
727	<< uint16 (smoothface);
728
729	ns->send_packet (sl);
730	}	739	}
731		740
732	/**	741	/**
733	* Tells client the picture it has to use	742	* Tells client the picture it has to use
734	* to smooth a picture number given as argument.	743	* to smooth a picture number given as argument.
735	*/	744	*/
736	void	745	void
737	AskSmooth (char *buf, int len, client *ns)	746	AskSmooth (char *buf, int len, client *ns)
738	{	747	{
739	SendSmooth (ns, atoi (buf));	748	ns->send_face (atoi (buf));
740	}	749	}
741		750
742	/**	751	/**
743	* This handles the general commands from the client (ie, north, fire, cast,	752	* This handles the general commands from the client (ie, north, fire, cast,
744	* etc.)	753	* etc.)
…		…
803	* commands.	812	* commands.
804	*/	813	*/
805	pl->count = 0;	814	pl->count = 0;
806		815
807	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	816	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
808	int time = FABS (pl->ob->speed) < 0.001	817	int time = fabs (pl->ob->speed) < 0.001
809	? time = MAX_TIME * 100	818	? time = MAX_TIME * 100
810	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	819	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
811		820
812	/* Send confirmation of command execution now */	821	/* Send confirmation of command execution now */
813	packet sl ("comc");	822	packet sl ("comc");
814	sl << uint16 (cmdid) << uint32 (time);	823	sl << uint16 (cmdid) << uint32 (time);
815	pl->socket->send_packet (sl);	824	pl->ns->send_packet (sl);
816	}	825	}
817
818		826
819	/** This is a reply to a previous query. */	827	/** This is a reply to a previous query. */
820	void	828	void
821	ReplyCmd (char *buf, int len, player *pl)	829	ReplyCmd (char *buf, int len, client *ns)
822	{	830	{
		831	if (ns->state == ST_CUSTOM)
		832	{
		833	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		834	return;
		835	}
		836
		837	if (!ns->pl)
		838	return; //TODO: depends on the exact reply we are after
		839	//TODO: but right now, we always have a ns->pl
		840
		841	player *pl = ns->pl;
		842
823	/* This is to synthesize how the data would be stored if it	843	/* This is to synthesize how the data would be stored if it
824	* was normally entered. A bit of a hack, and should be cleaned up	844	* was normally entered. A bit of a hack, and should be cleaned up
825	* once all the X11 code is removed from the server.	845	* once all the X11 code is removed from the server.
826	*	846	*
827	* We pass 13 to many of the functions because this way they	847	* We pass 13 to many of the functions because this way they
…		…
830	*/	850	*/
831	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	851	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832		852
833	/* this avoids any hacking here */	853	/* this avoids any hacking here */
834		854
835	switch (pl->state)	855	switch (ns->state)
836	{	856	{
837	case ST_PLAYING:	857	case ST_PLAYING:
838	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	858	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839	break;	859	break;
840		860
841	case ST_PLAY_AGAIN:
842	/* We can check this for return value (2==quit). Maybe we
843	* should, and do something appropriate?
844	*/
845	receive_play_again (pl->ob, buf[0]);
846	break;
847
848	case ST_ROLL_STAT:
849	key_roll_stat (pl->ob, buf[0]);
850	break;
851
852	case ST_CHANGE_CLASS:	861	case ST_CHANGE_CLASS:
853
854	key_change_class (pl->ob, buf[0]);	862	key_change_class (pl->ob, buf[0]);
855	break;
856
857	case ST_CONFIRM_QUIT:
858	key_confirm_quit (pl->ob, buf[0]);
859	break;
860
861	case ST_CONFIGURE:
862	LOG (llevError, "In client input handling, but into configure state\n");
863	pl->state = ST_PLAYING;
864	break;
865
866	case ST_GET_NAME:
867	receive_player_name (pl->ob, 13);
868	break;
869
870	case ST_GET_PASSWORD:
871	case ST_CONFIRM_PASSWORD:
872	receive_player_password (pl->ob, 13);
873	break;	863	break;
874		864
875	case ST_GET_PARTY_PASSWORD: /* Get password for party */	865	case ST_GET_PARTY_PASSWORD: /* Get password for party */
876	receive_party_password (pl->ob, 13);	866	receive_party_password (pl->ob, 13);
877	break;	867	break;
878		868
879	default:	869	default:
880	LOG (llevError, "Unknown input state: %d\n", pl->state);	870	LOG (llevError, "Unknown input state: %d\n", ns->state);
881	}	871	}
882	}	872	}
883		873
884	/**	874	/**
885	* Client tells its version. If there is a mismatch, we close the	875	* Client tells its version. If there is a mismatch, we close the
…		…
900	ns->cs_version = atoi (buf);	890	ns->cs_version = atoi (buf);
901	ns->sc_version = ns->cs_version;	891	ns->sc_version = ns->cs_version;
902		892
903	LOG (llevDebug, "connection from client <%s>\n", buf);	893	LOG (llevDebug, "connection from client <%s>\n", buf);
904		894
905
906	//TODO: should log here just for statistics	895	//TODO: should log here just for statistics
907		896
908	//if (VERSION_CS != ns->cs_version)	897	//if (VERSION_CS != ns->cs_version)
909	// unchecked;	898	// unchecked;
910		899
…		…
935	{	924	{
936	ns->sound = atoi (buf);	925	ns->sound = atoi (buf);
937	}	926	}
938		927
939	/** client wants the map resent */	928	/** client wants the map resent */
940
941	void	929	void
942	MapRedrawCmd (char *buf, int len, player *pl)	930	MapRedrawCmd (char *buf, int len, player *pl)
943	{	931	{
944	/* This function is currently disabled; just clearing the map state results in	932	/* This function is currently disabled; just clearing the map state results in
945	* display errors. It should clear the cache and send a newmap command.	933	* display errors. It should clear the cache and send a newmap command.
…		…
1032	esrv_update_stats (player *pl)	1020	esrv_update_stats (player *pl)
1033	{	1021	{
1034	char buf[MAX_BUF];	1022	char buf[MAX_BUF];
1035	uint16 flags;	1023	uint16 flags;
1036		1024
		1025	client *ns = pl->ns;
		1026	if (!ns)
		1027	return;
		1028
		1029	object *ob = pl->ob;
		1030	if (!ob)
		1031	return;
		1032
1037	packet sl ("stats");	1033	packet sl ("stats");
1038		1034
1039	if (pl->ob)
1040	{
1041	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1035	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1036	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1037	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1038	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1039	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1040	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1041	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1048	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1042	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1043	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1044	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1045	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1046	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1047	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054	}
1055		1048
1056	if (pl->socket->exp64)
1057	for (int s = 0; s < NUM_SKILLS; s++)	1049	for (int s = 0; s < NUM_SKILLS; s++)
1058	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1050	if (object *skill = pl->last_skill_ob[s])
		1051	if (skill->stats.exp != ns->last_skill_exp [s])
1059	{	1052	{
		1053	ns->last_skill_exp [s] = skill->stats.exp;
		1054
1060	/* Always send along the level if exp changes. This is only	1055	/* Always send along the level if exp changes. This is only
1061	* 1 extra byte, but keeps processing simpler.	1056	* 1 extra byte, but keeps processing simpler.
1062	*/	1057	*/
1063	sl << uint8 (s + CS_STAT_SKILLINFO)	1058	sl << uint8 (s + CS_STAT_SKILLINFO)
1064	<< uint8 (pl->last_skill_ob[s]->level)	1059	<< uint8 (skill->level)
1065	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1060	<< uint64 (skill->stats.exp);
1066
1067	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068	}	1061	}
1069		1062
1070	if (pl->socket->exp64)
1071	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1063	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1072	else
1073	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1064	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1065	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1066	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1067	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1068	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1080	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1069	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1070	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1082	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1071	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1072
1083	flags = 0;	1073	flags = 0;
1084		1074
1085	if (pl->fire_on)	1075	if (pl->fire_on)
1086	flags |= SF_FIREON;	1076	flags |= SF_FIREON;
1087		1077
1088	if (pl->run_on)	1078	if (pl->run_on)
1089	flags |= SF_RUNON;	1079	flags |= SF_RUNON;
1090		1080
1091	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1081	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092		1082
1093	if (pl->socket->sc_version < 1025)	1083	if (ns->sc_version < 1025)
1094	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1084	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095	else	1085	else
1096	for (int i = 0; i < NROFATTACKS; i++)	1086	for (int i = 0; i < NROFATTACKS; i++)
1097	{	1087	{
1098	/* Skip ones we won't send */	1088	/* Skip ones we won't send */
1099	if (atnr_cs_stat[i] == -1)	1089	if (atnr_cs_stat[i] == -1)
1100	continue;	1090	continue;
1101		1091
1102	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1092	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103	}	1093	}
1104		1094
1105	if (pl->socket->monitor_spells)	1095	if (pl->ns->monitor_spells)
1106	{	1096	{
1107	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1097	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1098	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1109	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1099	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110	}	1100	}
1111		1101
1112	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1102	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1113	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1103	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114	set_title (pl->ob, buf);	1104	set_title (ob, buf);
1115	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1105	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116		1106
1117	/* Only send it away if we have some actual data */	1107	/* Only send it away if we have some actual data */
1118	if (sl.length () > 6)	1108	if (sl.length () > 6)
1119	pl->socket->send_packet (sl);	1109	ns->send_packet (sl);
1120	}	1110	}
1121		1111
1122	/**	1112	/**
1123	* Tells the client that here is a player it should start using.	1113	* Tells the client that here is a player it should start using.
1124	*/	1114	*/
1125	void	1115	void
1126	esrv_new_player (player *pl, uint32 weight)	1116	esrv_new_player (player *pl, uint32 weight)
1127	{	1117	{
1128	pl->last_weight = weight;
1129
1130	packet sl ("player");	1118	packet sl ("player");
1131		1119
1132	sl << uint32 (pl->ob->count)	1120	sl << uint32 (pl->ob->count)
1133	<< uint32 (weight)	1121	<< uint32 (weight)
1134	<< uint32 (pl->ob->face->number)	1122	<< uint32 (pl->ob->face)
1135	<< data8 (pl->ob->name);	1123	<< data8 (pl->ob->name);
1136		1124
		1125	pl->ns->last_weight = weight;
1137	pl->socket->send_packet (sl);	1126	pl->ns->send_packet (sl);
1138	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1127	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139	}	1128	}
1140
1141	/**
1142	* Need to send an animation sequence to the client.
1143	* We will send appropriate face commands to the client if we haven't
1144	* sent them the face yet (this can become quite costly in terms of
1145	* how much we are sending - on the other hand, this should only happen
1146	* when the player logs in and picks stuff up.
1147	*/
1148	void
1149	esrv_send_animation (client * ns, short anim_num)
1150	{
1151	/* Do some checking on the anim_num we got. Note that the animations
1152	* are added in contigous order, so if the number is in the valid
1153	* range, it must be a valid animation.
1154	*/
1155	if (anim_num < 0 || anim_num > num_animations)
1156	{
1157	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1158	return;
1159	}
1160
1161	packet sl ("anim");
1162
1163	sl << uint16 (anim_num)
1164	<< uint16 (0); /* flags - not used right now */
1165
1166	/* Build up the list of faces. Also, send any information (ie, the
1167	* the face itself) down to the client.
1168	*/
1169	for (int i = 0; i < animations[anim_num].num_animations; i++)
1170	{
1171	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1172	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1174	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1175	}
1176
1177	ns->send_packet (sl);
1178
1179	ns->anims_sent[anim_num] = 1;
1180	}
1181
1182		1129
1183	/******************************************************************************	1130	/******************************************************************************
1184	*	1131	*
1185	* Start of map related commands.	1132	* Start of map related commands.
1186	*	1133	*
1187	******************************************************************************/	1134	******************************************************************************/
1188		1135
1189	/**
1190	* This adds face_num to a map cell at x,y. If the client doesn't have
1191	* the face yet, we will also send it.
1192	*/
1193	static void
1194	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1195	{
1196	if (newmap->cells[x][y].count >= MAP_LAYERS)
1197	{
1198	//TODO: one or the other, can't both have abort and return, verify and act
1199	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1200	return;
1201	abort ();
1202	}
1203
1204	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1205	newmap->cells[x][y].count++;
1206
1207	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1208	esrv_send_face (ns, face_num, 0);
1209	}
1210
1211	/** Clears a map cell */	1136	/** Clears a map cell */
1212	static void	1137	static void
1213	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1138	map_clearcell (struct MapCell *cell, int count)
1214	{	1139	{
1215	cell->faces[0] = face0;	1140	cell->faces[0] = 0;
1216	cell->faces[1] = face1;	1141	cell->faces[1] = 0;
1217	cell->faces[2] = face2;	1142	cell->faces[2] = 0;
		1143	cell->smooth[0] = 0;
		1144	cell->smooth[1] = 0;
		1145	cell->smooth[2] = 0;
1218	cell->count = count;	1146	cell->count = count;
1219	cell->stat_hp = 0;	1147	cell->stat_hp = 0;
1220	cell->flags = 0;	1148	cell->flags = 0;
1221	cell->player = 0;	1149	cell->player = 0;
1222	}	1150	}
1223		1151
1224	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1225	#define MAX_LAYERS 3	1152	#define MAX_LAYERS 3
1226
1227	/* Using a global really isn't a good approach, but saves the over head of
1228	* allocating and deallocating such a block of data each time run through,
1229	* and saves the space of allocating this in the socket object when we only
1230	* need it for this cycle. If the server is ever threaded, this needs to be
1231	* re-examined.
1232	*/
1233	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1234
1235	/**
1236	* Returns true if any of the heads for this
1237	* space is set. Returns false if all are blank - this is used
1238	* for empty space checking.
1239	*/
1240	static inline int
1241	have_head (int ax, int ay)
1242	{
1243	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1244	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1245	return 1;
1246
1247	return 0;
1248	}
1249
1250	/**
1251	* check_head is a bit simplistic version of update_space below.
1252	* basically, it only checks the that the head on space ax,ay at layer
1253	* needs to get sent - if so, it adds the data, sending the head
1254	* if needed, and returning 1. If this no data needs to get
1255	* sent, it returns zero.
1256	*/
1257	static int
1258	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1259	{
1260	short face_num;
1261
1262	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1263	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1264	else
1265	face_num = 0;
1266
1267	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1268	{
1269	sl << uint16 (face_num);
1270	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1271	esrv_send_face (&ns, face_num, 0);
1272
1273	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1274	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1275	return 1;
1276	}
1277
1278	return 0; /* No change */
1279	}
1280		1153
1281	/**	1154	/**
1282	* Removes the need to replicate the same code for each layer.	1155	* Removes the need to replicate the same code for each layer.
1283	* this returns true if this space is now in fact different than	1156	* this returns true if this space is now in fact different than
1284	* it was.	1157	* it was.
1285	* sl is the socklist this data is going into.	1158	* sl is the socklist this data is going into.
1286	* ns is the socket we are working on - all the info we care	1159	* ns is the socket we are working on - all the info we care
1287	* about is in this socket structure, so now need not pass the	1160	* about is in this socket structure, so now need not pass the
1288	* entire player object.	1161	* entire player object.
1289	* mx and my are map coordinate offsets for map mp
1290	* sx and sy are the offsets into the socket structure that
1291	* holds the old values.
1292	* layer is the layer to update, with 2 being the floor and 0 the	1162	* layer is the layer to update, with 2 being the floor and 0 the
1293	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	1163	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1294	* take. Interesting to note that before this function, the map1 function	1164	* take. Interesting to note that before this function, the map1 function
1295	* numbers the spaces differently - I think this was a leftover from	1165	* numbers the spaces differently - I think this was a leftover from
1296	* the map command, where the faces stack up. Sinces that is no longer	1166	* the map command, where the faces stack up. Sinces that is no longer
1297	* the case, it seems to make more sense to have these layer values	1167	* the case, it seems to make more sense to have these layer values
1298	* actually match.	1168	* actually match.
1299	*/	1169	*/
1300	static int	1170	static int
1301	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1171	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1302	{	1172	{
1303	object *ob, *head;	1173	object *ob = ms.faces_obj [layer];
1304	uint16 face_num;
1305	int bx, by, i;
1306
1307	/* If there is a multipart object stored away, treat that as more important.
1308	* If not, then do the normal processing.
1309	*/
1310	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1311
1312	/* Check to see if this head is part of the set of objects
1313	* we would normally send for this space. If so, then
1314	* don't use the head value. We need to do the check
1315	* here and not when setting up the heads[] value for two reasons -
1316	* 1) the heads[] values will get used even if the space is not visible.
1317	* 2) its possible the head is not on the same map as a part, and I'd
1318	* rather not need to do the map translation overhead.
1319	* 3) We need to do some extra checking to make sure that we will
1320	* otherwise send the image as this layer, eg, either it matches
1321	* the head value, or is not multipart.
1322	*/
1323	if (head && !head->more)
1324	{
1325	for (i = 0; i < MAP_LAYERS; i++)
1326	{
1327	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1328	if (!ob)
1329	continue;
1330
1331	if (ob->head)
1332	ob = ob->head;
1333
1334	if (ob == head)
1335	{
1336	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1337	head = NULL;
1338	break;
1339	}
1340	}
1341	}
1342
1343	ob = head;
1344	if (!ob)
1345	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1346		1174
1347	/* If there is no object for this space, or if the face for the object	1175	/* If there is no object for this space, or if the face for the object
1348	* is the blank face, set the face number to zero.	1176	* is the blank face, set the face number to zero.
1349	* else if we have the stored head object for this space, that takes	1177	* else if we have the stored head object for this space, that takes
1350	* precedence over the other object for this space.	1178	* precedence over the other object for this space.
1351	* otherwise, we do special head processing	1179	* otherwise, we do special head processing
1352	*/	1180	*/
1353	if (!ob || ob->face == blank_face)	1181	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1354	face_num = 0;
1355	else if (head)
1356	{
1357	/* if this is a head that had previously been stored */
1358	face_num = ob->face->number;
1359	}
1360	else
1361	{
1362	/* if the faces for the different parts of a multipart object
1363	* are the same, we only want to send the bottom right most
1364	* portion of the object. That info is in the tail_.. values
1365	* of the head. Note that for the head itself, ob->head will
1366	* be null, so we only do this block if we are working on
1367	* a tail piece.
1368	*/
1369
1370	/* tail_x and tail_y will only be set in the head object. If
1371	* this is the head object and these are set, we proceed
1372	* with logic to only send bottom right. Similarly, if
1373	* this is one of the more parts but the head has those values
1374	* set, we want to do the processing. There can be cases where
1375	* the head is not visible but one of its parts is, so we just
1376	* can always expect that ob->arch->tail_x will be true for all
1377	* object we may want to display.
1378	*/
1379	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1380	{
1381
1382	if (ob->head)
1383	head = ob->head;
1384	else
1385	head = ob;
1386
1387	/* Basically figure out where the offset is from where we are right
1388	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1389	* piece is from the head, and the tail is where the tail is from the
1390	* head. Note that bx and by will equal sx and sy if we are already working
1391	* on the bottom right corner. If ob is the head, the clone values
1392	* will be zero, so the right thing will still happen.
1393	*/
1394	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1395	by = sy + head->arch->tail_y - ob->arch->clone.y;
1396
1397	/* I don't think this can ever happen, but better to check for it just
1398	* in case.
1399	*/
1400	if (bx < sx || by < sy)
1401	{
1402	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1403	face_num = 0;
1404	}
1405	/* single part object, multipart object with non merged faces,
1406	* of multipart object already at lower right.
1407	*/
1408	else if (bx == sx && by == sy)
1409	{
1410	face_num = ob->face->number;
1411
1412	/* if this face matches one stored away, clear that one away.
1413	* this code relies on the fact that the map1 commands
1414	* goes from 2 down to 0.
1415	*/
1416	for (i = 0; i < MAP_LAYERS; i++)
1417	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1418	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1419	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1420	}
1421	else
1422	{
1423	/* If this head is stored away, clear it - otherwise,
1424	* there can be cases where a object is on multiple layers -
1425	* we only want to send it once.
1426	*/
1427	face_num = head->face->number;
1428	for (i = 0; i < MAP_LAYERS; i++)
1429	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1430	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1431	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1432
1433	/* First, try to put the new head on the same layer. If that is used up,
1434	* then find another layer.
1435	*/
1436	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1437	{
1438	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1439	}
1440	else
1441	for (i = 0; i < MAX_LAYERS; i++)
1442	{
1443	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1444	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1445	{
1446	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1447	}
1448	}
1449	face_num = 0; /* Don't send this object - we'll send the head later */
1450	}
1451	}
1452	else
1453	{
1454	/* In this case, we are already at the lower right or single part object,
1455	* so nothing special
1456	*/
1457	face_num = ob->face->number;
1458
1459	/* clear out any head entries that have the same face as this one */
1460	for (bx = 0; bx < layer; bx++)
1461	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1462	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1463	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1464	}
1465	} /* else not already head object or blank face */
1466
1467	/* This is a real hack. Basically, if we have nothing to send for this layer,
1468	* but there is a head on the next layer, send that instead.
1469	* Without this, what happens is you can get the case where the player stands
1470	* on the same space as the head. However, if you have overlapping big objects
1471	* of the same type, what happens then is it doesn't think it needs to send
1472	* This tends to make stacking also work/look better.
1473	*/
1474	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1475	{
1476	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1477	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1478	}
1479
1480	/* Another hack - because of heads and whatnot, this face may match one
1481	* we already sent for a lower layer. In that case, don't send
1482	* this one.
1483	*/
1484	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1485	face_num = 0;
1486		1182
1487	/* We've gotten what face we want to use for the object. Now see if	1183	/* We've gotten what face we want to use for the object. Now see if
1488	* if it has changed since we last sent it to the client.	1184	* if it has changed since we last sent it to the client.
1489	*/	1185	*/
1490	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1186	if (lastcell.faces[layer] != face_num)
1491	{	1187	{
1492	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1188	lastcell.faces[layer] = face_num;
		1189
1493	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	1190	if (!ns.faces_sent[face_num])
		1191	if (ob)
		1192	ns.send_faces (ob);
		1193	else
1494	esrv_send_face (&ns, face_num, 0);	1194	ns.send_face (face_num);
1495		1195
1496	sl << uint16 (face_num);	1196	sl << uint16 (face_num);
1497	return 1;
1498	}
1499
1500	/* Nothing changed */
1501	return 0;
1502	}
1503
1504	/**
1505	* This function is mainly a copy of update_space,
1506	* except it handles update of the smoothing updates,
1507	* not the face updates.
1508	* Removes the need to replicate the same code for each layer.
1509	* this returns true if this smooth is now in fact different
1510	* than it was.
1511	* sl is the socklist this data is going into.
1512	* ns is the socket we are working on - all the info we care
1513	* about is in this socket structure, so know need to pass the
1514	* entire player object.
1515	* mx and my are map coordinate offsets for map mp
1516	* sx and sy are the offsets into the socket structure that
1517	* holds the old values.
1518	* layer is the layer to update, with 2 being the floor and 0 the
1519	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1520	* take.
1521	*/
1522
1523	static inline int
1524	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1525	{
1526	object *ob;
1527	int smoothlevel; /* old face_num; */
1528
1529	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1530
1531	/* If there is no object for this space, or if the face for the object
1532	* is the blank face, set the smoothlevel to zero.
1533	*/
1534	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1535	smoothlevel = 0;
1536	else
1537	{
1538	smoothlevel = ob->smoothlevel;
1539	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1540	SendSmooth (&ns, ob->face->number);
1541	} /* else not already head object or blank face */
1542
1543	/* We've gotten what face we want to use for the object. Now see if
1544	* if it has changed since we last sent it to the client.
1545	*/
1546	if (smoothlevel > 255)
1547	smoothlevel = 255;
1548	else if (smoothlevel < 0)
1549	smoothlevel = 0;
1550
1551	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1552	{
1553	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1554	sl << uint8 (smoothlevel);
1555	return 1;	1197	return 1;
1556	}	1198	}
1557		1199
1558	/* Nothing changed */	1200	/* Nothing changed */
1559	return 0;	1201	return 0;
…		…
1574	if (ns->EMI_smooth)	1216	if (ns->EMI_smooth)
1575	result += 1; /*One byte for smoothlevel */	1217	result += 1; /*One byte for smoothlevel */
1576	}	1218	}
1577		1219
1578	return result;	1220	return result;
		1221	}
		1222
		1223	// prefetch (and touch) all maps within a specific distancd
		1224	static void
		1225	prefetch_surrounding_maps (maptile *map, int distance)
		1226	{
		1227	map->last_access = runtime;
		1228
		1229	if (--distance)
		1230	for (int dir = 4; --dir; )
		1231	if (const shstr &path = map->tile_path [dir])
		1232	if (maptile *&neigh = map->tile_map [dir])
		1233	prefetch_surrounding_maps (neigh, distance);
		1234	else
		1235	neigh = maptile::find_async (path, map);
		1236	}
		1237
		1238	// prefetch a generous area around the player
		1239	static void
		1240	prefetch_surrounding_maps (object *op)
		1241	{
		1242	prefetch_surrounding_maps (op->map, 3);
1579	}	1243	}
1580		1244
1581	/**	1245	/**
1582	* This function uses the new map1 protocol command to send the map	1246	* This function uses the new map1 protocol command to send the map
1583	* to the client. It is necessary because the old map command supports	1247	* to the client. It is necessary because the old map command supports
…		…
1589	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1253	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1590	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1254	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1591	* and use the other 4 bits for other informatiion. For full documentation	1255	* and use the other 4 bits for other informatiion. For full documentation
1592	* of what we send, see the doc/Protocol file.	1256	* of what we send, see the doc/Protocol file.
1593	* I will describe internally what we do:	1257	* I will describe internally what we do:
1594	* the socket->lastmap shows how the map last looked when sent to the client.	1258	* the ns->lastmap shows how the map last looked when sent to the client.
1595	* in the lastmap structure, there is a cells array, which is set to the	1259	* in the lastmap structure, there is a cells array, which is set to the
1596	* maximum viewable size (As set in config.h).	1260	* maximum viewable size (As set in config.h).
1597	* in the cells, there are faces and a count value.	1261	* in the cells, there are faces and a count value.
1598	* we use the count value to hold the darkness value. If -1, then this space	1262	* we use the count value to hold the darkness value. If -1, then this space
1599	* is not viewable.	1263	* is not viewable.
…		…
1601	* look like.	1265	* look like.
1602	*/	1266	*/
1603	void	1267	void
1604	draw_client_map1 (object *pl)	1268	draw_client_map1 (object *pl)
1605	{	1269	{
1606	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1270	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1607	sint16 nx, ny;	1271	sint16 nx, ny;
1608	int estartlen, eoldlen;	1272	int estartlen, eoldlen;
1609	uint16 mask, emask;
1610	uint8 eentrysize;	1273	uint8 eentrysize;
1611	uint16 ewhatstart, ewhatflag;	1274	uint16 ewhatstart, ewhatflag;
1612	uint8 extendedinfos;	1275	uint8 extendedinfos;
1613	maptile *m;	1276	maptile *m;
1614		1277
1615	client &socket = *pl->contr->socket;	1278	client &socket = *pl->contr->ns;
		1279
		1280	if (!pl->active)
		1281	return;
1616		1282
1617	check_map_change (pl->contr);	1283	check_map_change (pl->contr);
		1284	prefetch_surrounding_maps (pl);
1618		1285
1619	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1286	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620	packet esl;	1287	packet esl;
1621		1288
1622	startlen = sl.length ();	1289	startlen = sl.length ();
…		…
1637	<< uint8 (extendedinfos)	1304	<< uint8 (extendedinfos)
1638	<< uint8 (eentrysize);	1305	<< uint8 (eentrysize);
1639		1306
1640	estartlen = esl.length ();	1307	estartlen = esl.length ();
1641	}	1308	}
1642	else
1643	{
1644	/* suppress compiler warnings */
1645	ewhatstart = 0;
1646	ewhatflag = 0;
1647	estartlen = 0;
1648	}
1649
1650	/* Init data to zero */
1651	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1652		1309
1653	/* x,y are the real map locations. ax, ay are viewport relative	1310	/* x,y are the real map locations. ax, ay are viewport relative
1654	* locations.	1311	* locations.
1655	*/	1312	*/
1656	ay = 0;	1313	ay = 0;
…		…
1659	* but that started to get a bit messy to look at.	1316	* but that started to get a bit messy to look at.
1660	*/	1317	*/
1661	max_x = pl->x + (socket.mapx + 1) / 2;	1318	max_x = pl->x + (socket.mapx + 1) / 2;
1662	max_y = pl->y + (socket.mapy + 1) / 2;	1319	max_y = pl->y + (socket.mapy + 1) / 2;
1663		1320
1664	if (socket.mapmode == Map1aCmd)	1321	maptile *plmap = pl->map;
1665	{
1666	max_x += MAX_HEAD_OFFSET;
1667	max_y += MAX_HEAD_OFFSET;
1668	}
1669		1322
1670	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1323	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1671	{	1324	{
1672	ax = 0;	1325	ax = 0;
1673	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1326	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1674	{	1327	{
1675		1328	int emask, mask;
1676	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1329	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1677		1330
1678	/* If this space is out of the normal viewable area, we only check
1679	* the heads value ax or ay will only be greater than what
1680	* the client wants if using the map1a command - this is because
1681	* if the map1a command is not used, max_x and max_y will be
1682	* set to lower values.
1683	*/
1684	if (ax >= socket.mapx || ay >= socket.mapy)
1685	{
1686	int i, got_one;
1687
1688	oldlen = sl.length ();
1689
1690	sl << uint16 (mask);
1691
1692	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1693	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1694	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1695
1696	/* If all we are doing is sending 0 (blank) faces, we don't
1697	* actually need to send that - just the coordinates
1698	* with no faces tells the client to blank out the
1699	* space.
1700	*/
1701	got_one = 0;
1702	for (i = oldlen + 2; i < sl.length (); i++)
1703	if (sl[i])
1704	got_one = 1;
1705
1706	if (got_one && (mask & 0xf))
1707	sl[oldlen + 1] = mask & 0xff;
1708	else
1709	{ /*either all faces blank, either no face at all */
1710	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1711	sl.reset (oldlen + 2);
1712	else
1713	sl.reset (oldlen);
1714	}
1715
1716	/*What concerns extendinfos, nothing to be done for now
1717	* (perhaps effects layer later)
1718	*/
1719	continue; /* don't do processing below */
1720	}
1721
1722	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1331	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1723
1724	d = pl->contr->blocked_los[ax][ay];
1725		1332
1726	/* If the coordinates are not valid, or it is too dark to see,	1333	/* If the coordinates are not valid, or it is too dark to see,
1727	* we tell the client as such	1334	* we tell the client as such
1728	*/	1335	*/
1729	nx = x;	1336	nx = x;
1730	ny = y;	1337	ny = y;
1731	m = get_map_from_coord (pl->map, &nx, &ny);	1338	m = get_map_from_coord (plmap, &nx, &ny);
1732		1339
1733	if (!m)	1340	if (!m)
1734	{	1341	{
1735	/* space is out of map. Update space and clear values	1342	/* space is out of map. Update space and clear values
1736	* if this hasn't already been done. If the space is out	1343	* if this hasn't already been done. If the space is out
1737	* of the map, it shouldn't have a head	1344	* of the map, it shouldn't have a head
1738	*/	1345	*/
1739	if (lastcell.count != -1)	1346	if (lastcell.count != -1)
1740	{	1347	{
1741	sl << uint16 (mask);	1348	sl << uint16 (mask);
1742	map_clearcell (&lastcell, 0, 0, 0, -1);	1349	map_clearcell (&lastcell, -1);
1743	}	1350	}
		1351
		1352	continue;
1744	}	1353	}
		1354
		1355	m->touch ();
		1356
		1357	int d = pl->contr->blocked_los[ax][ay];
		1358
1745	else if (d > 3)	1359	if (d > 3)
1746	{	1360	{
		1361
1747	int need_send = 0, count;	1362	int need_send = 0, count;
1748		1363
1749	/* This block deals with spaces that are not visible for whatever	1364	/* This block deals with spaces that are not visible for whatever
1750	* reason. Still may need to send the head for this space.	1365	* reason. Still may need to send the head for this space.
1751	*/	1366	*/
1752		1367
1753	oldlen = sl.length ();	1368	oldlen = sl.length ();
1754		1369
1755	sl << uint16 (mask);	1370	sl << uint16 (mask);
…		…
1757	if (lastcell.count != -1)	1372	if (lastcell.count != -1)
1758	need_send = 1;	1373	need_send = 1;
1759		1374
1760	count = -1;	1375	count = -1;
1761		1376
1762	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1763	{
1764	/* Now check to see if any heads need to be sent */
1765
1766	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1767	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1768	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1769
1770	lastcell.count = count;
1771	}
1772	else
1773	{
1774	/* properly clear a previously sent big face */	1377	/* properly clear a previously sent big face */
1775	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1378	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1776	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1379	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1777	need_send = 1;	1380	need_send = 1;
1778		1381
1779	map_clearcell (&lastcell, 0, 0, 0, count);	1382	map_clearcell (&lastcell, count);
1780	}
1781		1383
1782	if ((mask & 0xf) || need_send)	1384	if ((mask & 0xf) || need_send)
1783	sl[oldlen + 1] = mask & 0xff;	1385	sl[oldlen + 1] = mask & 0xff;
1784	else	1386	else
1785	sl.reset (oldlen);	1387	sl.reset (oldlen);
1786	}	1388	}
1787	else	1389	else
1788	{	1390	{
1789	/* In this block, the space is visible or there are head objects	1391	/* In this block, the space is visible.
1790	* we need to send.
1791	*/	1392	*/
1792		1393
1793	/* Rather than try to figure out what everything that we might	1394	/* Rather than try to figure out what everything that we might
1794	* need to send is, then form the packet after that,	1395	* need to send is, then form the packet after that,
1795	* we presume that we will in fact form a packet, and update	1396	* we presume that we will in fact form a packet, and update
…		…
1798	* is done.	1399	* is done.
1799	* I think this is simpler than doing a bunch of checks to see	1400	* I think this is simpler than doing a bunch of checks to see
1800	* what if anything we need to send, setting the bits, then	1401	* what if anything we need to send, setting the bits, then
1801	* doing those checks again to add the real data.	1402	* doing those checks again to add the real data.
1802	*/	1403	*/
1803	oldlen = sl.length ();	1404	oldlen = sl.length ();
1804	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1805	eoldlen = esl.length ();	1405	eoldlen = esl.length ();
1806	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1406
1807	sl << uint16 (mask);	1407	sl << uint16 (mask);
1808
1809	if (socket.ext_mapinfos)
1810	esl << uint16 (emask);
1811		1408
1812	unsigned char dummy;	1409	unsigned char dummy;
1813	unsigned char *last_ext = &dummy;	1410	unsigned char *last_ext = &dummy;
1814		1411
1815	/* Darkness changed */	1412	/* Darkness changed */
…		…
1827	sl << uint8 (255 - 64 * d);	1424	sl << uint8 (255 - 64 * d);
1828	}	1425	}
1829		1426
1830	lastcell.count = d;	1427	lastcell.count = d;
1831		1428
		1429	mapspace &ms = m->at (nx, ny);
		1430
1832	if (socket.extmap)	1431	if (socket.extmap)
1833	{	1432	{
1834	uint8 stat_hp = 0;	1433	uint8 stat_hp = 0;
1835	uint8 stat_width = 0;	1434	uint8 stat_width = 0;
1836	uint8 flags = 0;	1435	uint8 flags = 0;
1837	UUID player = 0;	1436	UUID player = 0;
1838		1437
1839	// send hp information, if applicable	1438	// send hp information, if applicable
1840	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1439	if (object *op = ms.faces_obj [0])
1841	{	1440	{
1842	if (op->head || op->invisible)	1441	if (op->head || op->invisible)
1843	; // do not show	1442	; // do not show
1844	else if (op->type == PLAYER	1443	else if (op->type == PLAYER
1845	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1444	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1899	sl << uint8 (8) << uint8 (flags);	1498	sl << uint8 (8) << uint8 (flags);
1900	}	1499	}
1901	}	1500	}
1902		1501
1903	/* Floor face */	1502	/* Floor face */
1904	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1503	if (update_space (sl, socket, ms, lastcell, 2))
1905	mask |= 0x4;	1504	mask |= 0x4;
1906		1505
1907	if (socket.EMI_smooth)
1908	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1909	emask |= 0x4;
1910
1911	/* Middle face */	1506	/* Middle face */
1912	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1507	if (update_space (sl, socket, ms, lastcell, 1))
1913	mask |= 0x2;	1508	mask |= 0x2;
1914		1509
1915	if (socket.EMI_smooth)	1510	if (ms.player () == pl
1916	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1511	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1917	emask |= 0x2;
1918
1919	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1920	{	1512	{
		1513	// force player to be visible to himself if invisible
1921	if (lastcell.faces[0] != pl->face->number)	1514	if (lastcell.faces[0] != pl->face)
1922	{	1515	{
1923	lastcell.faces[0] = pl->face->number;	1516	lastcell.faces[0] = pl->face;
		1517
1924	mask |= 0x1;	1518	mask |= 0x1;
1925
1926	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1927	esrv_send_face (&socket, pl->face->number, 0);
1928
1929	sl << uint16 (pl->face->number);	1519	sl << uint16 (pl->face);
		1520
		1521	socket.send_faces (pl);
1930	}	1522	}
1931	}	1523	}
1932	else
1933	{
1934	/* Top face */	1524	/* Top face */
1935	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1525	else if (update_space (sl, socket, ms, lastcell, 0))
1936	mask |= 0x1;	1526	mask |= 0x1;
1937
1938	if (socket.EMI_smooth)
1939	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1940	emask |= 0x1;
1941	}	1527
1942		1528
1943	/* Check to see if we are in fact sending anything for this	1529	/* Check to see if we are in fact sending anything for this
1944	* space by checking the mask. If so, update the mask.	1530	* space by checking the mask. If so, update the mask.
1945	* if not, reset the len to that from before adding the mask	1531	* if not, reset the len to that from before adding the mask
1946	* value, so we don't send those bits.	1532	* value, so we don't send those bits.
…		…
1948	if (mask & 0xf)	1534	if (mask & 0xf)
1949	sl[oldlen + 1] = mask & 0xff;	1535	sl[oldlen + 1] = mask & 0xff;
1950	else	1536	else
1951	sl.reset (oldlen);	1537	sl.reset (oldlen);
1952		1538
		1539	if (socket.ext_mapinfos)
		1540	esl << uint16 (emask);
		1541
		1542	if (socket.EMI_smooth)
		1543	{
		1544	for (int layer = 2+1; layer--; )
		1545	{
		1546	object *ob = ms.faces_obj [layer];
		1547
		1548	// If there is no object for this space, or if the face for the object
		1549	// is the blank face, set the smoothlevel to zero.
		1550	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1551
		1552	// We've gotten what face we want to use for the object. Now see if
		1553	// if it has changed since we last sent it to the client.
		1554	if (lastcell.smooth[layer] != smoothlevel)
		1555	{
		1556	lastcell.smooth[layer] = smoothlevel;
		1557	esl << uint8 (smoothlevel);
		1558	emask |= 1 << layer;
		1559	}
		1560	}
		1561
1953	if (emask & 0xf)	1562	if (emask & 0xf)
1954	esl[eoldlen + 1] = emask & 0xff;	1563	esl[eoldlen + 1] = emask & 0xff;
1955	else	1564	else
1956	esl.reset (eoldlen);	1565	esl.reset (eoldlen);
		1566	}
1957	} /* else this is a viewable space */	1567	} /* else this is a viewable space */
1958	} /* for x loop */	1568	} /* for x loop */
1959	} /* for y loop */	1569	} /* for y loop */
1960		1570
1961	/* Verify that we in fact do need to send this */	1571	/* Verify that we in fact do need to send this */
…		…
1964	if (!(sl.length () > startlen || socket.sent_scroll))	1574	if (!(sl.length () > startlen || socket.sent_scroll))
1965	{	1575	{
1966	/* No map data will follow, so don't say the client	1576	/* No map data will follow, so don't say the client
1967	* it doesn't need draw!	1577	* it doesn't need draw!
1968	*/	1578	*/
1969	ewhatflag &= (~EMI_NOREDRAW);	1579	ewhatflag &= ~EMI_NOREDRAW;
1970	esl[ewhatstart + 1] = ewhatflag & 0xff;	1580	esl[ewhatstart + 1] = ewhatflag & 0xff;
1971	}	1581	}
1972		1582
1973	if (esl.length () > estartlen)	1583	if (esl.length () > estartlen)
1974	socket.send_packet (esl);	1584	socket.send_packet (esl);
…		…
1986	*/	1596	*/
1987	void	1597	void
1988	draw_client_map (object *pl)	1598	draw_client_map (object *pl)
1989	{	1599	{
1990	int i, j;	1600	int i, j;
1991	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1601	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1992	New_Face *face, *floor;
1993	New_Face *floor2;
1994	int d, mflags;	1602	int mflags;
1995	struct Map newmap;	1603	struct Map newmap;
1996	maptile *m, *pm;	1604	maptile *m, *pm;
1997		1605
1998	if (pl->type != PLAYER)	1606	if (pl->type != PLAYER)
1999	{	1607	{
…		…
2010	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1618	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2011	return;	1619	return;
2012		1620
2013	memset (&newmap, 0, sizeof (struct Map));	1621	memset (&newmap, 0, sizeof (struct Map));
2014		1622
2015	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1623	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2016	{
2017	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1624	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2018	{	1625	{
2019	ax = i;	1626	ax = i;
2020	ay = j;	1627	ay = j;
2021	m = pm;	1628	m = pm;
2022	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1629	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023		1630
2024	if (mflags & P_OUT_OF_MAP)	1631	if (mflags & P_OUT_OF_MAP)
2025	continue;	1632	continue;
2026		1633
2027	if (mflags & P_NEED_UPDATE)
2028	update_position (m, ax, ay);
2029
2030	/* If a map is visible to the player, we don't want to swap it out	1634	/* If a map is visible to the player, we don't want to swap it out
2031	* just to reload it. This should really call something like	1635	* just to reload it. This should really call something like
2032	* swap_map, but this is much more efficient and 'good enough'	1636	* swap_map, but this is much more efficient and 'good enough'
2033	*/	1637	*/
2034	if (mflags & P_NEW_MAP)	1638	if (mflags & P_NEW_MAP)
2035	m->timeout = 50;	1639	m->timeout = 50;
2036	}	1640	}
2037	}	1641
2038	/* do LOS after calls to update_position */	1642	/* do LOS after calls to update_position */
2039	if (pl->contr->do_los)	1643	if (pl->contr->do_los)
2040	{	1644	{
2041	update_los (pl);	1645	update_los (pl);
2042	pl->contr->do_los = 0;	1646	pl->contr->do_los = 0;
…		…
2057		1661
2058	/*****************************************************************************/	1662	/*****************************************************************************/
2059	void	1663	void
2060	send_plugin_custom_message (object *pl, char *buf)	1664	send_plugin_custom_message (object *pl, char *buf)
2061	{	1665	{
2062	pl->contr->socket->send_packet (buf);	1666	pl->contr->ns->send_packet (buf);
2063	}	1667	}
2064		1668
2065	/**	1669	/**
2066	* This sends the skill number to name mapping. We ignore	1670	* This sends the skill number to name mapping. We ignore
2067	* the params - we always send the same info no matter what.	1671	* the params - we always send the same info no matter what.
…		…
2112	* it then sends an updspell packet for each spell that has changed in this way	1716	* it then sends an updspell packet for each spell that has changed in this way
2113	*/	1717	*/
2114	void	1718	void
2115	esrv_update_spells (player *pl)	1719	esrv_update_spells (player *pl)
2116	{	1720	{
		1721	if (!pl->ns)
		1722	return;
		1723
2117	if (!pl->socket->monitor_spells)	1724	if (!pl->ns->monitor_spells)
2118	return;	1725	return;
2119		1726
2120	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1727	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2121	{	1728	{
2122	if (spell->type == SPELL)	1729	if (spell->type == SPELL)
…		…
2152		1759
2153	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1760	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2154	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1761	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2155	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1762	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2156		1763
2157	pl->socket->send_packet (sl);	1764	pl->ns->send_packet (sl);
2158	}	1765	}
2159	}	1766	}
2160	}	1767	}
2161	}	1768	}
2162		1769
2163	void	1770	void
2164	esrv_remove_spell (player *pl, object *spell)	1771	esrv_remove_spell (player *pl, object *spell)
2165	{	1772	{
2166	if (!pl->socket->monitor_spells)	1773	if (!pl->ns->monitor_spells)
2167	return;	1774	return;
2168		1775
2169	if (!pl || !spell || spell->env != pl->ob)	1776	if (!pl || !spell || spell->env != pl->ob)
2170	{	1777	{
2171	LOG (llevError, "Invalid call to esrv_remove_spell");	1778	LOG (llevError, "Invalid call to esrv_remove_spell");
…		…
2174		1781
2175	packet sl ("delspell");	1782	packet sl ("delspell");
2176		1783
2177	sl << uint32 (spell->count);	1784	sl << uint32 (spell->count);
2178		1785
2179	pl->socket->send_packet (sl);	1786	pl->ns->send_packet (sl);
2180	}	1787	}
2181		1788
2182	/* appends the spell *spell to the Socklist we will send the data to. */	1789	/* appends the spell *spell to the Socklist we will send the data to. */
2183	static void	1790	static void
2184	append_spell (player *pl, packet &sl, object *spell)	1791	append_spell (player *pl, packet &sl, object *spell)
2185	{	1792	{
2186	int len, i, skill = 0;	1793	int i, skill = 0;
2187		1794
2188	if (!(spell->name))	1795	if (!(spell->name))
2189	{	1796	{
2190	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1797	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2191	return;	1798	return;
…		…
2203	if (!strcmp (spell->skill, skill_names[i]))	1810	if (!strcmp (spell->skill, skill_names[i]))
2204	{	1811	{
2205	skill = i + CS_STAT_SKILLINFO;	1812	skill = i + CS_STAT_SKILLINFO;
2206	break;	1813	break;
2207	}	1814	}
		1815	}
		1816
		1817	// spells better have a face
		1818	if (!spell->face)
		1819	{
		1820	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1821	spell->face = face_find ("burnout.x11", blank_face);
2208	}	1822	}
2209		1823
2210	/* send the current values */	1824	/* send the current values */
2211	sl << uint32 (spell->count)	1825	sl << uint32 (spell->count)
2212	<< uint16 (spell->level)	1826	<< uint16 (spell->level)
…		…
2214	<< uint16 (spell->last_sp)	1828	<< uint16 (spell->last_sp)
2215	<< uint16 (spell->last_grace)	1829	<< uint16 (spell->last_grace)
2216	<< uint16 (spell->last_eat)	1830	<< uint16 (spell->last_eat)
2217	<< uint8 (skill)	1831	<< uint8 (skill)
2218	<< uint32 (spell->path_attuned)	1832	<< uint32 (spell->path_attuned)
2219	<< uint32 (spell->face ? spell->face->number : 0)	1833	<< uint32 (spell->face)
2220	<< data8 (spell->name)	1834	<< data8 (spell->name)
2221	<< data16 (spell->msg);	1835	<< data16 (spell->msg);
2222	}	1836	}
2223		1837
2224	/**	1838	/**
…		…
2232	{	1846	{
2233	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1847	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2234	return;	1848	return;
2235	}	1849	}
2236		1850
2237	if (!pl->socket->monitor_spells)	1851	if (!pl->ns->monitor_spells)
2238	return;	1852	return;
2239		1853
2240	packet sl ("addspell");	1854	packet sl ("addspell");
2241		1855
2242	if (!spell)	1856	if (!spell)
2243	{	1857	{
2244	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1858	for (spell = pl->ob->inv; spell; spell = spell->below)
2245	{	1859	{
2246	/* were we to simply keep appending data here, we could exceed	1860	/* were we to simply keep appending data here, we could exceed
2247	* MAXSOCKBUF if the player has enough spells to add, we know that	1861	* MAXSOCKBUF if the player has enough spells to add, we know that
2248	* append_spells will always append 19 data bytes, plus 4 length	1862	* append_spells will always append 19 data bytes, plus 4 length
2249	* bytes and 3 strings (because that is the spec) so we need to	1863	* bytes and 3 strings (because that is the spec) so we need to
…		…
2259	if (spell->type != SPELL)	1873	if (spell->type != SPELL)
2260	continue;	1874	continue;
2261		1875
2262	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1876	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2263	{	1877	{
2264	pl->socket->send_packet (sl);	1878	pl->ns->send_packet (sl);
2265		1879
2266	sl.reset ();	1880	sl.reset ();
2267	sl << "addspell ";	1881	sl << "addspell ";
2268	}	1882	}
2269		1883
…		…
2283	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1897	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2284	fatal (0);	1898	fatal (0);
2285	}	1899	}
2286		1900
2287	/* finally, we can send the packet */	1901	/* finally, we can send the packet */
2288	pl->socket->send_packet (sl);	1902	pl->ns->send_packet (sl);
2289	}	1903	}
2290		1904

Diff Legend

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