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

Diff Legend

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