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.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.76 by root, Wed Mar 14 13:05:30 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
145	if (pl->socket->newmapcmd == 1)	137	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	138	pl->ns->send_packet ("newmap");
147		139
148	pl->socket->floorbox_reset ();	140	pl->ns->floorbox_reset ();
149	}	141	}
150		142
151	/** check for map change and send new map data */	143	/** check for map/region change and send new map data */
152	static void	144	static void
153	check_map_change (player *pl)	145	check_map_change (player *pl)
154	{	146	{
155	client &socket = *pl->socket;	147	client &socket = *pl->ns;
156	object *ob = pl->ob;	148	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	149	char buf[MAX_BUF]; /* eauugggh */
158		150
159	if (socket.current_map != ob->map)	151	if (socket.current_map != ob->map)
160	{	152	{
…		…
176	flags |= 4;	168	flags |= 4;
177	if (ob->map->tile_path[3])	169	if (ob->map->tile_path[3])
178	flags |= 8;	170	flags |= 8;
179		171
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	174	}
183	else	175	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	176	snprintf (buf, MAX_BUF, "mapinfo current");
185		177
186	socket.send_packet (buf);	178	socket.send_packet (buf);
…		…
200	}	192	}
201	}	193	}
202		194
203	socket.current_x = ob->x;	195	socket.current_x = ob->x;
204	socket.current_y = ob->y;	196	socket.current_y = ob->y;
		197
		198	region *reg = ob->region ();
		199	if (socket.current_region != reg)
		200	{
		201	socket.current_region = reg;
		202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		203	}
205	}	204	}
206		205
207	/**	206	/**
208	* RequestInfo is sort of a meta command. There is some specific	207	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	208	* request of information, but we call other functions to provide
…		…
280	buf += 8;	279	buf += 8;
281		280
282	// initial map and its origin	281	// initial map and its origin
283	maptile *map = pl->ob->map;	282	maptile *map = pl->ob->map;
284	sint16 dx, dy;	283	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	284	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	286	int max_distance = 8; // limit maximum path length to something generous
288		287
289	while (*buf && map && max_distance)	288	while (*buf && map && max_distance)
290	{	289	{
291	int dir = *buf++;	290	int dir = *buf++;
292		291
293	switch (dir)	292	switch (dir)
294	{	293	{
295	case '1':	294	case '1':
296	dx = 0;	295	dx = 0;
297	dy = -1;	296	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	297	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	298	map && (mapy -= map->height);
300	break;	299	break;
301	case '2':	300	case '2':
302	mapx += map->width;	301	mapx += map->width;
303	dx = map->width;	302	dx = map->width;
304	dy = 0;	303	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	304	map = map->xy_find (dx, dy);
306	break;	305	break;
307	case '3':	306	case '3':
308	mapy += map->height;	307	mapy += map->height;
309	dx = 0;	308	dx = 0;
310	dy = map->height;	309	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	310	map = map->xy_find (dx, dy);
312	break;	311	break;
313	case '4':	312	case '4':
314	dx = -1;	313	dx = -1;
315	dy = 0;	314	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	315	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	316	map && (mapx -= map->width);
318	break;	317	break;
319	}	318	}
320		319
321	--max_distance;	320	--max_distance;
322	}	321	}
323		322
…		…
334	if (map->tile_path[2])	333	if (map->tile_path[2])
335	flags |= 4;	334	flags |= 4;
336	if (map->tile_path[3])	335	if (map->tile_path[3])
337	flags |= 8;	336	flags |= 8;
338		337
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	339	}
341	else	340	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	342	}
344	else	343	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		345
347	pl->socket->send_packet (bigbuf);	346	pl->ns->send_packet (bigbuf);
348	}	347	}
349		348
350	/** This is the Setup cmd - easy first implementation */	349	/** This is the Setup cmd - easy first implementation */
351	void	350	void
352	SetUp (char *buf, int len, client * ns)	351	SetUp (char *buf, int len, client * ns)
…		…
399	{	398	{
400	ns->sound = atoi (param);	399	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);	400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}	401	}
403	else if (!strcmp (cmd, "exp64"))	402	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);	403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))	404	else if (!strcmp (cmd, "spellmon"))
409	{	405	{
410	ns->monitor_spells = atoi (param);	406	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);	407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}	408	}
…		…
435	}	431	}
436	else if (!strcmp (cmd, "newmapcmd"))	432	else if (!strcmp (cmd, "newmapcmd"))
437	{	433	{
438	ns->newmapcmd = atoi (param);	434	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);	435	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	}	436	}
444	else if (!strcmp (cmd, "mapinfocmd"))	437	else if (!strcmp (cmd, "mapinfocmd"))
445	{	438	{
446	ns->mapinfocmd = atoi (param);	439	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);	440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
…		…
466	char tmpbuf[20];	459	char tmpbuf[20];
467	int q = atoi (param);	460	int q = atoi (param);
468		461
469	if (is_valid_faceset (q))	462	if (is_valid_faceset (q))
470	ns->faceset = q;	463	ns->faceset = q;
		464
471	sprintf (tmpbuf, "%d", ns->faceset);	465	sprintf (tmpbuf, "%d", ns->faceset);
472	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	466	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473	/* if the client is using faceset, it knows about image2 command */	467	/* if the client is using faceset, it knows about image2 command */
474	ns->image2 = 1;	468	ns->image2 = 1;
475	}	469	}
…		…
503	if (*cp == 'x' || *cp == 'X')	497	if (*cp == 'x' || *cp == 'X')
504	{	498	{
505	y = atoi (cp + 1);	499	y = atoi (cp + 1);
506	break;	500	break;
507	}	501	}
		502
508	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)	503	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509	{	504	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);	505	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	506	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}	507	}
…		…
569	* it either has to be here or init_sockets needs to be exported.	564	* it either has to be here or init_sockets needs to be exported.
570	*/	565	*/
571	void	566	void
572	AddMeCmd (char *buf, int len, client * ns)	567	AddMeCmd (char *buf, int len, client * ns)
573	{	568	{
574	if (INVOKE_CLIENT (ADDME, ns))	569	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	return;
576
577	if (ns->pl || add_player (ns))
578	ns->send_packet ("addme_failed");
579	else
580	ns->send_packet ("addme_success");
581	}	570	}
582		571
583	/** Reply to ExtendedInfos command */	572	/** Reply to ExtendedInfos command */
584	void	573	void
585	ToggleExtendedInfos (char *buf, int len, client * ns)	574	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
695		684
696	ns->send_packet (cmdback);	685	ns->send_packet (cmdback);
697	}	686	}
698		687
699	/**	688	/**
700	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
701	* Basically, it makes no sense to wait for the client to request a
702	* a piece of data from us that we know the client wants. So
703	* if we know the client wants it, might as well push it to the
704	* client.
705	*/
706	static void
707	SendSmooth (client *ns, uint16 face)
708	{
709	uint16 smoothface;
710
711	/* If we can't find a face, return and set it so we won't try to send this
712	* again.
713	*/
714	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
715	{
716
717	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
718	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719	return;
720	}
721
722	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
723	esrv_send_face (ns, smoothface, 0);
724
725	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
726
727	packet sl ("smooth");
728
729	sl << uint16 (face)
730	<< uint16 (smoothface);
731
732	ns->send_packet (sl);
733	}
734
735	/**
736	* Tells client the picture it has to use	689	* Tells client the picture it has to use
737	* to smooth a picture number given as argument.	690	* to smooth a picture number given as argument.
738	*/	691	*/
739	void	692	void
740	AskSmooth (char *buf, int len, client *ns)	693	AskSmooth (char *buf, int len, client *ns)
741	{	694	{
742	SendSmooth (ns, atoi (buf));	695	ns->send_face (atoi (buf));
743	}	696	}
744		697
745	/**	698	/**
746	* This handles the general commands from the client (ie, north, fire, cast,	699	* This handles the general commands from the client (ie, north, fire, cast,
747	* etc.)	700	* etc.)
…		…
806	* commands.	759	* commands.
807	*/	760	*/
808	pl->count = 0;	761	pl->count = 0;
809		762
810	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	763	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
811	int time = FABS (pl->ob->speed) < 0.001	764	int time = fabs (pl->ob->speed) < 0.001
812	? time = MAX_TIME * 100	765	? time = MAX_TIME * 100
813	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	766	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
814		767
815	/* Send confirmation of command execution now */	768	/* Send confirmation of command execution now */
816	packet sl ("comc");	769	packet sl ("comc");
817	sl << uint16 (cmdid) << uint32 (time);	770	sl << uint16 (cmdid) << uint32 (time);
818	pl->socket->send_packet (sl);	771	pl->ns->send_packet (sl);
819	}	772	}
820		773
821	/** This is a reply to a previous query. */	774	/** This is a reply to a previous query. */
822	void	775	void
823	ReplyCmd (char *buf, int len, client *ns)	776	ReplyCmd (char *buf, int len, client *ns)
824	{	777	{
		778	if (ns->state == ST_CUSTOM)
		779	{
		780	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		781	return;
		782	}
		783
825	if (!ns->pl)	784	if (!ns->pl)
826	return; //TODO: depends on the exact reply we are after	785	return; //TODO: depends on the exact reply we are after
827	//TODO: but right now, we always have a ns->pl	786	//TODO: but right now, we always have a ns->pl
828		787
829	player *pl = ns->pl;	788	player *pl = ns->pl;
…		…
838	*/	797	*/
839	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	798	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
840		799
841	/* this avoids any hacking here */	800	/* this avoids any hacking here */
842		801
843	switch (pl->state)	802	switch (ns->state)
844	{	803	{
845	case ST_PLAYING:	804	case ST_PLAYING:
846	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	805	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
847	break;	806	break;
848		807
849	case ST_PLAY_AGAIN:
850	/* We can check this for return value (2==quit). Maybe we
851	* should, and do something appropriate?
852	*/
853	receive_play_again (pl->ob, buf[0]);
854	break;
855
856	case ST_ROLL_STAT:
857	key_roll_stat (pl->ob, buf[0]);
858	break;
859
860	case ST_CHANGE_CLASS:	808	case ST_CHANGE_CLASS:
861	key_change_class (pl->ob, buf[0]);	809	key_change_class (pl->ob, buf[0]);
862	break;	810	break;
863		811
864	case ST_CONFIRM_QUIT:
865	key_confirm_quit (pl->ob, buf[0]);
866	break;
867
868	case ST_CONFIGURE:
869	LOG (llevError, "In client input handling, but into configure state\n");
870	pl->state = ST_PLAYING;
871	break;
872
873	case ST_GET_NAME:
874	receive_player_name (pl->ob, 13);
875	break;
876
877	case ST_GET_PASSWORD:
878	case ST_CONFIRM_PASSWORD:
879	receive_player_password (pl->ob, 13);
880	break;
881
882	case ST_GET_PARTY_PASSWORD: /* Get password for party */	812	case ST_GET_PARTY_PASSWORD: /* Get password for party */
883	receive_party_password (pl->ob, 13);	813	receive_party_password (pl->ob, 13);
884	break;	814	break;
885		815
886	default:	816	default:
887	LOG (llevError, "Unknown input state: %d\n", pl->state);	817	LOG (llevError, "Unknown input state: %d\n", ns->state);
888	}	818	}
889	}	819	}
890		820
891	/**	821	/**
892	* Client tells its version. If there is a mismatch, we close the	822	* Client tells its version. If there is a mismatch, we close the
…		…
907	ns->cs_version = atoi (buf);	837	ns->cs_version = atoi (buf);
908	ns->sc_version = ns->cs_version;	838	ns->sc_version = ns->cs_version;
909		839
910	LOG (llevDebug, "connection from client <%s>\n", buf);	840	LOG (llevDebug, "connection from client <%s>\n", buf);
911		841
912
913	//TODO: should log here just for statistics	842	//TODO: should log here just for statistics
914		843
915	//if (VERSION_CS != ns->cs_version)	844	//if (VERSION_CS != ns->cs_version)
916	// unchecked;	845	// unchecked;
917		846
…		…
942	{	871	{
943	ns->sound = atoi (buf);	872	ns->sound = atoi (buf);
944	}	873	}
945		874
946	/** client wants the map resent */	875	/** client wants the map resent */
947
948	void	876	void
949	MapRedrawCmd (char *buf, int len, player *pl)	877	MapRedrawCmd (char *buf, int len, player *pl)
950	{	878	{
951	/* This function is currently disabled; just clearing the map state results in	879	/* This function is currently disabled; just clearing the map state results in
952	* display errors. It should clear the cache and send a newmap command.	880	* display errors. It should clear the cache and send a newmap command.
…		…
1039	esrv_update_stats (player *pl)	967	esrv_update_stats (player *pl)
1040	{	968	{
1041	char buf[MAX_BUF];	969	char buf[MAX_BUF];
1042	uint16 flags;	970	uint16 flags;
1043		971
		972	client *ns = pl->ns;
		973	if (!ns)
		974	return;
		975
		976	object *ob = pl->ob;
		977	if (!ob)
		978	return;
		979
1044	packet sl ("stats");	980	packet sl ("stats");
1045		981
1046	if (pl->ob)
1047	{
1048	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	982	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1049	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	983	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1050	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	984	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1051	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	985	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1052	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	986	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1053	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	987	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1054	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	988	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1055	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1056	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1057	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1058	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	989	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1059	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	990	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		991	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		992	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		993	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1060	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	994	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1061	}
1062		995
1063	if (pl->socket->exp64)
1064	for (int s = 0; s < NUM_SKILLS; s++)	996	for (int s = 0; s < NUM_SKILLS; s++)
1065	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	997	if (object *skill = pl->last_skill_ob[s])
		998	if (skill->stats.exp != ns->last_skill_exp [s])
1066	{	999	{
		1000	ns->last_skill_exp [s] = skill->stats.exp;
		1001
1067	/* Always send along the level if exp changes. This is only	1002	/* Always send along the level if exp changes. This is only
1068	* 1 extra byte, but keeps processing simpler.	1003	* 1 extra byte, but keeps processing simpler.
1069	*/	1004	*/
1070	sl << uint8 (s + CS_STAT_SKILLINFO)	1005	sl << uint8 (s + CS_STAT_SKILLINFO)
1071	<< uint8 (pl->last_skill_ob[s]->level)	1006	<< uint8 (skill->level)
1072	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1007	<< uint64 (skill->stats.exp);
1073
1074	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1075	}	1008	}
1076		1009
1077	if (pl->socket->exp64)
1078	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1010	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1079	else
1080	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1081
1082	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1011	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1083	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1012	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1084	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1013	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1085	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1014	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1086	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1015	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1087	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1016	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1088	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1017	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1089	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1018	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1019
1090	flags = 0;	1020	flags = 0;
1091		1021
1092	if (pl->fire_on)	1022	if (pl->fire_on)
1093	flags |= SF_FIREON;	1023	flags |= SF_FIREON;
1094		1024
1095	if (pl->run_on)	1025	if (pl->run_on)
1096	flags |= SF_RUNON;	1026	flags |= SF_RUNON;
1097		1027
1098	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1028	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1099		1029
1100	if (pl->socket->sc_version < 1025)	1030	if (ns->sc_version < 1025)
1101	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1031	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1102	else	1032	else
1103	for (int i = 0; i < NROFATTACKS; i++)	1033	for (int i = 0; i < NROFATTACKS; i++)
1104	{	1034	{
1105	/* Skip ones we won't send */	1035	/* Skip ones we won't send */
1106	if (atnr_cs_stat[i] == -1)	1036	if (atnr_cs_stat[i] == -1)
1107	continue;	1037	continue;
1108		1038
1109	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1039	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1110	}	1040	}
1111		1041
1112	if (pl->socket->monitor_spells)	1042	if (pl->ns->monitor_spells)
1113	{	1043	{
1114	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1044	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1115	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1045	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1116	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1046	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1117	}	1047	}
1118		1048
1119	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1049	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1120	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1050	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1121	set_title (pl->ob, buf);	1051	set_title (ob, buf);
1122	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1052	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1123		1053
1124	/* Only send it away if we have some actual data */	1054	/* Only send it away if we have some actual data */
1125	if (sl.length () > 6)	1055	if (sl.length () > 6)
1126	pl->socket->send_packet (sl);	1056	ns->send_packet (sl);
1127	}	1057	}
1128		1058
1129	/**	1059	/**
1130	* Tells the client that here is a player it should start using.	1060	* Tells the client that here is a player it should start using.
1131	*/	1061	*/
1132	void	1062	void
1133	esrv_new_player (player *pl, uint32 weight)	1063	esrv_new_player (player *pl, uint32 weight)
1134	{	1064	{
1135	pl->last_weight = weight;
1136
1137	packet sl ("player");	1065	packet sl ("player");
1138		1066
1139	sl << uint32 (pl->ob->count)	1067	sl << uint32 (pl->ob->count)
1140	<< uint32 (weight)	1068	<< uint32 (weight)
1141	<< uint32 (pl->ob->face->number)	1069	<< uint32 (pl->ob->face)
1142	<< data8 (pl->ob->name);	1070	<< data8 (pl->ob->name);
1143		1071
		1072	pl->ns->last_weight = weight;
1144	pl->socket->send_packet (sl);	1073	pl->ns->send_packet (sl);
1145	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1074	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146	}	1075	}
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 ("anim");
1169
1170	sl << uint16 (anim_num)
1171	<< uint16 (0); /* flags - not used right now */
1172
1173	/* Build up the list of faces. Also, send any information (ie, the
1174	* the face itself) down to the client.
1175	*/
1176	for (int i = 0; i < animations[anim_num].num_animations; i++)
1177	{
1178	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1179	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1180
1181	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1182	}
1183
1184	ns->send_packet (sl);
1185
1186	ns->anims_sent[anim_num] = 1;
1187	}
1188
1189		1076
1190	/******************************************************************************	1077	/******************************************************************************
1191	*	1078	*
1192	* Start of map related commands.	1079	* Start of map related commands.
1193	*	1080	*
1194	******************************************************************************/	1081	******************************************************************************/
1195		1082
1196	/**
1197	* This adds face_num to a map cell at x,y. If the client doesn't have
1198	* the face yet, we will also send it.
1199	*/
1200	static void
1201	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1202	{
1203	if (newmap->cells[x][y].count >= MAP_LAYERS)
1204	{
1205	//TODO: one or the other, can't both have abort and return, verify and act
1206	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1207	return;
1208	abort ();
1209	}
1210
1211	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1212	newmap->cells[x][y].count++;
1213
1214	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1215	esrv_send_face (ns, face_num, 0);
1216	}
1217
1218	/** Clears a map cell */	1083	/** Clears a map cell */
1219	static void	1084	static void
1220	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1085	map_clearcell (struct MapCell *cell, int count)
1221	{	1086	{
1222	cell->faces[0] = face0;	1087	cell->faces[0] = 0;
1223	cell->faces[1] = face1;	1088	cell->faces[1] = 0;
1224	cell->faces[2] = face2;	1089	cell->faces[2] = 0;
		1090	cell->smooth[0] = 0;
		1091	cell->smooth[1] = 0;
		1092	cell->smooth[2] = 0;
1225	cell->count = count;	1093	cell->count = count;
1226	cell->stat_hp = 0;	1094	cell->stat_hp = 0;
1227	cell->flags = 0;	1095	cell->flags = 0;
1228	cell->player = 0;	1096	cell->player = 0;
1229	}	1097	}
1230		1098
1231	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1232	#define MAX_LAYERS 3	1099	#define MAX_LAYERS 3
1233
1234	/* Using a global really isn't a good approach, but saves the over head of
1235	* allocating and deallocating such a block of data each time run through,
1236	* and saves the space of allocating this in the socket object when we only
1237	* need it for this cycle. If the server is ever threaded, this needs to be
1238	* re-examined.
1239	*/
1240	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1241
1242	/**
1243	* Returns true if any of the heads for this
1244	* space is set. Returns false if all are blank - this is used
1245	* for empty space checking.
1246	*/
1247	static inline int
1248	have_head (int ax, int ay)
1249	{
1250	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1251	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1252	return 1;
1253
1254	return 0;
1255	}
1256
1257	/**
1258	* check_head is a bit simplistic version of update_space below.
1259	* basically, it only checks the that the head on space ax,ay at layer
1260	* needs to get sent - if so, it adds the data, sending the head
1261	* if needed, and returning 1. If this no data needs to get
1262	* sent, it returns zero.
1263	*/
1264	static int
1265	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1266	{
1267	short face_num;
1268
1269	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1270	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1271	else
1272	face_num = 0;
1273
1274	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1275	{
1276	sl << uint16 (face_num);
1277	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1278	esrv_send_face (&ns, face_num, 0);
1279
1280	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1281	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1282	return 1;
1283	}
1284
1285	return 0; /* No change */
1286	}
1287		1100
1288	/**	1101	/**
1289	* Removes the need to replicate the same code for each layer.	1102	* Removes the need to replicate the same code for each layer.
1290	* this returns true if this space is now in fact different than	1103	* this returns true if this space is now in fact different than
1291	* it was.	1104	* it was.
1292	* sl is the socklist this data is going into.	1105	* sl is the socklist this data is going into.
1293	* ns is the socket we are working on - all the info we care	1106	* ns is the socket we are working on - all the info we care
1294	* about is in this socket structure, so now need not pass the	1107	* about is in this socket structure, so now need not pass the
1295	* entire player object.	1108	* entire player object.
1296	* mx and my are map coordinate offsets for map mp
1297	* sx and sy are the offsets into the socket structure that
1298	* holds the old values.
1299	* layer is the layer to update, with 2 being the floor and 0 the	1109	* layer is the layer to update, with 2 being the floor and 0 the
1300	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	1110	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1301	* take. Interesting to note that before this function, the map1 function	1111	* take. Interesting to note that before this function, the map1 function
1302	* numbers the spaces differently - I think this was a leftover from	1112	* numbers the spaces differently - I think this was a leftover from
1303	* the map command, where the faces stack up. Sinces that is no longer	1113	* the map command, where the faces stack up. Sinces that is no longer
1304	* the case, it seems to make more sense to have these layer values	1114	* the case, it seems to make more sense to have these layer values
1305	* actually match.	1115	* actually match.
1306	*/	1116	*/
1307	static int	1117	static int
1308	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1118	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1309	{	1119	{
1310	object *ob, *head;	1120	object *ob = ms.faces_obj [layer];
1311	uint16 face_num;
1312	int bx, by, i;
1313
1314	/* If there is a multipart object stored away, treat that as more important.
1315	* If not, then do the normal processing.
1316	*/
1317	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1318
1319	/* Check to see if this head is part of the set of objects
1320	* we would normally send for this space. If so, then
1321	* don't use the head value. We need to do the check
1322	* here and not when setting up the heads[] value for two reasons -
1323	* 1) the heads[] values will get used even if the space is not visible.
1324	* 2) its possible the head is not on the same map as a part, and I'd
1325	* rather not need to do the map translation overhead.
1326	* 3) We need to do some extra checking to make sure that we will
1327	* otherwise send the image as this layer, eg, either it matches
1328	* the head value, or is not multipart.
1329	*/
1330	if (head && !head->more)
1331	{
1332	for (i = 0; i < MAP_LAYERS; i++)
1333	{
1334	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1335	if (!ob)
1336	continue;
1337
1338	if (ob->head)
1339	ob = ob->head;
1340
1341	if (ob == head)
1342	{
1343	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1344	head = NULL;
1345	break;
1346	}
1347	}
1348	}
1349
1350	ob = head;
1351	if (!ob)
1352	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1353		1121
1354	/* If there is no object for this space, or if the face for the object	1122	/* If there is no object for this space, or if the face for the object
1355	* is the blank face, set the face number to zero.	1123	* is the blank face, set the face number to zero.
1356	* else if we have the stored head object for this space, that takes	1124	* else if we have the stored head object for this space, that takes
1357	* precedence over the other object for this space.	1125	* precedence over the other object for this space.
1358	* otherwise, we do special head processing	1126	* otherwise, we do special head processing
1359	*/	1127	*/
1360	if (!ob || ob->face == blank_face)	1128	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1361	face_num = 0;
1362	else if (head)
1363	{
1364	/* if this is a head that had previously been stored */
1365	face_num = ob->face->number;
1366	}
1367	else
1368	{
1369	/* if the faces for the different parts of a multipart object
1370	* are the same, we only want to send the bottom right most
1371	* portion of the object. That info is in the tail_.. values
1372	* of the head. Note that for the head itself, ob->head will
1373	* be null, so we only do this block if we are working on
1374	* a tail piece.
1375	*/
1376
1377	/* tail_x and tail_y will only be set in the head object. If
1378	* this is the head object and these are set, we proceed
1379	* with logic to only send bottom right. Similarly, if
1380	* this is one of the more parts but the head has those values
1381	* set, we want to do the processing. There can be cases where
1382	* the head is not visible but one of its parts is, so we just
1383	* can always expect that ob->arch->tail_x will be true for all
1384	* object we may want to display.
1385	*/
1386	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1387	{
1388
1389	if (ob->head)
1390	head = ob->head;
1391	else
1392	head = ob;
1393
1394	/* Basically figure out where the offset is from where we are right
1395	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1396	* piece is from the head, and the tail is where the tail is from the
1397	* head. Note that bx and by will equal sx and sy if we are already working
1398	* on the bottom right corner. If ob is the head, the clone values
1399	* will be zero, so the right thing will still happen.
1400	*/
1401	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1402	by = sy + head->arch->tail_y - ob->arch->clone.y;
1403
1404	/* I don't think this can ever happen, but better to check for it just
1405	* in case.
1406	*/
1407	if (bx < sx || by < sy)
1408	{
1409	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1410	face_num = 0;
1411	}
1412	/* single part object, multipart object with non merged faces,
1413	* of multipart object already at lower right.
1414	*/
1415	else if (bx == sx && by == sy)
1416	{
1417	face_num = ob->face->number;
1418
1419	/* if this face matches one stored away, clear that one away.
1420	* this code relies on the fact that the map1 commands
1421	* goes from 2 down to 0.
1422	*/
1423	for (i = 0; i < MAP_LAYERS; i++)
1424	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1425	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1426	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1427	}
1428	else
1429	{
1430	/* If this head is stored away, clear it - otherwise,
1431	* there can be cases where a object is on multiple layers -
1432	* we only want to send it once.
1433	*/
1434	face_num = head->face->number;
1435	for (i = 0; i < MAP_LAYERS; i++)
1436	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1437	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1438	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1439
1440	/* First, try to put the new head on the same layer. If that is used up,
1441	* then find another layer.
1442	*/
1443	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1444	{
1445	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1446	}
1447	else
1448	for (i = 0; i < MAX_LAYERS; i++)
1449	{
1450	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1451	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1452	{
1453	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1454	}
1455	}
1456	face_num = 0; /* Don't send this object - we'll send the head later */
1457	}
1458	}
1459	else
1460	{
1461	/* In this case, we are already at the lower right or single part object,
1462	* so nothing special
1463	*/
1464	face_num = ob->face->number;
1465
1466	/* clear out any head entries that have the same face as this one */
1467	for (bx = 0; bx < layer; bx++)
1468	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1469	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1470	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1471	}
1472	} /* else not already head object or blank face */
1473
1474	/* This is a real hack. Basically, if we have nothing to send for this layer,
1475	* but there is a head on the next layer, send that instead.
1476	* Without this, what happens is you can get the case where the player stands
1477	* on the same space as the head. However, if you have overlapping big objects
1478	* of the same type, what happens then is it doesn't think it needs to send
1479	* This tends to make stacking also work/look better.
1480	*/
1481	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1482	{
1483	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1484	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1485	}
1486
1487	/* Another hack - because of heads and whatnot, this face may match one
1488	* we already sent for a lower layer. In that case, don't send
1489	* this one.
1490	*/
1491	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1492	face_num = 0;
1493		1129
1494	/* We've gotten what face we want to use for the object. Now see if	1130	/* We've gotten what face we want to use for the object. Now see if
1495	* if it has changed since we last sent it to the client.	1131	* if it has changed since we last sent it to the client.
1496	*/	1132	*/
1497	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1133	if (lastcell.faces[layer] != face_num)
1498	{	1134	{
1499	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1135	lastcell.faces[layer] = face_num;
		1136
1500	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	1137	if (!ns.faces_sent[face_num])
		1138	if (ob)
		1139	ns.send_faces (ob);
		1140	else
1501	esrv_send_face (&ns, face_num, 0);	1141	ns.send_face (face_num);
1502		1142
1503	sl << uint16 (face_num);	1143	sl << uint16 (face_num);
1504	return 1;
1505	}
1506
1507	/* Nothing changed */
1508	return 0;
1509	}
1510
1511	/**
1512	* This function is mainly a copy of update_space,
1513	* except it handles update of the smoothing updates,
1514	* not the face updates.
1515	* Removes the need to replicate the same code for each layer.
1516	* this returns true if this smooth is now in fact different
1517	* than it was.
1518	* sl is the socklist this data is going into.
1519	* ns is the socket we are working on - all the info we care
1520	* about is in this socket structure, so know need to pass the
1521	* entire player object.
1522	* mx and my are map coordinate offsets for map mp
1523	* sx and sy are the offsets into the socket structure that
1524	* holds the old values.
1525	* layer is the layer to update, with 2 being the floor and 0 the
1526	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1527	* take.
1528	*/
1529
1530	static inline int
1531	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1532	{
1533	object *ob;
1534	int smoothlevel; /* old face_num; */
1535
1536	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1537
1538	/* If there is no object for this space, or if the face for the object
1539	* is the blank face, set the smoothlevel to zero.
1540	*/
1541	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1542	smoothlevel = 0;
1543	else
1544	{
1545	smoothlevel = ob->smoothlevel;
1546	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1547	SendSmooth (&ns, ob->face->number);
1548	} /* else not already head object or blank face */
1549
1550	/* We've gotten what face we want to use for the object. Now see if
1551	* if it has changed since we last sent it to the client.
1552	*/
1553	if (smoothlevel > 255)
1554	smoothlevel = 255;
1555	else if (smoothlevel < 0)
1556	smoothlevel = 0;
1557
1558	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1559	{
1560	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1561	sl << uint8 (smoothlevel);
1562	return 1;	1144	return 1;
1563	}	1145	}
1564		1146
1565	/* Nothing changed */	1147	/* Nothing changed */
1566	return 0;	1148	return 0;
…		…
1581	if (ns->EMI_smooth)	1163	if (ns->EMI_smooth)
1582	result += 1; /*One byte for smoothlevel */	1164	result += 1; /*One byte for smoothlevel */
1583	}	1165	}
1584		1166
1585	return result;	1167	return result;
		1168	}
		1169
		1170	// prefetch (and touch) all maps within a specific distancd
		1171	static void
		1172	prefetch_surrounding_maps (maptile *map, int distance)
		1173	{
		1174	map->last_access = runtime;
		1175
		1176	if (--distance)
		1177	for (int dir = 4; --dir; )
		1178	if (const shstr &path = map->tile_path [dir])
		1179	if (maptile *&neigh = map->tile_map [dir])
		1180	prefetch_surrounding_maps (neigh, distance);
		1181	else
		1182	neigh = maptile::find_async (path, map);
		1183	}
		1184
		1185	// prefetch a generous area around the player
		1186	static void
		1187	prefetch_surrounding_maps (object *op)
		1188	{
		1189	prefetch_surrounding_maps (op->map, 3);
1586	}	1190	}
1587		1191
1588	/**	1192	/**
1589	* This function uses the new map1 protocol command to send the map	1193	* This function uses the new map1 protocol command to send the map
1590	* to the client. It is necessary because the old map command supports	1194	* to the client. It is necessary because the old map command supports
…		…
1596	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1200	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1597	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1201	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1598	* and use the other 4 bits for other informatiion. For full documentation	1202	* and use the other 4 bits for other informatiion. For full documentation
1599	* of what we send, see the doc/Protocol file.	1203	* of what we send, see the doc/Protocol file.
1600	* I will describe internally what we do:	1204	* I will describe internally what we do:
1601	* the socket->lastmap shows how the map last looked when sent to the client.	1205	* the ns->lastmap shows how the map last looked when sent to the client.
1602	* in the lastmap structure, there is a cells array, which is set to the	1206	* in the lastmap structure, there is a cells array, which is set to the
1603	* maximum viewable size (As set in config.h).	1207	* maximum viewable size (As set in config.h).
1604	* in the cells, there are faces and a count value.	1208	* in the cells, there are faces and a count value.
1605	* we use the count value to hold the darkness value. If -1, then this space	1209	* we use the count value to hold the darkness value. If -1, then this space
1606	* is not viewable.	1210	* is not viewable.
…		…
1608	* look like.	1212	* look like.
1609	*/	1213	*/
1610	void	1214	void
1611	draw_client_map1 (object *pl)	1215	draw_client_map1 (object *pl)
1612	{	1216	{
1613	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1217	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1614	sint16 nx, ny;	1218	sint16 nx, ny;
1615	int estartlen, eoldlen;	1219	int estartlen, eoldlen;
1616	uint16 mask, emask;
1617	uint8 eentrysize;	1220	uint8 eentrysize;
1618	uint16 ewhatstart, ewhatflag;	1221	uint16 ewhatstart, ewhatflag;
1619	uint8 extendedinfos;	1222	uint8 extendedinfos;
1620	maptile *m;	1223	maptile *m;
1621		1224
1622	client &socket = *pl->contr->socket;	1225	client &socket = *pl->contr->ns;
		1226
		1227	if (!pl->active)
		1228	return;
1623		1229
1624	check_map_change (pl->contr);	1230	check_map_change (pl->contr);
		1231	prefetch_surrounding_maps (pl);
1625		1232
1626	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1233	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1627	packet esl;	1234	packet esl;
1628		1235
1629	startlen = sl.length ();	1236	startlen = sl.length ();
…		…
1652	ewhatstart = 0;	1259	ewhatstart = 0;
1653	ewhatflag = 0;	1260	ewhatflag = 0;
1654	estartlen = 0;	1261	estartlen = 0;
1655	}	1262	}
1656		1263
1657	/* Init data to zero */
1658	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1659
1660	/* x,y are the real map locations. ax, ay are viewport relative	1264	/* x,y are the real map locations. ax, ay are viewport relative
1661	* locations.	1265	* locations.
1662	*/	1266	*/
1663	ay = 0;	1267	ay = 0;
1664		1268
…		…
1666	* but that started to get a bit messy to look at.	1270	* but that started to get a bit messy to look at.
1667	*/	1271	*/
1668	max_x = pl->x + (socket.mapx + 1) / 2;	1272	max_x = pl->x + (socket.mapx + 1) / 2;
1669	max_y = pl->y + (socket.mapy + 1) / 2;	1273	max_y = pl->y + (socket.mapy + 1) / 2;
1670		1274
1671	if (socket.mapmode == Map1aCmd)	1275	maptile *plmap = pl->map;
1672	{
1673	max_x += MAX_HEAD_OFFSET;
1674	max_y += MAX_HEAD_OFFSET;
1675	}
1676		1276
1677	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1277	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1678	{	1278	{
1679	ax = 0;	1279	ax = 0;
1680	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1280	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1681	{	1281	{
		1282	int emask, mask;
1682	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1283	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1683		1284
1684	/* If this space is out of the normal viewable area, we only check
1685	* the heads value ax or ay will only be greater than what
1686	* the client wants if using the map1a command - this is because
1687	* if the map1a command is not used, max_x and max_y will be
1688	* set to lower values.
1689	*/
1690	if (ax >= socket.mapx || ay >= socket.mapy)
1691	{
1692	int i, got_one;
1693
1694	oldlen = sl.length ();
1695
1696	sl << uint16 (mask);
1697
1698	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1699	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1700	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1701
1702	/* If all we are doing is sending 0 (blank) faces, we don't
1703	* actually need to send that - just the coordinates
1704	* with no faces tells the client to blank out the
1705	* space.
1706	*/
1707	got_one = 0;
1708	for (i = oldlen + 2; i < sl.length (); i++)
1709	if (sl[i])
1710	got_one = 1;
1711
1712	if (got_one && (mask & 0xf))
1713	sl[oldlen + 1] = mask & 0xff;
1714	else
1715	{ /*either all faces blank, either no face at all */
1716	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1717	sl.reset (oldlen + 2);
1718	else
1719	sl.reset (oldlen);
1720	}
1721
1722	/*What concerns extendinfos, nothing to be done for now
1723	* (perhaps effects layer later)
1724	*/
1725	continue; /* don't do processing below */
1726	}
1727
1728	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1285	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1729
1730	d = pl->contr->blocked_los[ax][ay];
1731		1286
1732	/* If the coordinates are not valid, or it is too dark to see,	1287	/* If the coordinates are not valid, or it is too dark to see,
1733	* we tell the client as such	1288	* we tell the client as such
1734	*/	1289	*/
1735	nx = x;	1290	nx = x;
1736	ny = y;	1291	ny = y;
1737	m = get_map_from_coord (pl->map, &nx, &ny);	1292	m = get_map_from_coord (plmap, &nx, &ny);
1738		1293
1739	if (!m)	1294	if (!m)
1740	{	1295	{
1741	/* space is out of map. Update space and clear values	1296	/* space is out of map. Update space and clear values
1742	* if this hasn't already been done. If the space is out	1297	* if this hasn't already been done. If the space is out
1743	* of the map, it shouldn't have a head	1298	* of the map, it shouldn't have a head
1744	*/	1299	*/
1745	if (lastcell.count != -1)	1300	if (lastcell.count != -1)
1746	{	1301	{
1747	sl << uint16 (mask);	1302	sl << uint16 (mask);
1748	map_clearcell (&lastcell, 0, 0, 0, -1);	1303	map_clearcell (&lastcell, -1);
1749	}	1304	}
		1305
		1306	continue;
1750	}	1307	}
		1308
		1309	m->touch ();
		1310
		1311	int d = pl->contr->blocked_los[ax][ay];
		1312
1751	else if (d > 3)	1313	if (d > 3)
1752	{	1314	{
		1315
1753	int need_send = 0, count;	1316	int need_send = 0, count;
1754		1317
1755	/* This block deals with spaces that are not visible for whatever	1318	/* This block deals with spaces that are not visible for whatever
1756	* reason. Still may need to send the head for this space.	1319	* reason. Still may need to send the head for this space.
1757	*/	1320	*/
1758		1321
1759	oldlen = sl.length ();	1322	oldlen = sl.length ();
1760		1323
1761	sl << uint16 (mask);	1324	sl << uint16 (mask);
…		…
1763	if (lastcell.count != -1)	1326	if (lastcell.count != -1)
1764	need_send = 1;	1327	need_send = 1;
1765		1328
1766	count = -1;	1329	count = -1;
1767		1330
1768	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1769	{
1770	/* Now check to see if any heads need to be sent */
1771
1772	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1773	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1774	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1775
1776	lastcell.count = count;
1777	}
1778	else
1779	{
1780	/* properly clear a previously sent big face */	1331	/* properly clear a previously sent big face */
1781	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1332	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1782	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1333	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1783	need_send = 1;	1334	need_send = 1;
1784		1335
1785	map_clearcell (&lastcell, 0, 0, 0, count);	1336	map_clearcell (&lastcell, count);
1786	}
1787		1337
1788	if ((mask & 0xf) || need_send)	1338	if ((mask & 0xf) || need_send)
1789	sl[oldlen + 1] = mask & 0xff;	1339	sl[oldlen + 1] = mask & 0xff;
1790	else	1340	else
1791	sl.reset (oldlen);	1341	sl.reset (oldlen);
1792	}	1342	}
1793	else	1343	else
1794	{	1344	{
1795	/* In this block, the space is visible or there are head objects	1345	/* In this block, the space is visible.
1796	* we need to send.
1797	*/	1346	*/
1798		1347
1799	/* Rather than try to figure out what everything that we might	1348	/* Rather than try to figure out what everything that we might
1800	* need to send is, then form the packet after that,	1349	* need to send is, then form the packet after that,
1801	* we presume that we will in fact form a packet, and update	1350	* we presume that we will in fact form a packet, and update
…		…
1804	* is done.	1353	* is done.
1805	* I think this is simpler than doing a bunch of checks to see	1354	* I think this is simpler than doing a bunch of checks to see
1806	* what if anything we need to send, setting the bits, then	1355	* what if anything we need to send, setting the bits, then
1807	* doing those checks again to add the real data.	1356	* doing those checks again to add the real data.
1808	*/	1357	*/
1809	oldlen = sl.length ();	1358	oldlen = sl.length ();
1810	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1811	eoldlen = esl.length ();	1359	eoldlen = esl.length ();
1812	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1360
1813	sl << uint16 (mask);	1361	sl << uint16 (mask);
1814
1815	if (socket.ext_mapinfos)
1816	esl << uint16 (emask);
1817		1362
1818	unsigned char dummy;	1363	unsigned char dummy;
1819	unsigned char *last_ext = &dummy;	1364	unsigned char *last_ext = &dummy;
1820		1365
1821	/* Darkness changed */	1366	/* Darkness changed */
…		…
1833	sl << uint8 (255 - 64 * d);	1378	sl << uint8 (255 - 64 * d);
1834	}	1379	}
1835		1380
1836	lastcell.count = d;	1381	lastcell.count = d;
1837		1382
		1383	mapspace &ms = m->at (nx, ny);
		1384
1838	if (socket.extmap)	1385	if (socket.extmap)
1839	{	1386	{
1840	uint8 stat_hp = 0;	1387	uint8 stat_hp = 0;
1841	uint8 stat_width = 0;	1388	uint8 stat_width = 0;
1842	uint8 flags = 0;	1389	uint8 flags = 0;
1843	UUID player = 0;	1390	UUID player = 0;
1844		1391
1845	// send hp information, if applicable	1392	// send hp information, if applicable
1846	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1393	if (object *op = ms.faces_obj [0])
1847	{	1394	{
1848	if (op->head || op->invisible)	1395	if (op->head || op->invisible)
1849	; // do not show	1396	; // do not show
1850	else if (op->type == PLAYER	1397	else if (op->type == PLAYER
1851	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1398	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1905	sl << uint8 (8) << uint8 (flags);	1452	sl << uint8 (8) << uint8 (flags);
1906	}	1453	}
1907	}	1454	}
1908		1455
1909	/* Floor face */	1456	/* Floor face */
1910	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1457	if (update_space (sl, socket, ms, lastcell, 2))
1911	mask |= 0x4;	1458	mask |= 0x4;
1912		1459
1913	if (socket.EMI_smooth)
1914	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1915	emask |= 0x4;
1916
1917	/* Middle face */	1460	/* Middle face */
1918	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1461	if (update_space (sl, socket, ms, lastcell, 1))
1919	mask |= 0x2;	1462	mask |= 0x2;
1920		1463
1921	if (socket.EMI_smooth)	1464	if (ms.player () == pl
1922	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1465	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1923	emask |= 0x2;
1924
1925	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1926	{	1466	{
		1467	// force player to be visible to himself if invisible
1927	if (lastcell.faces[0] != pl->face->number)	1468	if (lastcell.faces[0] != pl->face)
1928	{	1469	{
1929	lastcell.faces[0] = pl->face->number;	1470	lastcell.faces[0] = pl->face;
		1471
1930	mask |= 0x1;	1472	mask |= 0x1;
1931
1932	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1933	esrv_send_face (&socket, pl->face->number, 0);
1934
1935	sl << uint16 (pl->face->number);	1473	sl << uint16 (pl->face);
		1474
		1475	socket.send_faces (pl);
1936	}	1476	}
1937	}	1477	}
1938	else
1939	{
1940	/* Top face */	1478	/* Top face */
1941	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1479	else if (update_space (sl, socket, ms, lastcell, 0))
1942	mask |= 0x1;	1480	mask |= 0x1;
1943
1944	if (socket.EMI_smooth)
1945	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1946	emask |= 0x1;
1947	}	1481
1948		1482
1949	/* Check to see if we are in fact sending anything for this	1483	/* Check to see if we are in fact sending anything for this
1950	* space by checking the mask. If so, update the mask.	1484	* space by checking the mask. If so, update the mask.
1951	* if not, reset the len to that from before adding the mask	1485	* if not, reset the len to that from before adding the mask
1952	* value, so we don't send those bits.	1486	* value, so we don't send those bits.
…		…
1954	if (mask & 0xf)	1488	if (mask & 0xf)
1955	sl[oldlen + 1] = mask & 0xff;	1489	sl[oldlen + 1] = mask & 0xff;
1956	else	1490	else
1957	sl.reset (oldlen);	1491	sl.reset (oldlen);
1958		1492
		1493	if (socket.ext_mapinfos)
		1494	esl << uint16 (emask);
		1495
		1496	if (socket.EMI_smooth)
		1497	{
		1498	for (int layer = 2+1; layer--; )
		1499	{
		1500	object *ob = ms.faces_obj [layer];
		1501
		1502	// If there is no object for this space, or if the face for the object
		1503	// is the blank face, set the smoothlevel to zero.
		1504	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1505
		1506	// We've gotten what face we want to use for the object. Now see if
		1507	// if it has changed since we last sent it to the client.
		1508	if (lastcell.smooth[layer] != smoothlevel)
		1509	{
		1510	lastcell.smooth[layer] = smoothlevel;
		1511	esl << uint8 (smoothlevel);
		1512	emask |= 1 << layer;
		1513	}
		1514	}
		1515
1959	if (emask & 0xf)	1516	if (emask & 0xf)
1960	esl[eoldlen + 1] = emask & 0xff;	1517	esl[eoldlen + 1] = emask & 0xff;
1961	else	1518	else
1962	esl.reset (eoldlen);	1519	esl.reset (eoldlen);
		1520	}
1963	} /* else this is a viewable space */	1521	} /* else this is a viewable space */
1964	} /* for x loop */	1522	} /* for x loop */
1965	} /* for y loop */	1523	} /* for y loop */
1966		1524
1967	/* Verify that we in fact do need to send this */	1525	/* Verify that we in fact do need to send this */
…		…
1970	if (!(sl.length () > startlen || socket.sent_scroll))	1528	if (!(sl.length () > startlen || socket.sent_scroll))
1971	{	1529	{
1972	/* No map data will follow, so don't say the client	1530	/* No map data will follow, so don't say the client
1973	* it doesn't need draw!	1531	* it doesn't need draw!
1974	*/	1532	*/
1975	ewhatflag &= (~EMI_NOREDRAW);	1533	ewhatflag &= ~EMI_NOREDRAW;
1976	esl[ewhatstart + 1] = ewhatflag & 0xff;	1534	esl[ewhatstart + 1] = ewhatflag & 0xff;
1977	}	1535	}
1978		1536
1979	if (esl.length () > estartlen)	1537	if (esl.length () > estartlen)
1980	socket.send_packet (esl);	1538	socket.send_packet (esl);
…		…
1992	*/	1550	*/
1993	void	1551	void
1994	draw_client_map (object *pl)	1552	draw_client_map (object *pl)
1995	{	1553	{
1996	int i, j;	1554	int i, j;
1997	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1555	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1998	New_Face *face, *floor;
1999	New_Face *floor2;
2000	int d, mflags;	1556	int mflags;
2001	struct Map newmap;	1557	struct Map newmap;
2002	maptile *m, *pm;	1558	maptile *m, *pm;
2003		1559
2004	if (pl->type != PLAYER)	1560	if (pl->type != PLAYER)
2005	{	1561	{
…		…
2016	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1572	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2017	return;	1573	return;
2018		1574
2019	memset (&newmap, 0, sizeof (struct Map));	1575	memset (&newmap, 0, sizeof (struct Map));
2020		1576
2021	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1577	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2022	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1578	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023	{	1579	{
2024	ax = i;	1580	ax = i;
2025	ay = j;	1581	ay = j;
2026	m = pm;	1582	m = pm;
2027	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1583	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
…		…
2059		1615
2060	/*****************************************************************************/	1616	/*****************************************************************************/
2061	void	1617	void
2062	send_plugin_custom_message (object *pl, char *buf)	1618	send_plugin_custom_message (object *pl, char *buf)
2063	{	1619	{
2064	pl->contr->socket->send_packet (buf);	1620	pl->contr->ns->send_packet (buf);
2065	}	1621	}
2066		1622
2067	/**	1623	/**
2068	* This sends the skill number to name mapping. We ignore	1624	* This sends the skill number to name mapping. We ignore
2069	* the params - we always send the same info no matter what.	1625	* the params - we always send the same info no matter what.
…		…
2114	* it then sends an updspell packet for each spell that has changed in this way	1670	* it then sends an updspell packet for each spell that has changed in this way
2115	*/	1671	*/
2116	void	1672	void
2117	esrv_update_spells (player *pl)	1673	esrv_update_spells (player *pl)
2118	{	1674	{
		1675	if (!pl->ns)
		1676	return;
		1677
2119	if (!pl->socket->monitor_spells)	1678	if (!pl->ns->monitor_spells)
2120	return;	1679	return;
2121		1680
2122	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1681	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2123	{	1682	{
2124	if (spell->type == SPELL)	1683	if (spell->type == SPELL)
…		…
2154		1713
2155	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1714	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2156	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1715	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2157	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1716	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2158		1717
2159	pl->socket->send_packet (sl);	1718	pl->ns->send_packet (sl);
2160	}	1719	}
2161	}	1720	}
2162	}	1721	}
2163	}	1722	}
2164		1723
2165	void	1724	void
2166	esrv_remove_spell (player *pl, object *spell)	1725	esrv_remove_spell (player *pl, object *spell)
2167	{	1726	{
2168	if (!pl->socket->monitor_spells)	1727	if (!pl->ns->monitor_spells)
2169	return;	1728	return;
2170		1729
2171	if (!pl || !spell || spell->env != pl->ob)	1730	if (!pl || !spell || spell->env != pl->ob)
2172	{	1731	{
2173	LOG (llevError, "Invalid call to esrv_remove_spell");	1732	LOG (llevError, "Invalid call to esrv_remove_spell");
…		…
2176		1735
2177	packet sl ("delspell");	1736	packet sl ("delspell");
2178		1737
2179	sl << uint32 (spell->count);	1738	sl << uint32 (spell->count);
2180		1739
2181	pl->socket->send_packet (sl);	1740	pl->ns->send_packet (sl);
2182	}	1741	}
2183		1742
2184	/* appends the spell *spell to the Socklist we will send the data to. */	1743	/* appends the spell *spell to the Socklist we will send the data to. */
2185	static void	1744	static void
2186	append_spell (player *pl, packet &sl, object *spell)	1745	append_spell (player *pl, packet &sl, object *spell)
2187	{	1746	{
2188	int len, i, skill = 0;	1747	int i, skill = 0;
2189		1748
2190	if (!(spell->name))	1749	if (!(spell->name))
2191	{	1750	{
2192	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1751	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2193	return;	1752	return;
…		…
2205	if (!strcmp (spell->skill, skill_names[i]))	1764	if (!strcmp (spell->skill, skill_names[i]))
2206	{	1765	{
2207	skill = i + CS_STAT_SKILLINFO;	1766	skill = i + CS_STAT_SKILLINFO;
2208	break;	1767	break;
2209	}	1768	}
		1769	}
		1770
		1771	// spells better have a face
		1772	if (!spell->face)
		1773	{
		1774	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1775	spell->face = face_find ("burnout.x11", blank_face);
2210	}	1776	}
2211		1777
2212	/* send the current values */	1778	/* send the current values */
2213	sl << uint32 (spell->count)	1779	sl << uint32 (spell->count)
2214	<< uint16 (spell->level)	1780	<< uint16 (spell->level)
…		…
2216	<< uint16 (spell->last_sp)	1782	<< uint16 (spell->last_sp)
2217	<< uint16 (spell->last_grace)	1783	<< uint16 (spell->last_grace)
2218	<< uint16 (spell->last_eat)	1784	<< uint16 (spell->last_eat)
2219	<< uint8 (skill)	1785	<< uint8 (skill)
2220	<< uint32 (spell->path_attuned)	1786	<< uint32 (spell->path_attuned)
2221	<< uint32 (spell->face ? spell->face->number : 0)	1787	<< uint32 (spell->face)
2222	<< data8 (spell->name)	1788	<< data8 (spell->name)
2223	<< data16 (spell->msg);	1789	<< data16 (spell->msg);
2224	}	1790	}
2225		1791
2226	/**	1792	/**
…		…
2234	{	1800	{
2235	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1801	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2236	return;	1802	return;
2237	}	1803	}
2238		1804
2239	if (!pl->socket->monitor_spells)	1805	if (!pl->ns->monitor_spells)
2240	return;	1806	return;
2241		1807
2242	packet sl ("addspell");	1808	packet sl ("addspell");
2243		1809
2244	if (!spell)	1810	if (!spell)
2245	{	1811	{
2246	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1812	for (spell = pl->ob->inv; spell; spell = spell->below)
2247	{	1813	{
2248	/* were we to simply keep appending data here, we could exceed	1814	/* were we to simply keep appending data here, we could exceed
2249	* MAXSOCKBUF if the player has enough spells to add, we know that	1815	* MAXSOCKBUF if the player has enough spells to add, we know that
2250	* append_spells will always append 19 data bytes, plus 4 length	1816	* append_spells will always append 19 data bytes, plus 4 length
2251	* bytes and 3 strings (because that is the spec) so we need to	1817	* bytes and 3 strings (because that is the spec) so we need to
…		…
2261	if (spell->type != SPELL)	1827	if (spell->type != SPELL)
2262	continue;	1828	continue;
2263		1829
2264	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1830	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2265	{	1831	{
2266	pl->socket->send_packet (sl);	1832	pl->ns->send_packet (sl);
2267		1833
2268	sl.reset ();	1834	sl.reset ();
2269	sl << "addspell ";	1835	sl << "addspell ";
2270	}	1836	}
2271		1837
…		…
2285	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1851	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2286	fatal (0);	1852	fatal (0);
2287	}	1853	}
2288		1854
2289	/* finally, we can send the packet */	1855	/* finally, we can send the packet */
2290	pl->socket->send_packet (sl);	1856	pl->ns->send_packet (sl);
2291	}	1857	}
2292		1858

Diff Legend

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