[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.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	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		136
145	if (pl->socket->newmapcmd == 1)	137	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	138	pl->ns->send_packet ("newmap");
147		139
148	pl->socket->floorbox_reset ();	140	pl->ns->floorbox_reset ();
149	}	141	}
150		142
151	/** check for map change and send new map data */	143	/** check for map/region change and send new map data */
152	static void	144	static void
153	check_map_change (player *pl)	145	check_map_change (player *pl)
154	{	146	{
155	client &socket = *pl->socket;	147	client &socket = *pl->ns;
156	object *ob = pl->ob;	148	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	149	char buf[MAX_BUF]; /* eauugggh */
158		150
159	if (socket.current_map != ob->map)	151	if (socket.current_map != ob->map)
160	{	152	{
…		…
176	flags \|= 4;	168	flags \|= 4;
177	if (ob->map->tile_path[3])	169	if (ob->map->tile_path[3])
178	flags \|= 8;	170	flags \|= 8;
179		171
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	174	}
183	else	175	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	176	snprintf (buf, MAX_BUF, "mapinfo current");
185		177
186	socket.send_packet (buf);	178	socket.send_packet (buf);
…		…
200	}	192	}
201	}	193	}
202		194
203	socket.current_x = ob->x;	195	socket.current_x = ob->x;
204	socket.current_y = ob->y;	196	socket.current_y = ob->y;
		197
		198	region *reg = ob->region ();
		199	if (socket.current_region != reg)
		200	{
		201	socket.current_region = reg;
		202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		203	}
205	}	204	}
206		205
207	/**	206	/**
208	* RequestInfo is sort of a meta command. There is some specific	207	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	208	* request of information, but we call other functions to provide
…		…
280	buf += 8;	279	buf += 8;
281		280
282	// initial map and its origin	281	// initial map and its origin
283	maptile *map = pl->ob->map;	282	maptile *map = pl->ob->map;
284	sint16 dx, dy;	283	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	284	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	286	int max_distance = 8; // limit maximum path length to something generous
288		287
289	while (*buf && map && max_distance)	288	while (*buf && map && max_distance)
290	{	289	{
291	int dir = *buf++;	290	int dir = *buf++;
292		291
293	switch (dir)	292	switch (dir)
294	{	293	{
295	case '1':	294	case '1':
296	dx = 0;	295	dx = 0;
297	dy = -1;	296	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	297	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	298	map && (mapy -= map->height);
300	break;	299	break;
301	case '2':	300	case '2':
302	mapx += map->width;	301	mapx += map->width;
303	dx = map->width;	302	dx = map->width;
304	dy = 0;	303	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	304	map = map->xy_find (dx, dy);
306	break;	305	break;
307	case '3':	306	case '3':
308	mapy += map->height;	307	mapy += map->height;
309	dx = 0;	308	dx = 0;
310	dy = map->height;	309	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	310	map = map->xy_find (dx, dy);
312	break;	311	break;
313	case '4':	312	case '4':
314	dx = -1;	313	dx = -1;
315	dy = 0;	314	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	315	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	316	map && (mapx -= map->width);
318	break;	317	break;
319	}	318	}
320		319
321	--max_distance;	320	--max_distance;
322	}	321	}
323		322
…		…
334	if (map->tile_path[2])	333	if (map->tile_path[2])
335	flags \|= 4;	334	flags \|= 4;
336	if (map->tile_path[3])	335	if (map->tile_path[3])
337	flags \|= 8;	336	flags \|= 8;
338		337
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	339	}
341	else	340	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	342	}
344	else	343	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		345
347	pl->socket->send_packet (bigbuf);	346	pl->ns->send_packet (bigbuf);
348	}	347	}
349		348
350	/** This is the Setup cmd - easy first implementation */	349	/** This is the Setup cmd - easy first implementation */
351	void	350	void
352	SetUp (char buf, int len, client ns)	351	SetUp (char buf, int len, client ns)
…		…
399	{	398	{
400	ns->sound = atoi (param);	399	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);	400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}	401	}
403	else if (!strcmp (cmd, "exp64"))	402	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);	403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))	404	else if (!strcmp (cmd, "spellmon"))
409	{	405	{
410	ns->monitor_spells = atoi (param);	406	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);	407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}	408	}
…		…
435	}	431	}
436	else if (!strcmp (cmd, "newmapcmd"))	432	else if (!strcmp (cmd, "newmapcmd"))
437	{	433	{
438	ns->newmapcmd = atoi (param);	434	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);	435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
440	// } else if (!strcmp(cmd,"plugincmd")) {
441	// ns->plugincmd = atoi(param);
442	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443	}	436	}
444	else if (!strcmp (cmd, "mapinfocmd"))	437	else if (!strcmp (cmd, "mapinfocmd"))
445	{	438	{
446	ns->mapinfocmd = atoi (param);	439	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);	440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
…		…
503	if (cp == 'x' \|\| cp == 'X')	496	if (cp == 'x' \|\| cp == 'X')
504	{	497	{
505	y = atoi (cp + 1);	498	y = atoi (cp + 1);
506	break;	499	break;
507	}	500	}
		501
508	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)
509	{	503	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);	504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}	506	}
…		…
569	* 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.
570	*/	564	*/
571	void	565	void
572	AddMeCmd (char buf, int len, client ns)	566	AddMeCmd (char buf, int len, client ns)
573	{	567	{
574	if (ns->status != Ns_Add \|\| add_player (ns))	568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	ns->send_packet ("addme_failed");
576	else
577	ns->send_packet ("addme_success");
578	}	569	}
579		570
580	/** Reply to ExtendedInfos command */	571	/** Reply to ExtendedInfos command */
581	void	572	void
582	ToggleExtendedInfos (char buf, int len, client ns)	573	ToggleExtendedInfos (char buf, int len, client ns)
…		…
692		683
693	ns->send_packet (cmdback);	684	ns->send_packet (cmdback);
694	}	685	}
695		686
696	/**	687	/**
697	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
698	* Basically, it makes no sense to wait for the client to request a
699	* a piece of data from us that we know the client wants. So
700	* if we know the client wants it, might as well push it to the
701	* client.
702	*/
703	static void
704	SendSmooth (client *ns, uint16 face)
705	{
706	uint16 smoothface;
707
708	/* If we can't find a face, return and set it so we won't try to send this
709	* again.
710	*/
711	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
712	{
713
714	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
715	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
716	return;
717	}
718
719	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720	esrv_send_face (ns, smoothface, 0);
721
722	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
723
724	packet sl ("smooth");
725
726	sl << uint16 (face)
727	<< uint16 (smoothface);
728
729	ns->send_packet (sl);
730	}
731
732	/**
733	* Tells client the picture it has to use	688	* Tells client the picture it has to use
734	* to smooth a picture number given as argument.	689	* to smooth a picture number given as argument.
735	*/	690	*/
736	void	691	void
737	AskSmooth (char buf, int len, client ns)	692	AskSmooth (char buf, int len, client ns)
738	{	693	{
739	SendSmooth (ns, atoi (buf));	694	ns->send_smooth (atoi (buf));
740	}	695	}
741		696
742	/**	697	/**
743	* 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,
744	* etc.)	699	* etc.)
…		…
803	* commands.	758	* commands.
804	*/	759	*/
805	pl->count = 0;	760	pl->count = 0;
806		761
807	//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
808	int time = FABS (pl->ob->speed) < 0.001	763	int time = fabs (pl->ob->speed) < 0.001
809	? time = MAX_TIME * 100	764	? time = MAX_TIME * 100
810	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	765	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
811		766
812	/* Send confirmation of command execution now */	767	/* Send confirmation of command execution now */
813	packet sl ("comc");	768	packet sl ("comc");
814	sl << uint16 (cmdid) << uint32 (time);	769	sl << uint16 (cmdid) << uint32 (time);
815	pl->socket->send_packet (sl);	770	pl->ns->send_packet (sl);
816	}	771	}
817
818		772
819	/** This is a reply to a previous query. */	773	/** This is a reply to a previous query. */
820	void	774	void
821	ReplyCmd (char buf, int len, player pl)	775	ReplyCmd (char buf, int len, client ns)
822	{	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
823	/* 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
824	* 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
825	* once all the X11 code is removed from the server.	791	* once all the X11 code is removed from the server.
826	*	792	*
827	* 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
…		…
830	*/	796	*/
831	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	797	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832		798
833	/* this avoids any hacking here */	799	/* this avoids any hacking here */
834		800
835	switch (pl->state)	801	switch (ns->state)
836	{	802	{
837	case ST_PLAYING:	803	case ST_PLAYING:
838	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	804	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839	break;	805	break;
840		806
841	case ST_PLAY_AGAIN:
842	/* We can check this for return value (2==quit). Maybe we
843	* should, and do something appropriate?
844	*/
845	receive_play_again (pl->ob, buf[0]);
846	break;
847
848	case ST_ROLL_STAT:
849	key_roll_stat (pl->ob, buf[0]);
850	break;
851
852	case ST_CHANGE_CLASS:	807	case ST_CHANGE_CLASS:
853
854	key_change_class (pl->ob, buf[0]);	808	key_change_class (pl->ob, buf[0]);
855	break;
856
857	case ST_CONFIRM_QUIT:
858	key_confirm_quit (pl->ob, buf[0]);
859	break;
860
861	case ST_CONFIGURE:
862	LOG (llevError, "In client input handling, but into configure state\n");
863	pl->state = ST_PLAYING;
864	break;
865
866	case ST_GET_NAME:
867	receive_player_name (pl->ob, 13);
868	break;
869
870	case ST_GET_PASSWORD:
871	case ST_CONFIRM_PASSWORD:
872	receive_player_password (pl->ob, 13);
873	break;	809	break;
874		810
875	case ST_GET_PARTY_PASSWORD: /* Get password for party */	811	case ST_GET_PARTY_PASSWORD: /* Get password for party */
876	receive_party_password (pl->ob, 13);	812	receive_party_password (pl->ob, 13);
877	break;	813	break;
878		814
879	default:	815	default:
880	LOG (llevError, "Unknown input state: %d\n", pl->state);	816	LOG (llevError, "Unknown input state: %d\n", ns->state);
881	}	817	}
882	}	818	}
883		819
884	/**	820	/**
885	* 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
…		…
900	ns->cs_version = atoi (buf);	836	ns->cs_version = atoi (buf);
901	ns->sc_version = ns->cs_version;	837	ns->sc_version = ns->cs_version;
902		838
903	LOG (llevDebug, "connection from client <%s>\n", buf);	839	LOG (llevDebug, "connection from client <%s>\n", buf);
904		840
905
906	//TODO: should log here just for statistics	841	//TODO: should log here just for statistics
907		842
908	//if (VERSION_CS != ns->cs_version)	843	//if (VERSION_CS != ns->cs_version)
909	// unchecked;	844	// unchecked;
910		845
…		…
935	{	870	{
936	ns->sound = atoi (buf);	871	ns->sound = atoi (buf);
937	}	872	}
938		873
939	/** client wants the map resent */	874	/** client wants the map resent */
940
941	void	875	void
942	MapRedrawCmd (char buf, int len, player pl)	876	MapRedrawCmd (char buf, int len, player pl)
943	{	877	{
944	/* 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
945	* 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.
…		…
1032	esrv_update_stats (player *pl)	966	esrv_update_stats (player *pl)
1033	{	967	{
1034	char buf[MAX_BUF];	968	char buf[MAX_BUF];
1035	uint16 flags;	969	uint16 flags;
1036		970
		971	client *ns = pl->ns;
		972	if (!ns)
		973	return;
		974
		975	object *ob = pl->ob;
		976	if (!ob)
		977	return;
		978
1037	packet sl ("stats");	979	packet sl ("stats");
1038		980
1039	if (pl->ob)
1040	{
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;
1129
1130	packet sl ("player");	1064	packet sl ("player");
1131		1065
1132	sl << uint32 (pl->ob->count)	1066	sl << uint32 (pl->ob->count)
1133	<< uint32 (weight)	1067	<< uint32 (weight)
1134	<< uint32 (pl->ob->face->number)	1068	<< uint32 (pl->ob->face)
1135	<< data8 (pl->ob->name);	1069	<< data8 (pl->ob->name);
1136		1070
		1071	pl->ns->last_weight = weight;
1137	pl->socket->send_packet (sl);	1072	pl->ns->send_packet (sl);
1138	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1073	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139	}	1074	}
1140
1141	/**
1142	* Need to send an animation sequence to the client.
1143	* We will send appropriate face commands to the client if we haven't
1144	* sent them the face yet (this can become quite costly in terms of
1145	* how much we are sending - on the other hand, this should only happen
1146	* when the player logs in and picks stuff up.
1147	*/
1148	void
1149	esrv_send_animation (client * ns, short anim_num)
1150	{
1151	/* Do some checking on the anim_num we got. Note that the animations
1152	* are added in contigous order, so if the number is in the valid
1153	* range, it must be a valid animation.
1154	*/
1155	if (anim_num < 0 \|\| anim_num > num_animations)
1156	{
1157	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1158	return;
1159	}
1160
1161	packet sl ("anim");
1162
1163	sl << uint16 (anim_num)
1164	<< uint16 (0); /* flags - not used right now */
1165
1166	/* Build up the list of faces. Also, send any information (ie, the
1167	* the face itself) down to the client.
1168	*/
1169	for (int i = 0; i < animations[anim_num].num_animations; i++)
1170	{
1171	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1172	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1174	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1175	}
1176
1177	ns->send_packet (sl);
1178
1179	ns->anims_sent[anim_num] = 1;
1180	}
1181
1182		1075
1183	/******************************************************************************	1076	/******************************************************************************
1184	*	1077	*
1185	* Start of map related commands.	1078	* Start of map related commands.
1186	*	1079	*
1187	******************************************************************************/	1080	******************************************************************************/
1188		1081
1189	/**
1190	* This adds face_num to a map cell at x,y. If the client doesn't have
1191	* the face yet, we will also send it.
1192	*/
1193	static void
1194	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1195	{
1196	if (newmap->cells[x][y].count >= MAP_LAYERS)
1197	{
1198	//TODO: one or the other, can't both have abort and return, verify and act
1199	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1200	return;
1201	abort ();
1202	}
1203
1204	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1205	newmap->cells[x][y].count++;
1206
1207	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1208	esrv_send_face (ns, face_num, 0);
1209	}
1210
1211	/** Clears a map cell */	1082	/** Clears a map cell */
1212	static void	1083	static void
1213	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1084	map_clearcell (struct MapCell *cell, int count)
1214	{	1085	{
1215	cell->faces[0] = face0;	1086	cell->faces[0] = 0;
1216	cell->faces[1] = face1;	1087	cell->faces[1] = 0;
1217	cell->faces[2] = face2;	1088	cell->faces[2] = 0;
1218	cell->count = count;	1089	cell->count = count;
1219	cell->stat_hp = 0;	1090	cell->stat_hp = 0;
1220	cell->flags = 0;	1091	cell->flags = 0;
1221	cell->player = 0;	1092	cell->player = 0;
1222	}	1093	}
1223		1094
1224	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1225	#define MAX_LAYERS 3	1095	#define MAX_LAYERS 3
1226
1227	/* Using a global really isn't a good approach, but saves the over head of
1228	* allocating and deallocating such a block of data each time run through,
1229	* and saves the space of allocating this in the socket object when we only
1230	* need it for this cycle. If the server is ever threaded, this needs to be
1231	* re-examined.
1232	*/
1233	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1234
1235	/**
1236	* Returns true if any of the heads for this
1237	* space is set. Returns false if all are blank - this is used
1238	* for empty space checking.
1239	*/
1240	static inline int
1241	have_head (int ax, int ay)
1242	{
1243	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1244	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1245	return 1;
1246
1247	return 0;
1248	}
1249
1250	/**
1251	* check_head is a bit simplistic version of update_space below.
1252	* basically, it only checks the that the head on space ax,ay at layer
1253	* needs to get sent - if so, it adds the data, sending the head
1254	* if needed, and returning 1. If this no data needs to get
1255	* sent, it returns zero.
1256	*/
1257	static int
1258	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1259	{
1260	short face_num;
1261
1262	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1263	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1264	else
1265	face_num = 0;
1266
1267	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1268	{
1269	sl << uint16 (face_num);
1270	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1271	esrv_send_face (&ns, face_num, 0);
1272
1273	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1274	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1275	return 1;
1276	}
1277
1278	return 0; /* No change */
1279	}
1280		1096
1281	/**	1097	/**
1282	* Removes the need to replicate the same code for each layer.	1098	* Removes the need to replicate the same code for each layer.
1283	* 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
1284	* it was.	1100	* it was.
…		…
1298	* actually match.	1114	* actually match.
1299	*/	1115	*/
1300	static int	1116	static int
1301	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)
1302	{	1118	{
1303	object ob, head;
1304	uint16 face_num;	1119	uint16 face_num;
1305	int bx, by, i;	1120	int bx, by, i;
1306		1121
1307	/* If there is a multipart object stored away, treat that as more important.
1308	* If not, then do the normal processing.
1309	*/
1310	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1311
1312	/* Check to see if this head is part of the set of objects
1313	* we would normally send for this space. If so, then
1314	* don't use the head value. We need to do the check
1315	* here and not when setting up the heads[] value for two reasons -
1316	* 1) the heads[] values will get used even if the space is not visible.
1317	* 2) its possible the head is not on the same map as a part, and I'd
1318	* rather not need to do the map translation overhead.
1319	* 3) We need to do some extra checking to make sure that we will
1320	* otherwise send the image as this layer, eg, either it matches
1321	* the head value, or is not multipart.
1322	*/
1323	if (head && !head->more)
1324	{
1325	for (i = 0; i < MAP_LAYERS; i++)
1326	{
1327	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1328	if (!ob)
1329	continue;
1330
1331	if (ob->head)
1332	ob = ob->head;
1333
1334	if (ob == head)
1335	{
1336	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1337	head = NULL;
1338	break;
1339	}
1340	}
1341	}
1342
1343	ob = head;
1344	if (!ob)
1345	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1122	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1346		1123
1347	/* 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
1348	* is the blank face, set the face number to zero.	1125	* is the blank face, set the face number to zero.
1349	* 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
1350	* precedence over the other object for this space.	1127	* precedence over the other object for this space.
1351	* otherwise, we do special head processing	1128	* otherwise, we do special head processing
1352	*/	1129	*/
1353	if (!ob \|\| ob->face == blank_face)	1130	if (!ob \|\| ob->face == blank_face)
1354	face_num = 0;	1131	face_num = 0;
1355	else if (head)
1356	{
1357	/* if this is a head that had previously been stored */
1358	face_num = ob->face->number;
1359	}
1360	else	1132	else
1361	{
1362	/* if the faces for the different parts of a multipart object
1363	* are the same, we only want to send the bottom right most
1364	* portion of the object. That info is in the tail_.. values
1365	* of the head. Note that for the head itself, ob->head will
1366	* be null, so we only do this block if we are working on
1367	* a tail piece.
1368	*/
1369
1370	/* tail_x and tail_y will only be set in the head object. If
1371	* this is the head object and these are set, we proceed
1372	* with logic to only send bottom right. Similarly, if
1373	* this is one of the more parts but the head has those values
1374	* set, we want to do the processing. There can be cases where
1375	* the head is not visible but one of its parts is, so we just
1376	* can always expect that ob->arch->tail_x will be true for all
1377	* object we may want to display.
1378	*/
1379	if ((ob->arch->tail_x \|\| ob->arch->tail_y) \|\| (ob->head && (ob->head->arch->tail_x \|\| ob->head->arch->tail_y)))
1380	{
1381
1382	if (ob->head)
1383	head = ob->head;
1384	else
1385	head = ob;
1386
1387	/* Basically figure out where the offset is from where we are right
1388	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1389	* piece is from the head, and the tail is where the tail is from the
1390	* head. Note that bx and by will equal sx and sy if we are already working
1391	* on the bottom right corner. If ob is the head, the clone values
1392	* will be zero, so the right thing will still happen.
1393	*/
1394	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1395	by = sy + head->arch->tail_y - ob->arch->clone.y;
1396
1397	/* I don't think this can ever happen, but better to check for it just
1398	* in case.
1399	*/
1400	if (bx < sx \|\| by < sy)
1401	{
1402	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1403	face_num = 0;
1404	}
1405	/* single part object, multipart object with non merged faces,
1406	* of multipart object already at lower right.
1407	*/
1408	else if (bx == sx && by == sy)
1409	{
1410	face_num = ob->face->number;
1411
1412	/* if this face matches one stored away, clear that one away.
1413	* this code relies on the fact that the map1 commands
1414	* goes from 2 down to 0.
1415	*/
1416	for (i = 0; i < MAP_LAYERS; i++)
1417	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1418	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1419	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1420	}
1421	else
1422	{
1423	/* If this head is stored away, clear it - otherwise,
1424	* there can be cases where a object is on multiple layers -
1425	* we only want to send it once.
1426	*/
1427	face_num = head->face->number;
1428	for (i = 0; i < MAP_LAYERS; i++)
1429	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1430	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1431	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1432
1433	/* First, try to put the new head on the same layer. If that is used up,
1434	* then find another layer.
1435	*/
1436	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1437	{
1438	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1439	}
1440	else
1441	for (i = 0; i < MAX_LAYERS; i++)
1442	{
1443	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL \|\|
1444	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1445	{
1446	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1447	}
1448	}
1449	face_num = 0; /* Don't send this object - we'll send the head later */
1450	}
1451	}
1452	else
1453	{
1454	/* In this case, we are already at the lower right or single part object,	1133	/* In this case, we are already at the lower right or single part object,
1455	* so nothing special	1134	* so nothing special
1456	*/
1457	face_num = ob->face->number;
1458
1459	/* clear out any head entries that have the same face as this one */
1460	for (bx = 0; bx < layer; bx++)
1461	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1462	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1463	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1464	}
1465	} /* else not already head object or blank face */
1466
1467	/* This is a real hack. Basically, if we have nothing to send for this layer,
1468	* but there is a head on the next layer, send that instead.
1469	* Without this, what happens is you can get the case where the player stands
1470	* on the same space as the head. However, if you have overlapping big objects
1471	* of the same type, what happens then is it doesn't think it needs to send
1472	* This tends to make stacking also work/look better.
1473	*/	1135	*/
1474	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1475	{
1476	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1477	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1478	}
1479
1480	/* Another hack - because of heads and whatnot, this face may match one
1481	* we already sent for a lower layer. In that case, don't send
1482	* this one.
1483	*/
1484	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1485	face_num = 0;	1136	face_num = ob->face;
1486		1137
1487	/* 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
1488	* 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.
1489	*/	1140	*/
1490	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1141	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1491	{	1142	{
1492	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1143	ns.lastmap.cells[sx][sy].faces[layer] = face_num;
		1144
1493	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
1494	esrv_send_face (&ns, face_num, 0);	1149	ns.send_face (face_num);
1495		1150
1496	sl << uint16 (face_num);	1151	sl << uint16 (face_num);
1497	return 1;	1152	return 1;
1498	}	1153	}
1499		1154
…		…
1517	* holds the old values.	1172	* holds the old values.
1518	* 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
1519	* 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
1520	* take.	1175	* take.
1521	*/	1176	*/
1522
1523	static inline int	1177	static inline int
1524	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)
1525	{	1179	{
1526	object *ob;
1527	int smoothlevel; /* old face_num; */
1528
1529	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1180	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1530		1181
1531	/* 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
1532	* is the blank face, set the smoothlevel to zero.	1183	* is the blank face, set the smoothlevel to zero.
1533	*/	1184	*/
1534	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1185	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1535	smoothlevel = 0;
1536	else
1537	{
1538	smoothlevel = ob->smoothlevel;
1539	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1540	SendSmooth (&ns, ob->face->number);
1541	} /* else not already head object or blank face */
1542		1186
1543	/* 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
1544	* 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.
1545	*/	1189	*/
1546	if (smoothlevel > 255)	1190	if (smoothlevel > 255)
…		…
1548	else if (smoothlevel < 0)	1192	else if (smoothlevel < 0)
1549	smoothlevel = 0;	1193	smoothlevel = 0;
1550		1194
1551	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)	1195	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1552	{	1196	{
		1197	if (smoothlevel)
		1198	ns.send_smooth (ob->face);
		1199
1553	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;	1200	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1554	sl << uint8 (smoothlevel);	1201	sl << uint8 (smoothlevel);
1555	return 1;	1202	return 1;
1556	}	1203	}
1557		1204
…		…
1574	if (ns->EMI_smooth)	1221	if (ns->EMI_smooth)
1575	result += 1; /One byte for smoothlevel /	1222	result += 1; /One byte for smoothlevel /
1576	}	1223	}
1577		1224
1578	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);
1579	}	1248	}
1580		1249
1581	/**	1250	/**
1582	* 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
1583	* 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
…		…
1589	* 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
1590	* 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,
1591	* 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
1592	* of what we send, see the doc/Protocol file.	1261	* of what we send, see the doc/Protocol file.
1593	* I will describe internally what we do:	1262	* I will describe internally what we do:
1594	* 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.
1595	* 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
1596	* maximum viewable size (As set in config.h).	1265	* maximum viewable size (As set in config.h).
1597	* in the cells, there are faces and a count value.	1266	* in the cells, there are faces and a count value.
1598	* we use the count value to hold the darkness value. If -1, then this space	1267	* we use the count value to hold the darkness value. If -1, then this space
1599	* is not viewable.	1268	* is not viewable.
…		…
1601	* look like.	1270	* look like.
1602	*/	1271	*/
1603	void	1272	void
1604	draw_client_map1 (object *pl)	1273	draw_client_map1 (object *pl)
1605	{	1274	{
1606	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1275	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1607	sint16 nx, ny;	1276	sint16 nx, ny;
1608	int estartlen, eoldlen;	1277	int estartlen, eoldlen;
1609	uint16 mask, emask;
1610	uint8 eentrysize;	1278	uint8 eentrysize;
1611	uint16 ewhatstart, ewhatflag;	1279	uint16 ewhatstart, ewhatflag;
1612	uint8 extendedinfos;	1280	uint8 extendedinfos;
1613	maptile *m;	1281	maptile *m;
1614		1282
1615	client &socket = *pl->contr->socket;	1283	client &socket = *pl->contr->ns;
		1284
		1285	if (!pl->active)
		1286	return;
1616		1287
1617	check_map_change (pl->contr);	1288	check_map_change (pl->contr);
		1289	prefetch_surrounding_maps (pl);
1618		1290
1619	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1291	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620	packet esl;	1292	packet esl;
1621		1293
1622	startlen = sl.length ();	1294	startlen = sl.length ();
…		…
1645	ewhatstart = 0;	1317	ewhatstart = 0;
1646	ewhatflag = 0;	1318	ewhatflag = 0;
1647	estartlen = 0;	1319	estartlen = 0;
1648	}	1320	}
1649		1321
1650	/* Init data to zero */
1651	memset (heads, 0, sizeof (object ) MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1652
1653	/* 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
1654	* locations.	1323	* locations.
1655	*/	1324	*/
1656	ay = 0;	1325	ay = 0;
1657		1326
…		…
1659	* but that started to get a bit messy to look at.	1328	* but that started to get a bit messy to look at.
1660	*/	1329	*/
1661	max_x = pl->x + (socket.mapx + 1) / 2;	1330	max_x = pl->x + (socket.mapx + 1) / 2;
1662	max_y = pl->y + (socket.mapy + 1) / 2;	1331	max_y = pl->y + (socket.mapy + 1) / 2;
1663		1332
1664	if (socket.mapmode == Map1aCmd)
1665	{
1666	max_x += MAX_HEAD_OFFSET;
1667	max_y += MAX_HEAD_OFFSET;
1668	}
1669
1670	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++)
1671	{	1334	{
1672	ax = 0;	1335	ax = 0;
1673	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++)
1674	{	1337	{
1675		1338	int emask, mask;
1676	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1339	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1677		1340
1678	/* If this space is out of the normal viewable area, we only check
1679	* the heads value ax or ay will only be greater than what
1680	* the client wants if using the map1a command - this is because
1681	* if the map1a command is not used, max_x and max_y will be
1682	* set to lower values.
1683	*/
1684	if (ax >= socket.mapx \|\| ay >= socket.mapy)
1685	{
1686	int i, got_one;
1687
1688	oldlen = sl.length ();
1689
1690	sl << uint16 (mask);
1691
1692	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1693	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1694	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1695
1696	/* If all we are doing is sending 0 (blank) faces, we don't
1697	* actually need to send that - just the coordinates
1698	* with no faces tells the client to blank out the
1699	* space.
1700	*/
1701	got_one = 0;
1702	for (i = oldlen + 2; i < sl.length (); i++)
1703	if (sl[i])
1704	got_one = 1;
1705
1706	if (got_one && (mask & 0xf))
1707	sl[oldlen + 1] = mask & 0xff;
1708	else
1709	{ /either all faces blank, either no face at all /
1710	if (mask & 0xf) /at least 1 face, we know it's blank, only send coordinates /
1711	sl.reset (oldlen + 2);
1712	else
1713	sl.reset (oldlen);
1714	}
1715
1716	/*What concerns extendinfos, nothing to be done for now
1717	* (perhaps effects layer later)
1718	*/
1719	continue; /* don't do processing below */
1720	}
1721
1722	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1341	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1723
1724	d = pl->contr->blocked_los[ax][ay];
1725		1342
1726	/* 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,
1727	* we tell the client as such	1344	* we tell the client as such
1728	*/	1345	*/
1729	nx = x;	1346	nx = x;
…		…
1737	* of the map, it shouldn't have a head	1354	* of the map, it shouldn't have a head
1738	*/	1355	*/
1739	if (lastcell.count != -1)	1356	if (lastcell.count != -1)
1740	{	1357	{
1741	sl << uint16 (mask);	1358	sl << uint16 (mask);
1742	map_clearcell (&lastcell, 0, 0, 0, -1);	1359	map_clearcell (&lastcell, -1);
1743	}	1360	}
		1361
		1362	continue;
1744	}	1363	}
		1364
		1365	m->touch ();
		1366
		1367	int d = pl->contr->blocked_los[ax][ay];
		1368
1745	else if (d > 3)	1369	if (d > 3)
1746	{	1370	{
		1371
1747	int need_send = 0, count;	1372	int need_send = 0, count;
1748		1373
1749	/* This block deals with spaces that are not visible for whatever	1374	/* This block deals with spaces that are not visible for whatever
1750	* reason. Still may need to send the head for this space.	1375	* reason. Still may need to send the head for this space.
1751	*/	1376	*/
1752		1377
1753	oldlen = sl.length ();	1378	oldlen = sl.length ();
1754		1379
1755	sl << uint16 (mask);	1380	sl << uint16 (mask);
…		…
1757	if (lastcell.count != -1)	1382	if (lastcell.count != -1)
1758	need_send = 1;	1383	need_send = 1;
1759		1384
1760	count = -1;	1385	count = -1;
1761		1386
1762	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1763	{
1764	/* Now check to see if any heads need to be sent */
1765
1766	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1767	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1768	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1769
1770	lastcell.count = count;
1771	}
1772	else
1773	{
1774	/* properly clear a previously sent big face */	1387	/* properly clear a previously sent big face */
1775	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0	1388	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1776	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)	1389	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1777	need_send = 1;	1390	need_send = 1;
1778		1391
1779	map_clearcell (&lastcell, 0, 0, 0, count);	1392	map_clearcell (&lastcell, count);
1780	}
1781		1393
1782	if ((mask & 0xf) \|\| need_send)	1394	if ((mask & 0xf) \|\| need_send)
1783	sl[oldlen + 1] = mask & 0xff;	1395	sl[oldlen + 1] = mask & 0xff;
1784	else	1396	else
1785	sl.reset (oldlen);	1397	sl.reset (oldlen);
1786	}	1398	}
1787	else	1399	else
1788	{	1400	{
1789	/* In this block, the space is visible or there are head objects	1401	/* In this block, the space is visible.
1790	* we need to send.
1791	*/	1402	*/
1792		1403
1793	/* Rather than try to figure out what everything that we might	1404	/* Rather than try to figure out what everything that we might
1794	* need to send is, then form the packet after that,	1405	* need to send is, then form the packet after that,
1795	* 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
…		…
1798	* is done.	1409	* is done.
1799	* 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
1800	* what if anything we need to send, setting the bits, then	1411	* what if anything we need to send, setting the bits, then
1801	* doing those checks again to add the real data.	1412	* doing those checks again to add the real data.
1802	*/	1413	*/
1803	oldlen = sl.length ();	1414	oldlen = sl.length ();
1804	mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1805	eoldlen = esl.length ();	1415	eoldlen = esl.length ();
1806	emask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1416
1807	sl << uint16 (mask);	1417	sl << uint16 (mask);
1808		1418
1809	if (socket.ext_mapinfos)	1419	if (socket.ext_mapinfos)
1810	esl << uint16 (emask);	1420	esl << uint16 (emask);
1811		1421
…		…
1916	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1526	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1917	emask \|= 0x2;	1527	emask \|= 0x2;
1918		1528
1919	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))
1920	{	1530	{
1921	if (lastcell.faces[0] != pl->face->number)	1531	if (lastcell.faces[0] != pl->face)
1922	{	1532	{
1923	lastcell.faces[0] = pl->face->number;	1533	lastcell.faces[0] = pl->face;
1924	mask \|= 0x1;	1534	mask \|= 0x1;
1925		1535
1926	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1536	socket.send_faces (pl);
1927	esrv_send_face (&socket, pl->face->number, 0);
1928		1537
1929	sl << uint16 (pl->face->number);	1538	sl << uint16 (pl->face);
1930	}	1539	}
1931	}	1540	}
1932	else	1541	else
1933	{	1542	{
1934	/* Top face */	1543	/* Top face */
…		…
1964	if (!(sl.length () > startlen \|\| socket.sent_scroll))	1573	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1965	{	1574	{
1966	/* No map data will follow, so don't say the client	1575	/* No map data will follow, so don't say the client
1967	* it doesn't need draw!	1576	* it doesn't need draw!
1968	*/	1577	*/
1969	ewhatflag &= (~EMI_NOREDRAW);	1578	ewhatflag &= ~EMI_NOREDRAW;
1970	esl[ewhatstart + 1] = ewhatflag & 0xff;	1579	esl[ewhatstart + 1] = ewhatflag & 0xff;
1971	}	1580	}
1972		1581
1973	if (esl.length () > estartlen)	1582	if (esl.length () > estartlen)
1974	socket.send_packet (esl);	1583	socket.send_packet (esl);
…		…
1986	*/	1595	*/
1987	void	1596	void
1988	draw_client_map (object *pl)	1597	draw_client_map (object *pl)
1989	{	1598	{
1990	int i, j;	1599	int i, j;
1991	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 */
1992	New_Face face, floor;
1993	New_Face *floor2;
1994	int d, mflags;	1601	int mflags;
1995	struct Map newmap;	1602	struct Map newmap;
1996	maptile m, pm;	1603	maptile m, pm;
1997		1604
1998	if (pl->type != PLAYER)	1605	if (pl->type != PLAYER)
1999	{	1606	{
…		…
2010	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1617	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2011	return;	1618	return;
2012		1619
2013	memset (&newmap, 0, sizeof (struct Map));	1620	memset (&newmap, 0, sizeof (struct Map));
2014		1621
2015	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++)
2016	{
2017	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++)
2018	{	1624	{
2019	ax = i;	1625	ax = i;
2020	ay = j;	1626	ay = j;
2021	m = pm;	1627	m = pm;
2022	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1628	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023		1629
2024	if (mflags & P_OUT_OF_MAP)	1630	if (mflags & P_OUT_OF_MAP)
2025	continue;	1631	continue;
2026		1632
2027	if (mflags & P_NEED_UPDATE)
2028	update_position (m, ax, ay);
2029
2030	/* If a map is visible to the player, we don't want to swap it out	1633	/* If a map is visible to the player, we don't want to swap it out
2031	* just to reload it. This should really call something like	1634	* just to reload it. This should really call something like
2032	* swap_map, but this is much more efficient and 'good enough'	1635	* swap_map, but this is much more efficient and 'good enough'
2033	*/	1636	*/
2034	if (mflags & P_NEW_MAP)	1637	if (mflags & P_NEW_MAP)
2035	m->timeout = 50;	1638	m->timeout = 50;
2036	}	1639	}
2037	}	1640
2038	/* do LOS after calls to update_position */	1641	/* do LOS after calls to update_position */
2039	if (pl->contr->do_los)	1642	if (pl->contr->do_los)
2040	{	1643	{
2041	update_los (pl);	1644	update_los (pl);
2042	pl->contr->do_los = 0;	1645	pl->contr->do_los = 0;
…		…
2057		1660
2058	/*****************************************************************************/	1661	/*****************************************************************************/
2059	void	1662	void
2060	send_plugin_custom_message (object pl, char buf)	1663	send_plugin_custom_message (object pl, char buf)
2061	{	1664	{
2062	pl->contr->socket->send_packet (buf);	1665	pl->contr->ns->send_packet (buf);
2063	}	1666	}
2064		1667
2065	/**	1668	/**
2066	* This sends the skill number to name mapping. We ignore	1669	* This sends the skill number to name mapping. We ignore
2067	* the params - we always send the same info no matter what.	1670	* the params - we always send the same info no matter what.
…		…
2112	* it then sends an updspell packet for each spell that has changed in this way	1715	* it then sends an updspell packet for each spell that has changed in this way
2113	*/	1716	*/
2114	void	1717	void
2115	esrv_update_spells (player *pl)	1718	esrv_update_spells (player *pl)
2116	{	1719	{
		1720	if (!pl->ns)
		1721	return;
		1722
2117	if (!pl->socket->monitor_spells)	1723	if (!pl->ns->monitor_spells)
2118	return;	1724	return;
2119		1725
2120	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1726	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2121	{	1727	{
2122	if (spell->type == SPELL)	1728	if (spell->type == SPELL)
…		…
2152		1758
2153	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1759	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2154	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1760	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2155	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1761	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2156		1762
2157	pl->socket->send_packet (sl);	1763	pl->ns->send_packet (sl);
2158	}	1764	}
2159	}	1765	}
2160	}	1766	}
2161	}	1767	}
2162		1768
2163	void	1769	void
2164	esrv_remove_spell (player pl, object spell)	1770	esrv_remove_spell (player pl, object spell)
2165	{	1771	{
2166	if (!pl->socket->monitor_spells)	1772	if (!pl->ns->monitor_spells)
2167	return;	1773	return;
2168		1774
2169	if (!pl \|\| !spell \|\| spell->env != pl->ob)	1775	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2170	{	1776	{
2171	LOG (llevError, "Invalid call to esrv_remove_spell");	1777	LOG (llevError, "Invalid call to esrv_remove_spell");
…		…
2174		1780
2175	packet sl ("delspell");	1781	packet sl ("delspell");
2176		1782
2177	sl << uint32 (spell->count);	1783	sl << uint32 (spell->count);
2178		1784
2179	pl->socket->send_packet (sl);	1785	pl->ns->send_packet (sl);
2180	}	1786	}
2181		1787
2182	/* 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. /
2183	static void	1789	static void
2184	append_spell (player pl, packet &sl, object spell)	1790	append_spell (player pl, packet &sl, object spell)
2185	{	1791	{
2186	int len, i, skill = 0;	1792	int i, skill = 0;
2187		1793
2188	if (!(spell->name))	1794	if (!(spell->name))
2189	{	1795	{
2190	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);
2191	return;	1797	return;
…		…
2203	if (!strcmp (spell->skill, skill_names[i]))	1809	if (!strcmp (spell->skill, skill_names[i]))
2204	{	1810	{
2205	skill = i + CS_STAT_SKILLINFO;	1811	skill = i + CS_STAT_SKILLINFO;
2206	break;	1812	break;
2207	}	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);
2208	}	1821	}
2209		1822
2210	/* send the current values */	1823	/* send the current values */
2211	sl << uint32 (spell->count)	1824	sl << uint32 (spell->count)
2212	<< uint16 (spell->level)	1825	<< uint16 (spell->level)
…		…
2214	<< uint16 (spell->last_sp)	1827	<< uint16 (spell->last_sp)
2215	<< uint16 (spell->last_grace)	1828	<< uint16 (spell->last_grace)
2216	<< uint16 (spell->last_eat)	1829	<< uint16 (spell->last_eat)
2217	<< uint8 (skill)	1830	<< uint8 (skill)
2218	<< uint32 (spell->path_attuned)	1831	<< uint32 (spell->path_attuned)
2219	<< uint32 (spell->face ? spell->face->number : 0)	1832	<< uint32 (spell->face)
2220	<< data8 (spell->name)	1833	<< data8 (spell->name)
2221	<< data16 (spell->msg);	1834	<< data16 (spell->msg);
2222	}	1835	}
2223		1836
2224	/**	1837	/**
…		…
2232	{	1845	{
2233	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");
2234	return;	1847	return;
2235	}	1848	}
2236		1849
2237	if (!pl->socket->monitor_spells)	1850	if (!pl->ns->monitor_spells)
2238	return;	1851	return;
2239		1852
2240	packet sl ("addspell");	1853	packet sl ("addspell");
2241		1854
2242	if (!spell)	1855	if (!spell)
2243	{	1856	{
2244	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1857	for (spell = pl->ob->inv; spell; spell = spell->below)
2245	{	1858	{
2246	/* were we to simply keep appending data here, we could exceed	1859	/* were we to simply keep appending data here, we could exceed
2247	* 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
2248	* append_spells will always append 19 data bytes, plus 4 length	1861	* append_spells will always append 19 data bytes, plus 4 length
2249	* bytes and 3 strings (because that is the spec) so we need to	1862	* bytes and 3 strings (because that is the spec) so we need to
…		…
2259	if (spell->type != SPELL)	1872	if (spell->type != SPELL)
2260	continue;	1873	continue;
2261		1874
2262	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))))
2263	{	1876	{
2264	pl->socket->send_packet (sl);	1877	pl->ns->send_packet (sl);
2265		1878
2266	sl.reset ();	1879	sl.reset ();
2267	sl << "addspell ";	1880	sl << "addspell ";
2268	}	1881	}
2269		1882
…		…
2283	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1896	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2284	fatal (0);	1897	fatal (0);
2285	}	1898	}
2286		1899
2287	/* finally, we can send the packet */	1900	/* finally, we can send the packet */
2288	pl->socket->send_packet (sl);	1901	pl->ns->send_packet (sl);
2289	}	1902	}
2290		1903

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs. Revision 1.73 by root, Wed Mar 14 00:04:59 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.73 by root, Wed Mar 14 00:04:59 2007 UTC