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

Diff Legend

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