ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.36 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 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	*
…		…
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	* 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	* if a face has not already been sent to the client, it is sent now.
42	*	43	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	44	*/
47		45
48	#include <global.h>	46	#include <global.h>
49	#include <sproto.h>	47	#include <sproto.h>
50		48
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	49	#include <living.h>
54	#include <commands.h>	50	#include <commands.h>
55		51
56	/* This block is basically taken from socket.c - I assume if it works there,	52	/* This block is basically taken from socket.c - I assume if it works there,
57	* it should work here.	53	* it should work here.
…		…
60	#include <sys/time.h>	56	#include <sys/time.h>
61	#include <sys/socket.h>	57	#include <sys/socket.h>
62	#include <netinet/in.h>	58	#include <netinet/in.h>
63	#include <netdb.h>	59	#include <netdb.h>
64		60
65	#ifdef HAVE_UNISTD_H
66	# include <unistd.h>	61	#include <unistd.h>
67	#endif
68
69	#ifdef HAVE_SYS_TIME_H
70	# include <sys/time.h>	62	#include <sys/time.h>
71	#endif
72		63
73	#include "sounds.h"	64	#include "sounds.h"
74		65
75	/**	66	/**
76	* This table translates the attack numbers as used within the	67	* This table translates the attack numbers as used within the
…		…
93	-1, /* life stealing */	84	-1, /* life stealing */
94	-1 /* Disease - not fully done yet */	85	-1 /* Disease - not fully done yet */
95	};	86	};
96		87
97	static void	88	static void
98	socket_map_scroll (client_socket * ns, int dx, int dy)	89	socket_map_scroll (client *ns, int dx, int dy)
99	{	90	{
100	struct Map newmap;	91	struct Map newmap;
101	int x, y, mx, my;	92	int x, y, mx, my;
102		93
103	{
104	packet sl;
105
106	sl.printf ("map_scroll %d %d", dx, dy);	94	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107	ns->send_packet (sl);
108	}
109		95
110	/* If we are using the Map1aCmd, we may in fact send	96	/* If we are using the Map1aCmd, we may in fact send
111	* head information that is outside the viewable map.	97	* head information that is outside the viewable map.
112	* So set the mx,my to the max value we want to	98	* So set the mx,my to the max value we want to
113	* look for. Removed code to do so - it caused extra	99	* look for. Removed code to do so - it caused extra
…		…
153	}	139	}
154		140
155	static void	141	static void
156	clear_map (player *pl)	142	clear_map (player *pl)
157	{	143	{
158	client_socket &socket = *pl->socket;
159
160	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
161		145
162	if (socket.newmapcmd == 1)	146	if (pl->ns->newmapcmd == 1)
163	socket.send_packet ("newmap");	147	pl->ns->send_packet ("newmap");
164		148
165	socket.update_look = 1;	149	pl->ns->floorbox_reset ();
166	socket.look_position = 0;
167	}	150	}
168		151
169	/** check for map change and send new map data */	152	/** check for map/region change and send new map data */
170	static void	153	static void
171	check_map_change (player *pl)	154	check_map_change (player *pl)
172	{	155	{
173	client_socket &socket = *pl->socket;	156	client &socket = *pl->ns;
174	object *ob = pl->ob;	157	object *ob = pl->ob;
175	char buf[MAX_BUF]; /* eauugggh */	158	char buf[MAX_BUF]; /* eauugggh */
176		159
177	if (socket.current_map != ob->map)	160	if (socket.current_map != ob->map)
178	{	161	{
…		…
194	flags |= 4;	177	flags |= 4;
195	if (ob->map->tile_path[3])	178	if (ob->map->tile_path[3])
196	flags |= 8;	179	flags |= 8;
197		180
198	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	181	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
199	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	182	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
200	}	183	}
201	else	184	else
202	snprintf (buf, MAX_BUF, "mapinfo current");	185	snprintf (buf, MAX_BUF, "mapinfo current");
203		186
204	socket.send_packet (buf);	187	socket.send_packet (buf);
…		…
212	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	195	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	196	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
214	else	197	else
215	{	198	{
216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	199	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
217	socket.update_look = 1;	200	socket.floorbox_reset ();
218	socket.look_position = 0;
219	}	201	}
220	}	202	}
221		203
222	socket.current_x = ob->x;	204	socket.current_x = ob->x;
223	socket.current_y = ob->y;	205	socket.current_y = ob->y;
		206
		207	region *reg = ob->region ();
		208	if (socket.current_region != reg)
		209	{
		210	socket.current_region = reg;
		211	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		212	}
		213	}
		214
		215	/**
		216	* RequestInfo is sort of a meta command. There is some specific
		217	* request of information, but we call other functions to provide
		218	* that information.
		219	*/
		220	void
		221	RequestInfo (char *buf, int len, client * ns)
		222	{
		223	char *params = NULL, *cp;
		224
		225	/* No match */
		226	char bigbuf[MAX_BUF];
		227	int slen;
		228
		229	/* Set up replyinfo before we modify any of the buffers - this is used
		230	* if we don't find a match.
		231	*/
		232	strcpy (bigbuf, "replyinfo ");
		233	slen = strlen (bigbuf);
		234	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		235
		236	/* find the first space, make it null, and update the
		237	* params pointer.
		238	*/
		239	for (cp = buf; *cp != '\0'; cp++)
		240	if (*cp == ' ')
		241	{
		242	*cp = '\0';
		243	params = cp + 1;
		244	break;
		245	}
		246
		247	if (!strcmp (buf, "image_info"))
		248	send_image_info (ns, params);
		249	else if (!strcmp (buf, "image_sums"))
		250	send_image_sums (ns, params);
		251	else if (!strcmp (buf, "skill_info"))
		252	send_skill_info (ns, params);
		253	else if (!strcmp (buf, "spell_paths"))
		254	send_spell_paths (ns, params);
		255	else
		256	ns->send_packet (bigbuf, len);
224	}	257	}
225		258
226	void	259	void
227	ExtCmd (char *buf, int len, player *pl)	260	ExtCmd (char *buf, int len, player *pl)
228	{	261	{
229	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	262	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
		263	}
		264
		265	void
		266	ExtiCmd (char *buf, int len, client *ns)
		267	{
		268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230	}	269	}
231		270
232	void	271	void
233	MapInfoCmd (char *buf, int len, player *pl)	272	MapInfoCmd (char *buf, int len, player *pl)
234	{	273	{
…		…
249	buf += 8;	288	buf += 8;
250		289
251	// initial map and its origin	290	// initial map and its origin
252	maptile *map = pl->ob->map;	291	maptile *map = pl->ob->map;
253	sint16 dx, dy;	292	sint16 dx, dy;
254	int mapx = pl->socket->mapx / 2 - pl->ob->x;	293	int mapx = pl->ns->mapx / 2 - pl->ob->x;
255	int mapy = pl->socket->mapy / 2 - pl->ob->y;	294	int mapy = pl->ns->mapy / 2 - pl->ob->y;
256	int max_distance = 8; // limit maximum path length to something generous	295	int max_distance = 8; // limit maximum path length to something generous
257		296
258	while (*buf && map && max_distance)	297	while (*buf && map && max_distance)
259	{	298	{
260	int dir = *buf++;	299	int dir = *buf++;
261		300
262	switch (dir)	301	switch (dir)
263	{	302	{
264	case '1':	303	case '1':
265	dx = 0;	304	dx = 0;
266	dy = -1;	305	dy = -1;
267	map = get_map_from_coord (map, &dx, &dy);	306	map = map->xy_find (dx, dy);
268	map && (mapy -= map->height);	307	map && (mapy -= map->height);
269	break;	308	break;
270	case '2':	309	case '2':
271	mapx += map->width;	310	mapx += map->width;
272	dx = map->width;	311	dx = map->width;
273	dy = 0;	312	dy = 0;
274	map = get_map_from_coord (map, &dx, &dy);	313	map = map->xy_find (dx, dy);
275	break;	314	break;
276	case '3':	315	case '3':
277	mapy += map->height;	316	mapy += map->height;
278	dx = 0;	317	dx = 0;
279	dy = map->height;	318	dy = map->height;
280	map = get_map_from_coord (map, &dx, &dy);	319	map = map->xy_find (dx, dy);
281	break;	320	break;
282	case '4':	321	case '4':
283	dx = -1;	322	dx = -1;
284	dy = 0;	323	dy = 0;
285	map = get_map_from_coord (map, &dx, &dy);	324	map = map->xy_find (dx, dy);
286	map && (mapx -= map->width);	325	map && (mapx -= map->width);
287	break;	326	break;
288	}	327	}
289		328
290	--max_distance;	329	--max_distance;
291	}	330	}
292		331
…		…
303	if (map->tile_path[2])	342	if (map->tile_path[2])
304	flags |= 4;	343	flags |= 4;
305	if (map->tile_path[3])	344	if (map->tile_path[3])
306	flags |= 8;	345	flags |= 8;
307		346
308	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	347	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
309	}	348	}
310	else	349	else
311	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	350	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312	}	351	}
313	else	352	else
314	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	353	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315		354
316	pl->socket->send_packet (bigbuf);	355	pl->ns->send_packet (bigbuf);
317	}	356	}
318		357
319	/** This is the Setup cmd - easy first implementation */	358	/** This is the Setup cmd - easy first implementation */
320	void	359	void
321	SetUp (char *buf, int len, client_socket * ns)	360	SetUp (char *buf, int len, client * ns)
322	{	361	{
323	int s, slen;	362	int s, slen;
324	char *cmd, *param, cmdback[HUGE_BUF];	363	char *cmd, *param, cmdback[HUGE_BUF];
325		364
326	/* run through the cmds of setup	365	/* run through the cmds of setup
…		…
368	{	407	{
369	ns->sound = atoi (param);	408	ns->sound = atoi (param);
370	safe_strcat (cmdback, param, &slen, HUGE_BUF);	409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
371	}	410	}
372	else if (!strcmp (cmd, "exp64"))	411	else if (!strcmp (cmd, "exp64"))
373	{
374	ns->exp64 = atoi (param);
375	safe_strcat (cmdback, param, &slen, HUGE_BUF);	412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
376	}
377	else if (!strcmp (cmd, "spellmon"))	413	else if (!strcmp (cmd, "spellmon"))
378	{	414	{
379	ns->monitor_spells = atoi (param);	415	ns->monitor_spells = atoi (param);
380	safe_strcat (cmdback, param, &slen, HUGE_BUF);	416	safe_strcat (cmdback, param, &slen, HUGE_BUF);
381	}	417	}
…		…
536	* This is what takes care of it. We tell the client how things worked out.	572	* This is what takes care of it. We tell the client how things worked out.
537	* I am not sure if this file is the best place for this function. however,	573	* I am not sure if this file is the best place for this function. however,
538	* it either has to be here or init_sockets needs to be exported.	574	* it either has to be here or init_sockets needs to be exported.
539	*/	575	*/
540	void	576	void
541	AddMeCmd (char *buf, int len, client_socket * ns)	577	AddMeCmd (char *buf, int len, client * ns)
542	{	578	{
543	Settings oldsettings;	579	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
544
545	oldsettings = settings;
546	if (ns->status != Ns_Add || add_player (ns))
547	ns->send_packet ("addme_failed");
548	else
549	ns->send_packet ("addme_success");
550
551	settings = oldsettings;
552	}	580	}
553		581
554	/** Reply to ExtendedInfos command */	582	/** Reply to ExtendedInfos command */
555	void	583	void
556	ToggleExtendedInfos (char *buf, int len, client_socket * ns)	584	ToggleExtendedInfos (char *buf, int len, client * ns)
557	{	585	{
558	char cmdback[MAX_BUF];	586	char cmdback[MAX_BUF];
559	char command[50];	587	char command[50];
560	int info, nextinfo;	588	int info, nextinfo;
561		589
…		…
612	#define MSG_TYPE_MONUMENT 5	640	#define MSG_TYPE_MONUMENT 5
613	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	641	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614		642
615	/** Reply to ExtendedInfos command */	643	/** Reply to ExtendedInfos command */
616	void	644	void
617	ToggleExtendedText (char *buf, int len, client_socket * ns)	645	ToggleExtendedText (char *buf, int len, client * ns)
618	{	646	{
619	char cmdback[MAX_BUF];	647	char cmdback[MAX_BUF];
620	char temp[10];	648	char temp[10];
621	char command[50];	649	char command[50];
622	int info, nextinfo, i, flag;	650	int info, nextinfo, i, flag;
…		…
673	* a piece of data from us that we know the client wants. So	701	* a piece of data from us that we know the client wants. So
674	* if we know the client wants it, might as well push it to the	702	* if we know the client wants it, might as well push it to the
675	* client.	703	* client.
676	*/	704	*/
677	static void	705	static void
678	SendSmooth (client_socket * ns, uint16 face)	706	SendSmooth (client *ns, uint16 face)
679	{	707	{
680	uint16 smoothface;	708	uint16 smoothface;
681		709
682	/* If we can't find a face, return and set it so we won't try to send this	710	/* If we can't find a face, return and set it so we won't try to send this
683	* again.	711	* again.
…		…
693	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	721	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
694	esrv_send_face (ns, smoothface, 0);	722	esrv_send_face (ns, smoothface, 0);
695		723
696	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;	724	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
697		725
698	packet sl;	726	packet sl ("smooth");
699		727
700	sl << "smooth "
701	<< uint16 (face)	728	sl << uint16 (face)
702	<< uint16 (smoothface);	729	<< uint16 (smoothface);
703		730
704	Send_With_Handling (ns, &sl);	731	ns->send_packet (sl);
705	}	732	}
706		733
707	/**	734	/**
708	* Tells client the picture it has to use	735	* Tells client the picture it has to use
709	* to smooth a picture number given as argument.	736	* to smooth a picture number given as argument.
710	*/	737	*/
711	void	738	void
712	AskSmooth (char *buf, int len, client_socket * ns)	739	AskSmooth (char *buf, int len, client *ns)
713	{	740	{
714	uint16 facenbr;	741	SendSmooth (ns, atoi (buf));
715
716	facenbr = atoi (buf);
717	SendSmooth (ns, facenbr);
718	}	742	}
719		743
720	/**	744	/**
721	* This handles the general commands from the client (ie, north, fire, cast,	745	* This handles the general commands from the client (ie, north, fire, cast,
722	* etc.)	746	* etc.)
723	*/	747	*/
724	void	748	void
725	PlayerCmd (char *buf, int len, player *pl)	749	PlayerCmd (char *buf, int len, player *pl)
726	{	750	{
727
728	/* The following should never happen with a proper or honest client.
729	* Therefore, the error message doesn't have to be too clear - if
730	* someone is playing with a hacked/non working client, this gives them
731	* an idea of the problem, but they deserve what they get
732	*/
733	if (pl->state != ST_PLAYING)
734	{
735	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
736	return;
737	}
738	/* Check if there is a count. In theory, a zero count could also be	751	/* Check if there is a count. In theory, a zero count could also be
739	* sent, so check for that also.	752	* sent, so check for that also.
740	*/	753	*/
741	if (atoi (buf) || buf[0] == '0')	754	if (atoi (buf) || buf[0] == '0')
742	{	755	{
743	pl->count = atoi ((char *) buf);	756	pl->count = atoi ((char *) buf);
		757
744	buf = strchr (buf, ' '); /* advance beyond the numbers */	758	buf = strchr (buf, ' '); /* advance beyond the numbers */
745	if (!buf)	759	if (!buf)
746	{
747	#ifdef ESRV_DEBUG
748	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749	#endif
750	return;	760	return;
751	}	761
752	buf++;	762	buf++;
753	}	763	}
754	/* This should not happen anymore. */	764
755	if (pl->ob->speed_left < -1.0)
756	{
757	LOG (llevError, "Player has negative time - shouldn't do command.\n");
758	}
759	/* In c_new.c */
760	execute_newserver_command (pl->ob, (char *) buf);	765	execute_newserver_command (pl->ob, (char *) buf);
		766
761	/* Perhaps something better should be done with a left over count.	767	/* Perhaps something better should be done with a left over count.
762	* Cleaning up the input should probably be done first - all actions	768	* Cleaning up the input should probably be done first - all actions
763	* for the command that issued the count should be done before any other	769	* for the command that issued the count should be done before any other
764	* commands.	770	* commands.
765	*/	771	*/
766
767	pl->count = 0;	772	pl->count = 0;
768
769	}	773	}
770		774
771		775
772	/**	776	/**
773	* This handles the general commands from the client (ie, north, fire, cast,	777	* This handles the general commands from the client (ie, north, fire, cast,
774	* etc.). It is a lot like PlayerCmd above, but is called with the	778	* etc.). It is a lot like PlayerCmd above, but is called with the
775	* 'ncom' method which gives more information back to the client so it	779	* 'ncom' method which gives more information back to the client so it
776	* can throttle.	780	* can throttle.
777	*/	781	*/
778	void	782	void
779	NewPlayerCmd (uint8 * buf, int len, player *pl)	783	NewPlayerCmd (char *buf, int len, player *pl)
780	{	784	{
781	int time, repeat;
782	char command[MAX_BUF];
783	int pktlen;
784
785	if (len < 7)	785	if (len <= 6)
786	{	786	{
787	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	787	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
788	return;	788	return;
789	}	789	}
790		790
791	pktlen = net_uint16 (buf);	791	uint16 cmdid = net_uint16 ((uint8 *)buf);
792	repeat = net_uint32 (buf + 2);	792	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793		793
794	/* -1 is special - no repeat, but don't update */	794	/* -1 is special - no repeat, but don't update */
795	if (repeat != -1)	795	if (repeat != -1)
796	pl->count = repeat;	796	pl->count = repeat;
797		797
798	if ((len - 4) >= MAX_BUF)	798	buf += 6; //len -= 6;
799	len = MAX_BUF - 5;
800		799
801	strncpy ((char *) command, (char *) buf + 6, len - 4);
802	command[len - 4] = '\0';
803
804	/* The following should never happen with a proper or honest client.
805	* Therefore, the error message doesn't have to be too clear - if
806	* someone is playing with a hacked/non working client, this gives them
807	* an idea of the problem, but they deserve what they get
808	*/
809	if (pl->state != ST_PLAYING)
810	{
811	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
812	return;
813	}
814
815	/* This should not happen anymore. */
816	if (pl->ob->speed_left < -1.0)
817	LOG (llevError, "Player has negative time - shouldn't do command.\n");
818
819	/* In c_new.c */
820	execute_newserver_command (pl->ob, (char *) command);	800	execute_newserver_command (pl->ob, buf);
		801
821	/* Perhaps something better should be done with a left over count.	802	/* Perhaps something better should be done with a left over count.
822	* Cleaning up the input should probably be done first - all actions	803	* Cleaning up the input should probably be done first - all actions
823	* for the command that issued the count should be done before any other	804	* for the command that issued the count should be done before any other
824	* commands.	805	* commands.
825	*/	806	*/
826	pl->count = 0;	807	pl->count = 0;
827		808
828	if (FABS (pl->ob->speed) < 0.001)	809	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
		810	int time = fabs (pl->ob->speed) < 0.001
829	time = MAX_TIME * 100;	811	? time = MAX_TIME * 100
830	else
831	time = (int) (MAX_TIME / FABS (pl->ob->speed));	812	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
832		813
833	/* Send confirmation of command execution now */	814	/* Send confirmation of command execution now */
834		815	packet sl ("comc");
835	packet sl;
836	sl << "comc " << uint16 (pktlen) << uint32 (time);	816	sl << uint16 (cmdid) << uint32 (time);
837	Send_With_Handling (pl->socket, &sl);	817	pl->ns->send_packet (sl);
838	}	818	}
839
840		819
841	/** This is a reply to a previous query. */	820	/** This is a reply to a previous query. */
842	void	821	void
843	ReplyCmd (char *buf, int len, player *pl)	822	ReplyCmd (char *buf, int len, client *ns)
844	{	823	{
		824	if (ns->state == ST_CUSTOM)
		825	{
		826	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		827	return;
		828	}
		829
		830	if (!ns->pl)
		831	return; //TODO: depends on the exact reply we are after
		832	//TODO: but right now, we always have a ns->pl
		833
		834	player *pl = ns->pl;
		835
845	/* This is to synthesize how the data would be stored if it	836	/* This is to synthesize how the data would be stored if it
846	* was normally entered. A bit of a hack, and should be cleaned up	837	* was normally entered. A bit of a hack, and should be cleaned up
847	* once all the X11 code is removed from the server.	838	* once all the X11 code is removed from the server.
848	*	839	*
849	* We pass 13 to many of the functions because this way they	840	* We pass 13 to many of the functions because this way they
850	* think it was the carriage return that was entered, and the	841	* think it was the carriage return that was entered, and the
851	* function then does not try to do additional input.	842	* function then does not try to do additional input.
852	*/	843	*/
853	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	844	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
854		845
855	/* this avoids any hacking here */	846	/* this avoids any hacking here */
856		847
857	switch (pl->state)	848	switch (ns->state)
858	{	849	{
859	case ST_PLAYING:	850	case ST_PLAYING:
860	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	851	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861	break;	852	break;
862		853
863	case ST_PLAY_AGAIN:
864	/* We can check this for return value (2==quit). Maybe we
865	* should, and do something appropriate?
866	*/
867	receive_play_again (pl->ob, buf[0]);
868	break;
869
870	case ST_ROLL_STAT:
871	key_roll_stat (pl->ob, buf[0]);
872	break;
873
874	case ST_CHANGE_CLASS:	854	case ST_CHANGE_CLASS:
875
876	key_change_class (pl->ob, buf[0]);	855	key_change_class (pl->ob, buf[0]);
877	break;	856	break;
878		857
879	case ST_CONFIRM_QUIT:
880	key_confirm_quit (pl->ob, buf[0]);
881	break;
882
883	case ST_CONFIGURE:
884	LOG (llevError, "In client input handling, but into configure state\n");
885	pl->state = ST_PLAYING;
886	break;
887
888	case ST_GET_NAME:
889	receive_player_name (pl->ob, 13);
890	break;
891
892	case ST_GET_PASSWORD:
893	case ST_CONFIRM_PASSWORD:
894	receive_player_password (pl->ob, 13);
895	break;
896
897	case ST_GET_PARTY_PASSWORD: /* Get password for party */	858	case ST_GET_PARTY_PASSWORD: /* Get password for party */
898	receive_party_password (pl->ob, 13);	859	receive_party_password (pl->ob, 13);
899	break;	860	break;
900		861
901	default:	862	default:
902	LOG (llevError, "Unknown input state: %d\n", pl->state);	863	LOG (llevError, "Unknown input state: %d\n", ns->state);
903	}	864	}
904	}	865	}
905		866
906	/**	867	/**
907	* Client tells its version. If there is a mismatch, we close the	868	* Client tells its version. If there is a mismatch, we close the
…		…
909	* something older than the server. If we assume the client will be	870	* something older than the server. If we assume the client will be
910	* backwards compatible, having it be a later version should not be a	871	* backwards compatible, having it be a later version should not be a
911	* problem.	872	* problem.
912	*/	873	*/
913	void	874	void
914	VersionCmd (char *buf, int len, client_socket * ns)	875	VersionCmd (char *buf, int len, client * ns)
915	{	876	{
916	char *cp;
917	char version_warning[256];
918
919	if (!buf)	877	if (!buf)
920	{	878	{
921	LOG (llevError, "CS: received corrupted version command\n");	879	LOG (llevError, "CS: received corrupted version command\n");
922	return;	880	return;
923	}	881	}
924		882
925	ns->cs_version = atoi (buf);	883	ns->cs_version = atoi (buf);
926	ns->sc_version = ns->cs_version;	884	ns->sc_version = ns->cs_version;
		885
		886	LOG (llevDebug, "connection from client <%s>\n", buf);
		887
		888
		889	//TODO: should log here just for statistics
		890
927	if (VERSION_CS != ns->cs_version)	891	//if (VERSION_CS != ns->cs_version)
928	{	892	// unchecked;
929	#ifdef ESRV_DEBUG	893
930	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931	#endif
932	}
933	cp = strchr (buf + 1, ' ');	894	char *cp = strchr (buf + 1, ' ');
934	if (!cp)	895	if (!cp)
935	return;	896	return;
		897
936	ns->sc_version = atoi (cp);	898	ns->sc_version = atoi (cp);
		899
937	if (VERSION_SC != ns->sc_version)	900	//if (VERSION_SC != ns->sc_version)
938	{	901	// unchecked;
939	#ifdef ESRV_DEBUG	902
940	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941	#endif
942	}
943	cp = strchr (cp + 1, ' ');	903	cp = strchr (cp + 1, ' ');
		904
944	if (cp)	905	if (cp)
945	{	906	{
946	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	907	assign (ns->version, cp + 1);
947		908
948	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
949
950	/* This is first implementation - i skip all beta DX clients with it
951	* Add later stuff here for other clients
952	*/
953
954	/* these are old dxclients */
955	/* Version 1024 added support for singular + plural name values -
956	* requiing this minimal value reduces complexity of that code, and it
957	* has been around for a long time.
958	*/
959	if (ns->sc_version < 1026)	909	if (ns->sc_version < 1026)
960	{	910	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
961	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
962	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	911	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
963	ns->send_packet (version_warning);
964	}
965
966	}	912	}
967	}	913	}
968		914
969	/** sound related functions. */	915	/** sound related functions. */
970
971	void	916	void
972	SetSound (char *buf, int len, client_socket * ns)	917	SetSound (char *buf, int len, client * ns)
973	{	918	{
974	ns->sound = atoi (buf);	919	ns->sound = atoi (buf);
975	}	920	}
976		921
977	/** client wants the map resent */	922	/** client wants the map resent */
978
979	void	923	void
980	MapRedrawCmd (char *buf, int len, player *pl)	924	MapRedrawCmd (char *buf, int len, player *pl)
981	{	925	{
982
983	/* This function is currently disabled; just clearing the map state results in	926	/* This function is currently disabled; just clearing the map state results in
984	* display errors. It should clear the cache and send a newmap command.	927	* display errors. It should clear the cache and send a newmap command.
985	* Unfortunately this solution does not work because some client versions send	928	* Unfortunately this solution does not work because some client versions send
986	* a mapredraw command after receiving a newmap command.	929	* a mapredraw command after receiving a newmap command.
987	*/	930	*/
988	#if 0
989	/* Okay, this is MAJOR UGLY. but the only way I know how to
990	* clear the "cache"
991	*/
992	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
993	draw_client_map (pl->ob);
994	#endif
995	}	931	}
996		932
997	/**	933	/**
998	* Moves an object (typically, container to inventory).	934	* Moves an object (typically, container to inventory).
999	* syntax is: move (to) (tag) (nrof)	935	* syntax is: move (to) (tag) (nrof)
…		…
1002	MoveCmd (char *buf, int len, player *pl)	938	MoveCmd (char *buf, int len, player *pl)
1003	{	939	{
1004	int vals[3], i;	940	int vals[3], i;
1005		941
1006	/* A little funky here. We only cycle for 2 records, because	942	/* A little funky here. We only cycle for 2 records, because
1007	* we obviously am not going to find a space after the third	943	* we obviously are not going to find a space after the third
1008	* record. Perhaps we should just replace this with a	944	* record. Perhaps we should just replace this with a
1009	* sscanf?	945	* sscanf?
1010	*/	946	*/
1011	for (i = 0; i < 2; i++)	947	for (i = 0; i < 2; i++)
1012	{	948	{
1013	vals[i] = atoi (buf);	949	vals[i] = atoi (buf);
		950
1014	if (!(buf = strchr (buf, ' ')))	951	if (!(buf = strchr (buf, ' ')))
1015	{	952	{
1016	LOG (llevError, "Incomplete move command: %s\n", buf);	953	LOG (llevError, "Incomplete move command: %s\n", buf);
1017	return;	954	return;
1018	}	955	}
		956
1019	buf++;	957	buf++;
1020	}	958	}
		959
1021	vals[2] = atoi (buf);	960	vals[2] = atoi (buf);
1022		961
1023	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	962	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1024	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	963	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025	}	964	}
1026
1027
1028		965
1029	/******************************************************************************	966	/******************************************************************************
1030	*	967	*
1031	* Start of commands the server sends to the client.	968	* Start of commands the server sends to the client.
1032	*	969	*
…		…
1035	/**	972	/**
1036	* Asks the client to query the user. This way, the client knows	973	* Asks the client to query the user. This way, the client knows
1037	* it needs to send something back (vs just printing out a message)	974	* it needs to send something back (vs just printing out a message)
1038	*/	975	*/
1039	void	976	void
1040	send_query (client_socket * ns, uint8 flags, char *text)	977	send_query (client *ns, uint8 flags, char *text)
1041	{	978	{
1042	char buf[MAX_BUF];
1043
1044	sprintf (buf, "query %d %s", flags, text ? text : "");	979	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045	ns->send_packet (buf);
1046	}	980	}
1047		981
1048	#define AddIfInt64(Old,New,Type) if (Old != New) {\	982	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049	Old = New; \	983	Old = New; \
1050	sl << uint8 (Type) << uint64 (New); \	984	sl << uint8 (Type) << uint64 (New); \
…		…
1080	esrv_update_stats (player *pl)	1014	esrv_update_stats (player *pl)
1081	{	1015	{
1082	char buf[MAX_BUF];	1016	char buf[MAX_BUF];
1083	uint16 flags;	1017	uint16 flags;
1084		1018
1085	packet sl;	1019	client *ns = pl->ns;
1086	sl << "stats ";	1020	if (!ns)
		1021	return;
1087		1022
1088	if (pl->ob != NULL)	1023	object *ob = pl->ob;
1089	{	1024	if (!ob)
		1025	return;
		1026
		1027	packet sl ("stats");
		1028
1090	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1029	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1091	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1030	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1092	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1031	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1093	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1032	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1094	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1033	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1095	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1034	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1096	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1035	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1097	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1098	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1099	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1100	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1036	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1101	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1037	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1038	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1039	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1040	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1102	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1041	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1103	}
1104		1042
1105	if (pl->socket->exp64)
1106	{
1107	uint8 s;
1108
1109	for (s = 0; s < NUM_SKILLS; s++)	1043	for (int s = 0; s < NUM_SKILLS; s++)
1110	{	1044	if (object *skill = pl->last_skill_ob[s])
1111	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1045	if (skill->stats.exp != ns->last_skill_exp [s])
1112	{	1046	{
		1047	ns->last_skill_exp [s] = skill->stats.exp;
		1048
1113	/* Always send along the level if exp changes. This is only	1049	/* Always send along the level if exp changes. This is only
1114	* 1 extra byte, but keeps processing simpler.	1050	* 1 extra byte, but keeps processing simpler.
1115	*/	1051	*/
1116	sl << uint8 (s + CS_STAT_SKILLINFO)	1052	sl << uint8 (s + CS_STAT_SKILLINFO)
1117	<< uint8 (pl->last_skill_ob[s]->level)	1053	<< uint8 (skill->level)
1118	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1054	<< uint64 (skill->stats.exp);
1119
1120	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1121	}	1055	}
1122	}
1123	}
1124		1056
1125	if (pl->socket->exp64)
1126	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1057	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1127	else
1128	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1129
1130	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1058	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1131	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1059	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1132	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1060	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1133	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1061	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1134	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1062	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1135	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1063	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1136	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1064	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1137	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1065	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1066
1138	flags = 0;	1067	flags = 0;
1139		1068
1140	if (pl->fire_on)	1069	if (pl->fire_on)
1141	flags |= SF_FIREON;	1070	flags |= SF_FIREON;
1142		1071
1143	if (pl->run_on)	1072	if (pl->run_on)
1144	flags |= SF_RUNON;	1073	flags |= SF_RUNON;
1145		1074
1146	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1075	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1147		1076
1148	if (pl->socket->sc_version < 1025)	1077	if (ns->sc_version < 1025)
1149	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1078	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1150	else	1079	else
1151	{
1152	int i;
1153
1154	for (i = 0; i < NROFATTACKS; i++)	1080	for (int i = 0; i < NROFATTACKS; i++)
1155	{	1081	{
1156	/* Skip ones we won't send */	1082	/* Skip ones we won't send */
1157	if (atnr_cs_stat[i] == -1)	1083	if (atnr_cs_stat[i] == -1)
1158	continue;	1084	continue;
1159		1085
1160	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1086	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1161	}	1087	}
1162	}
1163		1088
1164	if (pl->socket->monitor_spells)	1089	if (pl->ns->monitor_spells)
1165	{	1090	{
1166	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1091	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1167	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1092	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1168	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1093	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1169	}	1094	}
1170		1095
1171	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1096	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1172	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1097	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1173	set_title (pl->ob, buf);	1098	set_title (ob, buf);
1174	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1099	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1175		1100
1176	/* Only send it away if we have some actual data */	1101	/* Only send it away if we have some actual data */
1177	if (sl.length () > 6)	1102	if (sl.length () > 6)
1178	Send_With_Handling (pl->socket, &sl);	1103	ns->send_packet (sl);
1179	}	1104	}
1180		1105
1181	/**	1106	/**
1182	* Tells the client that here is a player it should start using.	1107	* Tells the client that here is a player it should start using.
1183	*/	1108	*/
1184	void	1109	void
1185	esrv_new_player (player *pl, uint32 weight)	1110	esrv_new_player (player *pl, uint32 weight)
1186	{	1111	{
1187	pl->last_weight = weight;	1112	packet sl ("player");
1188
1189	packet sl;
1190	sl << "player ";
1191		1113
1192	sl << uint32 (pl->ob->count)	1114	sl << uint32 (pl->ob->count)
1193	<< uint32 (weight)	1115	<< uint32 (weight)
1194	<< uint32 (pl->ob->face->number)	1116	<< uint32 (pl->ob->face->number)
1195	<< data8 (pl->ob->name);	1117	<< data8 (pl->ob->name);
1196		1118
1197	Send_With_Handling (pl->socket, &sl);	1119	pl->ns->last_weight = weight;
		1120	pl->ns->send_packet (sl);
1198	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1121	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1199	}	1122	}
1200		1123
1201	/**	1124	/**
1202	* Need to send an animation sequence to the client.	1125	* Need to send an animation sequence to the client.
…		…
1204	* sent them the face yet (this can become quite costly in terms of	1127	* sent them the face yet (this can become quite costly in terms of
1205	* how much we are sending - on the other hand, this should only happen	1128	* how much we are sending - on the other hand, this should only happen
1206	* when the player logs in and picks stuff up.	1129	* when the player logs in and picks stuff up.
1207	*/	1130	*/
1208	void	1131	void
1209	esrv_send_animation (client_socket * ns, short anim_num)	1132	esrv_send_animation (client * ns, short anim_num)
1210	{	1133	{
1211	int i;
1212
1213	/* Do some checking on the anim_num we got. Note that the animations	1134	/* Do some checking on the anim_num we got. Note that the animations
1214	* are added in contigous order, so if the number is in the valid	1135	* are added in contigous order, so if the number is in the valid
1215	* range, it must be a valid animation.	1136	* range, it must be a valid animation.
1216	*/	1137	*/
1217	if (anim_num < 0 || anim_num > num_animations)	1138	if (anim_num < 0 || anim_num > num_animations)
1218	{	1139	{
1219	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1140	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1220	return;	1141	return;
1221	}	1142	}
1222		1143
1223	packet sl;	1144	packet sl ("anim");
1224		1145
1225	sl << "anim "
1226	<< uint16 (anim_num)	1146	sl << uint16 (anim_num)
1227	<< uint16 (0); /* flags - not used right now */	1147	<< uint16 (0); /* flags - not used right now */
1228		1148
1229	/* Build up the list of faces. Also, send any information (ie, the	1149	/* Build up the list of faces. Also, send any information (ie, the
1230	* the face itself) down to the client.	1150	* the face itself) down to the client.
1231	*/	1151	*/
1232	for (i = 0; i < animations[anim_num].num_animations; i++)	1152	for (int i = 0; i < animations[anim_num].num_animations; i++)
1233	{	1153	{
1234	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1154	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1235	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1155	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1156
1236	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1157	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1237	}	1158	}
1238		1159
1239	Send_With_Handling (ns, &sl);	1160	ns->send_packet (sl);
1240		1161
1241	ns->anims_sent[anim_num] = 1;	1162	ns->anims_sent[anim_num] = 1;
1242	}	1163	}
1243		1164
1244		1165
…		…
1251	/**	1172	/**
1252	* This adds face_num to a map cell at x,y. If the client doesn't have	1173	* This adds face_num to a map cell at x,y. If the client doesn't have
1253	* the face yet, we will also send it.	1174	* the face yet, we will also send it.
1254	*/	1175	*/
1255	static void	1176	static void
1256	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)	1177	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1257	{	1178	{
1258	if (newmap->cells[x][y].count >= MAP_LAYERS)	1179	if (newmap->cells[x][y].count >= MAP_LAYERS)
1259	{	1180	{
		1181	//TODO: one or the other, can't both have abort and return, verify and act
1260	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1182	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261	return;	1183	return;
1262	abort ();	1184	abort ();
1263	}	1185	}
1264		1186
1265	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1187	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266	newmap->cells[x][y].count++;	1188	newmap->cells[x][y].count++;
1267		1189
1268	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1190	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269	esrv_send_face (ns, face_num, 0);	1191	esrv_send_face (ns, face_num, 0);
1270	}
1271
1272	struct LayerCell
1273	{
1274	uint16 xy;
1275	short face;
1276	};
1277
1278	struct MapLayer
1279	{
1280	int count;
1281	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1282	};
1283
1284	/** Checkes if map cells have changed */
1285	static int
1286	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1287	{
1288	int k;
1289
1290	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1291	return 1;
1292	for (k = 0; k < newmap->cells[i][j].count; k++)
1293	{
1294	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1295	{
1296	return 1;
1297	}
1298	}
1299	return 0;
1300	}
1301
1302	/**
1303	* Basically, what this does is pack the data into layers.
1304	* cnum is the client number, cur is the the buffer we put all of
1305	* this data into. we return the end of the data. layers is
1306	* how many layers of data we should back.
1307	*/
1308	static uint8 *
1309	compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1310	{
1311	int x, y, k;
1312	int face;
1313	unsigned char *fcur;
1314	struct MapLayer layers[MAP_LAYERS];
1315
1316	for (k = 0; k < MAP_LAYERS; k++)
1317	layers[k].count = 0;
1318	fcur = cur;
1319	for (x = 0; x < ns->mapx; x++)
1320	{
1321	for (y = 0; y < ns->mapy; y++)
1322	{
1323	if (!mapcellchanged (ns, x, y, newmap))
1324	continue;
1325	if (newmap->cells[x][y].count == 0)
1326	{
1327	*cur = x * ns->mapy + y; /* mark empty space */
1328	cur++;
1329	continue;
1330	}
1331	for (k = 0; k < newmap->cells[x][y].count; k++)
1332	{
1333	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1334	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1335	layers[k].count++;
1336	}
1337	}
1338	}
1339	/* If no data, return now. */
1340	if (fcur == cur && layers[0].count == 0)
1341	return cur;
1342	*cur = 255; /* mark end of explicitly cleared cells */
1343	cur++;
1344	/* First pack by layers. */
1345	for (k = 0; k < numlayers; k++)
1346	{
1347	if (layers[k].count == 0)
1348	break; /* once a layer is entirely empty, no layer below it can
1349	have anything in it either */
1350	/* Pack by entries in thie layer */
1351	for (x = 0; x < layers[k].count;)
1352	{
1353	fcur = cur;
1354	*cur = layers[k].lcells[x].face >> 8;
1355	cur++;
1356	*cur = layers[k].lcells[x].face & 0xFF;
1357	cur++;
1358	face = layers[k].lcells[x].face;
1359	/* Now, we back the redundant data into 1 byte xy pairings */
1360	for (y = x; y < layers[k].count; y++)
1361	{
1362	if (layers[k].lcells[y].face == face)
1363	{
1364	*cur = (uint8) layers[k].lcells[y].xy;
1365	cur++;
1366	layers[k].lcells[y].face = -1;
1367	}
1368	}
1369	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1370	/* forward over the now redundant data */
1371	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1372	x++;
1373	}
1374	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1375	}
1376	return cur;
1377	}	1192	}
1378		1193
1379	/** Clears a map cell */	1194	/** Clears a map cell */
1380	static void	1195	static void
1381	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1196	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
…		…
1393	#define MAX_LAYERS 3	1208	#define MAX_LAYERS 3
1394		1209
1395	/* Using a global really isn't a good approach, but saves the over head of	1210	/* Using a global really isn't a good approach, but saves the over head of
1396	* allocating and deallocating such a block of data each time run through,	1211	* allocating and deallocating such a block of data each time run through,
1397	* and saves the space of allocating this in the socket object when we only	1212	* and saves the space of allocating this in the socket object when we only
1398	* need it for this cycle. If the serve is ever threaded, this needs to be	1213	* need it for this cycle. If the server is ever threaded, this needs to be
1399	* re-examined.	1214	* re-examined.
1400	*/	1215	*/
1401
1402	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];	1216	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1403		1217
1404	/**	1218	/**
1405	* Returns true if any of the heads for this	1219	* Returns true if any of the heads for this
1406	* space is set. Returns false if all are blank - this is used	1220	* space is set. Returns false if all are blank - this is used
1407	* for empty space checking.	1221	* for empty space checking.
1408	*/	1222	*/
1409	static inline int	1223	static inline int
1410	have_head (int ax, int ay)	1224	have_head (int ax, int ay)
1411	{	1225	{
1412
1413	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||	1226	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1414	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1227	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415	return 1;	1228	return 1;
		1229
1416	return 0;	1230	return 0;
1417	}	1231	}
1418		1232
1419	/**	1233	/**
1420	* check_head is a bit simplistic version of update_space below.	1234	* check_head is a bit simplistic version of update_space below.
1421	* basically, it only checks the that the head on space ax,ay at layer	1235	* basically, it only checks the that the head on space ax,ay at layer
1422	* needs to get sent - if so, it adds the data, sending the head	1236	* needs to get sent - if so, it adds the data, sending the head
1423	* if needed, and returning 1. If this no data needs to get	1237	* if needed, and returning 1. If this no data needs to get
1424	* sent, it returns zero.	1238	* sent, it returns zero.
1425	*/	1239	*/
1426	static int	1240	static int
1427	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1241	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1428	{	1242	{
1429	short face_num;	1243	short face_num;
1430		1244
1431	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1245	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1246	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
…		…
1464	* numbers the spaces differently - I think this was a leftover from	1278	* numbers the spaces differently - I think this was a leftover from
1465	* the map command, where the faces stack up. Sinces that is no longer	1279	* the map command, where the faces stack up. Sinces that is no longer
1466	* the case, it seems to make more sense to have these layer values	1280	* the case, it seems to make more sense to have these layer values
1467	* actually match.	1281	* actually match.
1468	*/	1282	*/
1469
1470	static int	1283	static int
1471	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1284	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1472	{	1285	{
1473	object *ob, *head;	1286	object *ob, *head;
1474	uint16 face_num;	1287	uint16 face_num;
1475	int bx, by, i;	1288	int bx, by, i;
1476		1289
…		…
1689	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1502	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1690	* take.	1503	* take.
1691	*/	1504	*/
1692		1505
1693	static inline int	1506	static inline int
1694	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1507	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1695	{	1508	{
1696	object *ob;	1509	object *ob;
1697	int smoothlevel; /* old face_num; */	1510	int smoothlevel; /* old face_num; */
1698		1511
1699	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1512	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1700		1513
1701	/* If there is no object for this space, or if the face for the object	1514	/* If there is no object for this space, or if the face for the object
1702	* is the blank face, set the smoothlevel to zero.	1515	* is the blank face, set the smoothlevel to zero.
1703	*/	1516	*/
1704	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))	1517	if (!ob || ob->face == blank_face)
1705	smoothlevel = 0;	1518	smoothlevel = 0;
1706	else	1519	else
1707	{	1520	{
1708	smoothlevel = ob->smoothlevel;	1521	smoothlevel = ob->smoothlevel;
1709	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1522	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
…		…
1733	* Returns the size of a data for a map square as returned by	1546	* Returns the size of a data for a map square as returned by
1734	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1547	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1735	* available.	1548	* available.
1736	*/	1549	*/
1737	int	1550	int
1738	getExtendedMapInfoSize (client_socket * ns)	1551	getExtendedMapInfoSize (client * ns)
1739	{	1552	{
1740	int result = 0;	1553	int result = 0;
1741		1554
1742	if (ns->ext_mapinfos)	1555	if (ns->ext_mapinfos)
1743	{	1556	{
1744	if (ns->EMI_smooth)	1557	if (ns->EMI_smooth)
1745	result += 1; /*One byte for smoothlevel */	1558	result += 1; /*One byte for smoothlevel */
1746	}	1559	}
		1560
1747	return result;	1561	return result;
		1562	}
		1563
		1564	// prefetch (and touch) all maps within a specific distancd
		1565	static void
		1566	prefetch_surrounding_maps (maptile *map, int distance)
		1567	{
		1568	map->last_access = runtime;
		1569
		1570	if (--distance)
		1571	for (int dir = 4; --dir; )
		1572	if (const shstr &path = map->tile_path [dir])
		1573	if (maptile *&neigh = map->tile_map [dir])
		1574	prefetch_surrounding_maps (neigh, distance);
		1575	else
		1576	neigh = maptile::find_async (path, map);
		1577	}
		1578
		1579	// prefetch a generous area around the player
		1580	static void
		1581	prefetch_surrounding_maps (object *op)
		1582	{
		1583	prefetch_surrounding_maps (op->map, 3);
1748	}	1584	}
1749		1585
1750	/**	1586	/**
1751	* This function uses the new map1 protocol command to send the map	1587	* This function uses the new map1 protocol command to send the map
1752	* to the client. It is necessary because the old map command supports	1588	* to the client. It is necessary because the old map command supports
…		…
1758	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1594	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1759	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1595	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1760	* and use the other 4 bits for other informatiion. For full documentation	1596	* and use the other 4 bits for other informatiion. For full documentation
1761	* of what we send, see the doc/Protocol file.	1597	* of what we send, see the doc/Protocol file.
1762	* I will describe internally what we do:	1598	* I will describe internally what we do:
1763	* the socket->lastmap shows how the map last looked when sent to the client.	1599	* the ns->lastmap shows how the map last looked when sent to the client.
1764	* in the lastmap structure, there is a cells array, which is set to the	1600	* in the lastmap structure, there is a cells array, which is set to the
1765	* maximum viewable size (As set in config.h).	1601	* maximum viewable size (As set in config.h).
1766	* in the cells, there are faces and a count value.	1602	* in the cells, there are faces and a count value.
1767	* we use the count value to hold the darkness value. If -1, then this space	1603	* we use the count value to hold the darkness value. If -1, then this space
1768	* is not viewable.	1604	* is not viewable.
…		…
1779	uint8 eentrysize;	1615	uint8 eentrysize;
1780	uint16 ewhatstart, ewhatflag;	1616	uint16 ewhatstart, ewhatflag;
1781	uint8 extendedinfos;	1617	uint8 extendedinfos;
1782	maptile *m;	1618	maptile *m;
1783		1619
1784	client_socket &socket = *pl->contr->socket;	1620	client &socket = *pl->contr->ns;
		1621
		1622	if (!pl->active)
		1623	return;
1785		1624
1786	check_map_change (pl->contr);	1625	check_map_change (pl->contr);
		1626	prefetch_surrounding_maps (pl);
1787		1627
1788	packet sl;	1628	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1789	packet esl;	1629	packet esl;
1790		1630
1791	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1792	startlen = sl.length ();	1631	startlen = sl.length ();
1793		1632
1794	/*Extendedmapinfo structure initialisation */	1633	/*Extendedmapinfo structure initialisation */
1795	if (socket.ext_mapinfos)	1634	if (socket.ext_mapinfos)
1796	{	1635	{
…		…
1840	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1679	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1841	{	1680	{
1842	ax = 0;	1681	ax = 0;
1843	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1682	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1844	{	1683	{
1845
1846	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1684	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1847		1685
1848	/* If this space is out of the normal viewable area, we only check	1686	/* If this space is out of the normal viewable area, we only check
1849	* the heads value ax or ay will only be greater than what	1687	* the heads value ax or ay will only be greater than what
1850	* the client wants if using the map1a command - this is because	1688	* the client wants if using the map1a command - this is because
…		…
1868	* with no faces tells the client to blank out the	1706	* with no faces tells the client to blank out the
1869	* space.	1707	* space.
1870	*/	1708	*/
1871	got_one = 0;	1709	got_one = 0;
1872	for (i = oldlen + 2; i < sl.length (); i++)	1710	for (i = oldlen + 2; i < sl.length (); i++)
1873	if (sl.buf[i])	1711	if (sl[i])
1874	got_one = 1;	1712	got_one = 1;
1875		1713
1876	if (got_one && (mask & 0xf))	1714	if (got_one && (mask & 0xf))
1877	sl.buf[oldlen + 1] = mask & 0xff;	1715	sl[oldlen + 1] = mask & 0xff;
1878	else	1716	else
1879	{ /*either all faces blank, either no face at all */	1717	{ /*either all faces blank, either no face at all */
1880	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */	1718	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1881	sl.reset (oldlen + 2);	1719	sl.reset (oldlen + 2);
1882	else	1720	else
…		…
1912	map_clearcell (&lastcell, 0, 0, 0, -1);	1750	map_clearcell (&lastcell, 0, 0, 0, -1);
1913	}	1751	}
1914	}	1752	}
1915	else if (d > 3)	1753	else if (d > 3)
1916	{	1754	{
		1755	m->touch ();
		1756
1917	int need_send = 0, count;	1757	int need_send = 0, count;
1918		1758
1919	/* This block deals with spaces that are not visible for whatever	1759	/* This block deals with spaces that are not visible for whatever
1920	* reason. Still may need to send the head for this space.	1760	* reason. Still may need to send the head for this space.
1921	*/	1761	*/
…		…
1948		1788
1949	map_clearcell (&lastcell, 0, 0, 0, count);	1789	map_clearcell (&lastcell, 0, 0, 0, count);
1950	}	1790	}
1951		1791
1952	if ((mask & 0xf) || need_send)	1792	if ((mask & 0xf) || need_send)
1953	sl.buf[oldlen + 1] = mask & 0xff;	1793	sl[oldlen + 1] = mask & 0xff;
1954	else	1794	else
1955	sl.reset (oldlen);	1795	sl.reset (oldlen);
1956	}	1796	}
1957	else	1797	else
1958	{	1798	{
		1799	m->touch ();
		1800
1959	/* In this block, the space is visible or there are head objects	1801	/* In this block, the space is visible or there are head objects
1960	* we need to send.	1802	* we need to send.
1961	*/	1803	*/
1962		1804
1963	/* Rather than try to figure out what everything that we might	1805	/* Rather than try to figure out what everything that we might
…		…
1988	mask |= 0x8;	1830	mask |= 0x8;
1989		1831
1990	if (socket.extmap)	1832	if (socket.extmap)
1991	{	1833	{
1992	*last_ext |= 0x80;	1834	*last_ext |= 0x80;
1993	last_ext = sl.buf + sl.length ();	1835	last_ext = &sl[sl.length ()];
1994	sl << uint8 (d);	1836	sl << uint8 (d);
1995	}	1837	}
1996	else	1838	else
1997	sl << uint8 (255 - 64 * d);	1839	sl << uint8 (255 - 64 * d);
1998	}	1840	}
…		…
2032	{	1874	{
2033	lastcell.stat_hp = stat_hp;	1875	lastcell.stat_hp = stat_hp;
2034		1876
2035	mask |= 0x8;	1877	mask |= 0x8;
2036	*last_ext |= 0x80;	1878	*last_ext |= 0x80;
2037	last_ext = sl.buf + sl.length ();	1879	last_ext = &sl[sl.length ()];
2038		1880
2039	sl << uint8 (5) << uint8 (stat_hp);	1881	sl << uint8 (5) << uint8 (stat_hp);
2040		1882
2041	if (stat_width > 1)	1883	if (stat_width > 1)
2042	{	1884	{
2043	*last_ext |= 0x80;	1885	*last_ext |= 0x80;
2044	last_ext = sl.buf + sl.length ();	1886	last_ext = &sl[sl.length ()];
2045		1887
2046	sl << uint8 (6) << uint8 (stat_width);	1888	sl << uint8 (6) << uint8 (stat_width);
2047	}	1889	}
2048	}	1890	}
2049		1891
…		…
2051	{	1893	{
2052	lastcell.player = player;	1894	lastcell.player = player;
2053		1895
2054	mask |= 0x8;	1896	mask |= 0x8;
2055	*last_ext |= 0x80;	1897	*last_ext |= 0x80;
2056	last_ext = sl.buf + sl.length ();	1898	last_ext = &sl[sl.length ()];
2057		1899
2058	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1900	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2059	}	1901	}
2060		1902
2061	if (lastcell.flags != flags)	1903	if (lastcell.flags != flags)
2062	{	1904	{
2063	lastcell.flags = flags;	1905	lastcell.flags = flags;
2064		1906
2065	mask |= 0x8;	1907	mask |= 0x8;
2066	*last_ext |= 0x80;	1908	*last_ext |= 0x80;
2067	last_ext = sl.buf + sl.length ();	1909	last_ext = &sl[sl.length ()];
2068		1910
2069	sl << uint8 (8) << uint8 (flags);	1911	sl << uint8 (8) << uint8 (flags);
2070	}	1912	}
2071	}	1913	}
2072		1914
…		…
2114	* space by checking the mask. If so, update the mask.	1956	* space by checking the mask. If so, update the mask.
2115	* if not, reset the len to that from before adding the mask	1957	* if not, reset the len to that from before adding the mask
2116	* value, so we don't send those bits.	1958	* value, so we don't send those bits.
2117	*/	1959	*/
2118	if (mask & 0xf)	1960	if (mask & 0xf)
2119	sl.buf[oldlen + 1] = mask & 0xff;	1961	sl[oldlen + 1] = mask & 0xff;
2120	else	1962	else
2121	sl.reset (oldlen);	1963	sl.reset (oldlen);
2122		1964
2123	if (emask & 0xf)	1965	if (emask & 0xf)
2124	esl.buf[eoldlen + 1] = emask & 0xff;	1966	esl[eoldlen + 1] = emask & 0xff;
2125	else	1967	else
2126	esl.reset (eoldlen);	1968	esl.reset (eoldlen);
2127	} /* else this is a viewable space */	1969	} /* else this is a viewable space */
2128	} /* for x loop */	1970	} /* for x loop */
2129	} /* for y loop */	1971	} /* for y loop */
…		…
2135	{	1977	{
2136	/* No map data will follow, so don't say the client	1978	/* No map data will follow, so don't say the client
2137	* it doesn't need draw!	1979	* it doesn't need draw!
2138	*/	1980	*/
2139	ewhatflag &= (~EMI_NOREDRAW);	1981	ewhatflag &= (~EMI_NOREDRAW);
2140	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	1982	esl[ewhatstart + 1] = ewhatflag & 0xff;
2141	}	1983	}
2142		1984
2143	if (esl.length () > estartlen)	1985	if (esl.length () > estartlen)
2144	Send_With_Handling (&socket, &esl);	1986	socket.send_packet (esl);
2145	}	1987	}
2146		1988
2147	if (sl.length () > startlen || socket.sent_scroll)	1989	if (sl.length () > startlen || socket.sent_scroll)
2148	{	1990	{
2149	Send_With_Handling (&socket, &sl);	1991	socket.send_packet (sl);
2150	socket.sent_scroll = 0;	1992	socket.sent_scroll = 0;
2151	}	1993	}
2152	}	1994	}
2153		1995
2154	/**	1996	/**
…		…
2157	void	1999	void
2158	draw_client_map (object *pl)	2000	draw_client_map (object *pl)
2159	{	2001	{
2160	int i, j;	2002	int i, j;
2161	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	2003	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2162	New_Face *face, *floor;	2004	facetile *face, *floor;
2163	New_Face *floor2;	2005	facetile *floor2;
2164	int d, mflags;	2006	int d, mflags;
2165	struct Map newmap;	2007	struct Map newmap;
2166	maptile *m, *pm;	2008	maptile *m, *pm;
2167		2009
2168	if (pl->type != PLAYER)	2010	if (pl->type != PLAYER)
…		…
2180	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	2022	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2181	return;	2023	return;
2182		2024
2183	memset (&newmap, 0, sizeof (struct Map));	2025	memset (&newmap, 0, sizeof (struct Map));
2184		2026
2185	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	2027	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2186	{
2187	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	2028	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2188	{	2029	{
2189	ax = i;	2030	ax = i;
2190	ay = j;	2031	ay = j;
2191	m = pm;	2032	m = pm;
2192	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2033	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2034
2193	if (mflags & P_OUT_OF_MAP)	2035	if (mflags & P_OUT_OF_MAP)
2194	continue;	2036	continue;
2195	if (mflags & P_NEED_UPDATE)	2037
2196	update_position (m, ax, ay);
2197	/* If a map is visible to the player, we don't want to swap it out	2038	/* If a map is visible to the player, we don't want to swap it out
2198	* just to reload it. This should really call something like	2039	* just to reload it. This should really call something like
2199	* swap_map, but this is much more efficient and 'good enough'	2040	* swap_map, but this is much more efficient and 'good enough'
2200	*/	2041	*/
2201	if (mflags & P_NEW_MAP)	2042	if (mflags & P_NEW_MAP)
2202	m->timeout = 50;	2043	m->timeout = 50;
2203	}	2044	}
2204	}	2045
2205	/* do LOS after calls to update_position */	2046	/* do LOS after calls to update_position */
2206	if (pl->contr->do_los)	2047	if (pl->contr->do_los)
2207	{	2048	{
2208	update_los (pl);	2049	update_los (pl);
2209	pl->contr->do_los = 0;	2050	pl->contr->do_los = 0;
…		…
2224		2065
2225	/*****************************************************************************/	2066	/*****************************************************************************/
2226	void	2067	void
2227	send_plugin_custom_message (object *pl, char *buf)	2068	send_plugin_custom_message (object *pl, char *buf)
2228	{	2069	{
2229	pl->contr->socket->send_packet (buf);	2070	pl->contr->ns->send_packet (buf);
2230	}	2071	}
2231		2072
2232	/**	2073	/**
2233	* This sends the skill number to name mapping. We ignore	2074	* This sends the skill number to name mapping. We ignore
2234	* the params - we always send the same info no matter what.	2075	* the params - we always send the same info no matter what.
2235	*/	2076	*/
2236	void	2077	void
2237	send_skill_info (client_socket *ns, char *params)	2078	send_skill_info (client *ns, char *params)
2238	{	2079	{
2239	packet sl;	2080	packet sl;
2240	sl << "replyinfo skill_info\n";	2081	sl << "replyinfo skill_info\n";
2241		2082
2242	for (int i = 1; i < NUM_SKILLS; i++)	2083	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2246	{	2087	{
2247	LOG (llevError, "Buffer overflow in send_skill_info!\n");	2088	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2248	fatal (0);	2089	fatal (0);
2249	}	2090	}
2250		2091
2251	Send_With_Handling (ns, &sl);	2092	ns->send_packet (sl);
2252	}	2093	}
2253		2094
2254	/**	2095	/**
2255	* This sends the spell path to name mapping. We ignore	2096	* This sends the spell path to name mapping. We ignore
2256	* the params - we always send the same info no matter what.	2097	* the params - we always send the same info no matter what.
2257	*/	2098	*/
2258	void	2099	void
2259	send_spell_paths (client_socket * ns, char *params)	2100	send_spell_paths (client * ns, char *params)
2260	{	2101	{
2261	packet sl;	2102	packet sl;
2262		2103
2263	sl << "replyinfo spell_paths\n";	2104	sl << "replyinfo spell_paths\n";
2264		2105
…		…
2269	{	2110	{
2270	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	2111	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2271	fatal (0);	2112	fatal (0);
2272	}	2113	}
2273		2114
2274	Send_With_Handling (ns, &sl);	2115	ns->send_packet (sl);
2275	}	2116	}
2276		2117
2277	/**	2118	/**
2278	* This looks for any spells the player may have that have changed their stats.	2119	* This looks for any spells the player may have that have changed their stats.
2279	* it then sends an updspell packet for each spell that has changed in this way	2120	* it then sends an updspell packet for each spell that has changed in this way
2280	*/	2121	*/
2281	void	2122	void
2282	esrv_update_spells (player *pl)	2123	esrv_update_spells (player *pl)
2283	{	2124	{
		2125	if (!pl->ns)
		2126	return;
		2127
2284	if (!pl->socket->monitor_spells)	2128	if (!pl->ns->monitor_spells)
2285	return;	2129	return;
2286		2130
2287	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2131	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2288	{	2132	{
2289	if (spell->type == SPELL)	2133	if (spell->type == SPELL)
…		…
2319		2163
2320	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2164	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2321	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2165	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2322	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2166	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2323		2167
2324	Send_With_Handling (pl->socket, &sl);	2168	pl->ns->send_packet (sl);
2325	}	2169	}
2326	}	2170	}
2327	}	2171	}
2328	}	2172	}
2329		2173
2330	void	2174	void
2331	esrv_remove_spell (player *pl, object *spell)	2175	esrv_remove_spell (player *pl, object *spell)
2332	{	2176	{
2333	if (!pl->socket->monitor_spells)	2177	if (!pl->ns->monitor_spells)
2334	return;	2178	return;
2335		2179
2336	if (!pl || !spell || spell->env != pl->ob)	2180	if (!pl || !spell || spell->env != pl->ob)
2337	{	2181	{
2338	LOG (llevError, "Invalid call to esrv_remove_spell");	2182	LOG (llevError, "Invalid call to esrv_remove_spell");
2339	return;	2183	return;
2340	}	2184	}
2341		2185
2342	packet sl;	2186	packet sl ("delspell");
2343		2187
2344	sl << "delspell "
2345	<< uint32 (spell->count);	2188	sl << uint32 (spell->count);
2346		2189
2347	Send_With_Handling (pl->socket, &sl);	2190	pl->ns->send_packet (sl);
2348	}	2191	}
2349		2192
2350	/* appends the spell *spell to the Socklist we will send the data to. */	2193	/* appends the spell *spell to the Socklist we will send the data to. */
2351	static void	2194	static void
2352	append_spell (player *pl, packet &sl, object *spell)	2195	append_spell (player *pl, packet &sl, object *spell)
…		…
2400	{	2243	{
2401	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2244	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2402	return;	2245	return;
2403	}	2246	}
2404		2247
2405	if (!pl->socket->monitor_spells)	2248	if (!pl->ns->monitor_spells)
2406	return;	2249	return;
2407		2250
2408	packet sl;	2251	packet sl ("addspell");
2409
2410	sl << "addspell ";
2411		2252
2412	if (!spell)	2253	if (!spell)
2413	{	2254	{
2414	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2255	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2415	{	2256	{
…		…
2429	if (spell->type != SPELL)	2270	if (spell->type != SPELL)
2430	continue;	2271	continue;
2431		2272
2432	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2273	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2433	{	2274	{
2434	Send_With_Handling (pl->socket, &sl);	2275	pl->ns->send_packet (sl);
2435		2276
2436	sl.reset ();	2277	sl.reset ();
2437	sl << "addspell ";	2278	sl << "addspell ";
2438	}	2279	}
2439		2280
…		…
2453	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2294	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2454	fatal (0);	2295	fatal (0);
2455	}	2296	}
2456		2297
2457	/* finally, we can send the packet */	2298	/* finally, we can send the packet */
2458	Send_With_Handling (pl->socket, &sl);	2299	pl->ns->send_packet (sl);
2459	}	2300	}
2460		2301

Diff Legend

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