[ViewVC] Diff of: 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.72 by root, Mon Mar 12 02:07:43 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)
…		…
704	uint16 smoothface;	697	uint16 smoothface;
705		698
706	/* If we can't find a face, return and set it so we won't try to send this	699	/* If we can't find a face, return and set it so we won't try to send this
707	* again.	700	* again.
708	*/	701	*/
709	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	702	if (!FindSmooth (face, &smoothface))
710	{	703	{
711		704
712	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	705	LOG (llevError, "could not findsmooth for %d.\n", face);
713	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	706	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
714	return;	707	return;
715	}	708	}
716		709
717	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718	esrv_send_face (ns, smoothface, 0);	711	esrv_send_face (ns, smoothface, 0);
719		712
720	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	713	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
721		714
722	packet sl;	715	packet sl ("smooth");
723		716
724	sl << "smooth "
725	<< uint16 (face)	717	sl << uint16 (face)
726	<< uint16 (smoothface);	718	<< uint16 (smoothface);
727		719
728	ns->send_packet (sl);	720	ns->send_packet (sl);
729	}	721	}
730		722
731	/**	723	/**
732	* Tells client the picture it has to use	724	* Tells client the picture it has to use
733	* to smooth a picture number given as argument.	725	* to smooth a picture number given as argument.
734	*/	726	*/
735	void	727	void
736	AskSmooth (char buf, int len, client ns)	728	AskSmooth (char buf, int len, client ns)
737	{	729	{
738	SendSmooth (ns, atoi (buf));	730	SendSmooth (ns, atoi (buf));
739	}	731	}
…		…
802	* commands.	794	* commands.
803	*/	795	*/
804	pl->count = 0;	796	pl->count = 0;
805		797
806	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	798	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
807	int time = FABS (pl->ob->speed) < 0.001	799	int time = fabs (pl->ob->speed) < 0.001
808	? time = MAX_TIME * 100	800	? time = MAX_TIME * 100
809	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	801	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
810		802
811	/* Send confirmation of command execution now */	803	/* Send confirmation of command execution now */
812	packet sl;	804	packet sl ("comc");
813	sl << "comc " << uint16 (cmdid) << uint32 (time);	805	sl << uint16 (cmdid) << uint32 (time);
814	pl->socket->send_packet (sl);	806	pl->ns->send_packet (sl);
815	}	807	}
816
817		808
818	/** This is a reply to a previous query. */	809	/** This is a reply to a previous query. */
819	void	810	void
820	ReplyCmd (char buf, int len, player pl)	811	ReplyCmd (char buf, int len, client ns)
821	{	812	{
		813	if (ns->state == ST_CUSTOM)
		814	{
		815	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		816	return;
		817	}
		818
		819	if (!ns->pl)
		820	return; //TODO: depends on the exact reply we are after
		821	//TODO: but right now, we always have a ns->pl
		822
		823	player *pl = ns->pl;
		824
822	/* This is to synthesize how the data would be stored if it	825	/* This is to synthesize how the data would be stored if it
823	* was normally entered. A bit of a hack, and should be cleaned up	826	* was normally entered. A bit of a hack, and should be cleaned up
824	* once all the X11 code is removed from the server.	827	* once all the X11 code is removed from the server.
825	*	828	*
826	* We pass 13 to many of the functions because this way they	829	* We pass 13 to many of the functions because this way they
…		…
829	*/	832	*/
830	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	833	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
831		834
832	/* this avoids any hacking here */	835	/* this avoids any hacking here */
833		836
834	switch (pl->state)	837	switch (ns->state)
835	{	838	{
836	case ST_PLAYING:	839	case ST_PLAYING:
837	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
838	break;	841	break;
839		842
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:	843	case ST_CHANGE_CLASS:
852
853	key_change_class (pl->ob, buf[0]);	844	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;	845	break;
873		846
874	case ST_GET_PARTY_PASSWORD: /* Get password for party */	847	case ST_GET_PARTY_PASSWORD: /* Get password for party */
875	receive_party_password (pl->ob, 13);	848	receive_party_password (pl->ob, 13);
876	break;	849	break;
877		850
878	default:	851	default:
879	LOG (llevError, "Unknown input state: %d\n", pl->state);	852	LOG (llevError, "Unknown input state: %d\n", ns->state);
880	}	853	}
881	}	854	}
882		855
883	/**	856	/**
884	* Client tells its version. If there is a mismatch, we close the	857	* Client tells its version. If there is a mismatch, we close the
…		…
899	ns->cs_version = atoi (buf);	872	ns->cs_version = atoi (buf);
900	ns->sc_version = ns->cs_version;	873	ns->sc_version = ns->cs_version;
901		874
902	LOG (llevDebug, "connection from client <%s>\n", buf);	875	LOG (llevDebug, "connection from client <%s>\n", buf);
903		876
904
905	//TODO: should log here just for statistics	877	//TODO: should log here just for statistics
906		878
907	//if (VERSION_CS != ns->cs_version)	879	//if (VERSION_CS != ns->cs_version)
908	// unchecked;	880	// unchecked;
909		881
…		…
934	{	906	{
935	ns->sound = atoi (buf);	907	ns->sound = atoi (buf);
936	}	908	}
937		909
938	/** client wants the map resent */	910	/** client wants the map resent */
939
940	void	911	void
941	MapRedrawCmd (char buf, int len, player pl)	912	MapRedrawCmd (char buf, int len, player pl)
942	{	913	{
943	/* This function is currently disabled; just clearing the map state results in	914	/* This function is currently disabled; just clearing the map state results in
944	* display errors. It should clear the cache and send a newmap command.	915	* display errors. It should clear the cache and send a newmap command.
…		…
1031	esrv_update_stats (player *pl)	1002	esrv_update_stats (player *pl)
1032	{	1003	{
1033	char buf[MAX_BUF];	1004	char buf[MAX_BUF];
1034	uint16 flags;	1005	uint16 flags;
1035		1006
1036	packet sl;	1007	client *ns = pl->ns;
1037	sl << "stats ";	1008	if (!ns)
		1009	return;
1038		1010
		1011	object *ob = pl->ob;
1039	if (pl->ob)	1012	if (!ob)
1040	{	1013	return;
		1014
		1015	packet sl ("stats");
		1016
1041	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1019	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1020	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1021	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1022	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1023	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);	1024	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1025	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1026	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1027	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1028	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054	}
1055		1030
1056	if (pl->socket->exp64)
1057	for (int s = 0; s < NUM_SKILLS; s++)	1031	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)	1032	if (object *skill = pl->last_skill_ob[s])
		1033	if (skill->stats.exp != ns->last_skill_exp [s])
1059	{	1034	{
		1035	ns->last_skill_exp [s] = skill->stats.exp;
		1036
1060	/* Always send along the level if exp changes. This is only	1037	/* Always send along the level if exp changes. This is only
1061	* 1 extra byte, but keeps processing simpler.	1038	* 1 extra byte, but keeps processing simpler.
1062	*/	1039	*/
1063	sl << uint8 (s + CS_STAT_SKILLINFO)	1040	sl << uint8 (s + CS_STAT_SKILLINFO)
1064	<< uint8 (pl->last_skill_ob[s]->level)	1041	<< uint8 (skill->level)
1065	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1042	<< uint64 (skill->stats.exp);
1066
1067	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068	}	1043	}
1069		1044
1070	if (pl->socket->exp64)
1071	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1045	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);	1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1080	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1052	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1082	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1053	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1054
1083	flags = 0;	1055	flags = 0;
1084		1056
1085	if (pl->fire_on)	1057	if (pl->fire_on)
1086	flags \|= SF_FIREON;	1058	flags \|= SF_FIREON;
1087		1059
1088	if (pl->run_on)	1060	if (pl->run_on)
1089	flags \|= SF_RUNON;	1061	flags \|= SF_RUNON;
1090		1062
1091	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092		1064
1093	if (pl->socket->sc_version < 1025)	1065	if (ns->sc_version < 1025)
1094	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1066	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095	else	1067	else
1096	for (int i = 0; i < NROFATTACKS; i++)	1068	for (int i = 0; i < NROFATTACKS; i++)
1097	{	1069	{
1098	/* Skip ones we won't send */	1070	/* Skip ones we won't send */
1099	if (atnr_cs_stat[i] == -1)	1071	if (atnr_cs_stat[i] == -1)
1100	continue;	1072	continue;
1101		1073
1102	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1074	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103	}	1075	}
1104		1076
1105	if (pl->socket->monitor_spells)	1077	if (pl->ns->monitor_spells)
1106	{	1078	{
1107	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1079	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1080	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1109	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1081	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110	}	1082	}
1111		1083
1112	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1084	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1113	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114	set_title (pl->ob, buf);	1086	set_title (ob, buf);
1115	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116		1088
1117	/* Only send it away if we have some actual data */	1089	/* Only send it away if we have some actual data */
1118	if (sl.length () > 6)	1090	if (sl.length () > 6)
1119	pl->socket->send_packet (sl);	1091	ns->send_packet (sl);
1120	}	1092	}
1121		1093
1122	/**	1094	/**
1123	* Tells the client that here is a player it should start using.	1095	* Tells the client that here is a player it should start using.
1124	*/	1096	*/
1125	void	1097	void
1126	esrv_new_player (player *pl, uint32 weight)	1098	esrv_new_player (player *pl, uint32 weight)
1127	{	1099	{
1128	pl->last_weight = weight;	1100	packet sl ("player");
1129
1130	packet sl;
1131	sl << "player ";
1132		1101
1133	sl << uint32 (pl->ob->count)	1102	sl << uint32 (pl->ob->count)
1134	<< uint32 (weight)	1103	<< uint32 (weight)
1135	<< uint32 (pl->ob->face->number)	1104	<< uint32 (pl->ob->face)
1136	<< data8 (pl->ob->name);	1105	<< data8 (pl->ob->name);
1137		1106
		1107	pl->ns->last_weight = weight;
1138	pl->socket->send_packet (sl);	1108	pl->ns->send_packet (sl);
1139	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1140	}	1110	}
1141		1111
1142	/**	1112	/**
1143	* Need to send an animation sequence to the client.	1113	* Need to send an animation sequence to the client.
…		…
1157	{	1127	{
1158	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1128	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1159	return;	1129	return;
1160	}	1130	}
1161		1131
1162	packet sl;	1132	packet sl ("anim");
1163		1133
1164	sl << "anim "
1165	<< uint16 (anim_num)	1134	sl << uint16 (anim_num)
1166	<< uint16 (0); /* flags - not used right now */	1135	<< uint16 (0); /* flags - not used right now */
1167		1136
1168	/* Build up the list of faces. Also, send any information (ie, the	1137	/* Build up the list of faces. Also, send any information (ie, the
1169	* the face itself) down to the client.	1138	* the face itself) down to the client.
1170	*/	1139	*/
…		…
1186	*	1155	*
1187	* Start of map related commands.	1156	* Start of map related commands.
1188	*	1157	*
1189	******************************************************************************/	1158	******************************************************************************/
1190		1159
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 */	1160	/** Clears a map cell */
1214	static void	1161	static void
1215	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1162	map_clearcell (struct MapCell *cell, int count)
1216	{	1163	{
1217	cell->faces[0] = face0;	1164	cell->faces[0] = 0;
1218	cell->faces[1] = face1;	1165	cell->faces[1] = 0;
1219	cell->faces[2] = face2;	1166	cell->faces[2] = 0;
1220	cell->count = count;	1167	cell->count = count;
1221	cell->stat_hp = 0;	1168	cell->stat_hp = 0;
1222	cell->flags = 0;	1169	cell->flags = 0;
1223	cell->player = 0;	1170	cell->player = 0;
1224	}	1171	}
1225		1172
1226	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1227	#define MAX_LAYERS 3	1173	#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		1174
1283	/**	1175	/**
1284	* Removes the need to replicate the same code for each layer.	1176	* Removes the need to replicate the same code for each layer.
1285	* this returns true if this space is now in fact different than	1177	* this returns true if this space is now in fact different than
1286	* it was.	1178	* it was.
…		…
1300	* actually match.	1192	* actually match.
1301	*/	1193	*/
1302	static int	1194	static int
1303	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1195	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1304	{	1196	{
1305	object ob, head;
1306	uint16 face_num;	1197	uint16 face_num;
1307	int bx, by, i;	1198	int bx, by, i;
1308		1199
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);	1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1348		1201
1349	/* If there is no object for this space, or if the face for the object	1202	/* If there is no object for this space, or if the face for the object
1350	* is the blank face, set the face number to zero.	1203	* is the blank face, set the face number to zero.
1351	* else if we have the stored head object for this space, that takes	1204	* else if we have the stored head object for this space, that takes
1352	* precedence over the other object for this space.	1205	* precedence over the other object for this space.
1353	* otherwise, we do special head processing	1206	* otherwise, we do special head processing
1354	*/	1207	*/
1355	if (!ob \|\| ob->face == blank_face)	1208	if (!ob \|\| ob->face == blank_face)
1356	face_num = 0;	1209	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	1210	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,	1211	/* In this case, we are already at the lower right or single part object,
1457	* so nothing special	1212	* 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	*/	1213	*/
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;	1214	face_num = ob->face;
1488		1215
1489	/* We've gotten what face we want to use for the object. Now see if	1216	/* We've gotten what face we want to use for the object. Now see if
1490	* if it has changed since we last sent it to the client.	1217	* if it has changed since we last sent it to the client.
1491	*/	1218	*/
1492	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
…		…
1519	* holds the old values.	1246	* holds the old values.
1520	* layer is the layer to update, with 2 being the floor and 0 the	1247	* layer is the layer to update, with 2 being the floor and 0 the
1521	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1248	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1522	* take.	1249	* take.
1523	*/	1250	*/
1524
1525	static inline int	1251	static inline int
1526	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1252	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1527	{	1253	{
1528	object *ob;	1254	object *ob;
1529	int smoothlevel; /* old face_num; */	1255	int smoothlevel; /* old face_num; */
…		…
1531	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1532		1258
1533	/* If there is no object for this space, or if the face for the object	1259	/* If there is no object for this space, or if the face for the object
1534	* is the blank face, set the smoothlevel to zero.	1260	* is the blank face, set the smoothlevel to zero.
1535	*/	1261	*/
1536	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1262	if (!ob \|\| ob->face == blank_face)
1537	smoothlevel = 0;	1263	smoothlevel = 0;
1538	else	1264	else
1539	{	1265	{
1540	smoothlevel = ob->smoothlevel;	1266	smoothlevel = ob->smoothlevel;
1541	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1542	SendSmooth (&ns, ob->face->number);	1268	SendSmooth (&ns, ob->face);
1543	} /* else not already head object or blank face */	1269	} /* else not already head object or blank face */
1544		1270
1545	/* We've gotten what face we want to use for the object. Now see if	1271	/* We've gotten what face we want to use for the object. Now see if
1546	* if it has changed since we last sent it to the client.	1272	* if it has changed since we last sent it to the client.
1547	*/	1273	*/
…		…
1576	if (ns->EMI_smooth)	1302	if (ns->EMI_smooth)
1577	result += 1; /One byte for smoothlevel /	1303	result += 1; /One byte for smoothlevel /
1578	}	1304	}
1579		1305
1580	return result;	1306	return result;
		1307	}
		1308
		1309	// prefetch (and touch) all maps within a specific distancd
		1310	static void
		1311	prefetch_surrounding_maps (maptile *map, int distance)
		1312	{
		1313	map->last_access = runtime;
		1314
		1315	if (--distance)
		1316	for (int dir = 4; --dir; )
		1317	if (const shstr &path = map->tile_path [dir])
		1318	if (maptile *&neigh = map->tile_map [dir])
		1319	prefetch_surrounding_maps (neigh, distance);
		1320	else
		1321	neigh = maptile::find_async (path, map);
		1322	}
		1323
		1324	// prefetch a generous area around the player
		1325	static void
		1326	prefetch_surrounding_maps (object *op)
		1327	{
		1328	prefetch_surrounding_maps (op->map, 3);
1581	}	1329	}
1582		1330
1583	/**	1331	/**
1584	* This function uses the new map1 protocol command to send the map	1332	* This function uses the new map1 protocol command to send the map
1585	* to the client. It is necessary because the old map command supports	1333	* to the client. It is necessary because the old map command supports
…		…
1591	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1339	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1592	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1340	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1593	* and use the other 4 bits for other informatiion. For full documentation	1341	* and use the other 4 bits for other informatiion. For full documentation
1594	* of what we send, see the doc/Protocol file.	1342	* of what we send, see the doc/Protocol file.
1595	* I will describe internally what we do:	1343	* I will describe internally what we do:
1596	* the socket->lastmap shows how the map last looked when sent to the client.	1344	* the ns->lastmap shows how the map last looked when sent to the client.
1597	* in the lastmap structure, there is a cells array, which is set to the	1345	* in the lastmap structure, there is a cells array, which is set to the
1598	* maximum viewable size (As set in config.h).	1346	* maximum viewable size (As set in config.h).
1599	* in the cells, there are faces and a count value.	1347	* 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	1348	* we use the count value to hold the darkness value. If -1, then this space
1601	* is not viewable.	1349	* is not viewable.
…		…
1603	* look like.	1351	* look like.
1604	*/	1352	*/
1605	void	1353	void
1606	draw_client_map1 (object *pl)	1354	draw_client_map1 (object *pl)
1607	{	1355	{
1608	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1356	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1609	sint16 nx, ny;	1357	sint16 nx, ny;
1610	int estartlen, eoldlen;	1358	int estartlen, eoldlen;
1611	uint16 mask, emask;
1612	uint8 eentrysize;	1359	uint8 eentrysize;
1613	uint16 ewhatstart, ewhatflag;	1360	uint16 ewhatstart, ewhatflag;
1614	uint8 extendedinfos;	1361	uint8 extendedinfos;
1615	maptile *m;	1362	maptile *m;
1616		1363
1617	client &socket = *pl->contr->socket;	1364	client &socket = *pl->contr->ns;
		1365
		1366	if (!pl->active)
		1367	return;
1618		1368
1619	check_map_change (pl->contr);	1369	check_map_change (pl->contr);
		1370	prefetch_surrounding_maps (pl);
1620		1371
1621	packet sl;	1372	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622	packet esl;	1373	packet esl;
1623		1374
1624	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1625	startlen = sl.length ();	1375	startlen = sl.length ();
1626		1376
1627	/Extendedmapinfo structure initialisation /	1377	/Extendedmapinfo structure initialisation /
1628	if (socket.ext_mapinfos)	1378	if (socket.ext_mapinfos)
1629	{	1379	{
…		…
1648	ewhatstart = 0;	1398	ewhatstart = 0;
1649	ewhatflag = 0;	1399	ewhatflag = 0;
1650	estartlen = 0;	1400	estartlen = 0;
1651	}	1401	}
1652		1402
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	1403	/* x,y are the real map locations. ax, ay are viewport relative
1657	* locations.	1404	* locations.
1658	*/	1405	*/
1659	ay = 0;	1406	ay = 0;
1660		1407
…		…
1662	* but that started to get a bit messy to look at.	1409	* but that started to get a bit messy to look at.
1663	*/	1410	*/
1664	max_x = pl->x + (socket.mapx + 1) / 2;	1411	max_x = pl->x + (socket.mapx + 1) / 2;
1665	max_y = pl->y + (socket.mapy + 1) / 2;	1412	max_y = pl->y + (socket.mapy + 1) / 2;
1666		1413
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++)	1414	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1674	{	1415	{
1675	ax = 0;	1416	ax = 0;
1676	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1417	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1677	{	1418	{
1678		1419	int emask, mask;
1679	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1420	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1680		1421
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];	1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1726
1727	d = pl->contr->blocked_los[ax][ay];
1728		1423
1729	/* If the coordinates are not valid, or it is too dark to see,	1424	/* If the coordinates are not valid, or it is too dark to see,
1730	* we tell the client as such	1425	* we tell the client as such
1731	*/	1426	*/
1732	nx = x;	1427	nx = x;
…		…
1740	* of the map, it shouldn't have a head	1435	* of the map, it shouldn't have a head
1741	*/	1436	*/
1742	if (lastcell.count != -1)	1437	if (lastcell.count != -1)
1743	{	1438	{
1744	sl << uint16 (mask);	1439	sl << uint16 (mask);
1745	map_clearcell (&lastcell, 0, 0, 0, -1);	1440	map_clearcell (&lastcell, -1);
1746	}	1441	}
		1442
		1443	continue;
1747	}	1444	}
		1445
		1446	m->touch ();
		1447
		1448	int d = pl->contr->blocked_los[ax][ay];
		1449
1748	else if (d > 3)	1450	if (d > 3)
1749	{	1451	{
		1452
1750	int need_send = 0, count;	1453	int need_send = 0, count;
1751		1454
1752	/* This block deals with spaces that are not visible for whatever	1455	/* This block deals with spaces that are not visible for whatever
1753	* reason. Still may need to send the head for this space.	1456	* reason. Still may need to send the head for this space.
1754	*/	1457	*/
1755		1458
1756	oldlen = sl.length ();	1459	oldlen = sl.length ();
1757		1460
1758	sl << uint16 (mask);	1461	sl << uint16 (mask);
…		…
1760	if (lastcell.count != -1)	1463	if (lastcell.count != -1)
1761	need_send = 1;	1464	need_send = 1;
1762		1465
1763	count = -1;	1466	count = -1;
1764		1467
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 */	1468	/* properly clear a previously sent big face */
1778	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0	1469	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1779	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)	1470	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1780	need_send = 1;	1471	need_send = 1;
1781		1472
1782	map_clearcell (&lastcell, 0, 0, 0, count);	1473	map_clearcell (&lastcell, count);
1783	}
1784		1474
1785	if ((mask & 0xf) \|\| need_send)	1475	if ((mask & 0xf) \|\| need_send)
1786	sl[oldlen + 1] = mask & 0xff;	1476	sl[oldlen + 1] = mask & 0xff;
1787	else	1477	else
1788	sl.reset (oldlen);	1478	sl.reset (oldlen);
1789	}	1479	}
1790	else	1480	else
1791	{	1481	{
1792	/* In this block, the space is visible or there are head objects	1482	/* In this block, the space is visible.
1793	* we need to send.
1794	*/	1483	*/
1795		1484
1796	/* Rather than try to figure out what everything that we might	1485	/* Rather than try to figure out what everything that we might
1797	* need to send is, then form the packet after that,	1486	* need to send is, then form the packet after that,
1798	* we presume that we will in fact form a packet, and update	1487	* we presume that we will in fact form a packet, and update
…		…
1801	* is done.	1490	* is done.
1802	* I think this is simpler than doing a bunch of checks to see	1491	* 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	1492	* what if anything we need to send, setting the bits, then
1804	* doing those checks again to add the real data.	1493	* doing those checks again to add the real data.
1805	*/	1494	*/
1806	oldlen = sl.length ();	1495	oldlen = sl.length ();
1807	mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1808	eoldlen = esl.length ();	1496	eoldlen = esl.length ();
1809	emask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1497
1810	sl << uint16 (mask);	1498	sl << uint16 (mask);
1811		1499
1812	if (socket.ext_mapinfos)	1500	if (socket.ext_mapinfos)
1813	esl << uint16 (emask);	1501	esl << uint16 (emask);
1814		1502
…		…
1919	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1607	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1920	emask \|= 0x2;	1608	emask \|= 0x2;
1921		1609
1922	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	1610	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1923	{	1611	{
1924	if (lastcell.faces[0] != pl->face->number)	1612	if (lastcell.faces[0] != pl->face)
1925	{	1613	{
1926	lastcell.faces[0] = pl->face->number;	1614	lastcell.faces[0] = pl->face;
1927	mask \|= 0x1;	1615	mask \|= 0x1;
1928		1616
1929	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1617	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1930	esrv_send_face (&socket, pl->face->number, 0);	1618	esrv_send_face (&socket, pl->face, 0);
1931		1619
1932	sl << uint16 (pl->face->number);	1620	sl << uint16 (pl->face);
1933	}	1621	}
1934	}	1622	}
1935	else	1623	else
1936	{	1624	{
1937	/* Top face */	1625	/* Top face */
…		…
1967	if (!(sl.length () > startlen \|\| socket.sent_scroll))	1655	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1968	{	1656	{
1969	/* No map data will follow, so don't say the client	1657	/* No map data will follow, so don't say the client
1970	* it doesn't need draw!	1658	* it doesn't need draw!
1971	*/	1659	*/
1972	ewhatflag &= (~EMI_NOREDRAW);	1660	ewhatflag &= ~EMI_NOREDRAW;
1973	esl[ewhatstart + 1] = ewhatflag & 0xff;	1661	esl[ewhatstart + 1] = ewhatflag & 0xff;
1974	}	1662	}
1975		1663
1976	if (esl.length () > estartlen)	1664	if (esl.length () > estartlen)
1977	socket.send_packet (esl);	1665	socket.send_packet (esl);
…		…
1989	*/	1677	*/
1990	void	1678	void
1991	draw_client_map (object *pl)	1679	draw_client_map (object *pl)
1992	{	1680	{
1993	int i, j;	1681	int i, j;
1994	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1682	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;	1683	int mflags;
1998	struct Map newmap;	1684	struct Map newmap;
1999	maptile m, pm;	1685	maptile m, pm;
2000		1686
2001	if (pl->type != PLAYER)	1687	if (pl->type != PLAYER)
2002	{	1688	{
…		…
2013	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1699	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2014	return;	1700	return;
2015		1701
2016	memset (&newmap, 0, sizeof (struct Map));	1702	memset (&newmap, 0, sizeof (struct Map));
2017		1703
2018	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1704	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++)	1705	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2021	{	1706	{
2022	ax = i;	1707	ax = i;
2023	ay = j;	1708	ay = j;
2024	m = pm;	1709	m = pm;
2025	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1710	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026		1711
2027	if (mflags & P_OUT_OF_MAP)	1712	if (mflags & P_OUT_OF_MAP)
2028	continue;	1713	continue;
2029		1714
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	1715	/* 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	1716	* just to reload it. This should really call something like
2035	* swap_map, but this is much more efficient and 'good enough'	1717	* swap_map, but this is much more efficient and 'good enough'
2036	*/	1718	*/
2037	if (mflags & P_NEW_MAP)	1719	if (mflags & P_NEW_MAP)
2038	m->timeout = 50;	1720	m->timeout = 50;
2039	}	1721	}
2040	}	1722
2041	/* do LOS after calls to update_position */	1723	/* do LOS after calls to update_position */
2042	if (pl->contr->do_los)	1724	if (pl->contr->do_los)
2043	{	1725	{
2044	update_los (pl);	1726	update_los (pl);
2045	pl->contr->do_los = 0;	1727	pl->contr->do_los = 0;
…		…
2060		1742
2061	/*****************************************************************************/	1743	/*****************************************************************************/
2062	void	1744	void
2063	send_plugin_custom_message (object pl, char buf)	1745	send_plugin_custom_message (object pl, char buf)
2064	{	1746	{
2065	pl->contr->socket->send_packet (buf);	1747	pl->contr->ns->send_packet (buf);
2066	}	1748	}
2067		1749
2068	/**	1750	/**
2069	* This sends the skill number to name mapping. We ignore	1751	* This sends the skill number to name mapping. We ignore
2070	* the params - we always send the same info no matter what.	1752	* 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	1797	* it then sends an updspell packet for each spell that has changed in this way
2116	*/	1798	*/
2117	void	1799	void
2118	esrv_update_spells (player *pl)	1800	esrv_update_spells (player *pl)
2119	{	1801	{
		1802	if (!pl->ns)
		1803	return;
		1804
2120	if (!pl->socket->monitor_spells)	1805	if (!pl->ns->monitor_spells)
2121	return;	1806	return;
2122		1807
2123	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1808	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2124	{	1809	{
2125	if (spell->type == SPELL)	1810	if (spell->type == SPELL)
…		…
2155		1840
2156	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1841	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2157	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1842	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2158	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1843	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2159		1844
2160	pl->socket->send_packet (sl);	1845	pl->ns->send_packet (sl);
2161	}	1846	}
2162	}	1847	}
2163	}	1848	}
2164	}	1849	}
2165		1850
2166	void	1851	void
2167	esrv_remove_spell (player pl, object spell)	1852	esrv_remove_spell (player pl, object spell)
2168	{	1853	{
2169	if (!pl->socket->monitor_spells)	1854	if (!pl->ns->monitor_spells)
2170	return;	1855	return;
2171		1856
2172	if (!pl \|\| !spell \|\| spell->env != pl->ob)	1857	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2173	{	1858	{
2174	LOG (llevError, "Invalid call to esrv_remove_spell");	1859	LOG (llevError, "Invalid call to esrv_remove_spell");
2175	return;	1860	return;
2176	}	1861	}
2177		1862
2178	packet sl;	1863	packet sl ("delspell");
2179		1864
2180	sl << "delspell "
2181	<< uint32 (spell->count);	1865	sl << uint32 (spell->count);
2182		1866
2183	pl->socket->send_packet (sl);	1867	pl->ns->send_packet (sl);
2184	}	1868	}
2185		1869
2186	/* appends the spell spell to the Socklist we will send the data to. /	1870	/* appends the spell spell to the Socklist we will send the data to. /
2187	static void	1871	static void
2188	append_spell (player pl, packet &sl, object spell)	1872	append_spell (player pl, packet &sl, object spell)
2189	{	1873	{
2190	int len, i, skill = 0;	1874	int i, skill = 0;
2191		1875
2192	if (!(spell->name))	1876	if (!(spell->name))
2193	{	1877	{
2194	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1878	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2195	return;	1879	return;
…		…
2207	if (!strcmp (spell->skill, skill_names[i]))	1891	if (!strcmp (spell->skill, skill_names[i]))
2208	{	1892	{
2209	skill = i + CS_STAT_SKILLINFO;	1893	skill = i + CS_STAT_SKILLINFO;
2210	break;	1894	break;
2211	}	1895	}
		1896	}
		1897
		1898	// spells better have a face
		1899	if (!spell->face)
		1900	{
		1901	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1902	spell->face = face_find ("burnout.x11", blank_face);
2212	}	1903	}
2213		1904
2214	/* send the current values */	1905	/* send the current values */
2215	sl << uint32 (spell->count)	1906	sl << uint32 (spell->count)
2216	<< uint16 (spell->level)	1907	<< uint16 (spell->level)
…		…
2218	<< uint16 (spell->last_sp)	1909	<< uint16 (spell->last_sp)
2219	<< uint16 (spell->last_grace)	1910	<< uint16 (spell->last_grace)
2220	<< uint16 (spell->last_eat)	1911	<< uint16 (spell->last_eat)
2221	<< uint8 (skill)	1912	<< uint8 (skill)
2222	<< uint32 (spell->path_attuned)	1913	<< uint32 (spell->path_attuned)
2223	<< uint32 (spell->face ? spell->face->number : 0)	1914	<< uint32 (spell->face)
2224	<< data8 (spell->name)	1915	<< data8 (spell->name)
2225	<< data16 (spell->msg);	1916	<< data16 (spell->msg);
2226	}	1917	}
2227		1918
2228	/**	1919	/**
…		…
2236	{	1927	{
2237	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1928	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2238	return;	1929	return;
2239	}	1930	}
2240		1931
2241	if (!pl->socket->monitor_spells)	1932	if (!pl->ns->monitor_spells)
2242	return;	1933	return;
2243		1934
2244	packet sl;	1935	packet sl ("addspell");
2245	sl << "addspell ";
2246		1936
2247	if (!spell)	1937	if (!spell)
2248	{	1938	{
2249	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1939	for (spell = pl->ob->inv; spell; spell = spell->below)
2250	{	1940	{
2251	/* were we to simply keep appending data here, we could exceed	1941	/* were we to simply keep appending data here, we could exceed
2252	* MAXSOCKBUF if the player has enough spells to add, we know that	1942	* MAXSOCKBUF if the player has enough spells to add, we know that
2253	* append_spells will always append 19 data bytes, plus 4 length	1943	* 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	1944	* bytes and 3 strings (because that is the spec) so we need to
…		…
2264	if (spell->type != SPELL)	1954	if (spell->type != SPELL)
2265	continue;	1955	continue;
2266		1956
2267	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1957	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2268	{	1958	{
2269	pl->socket->send_packet (sl);	1959	pl->ns->send_packet (sl);
2270		1960
2271	sl.reset ();	1961	sl.reset ();
2272	sl << "addspell ";	1962	sl << "addspell ";
2273	}	1963	}
2274		1964
…		…
2288	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1978	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2289	fatal (0);	1979	fatal (0);
2290	}	1980	}
2291		1981
2292	/* finally, we can send the packet */	1982	/* finally, we can send the packet */
2293	pl->socket->send_packet (sl);	1983	pl->ns->send_packet (sl);
2294	}	1984	}
2295		1985

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC vs. Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC