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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.46 by root, Tue Dec 19 05:12:52 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	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)
…		…
706	uint16 smoothface;	697	uint16 smoothface;
707		698
708	/* 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
709	* again.	700	* again.
710	*/	701	*/
711	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	702	if (!FindSmooth (face, &smoothface))
712	{	703	{
713		704
714	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);
715	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	706	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
716	return;	707	return;
717	}	708	}
718		709
719	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720	esrv_send_face (ns, smoothface, 0);	711	esrv_send_face (ns, smoothface, 0);
721		712
722	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	713	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
723		714
724	packet sl;	715	packet sl ("smooth");
725		716
726	sl << "smooth "
727	<< uint16 (face)	717	sl << uint16 (face)
728	<< uint16 (smoothface);	718	<< uint16 (smoothface);
729		719
730	ns->send_packet (sl);	720	ns->send_packet (sl);
731	}	721	}
732		722
733	/**	723	/**
734	* Tells client the picture it has to use	724	* Tells client the picture it has to use
735	* to smooth a picture number given as argument.	725	* to smooth a picture number given as argument.
736	*/	726	*/
737	void	727	void
738	AskSmooth (char buf, int len, client ns)	728	AskSmooth (char buf, int len, client ns)
739	{	729	{
740	SendSmooth (ns, atoi (buf));	730	SendSmooth (ns, atoi (buf));
741	}	731	}
…		…
804	* commands.	794	* commands.
805	*/	795	*/
806	pl->count = 0;	796	pl->count = 0;
807		797
808	//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
809	int time = FABS (pl->ob->speed) < 0.001	799	int time = fabs (pl->ob->speed) < 0.001
810	? time = MAX_TIME * 100	800	? time = MAX_TIME * 100
811	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	801	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
812		802
813	/* Send confirmation of command execution now */	803	/* Send confirmation of command execution now */
814	packet sl;	804	packet sl ("comc");
815	sl << "comc " << uint16 (cmdid) << uint32 (time);	805	sl << uint16 (cmdid) << uint32 (time);
816	pl->socket->send_packet (sl);	806	pl->ns->send_packet (sl);
817	}	807	}
818
819		808
820	/** This is a reply to a previous query. */	809	/** This is a reply to a previous query. */
821	void	810	void
822	ReplyCmd (char buf, int len, player pl)	811	ReplyCmd (char buf, int len, client ns)
823	{	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
824	/* 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
825	* 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
826	* once all the X11 code is removed from the server.	827	* once all the X11 code is removed from the server.
827	*	828	*
828	* 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
…		…
831	*/	832	*/
832	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	833	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
833		834
834	/* this avoids any hacking here */	835	/* this avoids any hacking here */
835		836
836	switch (pl->state)	837	switch (ns->state)
837	{	838	{
838	case ST_PLAYING:	839	case ST_PLAYING:
839	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
840	break;	841	break;
841		842
842	case ST_PLAY_AGAIN:
843	/* We can check this for return value (2==quit). Maybe we
844	* should, and do something appropriate?
845	*/
846	receive_play_again (pl->ob, buf[0]);
847	break;
848
849	case ST_ROLL_STAT:
850	key_roll_stat (pl->ob, buf[0]);
851	break;
852
853	case ST_CHANGE_CLASS:	843	case ST_CHANGE_CLASS:
854
855	key_change_class (pl->ob, buf[0]);	844	key_change_class (pl->ob, buf[0]);
856	break;
857
858	case ST_CONFIRM_QUIT:
859	key_confirm_quit (pl->ob, buf[0]);
860	break;
861
862	case ST_CONFIGURE:
863	LOG (llevError, "In client input handling, but into configure state\n");
864	pl->state = ST_PLAYING;
865	break;
866
867	case ST_GET_NAME:
868	receive_player_name (pl->ob, 13);
869	break;
870
871	case ST_GET_PASSWORD:
872	case ST_CONFIRM_PASSWORD:
873	receive_player_password (pl->ob, 13);
874	break;	845	break;
875		846
876	case ST_GET_PARTY_PASSWORD: /* Get password for party */	847	case ST_GET_PARTY_PASSWORD: /* Get password for party */
877	receive_party_password (pl->ob, 13);	848	receive_party_password (pl->ob, 13);
878	break;	849	break;
879		850
880	default:	851	default:
881	LOG (llevError, "Unknown input state: %d\n", pl->state);	852	LOG (llevError, "Unknown input state: %d\n", ns->state);
882	}	853	}
883	}	854	}
884		855
885	/**	856	/**
886	* 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
…		…
901	ns->cs_version = atoi (buf);	872	ns->cs_version = atoi (buf);
902	ns->sc_version = ns->cs_version;	873	ns->sc_version = ns->cs_version;
903		874
904	LOG (llevDebug, "connection from client <%s>\n", buf);	875	LOG (llevDebug, "connection from client <%s>\n", buf);
905		876
906
907	//TODO: should log here just for statistics	877	//TODO: should log here just for statistics
908		878
909	//if (VERSION_CS != ns->cs_version)	879	//if (VERSION_CS != ns->cs_version)
910	// unchecked;	880	// unchecked;
911		881
…		…
936	{	906	{
937	ns->sound = atoi (buf);	907	ns->sound = atoi (buf);
938	}	908	}
939		909
940	/** client wants the map resent */	910	/** client wants the map resent */
941
942	void	911	void
943	MapRedrawCmd (char buf, int len, player pl)	912	MapRedrawCmd (char buf, int len, player pl)
944	{	913	{
945	/* 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
946	* 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.
…		…
1033	esrv_update_stats (player *pl)	1002	esrv_update_stats (player *pl)
1034	{	1003	{
1035	char buf[MAX_BUF];	1004	char buf[MAX_BUF];
1036	uint16 flags;	1005	uint16 flags;
1037		1006
1038	packet sl;	1007	client *ns = pl->ns;
1039	sl << "stats ";	1008	if (!ns)
		1009	return;
1040		1010
		1011	object *ob = pl->ob;
1041	if (pl->ob)	1012	if (!ob)
1042	{	1013	return;
		1014
		1015	packet sl ("stats");
		1016
1043	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1044	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1045	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1019	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1046	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1020	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1047	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1021	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1048	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1022	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1049	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1023	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1050	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1051	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1052	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1053	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1024	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1054	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);
1055	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1056	}
1057		1030
1058	if (pl->socket->exp64)
1059	for (int s = 0; s < NUM_SKILLS; s++)	1031	for (int s = 0; s < NUM_SKILLS; s++)
1060	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])
1061	{	1034	{
		1035	ns->last_skill_exp [s] = skill->stats.exp;
		1036
1062	/* Always send along the level if exp changes. This is only	1037	/* Always send along the level if exp changes. This is only
1063	* 1 extra byte, but keeps processing simpler.	1038	* 1 extra byte, but keeps processing simpler.
1064	*/	1039	*/
1065	sl << uint8 (s + CS_STAT_SKILLINFO)	1040	sl << uint8 (s + CS_STAT_SKILLINFO)
1066	<< uint8 (pl->last_skill_ob[s]->level)	1041	<< uint8 (skill->level)
1067	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1042	<< uint64 (skill->stats.exp);
1068
1069	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1070	}	1043	}
1071		1044
1072	if (pl->socket->exp64)
1073	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1045	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1074	else
1075	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1076
1077	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1078	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1079	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1080	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1081	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1082	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1083	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);
1084	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
1085	flags = 0;	1055	flags = 0;
1086		1056
1087	if (pl->fire_on)	1057	if (pl->fire_on)
1088	flags \|= SF_FIREON;	1058	flags \|= SF_FIREON;
1089		1059
1090	if (pl->run_on)	1060	if (pl->run_on)
1091	flags \|= SF_RUNON;	1061	flags \|= SF_RUNON;
1092		1062
1093	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1094		1064
1095	if (pl->socket->sc_version < 1025)	1065	if (ns->sc_version < 1025)
1096	{ 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) }
1097	else	1067	else
1098	for (int i = 0; i < NROFATTACKS; i++)	1068	for (int i = 0; i < NROFATTACKS; i++)
1099	{	1069	{
1100	/* Skip ones we won't send */	1070	/* Skip ones we won't send */
1101	if (atnr_cs_stat[i] == -1)	1071	if (atnr_cs_stat[i] == -1)
1102	continue;	1072	continue;
1103		1073
1104	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]);
1105	}	1075	}
1106		1076
1107	if (pl->socket->monitor_spells)	1077	if (pl->ns->monitor_spells)
1108	{	1078	{
1109	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);
1110	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);
1111	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);
1112	}	1082	}
1113		1083
1114	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 */
1115	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1116	set_title (pl->ob, buf);	1086	set_title (ob, buf);
1117	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1118		1088
1119	/* Only send it away if we have some actual data */	1089	/* Only send it away if we have some actual data */
1120	if (sl.length () > 6)	1090	if (sl.length () > 6)
1121	pl->socket->send_packet (sl);	1091	ns->send_packet (sl);
1122	}	1092	}
1123		1093
1124	/**	1094	/**
1125	* 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.
1126	*/	1096	*/
1127	void	1097	void
1128	esrv_new_player (player *pl, uint32 weight)	1098	esrv_new_player (player *pl, uint32 weight)
1129	{	1099	{
1130	pl->last_weight = weight;	1100	packet sl ("player");
1131
1132	packet sl;
1133	sl << "player ";
1134		1101
1135	sl << uint32 (pl->ob->count)	1102	sl << uint32 (pl->ob->count)
1136	<< uint32 (weight)	1103	<< uint32 (weight)
1137	<< uint32 (pl->ob->face->number)	1104	<< uint32 (pl->ob->face)
1138	<< data8 (pl->ob->name);	1105	<< data8 (pl->ob->name);
1139		1106
		1107	pl->ns->last_weight = weight;
1140	pl->socket->send_packet (sl);	1108	pl->ns->send_packet (sl);
1141	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1142	}	1110	}
1143		1111
1144	/**	1112	/**
1145	* Need to send an animation sequence to the client.	1113	* Need to send an animation sequence to the client.
…		…
1159	{	1127	{
1160	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);
1161	return;	1129	return;
1162	}	1130	}
1163		1131
1164	packet sl;	1132	packet sl ("anim");
1165		1133
1166	sl << "anim "
1167	<< uint16 (anim_num)	1134	sl << uint16 (anim_num)
1168	<< uint16 (0); /* flags - not used right now */	1135	<< uint16 (0); /* flags - not used right now */
1169		1136
1170	/* 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
1171	* the face itself) down to the client.	1138	* the face itself) down to the client.
1172	*/	1139	*/
…		…
1188	*	1155	*
1189	* Start of map related commands.	1156	* Start of map related commands.
1190	*	1157	*
1191	******************************************************************************/	1158	******************************************************************************/
1192		1159
1193	/**
1194	* This adds face_num to a map cell at x,y. If the client doesn't have
1195	* the face yet, we will also send it.
1196	*/
1197	static void
1198	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1199	{
1200	if (newmap->cells[x][y].count >= MAP_LAYERS)
1201	{
1202	//TODO: one or the other, can't both have abort and return, verify and act
1203	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1204	return;
1205	abort ();
1206	}
1207
1208	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1209	newmap->cells[x][y].count++;
1210
1211	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1212	esrv_send_face (ns, face_num, 0);
1213	}
1214
1215	/** Clears a map cell */	1160	/** Clears a map cell */
1216	static void	1161	static void
1217	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1162	map_clearcell (struct MapCell *cell, int count)
1218	{	1163	{
1219	cell->faces[0] = face0;	1164	cell->faces[0] = 0;
1220	cell->faces[1] = face1;	1165	cell->faces[1] = 0;
1221	cell->faces[2] = face2;	1166	cell->faces[2] = 0;
1222	cell->count = count;	1167	cell->count = count;
1223	cell->stat_hp = 0;	1168	cell->stat_hp = 0;
1224	cell->flags = 0;	1169	cell->flags = 0;
1225	cell->player = 0;	1170	cell->player = 0;
1226	}	1171	}
1227		1172
1228	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1229	#define MAX_LAYERS 3	1173	#define MAX_LAYERS 3
1230
1231	/* Using a global really isn't a good approach, but saves the over head of
1232	* allocating and deallocating such a block of data each time run through,
1233	* and saves the space of allocating this in the socket object when we only
1234	* need it for this cycle. If the server is ever threaded, this needs to be
1235	* re-examined.
1236	*/
1237	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1238
1239	/**
1240	* Returns true if any of the heads for this
1241	* space is set. Returns false if all are blank - this is used
1242	* for empty space checking.
1243	*/
1244	static inline int
1245	have_head (int ax, int ay)
1246	{
1247	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1248	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1249	return 1;
1250
1251	return 0;
1252	}
1253
1254	/**
1255	* check_head is a bit simplistic version of update_space below.
1256	* basically, it only checks the that the head on space ax,ay at layer
1257	* needs to get sent - if so, it adds the data, sending the head
1258	* if needed, and returning 1. If this no data needs to get
1259	* sent, it returns zero.
1260	*/
1261	static int
1262	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1263	{
1264	short face_num;
1265
1266	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1267	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1268	else
1269	face_num = 0;
1270
1271	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1272	{
1273	sl << uint16 (face_num);
1274	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1275	esrv_send_face (&ns, face_num, 0);
1276
1277	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1278	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1279	return 1;
1280	}
1281
1282	return 0; /* No change */
1283	}
1284		1174
1285	/**	1175	/**
1286	* Removes the need to replicate the same code for each layer.	1176	* Removes the need to replicate the same code for each layer.
1287	* 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
1288	* it was.	1178	* it was.
…		…
1302	* actually match.	1192	* actually match.
1303	*/	1193	*/
1304	static int	1194	static int
1305	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)
1306	{	1196	{
1307	object ob, head;
1308	uint16 face_num;	1197	uint16 face_num;
1309	int bx, by, i;	1198	int bx, by, i;
1310		1199
1311	/* If there is a multipart object stored away, treat that as more important.
1312	* If not, then do the normal processing.
1313	*/
1314	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1315
1316	/* Check to see if this head is part of the set of objects
1317	* we would normally send for this space. If so, then
1318	* don't use the head value. We need to do the check
1319	* here and not when setting up the heads[] value for two reasons -
1320	* 1) the heads[] values will get used even if the space is not visible.
1321	* 2) its possible the head is not on the same map as a part, and I'd
1322	* rather not need to do the map translation overhead.
1323	* 3) We need to do some extra checking to make sure that we will
1324	* otherwise send the image as this layer, eg, either it matches
1325	* the head value, or is not multipart.
1326	*/
1327	if (head && !head->more)
1328	{
1329	for (i = 0; i < MAP_LAYERS; i++)
1330	{
1331	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1332	if (!ob)
1333	continue;
1334
1335	if (ob->head)
1336	ob = ob->head;
1337
1338	if (ob == head)
1339	{
1340	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1341	head = NULL;
1342	break;
1343	}
1344	}
1345	}
1346
1347	ob = head;
1348	if (!ob)
1349	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1350		1201
1351	/* 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
1352	* is the blank face, set the face number to zero.	1203	* is the blank face, set the face number to zero.
1353	* 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
1354	* precedence over the other object for this space.	1205	* precedence over the other object for this space.
1355	* otherwise, we do special head processing	1206	* otherwise, we do special head processing
1356	*/	1207	*/
1357	if (!ob \|\| ob->face == blank_face)	1208	if (!ob \|\| ob->face == blank_face)
1358	face_num = 0;	1209	face_num = 0;
1359	else if (head)
1360	{
1361	/* if this is a head that had previously been stored */
1362	face_num = ob->face->number;
1363	}
1364	else	1210	else
1365	{
1366	/* if the faces for the different parts of a multipart object
1367	* are the same, we only want to send the bottom right most
1368	* portion of the object. That info is in the tail_.. values
1369	* of the head. Note that for the head itself, ob->head will
1370	* be null, so we only do this block if we are working on
1371	* a tail piece.
1372	*/
1373
1374	/* tail_x and tail_y will only be set in the head object. If
1375	* this is the head object and these are set, we proceed
1376	* with logic to only send bottom right. Similarly, if
1377	* this is one of the more parts but the head has those values
1378	* set, we want to do the processing. There can be cases where
1379	* the head is not visible but one of its parts is, so we just
1380	* can always expect that ob->arch->tail_x will be true for all
1381	* object we may want to display.
1382	*/
1383	if ((ob->arch->tail_x \|\| ob->arch->tail_y) \|\| (ob->head && (ob->head->arch->tail_x \|\| ob->head->arch->tail_y)))
1384	{
1385
1386	if (ob->head)
1387	head = ob->head;
1388	else
1389	head = ob;
1390
1391	/* Basically figure out where the offset is from where we are right
1392	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1393	* piece is from the head, and the tail is where the tail is from the
1394	* head. Note that bx and by will equal sx and sy if we are already working
1395	* on the bottom right corner. If ob is the head, the clone values
1396	* will be zero, so the right thing will still happen.
1397	*/
1398	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1399	by = sy + head->arch->tail_y - ob->arch->clone.y;
1400
1401	/* I don't think this can ever happen, but better to check for it just
1402	* in case.
1403	*/
1404	if (bx < sx \|\| by < sy)
1405	{
1406	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1407	face_num = 0;
1408	}
1409	/* single part object, multipart object with non merged faces,
1410	* of multipart object already at lower right.
1411	*/
1412	else if (bx == sx && by == sy)
1413	{
1414	face_num = ob->face->number;
1415
1416	/* if this face matches one stored away, clear that one away.
1417	* this code relies on the fact that the map1 commands
1418	* goes from 2 down to 0.
1419	*/
1420	for (i = 0; i < MAP_LAYERS; i++)
1421	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1422	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1423	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1424	}
1425	else
1426	{
1427	/* If this head is stored away, clear it - otherwise,
1428	* there can be cases where a object is on multiple layers -
1429	* we only want to send it once.
1430	*/
1431	face_num = head->face->number;
1432	for (i = 0; i < MAP_LAYERS; i++)
1433	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1434	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1435	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1436
1437	/* First, try to put the new head on the same layer. If that is used up,
1438	* then find another layer.
1439	*/
1440	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1441	{
1442	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1443	}
1444	else
1445	for (i = 0; i < MAX_LAYERS; i++)
1446	{
1447	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL \|\|
1448	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1449	{
1450	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1451	}
1452	}
1453	face_num = 0; /* Don't send this object - we'll send the head later */
1454	}
1455	}
1456	else
1457	{
1458	/* 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,
1459	* so nothing special	1212	* so nothing special
1460	*/
1461	face_num = ob->face->number;
1462
1463	/* clear out any head entries that have the same face as this one */
1464	for (bx = 0; bx < layer; bx++)
1465	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1466	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1467	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1468	}
1469	} /* else not already head object or blank face */
1470
1471	/* This is a real hack. Basically, if we have nothing to send for this layer,
1472	* but there is a head on the next layer, send that instead.
1473	* Without this, what happens is you can get the case where the player stands
1474	* on the same space as the head. However, if you have overlapping big objects
1475	* of the same type, what happens then is it doesn't think it needs to send
1476	* This tends to make stacking also work/look better.
1477	*/	1213	*/
1478	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1479	{
1480	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1481	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1482	}
1483
1484	/* Another hack - because of heads and whatnot, this face may match one
1485	* we already sent for a lower layer. In that case, don't send
1486	* this one.
1487	*/
1488	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1489	face_num = 0;	1214	face_num = ob->face;
1490		1215
1491	/* 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
1492	* 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.
1493	*/	1218	*/
1494	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
…		…
1521	* holds the old values.	1246	* holds the old values.
1522	* 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
1523	* 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
1524	* take.	1249	* take.
1525	*/	1250	*/
1526
1527	static inline int	1251	static inline int
1528	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)
1529	{	1253	{
1530	object *ob;	1254	object *ob;
1531	int smoothlevel; /* old face_num; */	1255	int smoothlevel; /* old face_num; */
…		…
1533	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1534		1258
1535	/* 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
1536	* is the blank face, set the smoothlevel to zero.	1260	* is the blank face, set the smoothlevel to zero.
1537	*/	1261	*/
1538	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1262	if (!ob \|\| ob->face == blank_face)
1539	smoothlevel = 0;	1263	smoothlevel = 0;
1540	else	1264	else
1541	{	1265	{
1542	smoothlevel = ob->smoothlevel;	1266	smoothlevel = ob->smoothlevel;
1543	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1544	SendSmooth (&ns, ob->face->number);	1268	SendSmooth (&ns, ob->face);
1545	} /* else not already head object or blank face */	1269	} /* else not already head object or blank face */
1546		1270
1547	/* 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
1548	* 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.
1549	*/	1273	*/
…		…
1578	if (ns->EMI_smooth)	1302	if (ns->EMI_smooth)
1579	result += 1; /One byte for smoothlevel /	1303	result += 1; /One byte for smoothlevel /
1580	}	1304	}
1581		1305
1582	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);
1583	}	1329	}
1584		1330
1585	/**	1331	/**
1586	* 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
1587	* 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
…		…
1593	* 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
1594	* 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,
1595	* 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
1596	* of what we send, see the doc/Protocol file.	1342	* of what we send, see the doc/Protocol file.
1597	* I will describe internally what we do:	1343	* I will describe internally what we do:
1598	* 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.
1599	* 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
1600	* maximum viewable size (As set in config.h).	1346	* maximum viewable size (As set in config.h).
1601	* in the cells, there are faces and a count value.	1347	* in the cells, there are faces and a count value.
1602	* 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
1603	* is not viewable.	1349	* is not viewable.
…		…
1605	* look like.	1351	* look like.
1606	*/	1352	*/
1607	void	1353	void
1608	draw_client_map1 (object *pl)	1354	draw_client_map1 (object *pl)
1609	{	1355	{
1610	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1356	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1611	sint16 nx, ny;	1357	sint16 nx, ny;
1612	int estartlen, eoldlen;	1358	int estartlen, eoldlen;
1613	uint16 mask, emask;
1614	uint8 eentrysize;	1359	uint8 eentrysize;
1615	uint16 ewhatstart, ewhatflag;	1360	uint16 ewhatstart, ewhatflag;
1616	uint8 extendedinfos;	1361	uint8 extendedinfos;
1617	maptile *m;	1362	maptile *m;
1618		1363
1619	client &socket = *pl->contr->socket;	1364	client &socket = *pl->contr->ns;
		1365
		1366	if (!pl->active)
		1367	return;
1620		1368
1621	check_map_change (pl->contr);	1369	check_map_change (pl->contr);
		1370	prefetch_surrounding_maps (pl);
1622		1371
1623	packet sl;	1372	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1624	packet esl;	1373	packet esl;
1625		1374
1626	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1627	startlen = sl.length ();	1375	startlen = sl.length ();
1628		1376
1629	/Extendedmapinfo structure initialisation /	1377	/Extendedmapinfo structure initialisation /
1630	if (socket.ext_mapinfos)	1378	if (socket.ext_mapinfos)
1631	{	1379	{
…		…
1650	ewhatstart = 0;	1398	ewhatstart = 0;
1651	ewhatflag = 0;	1399	ewhatflag = 0;
1652	estartlen = 0;	1400	estartlen = 0;
1653	}	1401	}
1654		1402
1655	/* Init data to zero */
1656	memset (heads, 0, sizeof (object ) MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1657
1658	/* 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
1659	* locations.	1404	* locations.
1660	*/	1405	*/
1661	ay = 0;	1406	ay = 0;
1662		1407
…		…
1664	* but that started to get a bit messy to look at.	1409	* but that started to get a bit messy to look at.
1665	*/	1410	*/
1666	max_x = pl->x + (socket.mapx + 1) / 2;	1411	max_x = pl->x + (socket.mapx + 1) / 2;
1667	max_y = pl->y + (socket.mapy + 1) / 2;	1412	max_y = pl->y + (socket.mapy + 1) / 2;
1668		1413
1669	if (socket.mapmode == Map1aCmd)
1670	{
1671	max_x += MAX_HEAD_OFFSET;
1672	max_y += MAX_HEAD_OFFSET;
1673	}
1674
1675	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++)
1676	{	1415	{
1677	ax = 0;	1416	ax = 0;
1678	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++)
1679	{	1418	{
1680		1419	int emask, mask;
1681	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1420	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1682		1421
1683	/* If this space is out of the normal viewable area, we only check
1684	* the heads value ax or ay will only be greater than what
1685	* the client wants if using the map1a command - this is because
1686	* if the map1a command is not used, max_x and max_y will be
1687	* set to lower values.
1688	*/
1689	if (ax >= socket.mapx \|\| ay >= socket.mapy)
1690	{
1691	int i, got_one;
1692
1693	oldlen = sl.length ();
1694
1695	sl << uint16 (mask);
1696
1697	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1698	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1699	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1700
1701	/* If all we are doing is sending 0 (blank) faces, we don't
1702	* actually need to send that - just the coordinates
1703	* with no faces tells the client to blank out the
1704	* space.
1705	*/
1706	got_one = 0;
1707	for (i = oldlen + 2; i < sl.length (); i++)
1708	if (sl[i])
1709	got_one = 1;
1710
1711	if (got_one && (mask & 0xf))
1712	sl[oldlen + 1] = mask & 0xff;
1713	else
1714	{ /either all faces blank, either no face at all /
1715	if (mask & 0xf) /at least 1 face, we know it's blank, only send coordinates /
1716	sl.reset (oldlen + 2);
1717	else
1718	sl.reset (oldlen);
1719	}
1720
1721	/*What concerns extendinfos, nothing to be done for now
1722	* (perhaps effects layer later)
1723	*/
1724	continue; /* don't do processing below */
1725	}
1726
1727	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1728
1729	d = pl->contr->blocked_los[ax][ay];
1730		1423
1731	/* 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,
1732	* we tell the client as such	1425	* we tell the client as such
1733	*/	1426	*/
1734	nx = x;	1427	nx = x;
…		…
1742	* of the map, it shouldn't have a head	1435	* of the map, it shouldn't have a head
1743	*/	1436	*/
1744	if (lastcell.count != -1)	1437	if (lastcell.count != -1)
1745	{	1438	{
1746	sl << uint16 (mask);	1439	sl << uint16 (mask);
1747	map_clearcell (&lastcell, 0, 0, 0, -1);	1440	map_clearcell (&lastcell, -1);
1748	}	1441	}
		1442
		1443	continue;
1749	}	1444	}
		1445
		1446	m->touch ();
		1447
		1448	int d = pl->contr->blocked_los[ax][ay];
		1449
1750	else if (d > 3)	1450	if (d > 3)
1751	{	1451	{
		1452
1752	int need_send = 0, count;	1453	int need_send = 0, count;
1753		1454
1754	/* This block deals with spaces that are not visible for whatever	1455	/* This block deals with spaces that are not visible for whatever
1755	* reason. Still may need to send the head for this space.	1456	* reason. Still may need to send the head for this space.
1756	*/	1457	*/
1757		1458
1758	oldlen = sl.length ();	1459	oldlen = sl.length ();
1759		1460
1760	sl << uint16 (mask);	1461	sl << uint16 (mask);
…		…
1762	if (lastcell.count != -1)	1463	if (lastcell.count != -1)
1763	need_send = 1;	1464	need_send = 1;
1764		1465
1765	count = -1;	1466	count = -1;
1766		1467
1767	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1768	{
1769	/* Now check to see if any heads need to be sent */
1770
1771	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1772	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1773	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1774
1775	lastcell.count = count;
1776	}
1777	else
1778	{
1779	/* properly clear a previously sent big face */	1468	/* properly clear a previously sent big face */
1780	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0	1469	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1781	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)	1470	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1782	need_send = 1;	1471	need_send = 1;
1783		1472
1784	map_clearcell (&lastcell, 0, 0, 0, count);	1473	map_clearcell (&lastcell, count);
1785	}
1786		1474
1787	if ((mask & 0xf) \|\| need_send)	1475	if ((mask & 0xf) \|\| need_send)
1788	sl[oldlen + 1] = mask & 0xff;	1476	sl[oldlen + 1] = mask & 0xff;
1789	else	1477	else
1790	sl.reset (oldlen);	1478	sl.reset (oldlen);
1791	}	1479	}
1792	else	1480	else
1793	{	1481	{
1794	/* In this block, the space is visible or there are head objects	1482	/* In this block, the space is visible.
1795	* we need to send.
1796	*/	1483	*/
1797		1484
1798	/* Rather than try to figure out what everything that we might	1485	/* Rather than try to figure out what everything that we might
1799	* need to send is, then form the packet after that,	1486	* need to send is, then form the packet after that,
1800	* 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
…		…
1803	* is done.	1490	* is done.
1804	* 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
1805	* what if anything we need to send, setting the bits, then	1492	* what if anything we need to send, setting the bits, then
1806	* doing those checks again to add the real data.	1493	* doing those checks again to add the real data.
1807	*/	1494	*/
1808	oldlen = sl.length ();	1495	oldlen = sl.length ();
1809	mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1810	eoldlen = esl.length ();	1496	eoldlen = esl.length ();
1811	emask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1497
1812	sl << uint16 (mask);	1498	sl << uint16 (mask);
1813		1499
1814	if (socket.ext_mapinfos)	1500	if (socket.ext_mapinfos)
1815	esl << uint16 (emask);	1501	esl << uint16 (emask);
1816		1502
…		…
1921	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1607	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1922	emask \|= 0x2;	1608	emask \|= 0x2;
1923		1609
1924	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))
1925	{	1611	{
1926	if (lastcell.faces[0] != pl->face->number)	1612	if (lastcell.faces[0] != pl->face)
1927	{	1613	{
1928	lastcell.faces[0] = pl->face->number;	1614	lastcell.faces[0] = pl->face;
1929	mask \|= 0x1;	1615	mask \|= 0x1;
1930		1616
1931	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1617	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1932	esrv_send_face (&socket, pl->face->number, 0);	1618	esrv_send_face (&socket, pl->face, 0);
1933		1619
1934	sl << uint16 (pl->face->number);	1620	sl << uint16 (pl->face);
1935	}	1621	}
1936	}	1622	}
1937	else	1623	else
1938	{	1624	{
1939	/* Top face */	1625	/* Top face */
…		…
1969	if (!(sl.length () > startlen \|\| socket.sent_scroll))	1655	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1970	{	1656	{
1971	/* No map data will follow, so don't say the client	1657	/* No map data will follow, so don't say the client
1972	* it doesn't need draw!	1658	* it doesn't need draw!
1973	*/	1659	*/
1974	ewhatflag &= (~EMI_NOREDRAW);	1660	ewhatflag &= ~EMI_NOREDRAW;
1975	esl[ewhatstart + 1] = ewhatflag & 0xff;	1661	esl[ewhatstart + 1] = ewhatflag & 0xff;
1976	}	1662	}
1977		1663
1978	if (esl.length () > estartlen)	1664	if (esl.length () > estartlen)
1979	socket.send_packet (esl);	1665	socket.send_packet (esl);
…		…
1991	*/	1677	*/
1992	void	1678	void
1993	draw_client_map (object *pl)	1679	draw_client_map (object *pl)
1994	{	1680	{
1995	int i, j;	1681	int i, j;
1996	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 */
1997	New_Face face, floor;
1998	New_Face *floor2;
1999	int d, mflags;	1683	int mflags;
2000	struct Map newmap;	1684	struct Map newmap;
2001	maptile m, pm;	1685	maptile m, pm;
2002		1686
2003	if (pl->type != PLAYER)	1687	if (pl->type != PLAYER)
2004	{	1688	{
…		…
2015	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1699	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2016	return;	1700	return;
2017		1701
2018	memset (&newmap, 0, sizeof (struct Map));	1702	memset (&newmap, 0, sizeof (struct Map));
2019		1703
2020	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++)
2021	{
2022	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++)
2023	{	1706	{
2024	ax = i;	1707	ax = i;
2025	ay = j;	1708	ay = j;
2026	m = pm;	1709	m = pm;
2027	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1710	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028		1711
2029	if (mflags & P_OUT_OF_MAP)	1712	if (mflags & P_OUT_OF_MAP)
2030	continue;	1713	continue;
2031		1714
2032	if (mflags & P_NEED_UPDATE)
2033	update_position (m, ax, ay);
2034
2035	/* 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
2036	* just to reload it. This should really call something like	1716	* just to reload it. This should really call something like
2037	* swap_map, but this is much more efficient and 'good enough'	1717	* swap_map, but this is much more efficient and 'good enough'
2038	*/	1718	*/
2039	if (mflags & P_NEW_MAP)	1719	if (mflags & P_NEW_MAP)
2040	m->timeout = 50;	1720	m->timeout = 50;
2041	}	1721	}
2042	}	1722
2043	/* do LOS after calls to update_position */	1723	/* do LOS after calls to update_position */
2044	if (pl->contr->do_los)	1724	if (pl->contr->do_los)
2045	{	1725	{
2046	update_los (pl);	1726	update_los (pl);
2047	pl->contr->do_los = 0;	1727	pl->contr->do_los = 0;
…		…
2062		1742
2063	/*****************************************************************************/	1743	/*****************************************************************************/
2064	void	1744	void
2065	send_plugin_custom_message (object pl, char buf)	1745	send_plugin_custom_message (object pl, char buf)
2066	{	1746	{
2067	pl->contr->socket->send_packet (buf);	1747	pl->contr->ns->send_packet (buf);
2068	}	1748	}
2069		1749
2070	/**	1750	/**
2071	* This sends the skill number to name mapping. We ignore	1751	* This sends the skill number to name mapping. We ignore
2072	* the params - we always send the same info no matter what.	1752	* the params - we always send the same info no matter what.
…		…
2117	* 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
2118	*/	1798	*/
2119	void	1799	void
2120	esrv_update_spells (player *pl)	1800	esrv_update_spells (player *pl)
2121	{	1801	{
		1802	if (!pl->ns)
		1803	return;
		1804
2122	if (!pl->socket->monitor_spells)	1805	if (!pl->ns->monitor_spells)
2123	return;	1806	return;
2124		1807
2125	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1808	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2126	{	1809	{
2127	if (spell->type == SPELL)	1810	if (spell->type == SPELL)
…		…
2157		1840
2158	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1841	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2159	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1842	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2160	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1843	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2161		1844
2162	pl->socket->send_packet (sl);	1845	pl->ns->send_packet (sl);
2163	}	1846	}
2164	}	1847	}
2165	}	1848	}
2166	}	1849	}
2167		1850
2168	void	1851	void
2169	esrv_remove_spell (player pl, object spell)	1852	esrv_remove_spell (player pl, object spell)
2170	{	1853	{
2171	if (!pl->socket->monitor_spells)	1854	if (!pl->ns->monitor_spells)
2172	return;	1855	return;
2173		1856
2174	if (!pl \|\| !spell \|\| spell->env != pl->ob)	1857	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2175	{	1858	{
2176	LOG (llevError, "Invalid call to esrv_remove_spell");	1859	LOG (llevError, "Invalid call to esrv_remove_spell");
2177	return;	1860	return;
2178	}	1861	}
2179		1862
2180	packet sl;	1863	packet sl ("delspell");
2181		1864
2182	sl << "delspell "
2183	<< uint32 (spell->count);	1865	sl << uint32 (spell->count);
2184		1866
2185	pl->socket->send_packet (sl);	1867	pl->ns->send_packet (sl);
2186	}	1868	}
2187		1869
2188	/* 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. /
2189	static void	1871	static void
2190	append_spell (player pl, packet &sl, object spell)	1872	append_spell (player pl, packet &sl, object spell)
2191	{	1873	{
2192	int len, i, skill = 0;	1874	int i, skill = 0;
2193		1875
2194	if (!(spell->name))	1876	if (!(spell->name))
2195	{	1877	{
2196	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);
2197	return;	1879	return;
…		…
2209	if (!strcmp (spell->skill, skill_names[i]))	1891	if (!strcmp (spell->skill, skill_names[i]))
2210	{	1892	{
2211	skill = i + CS_STAT_SKILLINFO;	1893	skill = i + CS_STAT_SKILLINFO;
2212	break;	1894	break;
2213	}	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);
2214	}	1903	}
2215		1904
2216	/* send the current values */	1905	/* send the current values */
2217	sl << uint32 (spell->count)	1906	sl << uint32 (spell->count)
2218	<< uint16 (spell->level)	1907	<< uint16 (spell->level)
…		…
2220	<< uint16 (spell->last_sp)	1909	<< uint16 (spell->last_sp)
2221	<< uint16 (spell->last_grace)	1910	<< uint16 (spell->last_grace)
2222	<< uint16 (spell->last_eat)	1911	<< uint16 (spell->last_eat)
2223	<< uint8 (skill)	1912	<< uint8 (skill)
2224	<< uint32 (spell->path_attuned)	1913	<< uint32 (spell->path_attuned)
2225	<< uint32 (spell->face ? spell->face->number : 0)	1914	<< uint32 (spell->face)
2226	<< data8 (spell->name)	1915	<< data8 (spell->name)
2227	<< data16 (spell->msg);	1916	<< data16 (spell->msg);
2228	}	1917	}
2229		1918
2230	/**	1919	/**
…		…
2238	{	1927	{
2239	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");
2240	return;	1929	return;
2241	}	1930	}
2242		1931
2243	if (!pl->socket->monitor_spells)	1932	if (!pl->ns->monitor_spells)
2244	return;	1933	return;
2245		1934
2246	packet sl;	1935	packet sl ("addspell");
2247	sl << "addspell ";
2248		1936
2249	if (!spell)	1937	if (!spell)
2250	{	1938	{
2251	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1939	for (spell = pl->ob->inv; spell; spell = spell->below)
2252	{	1940	{
2253	/* were we to simply keep appending data here, we could exceed	1941	/* were we to simply keep appending data here, we could exceed
2254	* 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
2255	* append_spells will always append 19 data bytes, plus 4 length	1943	* append_spells will always append 19 data bytes, plus 4 length
2256	* 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
…		…
2266	if (spell->type != SPELL)	1954	if (spell->type != SPELL)
2267	continue;	1955	continue;
2268		1956
2269	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))))
2270	{	1958	{
2271	pl->socket->send_packet (sl);	1959	pl->ns->send_packet (sl);
2272		1960
2273	sl.reset ();	1961	sl.reset ();
2274	sl << "addspell ";	1962	sl << "addspell ";
2275	}	1963	}
2276		1964
…		…
2290	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1978	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2291	fatal (0);	1979	fatal (0);
2292	}	1980	}
2293		1981
2294	/* finally, we can send the packet */	1982	/* finally, we can send the packet */
2295	pl->socket->send_packet (sl);	1983	pl->ns->send_packet (sl);
2296	}	1984	}
2297		1985

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.46 by root, Tue Dec 19 05:12:52 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.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC