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

Diff Legend

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