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.35 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.75 by root, Wed Mar 14 04:12:29 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/**	25	/**
25	* \file	26	* \file
26	* Client handling.	27	* Client handling.
27	*	28	*
…		…
35	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
37	*	38	*
38	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
39	*	40	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.
42	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	41	*/
47		42
48	#include <global.h>	43	#include <global.h>
49	#include <sproto.h>	44	#include <sproto.h>
50		45
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	46	#include <living.h>
54	#include <commands.h>	47	#include <commands.h>
55		48
56	/* This block is basically taken from socket.c - I assume if it works there,	49	/* This block is basically taken from socket.c - I assume if it works there,
57	* it should work here.	50	* it should work here.
…		…
60	#include <sys/time.h>	53	#include <sys/time.h>
61	#include <sys/socket.h>	54	#include <sys/socket.h>
62	#include <netinet/in.h>	55	#include <netinet/in.h>
63	#include <netdb.h>	56	#include <netdb.h>
64		57
65	#ifdef HAVE_UNISTD_H
66	# include <unistd.h>	58	#include <unistd.h>
67	#endif
68
69	#ifdef HAVE_SYS_TIME_H
70	# include <sys/time.h>	59	#include <sys/time.h>
71	#endif
72		60
73	#include "sounds.h"	61	#include "sounds.h"
74		62
75	/**	63	/**
76	* This table translates the attack numbers as used within the	64	* This table translates the attack numbers as used within the
…		…
93	-1, /* life stealing */	81	-1, /* life stealing */
94	-1 /* Disease - not fully done yet */	82	-1 /* Disease - not fully done yet */
95	};	83	};
96		84
97	static void	85	static void
98	socket_map_scroll (client_socket * ns, int dx, int dy)	86	socket_map_scroll (client *ns, int dx, int dy)
99	{	87	{
100	struct Map newmap;	88	struct Map newmap;
101	int x, y, mx, my;	89	int x, y, mx, my;
102		90
103	{
104	packet sl;
105
106	sl.printf ("map_scroll %d %d", dx, dy);	91	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107	ns->send_packet (sl);
108	}
109		92
110	/* If we are using the Map1aCmd, we may in fact send	93	/* If we are using the Map1aCmd, we may in fact send
111	* head information that is outside the viewable map.	94	* head information that is outside the viewable map.
112	* So set the mx,my to the max value we want to	95	* So set the mx,my to the max value we want to
113	* look for. Removed code to do so - it caused extra	96	* look for. Removed code to do so - it caused extra
…		…
115	* that much difference in bandwidth.	98	* that much difference in bandwidth.
116	*/	99	*/
117	mx = ns->mapx;	100	mx = ns->mapx;
118	my = ns->mapy;	101	my = ns->mapy;
119		102
120	if (ns->mapmode == Map1aCmd)
121	{
122	mx += MAX_HEAD_OFFSET;
123	my += MAX_HEAD_OFFSET;
124	}
125
126	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
127	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
128	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
129	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
130	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
153	}	130	}
154		131
155	static void	132	static void
156	clear_map (player *pl)	133	clear_map (player *pl)
157	{	134	{
158	client_socket & socket = pl->socket;
159
160	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
161		136
162	if (socket.newmapcmd == 1)	137	if (pl->ns->newmapcmd == 1)
163	socket.send_packet ("newmap");	138	pl->ns->send_packet ("newmap");
164		139
165	socket.update_look = 1;	140	pl->ns->floorbox_reset ();
166	socket.look_position = 0;
167	}	141	}
168		142
169	/** check for map change and send new map data */	143	/** check for map/region change and send new map data */
170	static void	144	static void
171	check_map_change (player *pl)	145	check_map_change (player *pl)
172	{	146	{
173	client_socket & socket = pl->socket;	147	client &socket = *pl->ns;
174	object *ob = pl->ob;	148	object *ob = pl->ob;
175	char buf[MAX_BUF]; /* eauugggh */	149	char buf[MAX_BUF]; /* eauugggh */
176		150
177	if (socket.current_map != ob->map)	151	if (socket.current_map != ob->map)
178	{	152	{
…		…
194	flags |= 4;	168	flags |= 4;
195	if (ob->map->tile_path[3])	169	if (ob->map->tile_path[3])
196	flags |= 8;	170	flags |= 8;
197		171
198	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
199	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
200	}	174	}
201	else	175	else
202	snprintf (buf, MAX_BUF, "mapinfo current");	176	snprintf (buf, MAX_BUF, "mapinfo current");
203		177
204	socket.send_packet (buf);	178	socket.send_packet (buf);
…		…
212	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	186	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	187	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
214	else	188	else
215	{	189	{
216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	190	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
217	socket.update_look = 1;	191	socket.floorbox_reset ();
218	socket.look_position = 0;
219	}	192	}
220	}	193	}
221		194
222	socket.current_x = ob->x;	195	socket.current_x = ob->x;
223	socket.current_y = ob->y;	196	socket.current_y = ob->y;
		197
		198	region *reg = ob->region ();
		199	if (socket.current_region != reg)
		200	{
		201	socket.current_region = reg;
		202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		203	}
		204	}
		205
		206	/**
		207	* RequestInfo is sort of a meta command. There is some specific
		208	* request of information, but we call other functions to provide
		209	* that information.
		210	*/
		211	void
		212	RequestInfo (char *buf, int len, client * ns)
		213	{
		214	char *params = NULL, *cp;
		215
		216	/* No match */
		217	char bigbuf[MAX_BUF];
		218	int slen;
		219
		220	/* Set up replyinfo before we modify any of the buffers - this is used
		221	* if we don't find a match.
		222	*/
		223	strcpy (bigbuf, "replyinfo ");
		224	slen = strlen (bigbuf);
		225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		226
		227	/* find the first space, make it null, and update the
		228	* params pointer.
		229	*/
		230	for (cp = buf; *cp != '\0'; cp++)
		231	if (*cp == ' ')
		232	{
		233	*cp = '\0';
		234	params = cp + 1;
		235	break;
		236	}
		237
		238	if (!strcmp (buf, "image_info"))
		239	send_image_info (ns, params);
		240	else if (!strcmp (buf, "image_sums"))
		241	send_image_sums (ns, params);
		242	else if (!strcmp (buf, "skill_info"))
		243	send_skill_info (ns, params);
		244	else if (!strcmp (buf, "spell_paths"))
		245	send_spell_paths (ns, params);
		246	else
		247	ns->send_packet (bigbuf, len);
224	}	248	}
225		249
226	void	250	void
227	ExtCmd (char *buf, int len, player *pl)	251	ExtCmd (char *buf, int len, player *pl)
228	{	252	{
229	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	253	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
		254	}
		255
		256	void
		257	ExtiCmd (char *buf, int len, client *ns)
		258	{
		259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230	}	260	}
231		261
232	void	262	void
233	MapInfoCmd (char *buf, int len, player *pl)	263	MapInfoCmd (char *buf, int len, player *pl)
234	{	264	{
…		…
249	buf += 8;	279	buf += 8;
250		280
251	// initial map and its origin	281	// initial map and its origin
252	maptile *map = pl->ob->map;	282	maptile *map = pl->ob->map;
253	sint16 dx, dy;	283	sint16 dx, dy;
254	int mapx = pl->socket.mapx / 2 - pl->ob->x;	284	int mapx = pl->ns->mapx / 2 - pl->ob->x;
255	int mapy = pl->socket.mapy / 2 - pl->ob->y;	285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
256	int max_distance = 8; // limit maximum path length to something generous	286	int max_distance = 8; // limit maximum path length to something generous
257		287
258	while (*buf && map && max_distance)	288	while (*buf && map && max_distance)
259	{	289	{
260	int dir = *buf++;	290	int dir = *buf++;
261		291
262	switch (dir)	292	switch (dir)
263	{	293	{
264	case '1':	294	case '1':
265	dx = 0;	295	dx = 0;
266	dy = -1;	296	dy = -1;
267	map = get_map_from_coord (map, &dx, &dy);	297	map = map->xy_find (dx, dy);
268	map && (mapy -= map->height);	298	map && (mapy -= map->height);
269	break;	299	break;
270	case '2':	300	case '2':
271	mapx += map->width;	301	mapx += map->width;
272	dx = map->width;	302	dx = map->width;
273	dy = 0;	303	dy = 0;
274	map = get_map_from_coord (map, &dx, &dy);	304	map = map->xy_find (dx, dy);
275	break;	305	break;
276	case '3':	306	case '3':
277	mapy += map->height;	307	mapy += map->height;
278	dx = 0;	308	dx = 0;
279	dy = map->height;	309	dy = map->height;
280	map = get_map_from_coord (map, &dx, &dy);	310	map = map->xy_find (dx, dy);
281	break;	311	break;
282	case '4':	312	case '4':
283	dx = -1;	313	dx = -1;
284	dy = 0;	314	dy = 0;
285	map = get_map_from_coord (map, &dx, &dy);	315	map = map->xy_find (dx, dy);
286	map && (mapx -= map->width);	316	map && (mapx -= map->width);
287	break;	317	break;
288	}	318	}
289		319
290	--max_distance;	320	--max_distance;
291	}	321	}
292		322
…		…
303	if (map->tile_path[2])	333	if (map->tile_path[2])
304	flags |= 4;	334	flags |= 4;
305	if (map->tile_path[3])	335	if (map->tile_path[3])
306	flags |= 8;	336	flags |= 8;
307		337
308	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
309	}	339	}
310	else	340	else
311	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312	}	342	}
313	else	343	else
314	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315		345
316	pl->socket.send_packet (bigbuf);	346	pl->ns->send_packet (bigbuf);
317	}	347	}
318		348
319	/** This is the Setup cmd - easy first implementation */	349	/** This is the Setup cmd - easy first implementation */
320	void	350	void
321	SetUp (char *buf, int len, client_socket * ns)	351	SetUp (char *buf, int len, client * ns)
322	{	352	{
323	int s, slen;	353	int s, slen;
324	char *cmd, *param, cmdback[HUGE_BUF];	354	char *cmd, *param, cmdback[HUGE_BUF];
325		355
326	/* run through the cmds of setup	356	/* run through the cmds of setup
…		…
368	{	398	{
369	ns->sound = atoi (param);	399	ns->sound = atoi (param);
370	safe_strcat (cmdback, param, &slen, HUGE_BUF);	400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
371	}	401	}
372	else if (!strcmp (cmd, "exp64"))	402	else if (!strcmp (cmd, "exp64"))
373	{
374	ns->exp64 = atoi (param);
375	safe_strcat (cmdback, param, &slen, HUGE_BUF);	403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
376	}
377	else if (!strcmp (cmd, "spellmon"))	404	else if (!strcmp (cmd, "spellmon"))
378	{	405	{
379	ns->monitor_spells = atoi (param);	406	ns->monitor_spells = atoi (param);
380	safe_strcat (cmdback, param, &slen, HUGE_BUF);	407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
381	}	408	}
…		…
404	}	431	}
405	else if (!strcmp (cmd, "newmapcmd"))	432	else if (!strcmp (cmd, "newmapcmd"))
406	{	433	{
407	ns->newmapcmd = atoi (param);	434	ns->newmapcmd = atoi (param);
408	safe_strcat (cmdback, param, &slen, HUGE_BUF);	435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
409	// } else if (!strcmp(cmd,"plugincmd")) {
410	// ns->plugincmd = atoi(param);
411	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
412	}	436	}
413	else if (!strcmp (cmd, "mapinfocmd"))	437	else if (!strcmp (cmd, "mapinfocmd"))
414	{	438	{
415	ns->mapinfocmd = atoi (param);	439	ns->mapinfocmd = atoi (param);
416	safe_strcat (cmdback, "1", &slen, HUGE_BUF);	440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
…		…
472	if (*cp == 'x' || *cp == 'X')	496	if (*cp == 'x' || *cp == 'X')
473	{	497	{
474	y = atoi (cp + 1);	498	y = atoi (cp + 1);
475	break;	499	break;
476	}	500	}
		501
477	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)	502	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
478	{	503	{
479	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);	504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
480	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
481	}	506	}
…		…
536	* This is what takes care of it. We tell the client how things worked out.	561	* 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,	562	* 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.	563	* it either has to be here or init_sockets needs to be exported.
539	*/	564	*/
540	void	565	void
541	AddMeCmd (char *buf, int len, client_socket * ns)	566	AddMeCmd (char *buf, int len, client * ns)
542	{	567	{
543	Settings oldsettings;	568	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	{
550	/* Basically, the add_player copies the socket structure into
551	* the player structure, so this one (which is from init_sockets)
552	* is not needed anymore. The write below should still work, as the
553	* stuff in ns is still relevant.
554	*/
555	ns->send_packet ("addme_success");
556	socket_info.nconns--;
557	ns->status = Ns_Avail;
558	}
559
560	settings = oldsettings;
561	}	569	}
562		570
563	/** Reply to ExtendedInfos command */	571	/** Reply to ExtendedInfos command */
564	void	572	void
565	ToggleExtendedInfos (char *buf, int len, client_socket * ns)	573	ToggleExtendedInfos (char *buf, int len, client * ns)
566	{	574	{
567	char cmdback[MAX_BUF];	575	char cmdback[MAX_BUF];
568	char command[50];	576	char command[50];
569	int info, nextinfo;	577	int info, nextinfo;
570		578
…		…
621	#define MSG_TYPE_MONUMENT 5	629	#define MSG_TYPE_MONUMENT 5
622	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	630	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623		631
624	/** Reply to ExtendedInfos command */	632	/** Reply to ExtendedInfos command */
625	void	633	void
626	ToggleExtendedText (char *buf, int len, client_socket * ns)	634	ToggleExtendedText (char *buf, int len, client * ns)
627	{	635	{
628	char cmdback[MAX_BUF];	636	char cmdback[MAX_BUF];
629	char temp[10];	637	char temp[10];
630	char command[50];	638	char command[50];
631	int info, nextinfo, i, flag;	639	int info, nextinfo, i, flag;
…		…
675		683
676	ns->send_packet (cmdback);	684	ns->send_packet (cmdback);
677	}	685	}
678		686
679	/**	687	/**
680	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
681	* Basically, it makes no sense to wait for the client to request a
682	* a piece of data from us that we know the client wants. So
683	* if we know the client wants it, might as well push it to the
684	* client.
685	*/
686	static void
687	SendSmooth (client_socket * ns, uint16 face)
688	{
689	uint16 smoothface;
690
691	/* If we can't find a face, return and set it so we won't try to send this
692	* again.
693	*/
694	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
695	{
696
697	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
698	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
699	return;
700	}
701
702	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
703	esrv_send_face (ns, smoothface, 0);
704
705	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
706
707	packet sl;
708
709	sl << "smooth "
710	<< uint16 (face)
711	<< uint16 (smoothface);
712
713	Send_With_Handling (ns, &sl);
714	}
715
716	/**
717	* Tells client the picture it has to use	688	* Tells client the picture it has to use
718	* to smooth a picture number given as argument.	689	* to smooth a picture number given as argument.
719	*/	690	*/
720	void	691	void
721	AskSmooth (char *buf, int len, client_socket * ns)	692	AskSmooth (char *buf, int len, client *ns)
722	{	693	{
723	uint16 facenbr;	694	ns->send_face (atoi (buf));
724
725	facenbr = atoi (buf);
726	SendSmooth (ns, facenbr);
727	}	695	}
728		696
729	/**	697	/**
730	* This handles the general commands from the client (ie, north, fire, cast,	698	* This handles the general commands from the client (ie, north, fire, cast,
731	* etc.)	699	* etc.)
732	*/	700	*/
733	void	701	void
734	PlayerCmd (char *buf, int len, player *pl)	702	PlayerCmd (char *buf, int len, player *pl)
735	{	703	{
736
737	/* The following should never happen with a proper or honest client.
738	* Therefore, the error message doesn't have to be too clear - if
739	* someone is playing with a hacked/non working client, this gives them
740	* an idea of the problem, but they deserve what they get
741	*/
742	if (pl->state != ST_PLAYING)
743	{
744	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
745	return;
746	}
747	/* Check if there is a count. In theory, a zero count could also be	704	/* Check if there is a count. In theory, a zero count could also be
748	* sent, so check for that also.	705	* sent, so check for that also.
749	*/	706	*/
750	if (atoi (buf) || buf[0] == '0')	707	if (atoi (buf) || buf[0] == '0')
751	{	708	{
752	pl->count = atoi ((char *) buf);	709	pl->count = atoi ((char *) buf);
		710
753	buf = strchr (buf, ' '); /* advance beyond the numbers */	711	buf = strchr (buf, ' '); /* advance beyond the numbers */
754	if (!buf)	712	if (!buf)
755	{
756	#ifdef ESRV_DEBUG
757	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758	#endif
759	return;	713	return;
760	}	714
761	buf++;	715	buf++;
762	}	716	}
763	/* This should not happen anymore. */	717
764	if (pl->ob->speed_left < -1.0)
765	{
766	LOG (llevError, "Player has negative time - shouldn't do command.\n");
767	}
768	/* In c_new.c */
769	execute_newserver_command (pl->ob, (char *) buf);	718	execute_newserver_command (pl->ob, (char *) buf);
770	/* Perhaps something better should be done with a left over count.
771	* Cleaning up the input should probably be done first - all actions
772	* for the command that issued the count should be done before any other
773	* commands.
774	*/
775		719
776	pl->count = 0;
777
778	}
779
780
781	/**
782	* This handles the general commands from the client (ie, north, fire, cast,
783	* etc.). It is a lot like PlayerCmd above, but is called with the
784	* 'ncom' method which gives more information back to the client so it
785	* can throttle.
786	*/
787	void
788	NewPlayerCmd (uint8 * buf, int len, player *pl)
789	{
790	int time, repeat;
791	char command[MAX_BUF];
792	int pktlen;
793
794	if (len < 7)
795	{
796	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
797	return;
798	}
799
800	pktlen = net_uint16 (buf);
801	repeat = net_uint32 (buf + 2);
802
803	/* -1 is special - no repeat, but don't update */
804	if (repeat != -1)
805	pl->count = repeat;
806
807	if ((len - 4) >= MAX_BUF)
808	len = MAX_BUF - 5;
809
810	strncpy ((char *) command, (char *) buf + 6, len - 4);
811	command[len - 4] = '\0';
812
813	/* The following should never happen with a proper or honest client.
814	* Therefore, the error message doesn't have to be too clear - if
815	* someone is playing with a hacked/non working client, this gives them
816	* an idea of the problem, but they deserve what they get
817	*/
818	if (pl->state != ST_PLAYING)
819	{
820	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
821	return;
822	}
823
824	/* This should not happen anymore. */
825	if (pl->ob->speed_left < -1.0)
826	LOG (llevError, "Player has negative time - shouldn't do command.\n");
827
828	/* In c_new.c */
829	execute_newserver_command (pl->ob, (char *) command);
830	/* Perhaps something better should be done with a left over count.	720	/* Perhaps something better should be done with a left over count.
831	* Cleaning up the input should probably be done first - all actions	721	* Cleaning up the input should probably be done first - all actions
832	* for the command that issued the count should be done before any other	722	* for the command that issued the count should be done before any other
833	* commands.	723	* commands.
834	*/	724	*/
835	pl->count = 0;	725	pl->count = 0;
		726	}
836		727
837	if (FABS (pl->ob->speed) < 0.001)	728
		729	/**
		730	* This handles the general commands from the client (ie, north, fire, cast,
		731	* etc.). It is a lot like PlayerCmd above, but is called with the
		732	* 'ncom' method which gives more information back to the client so it
		733	* can throttle.
		734	*/
		735	void
		736	NewPlayerCmd (char *buf, int len, player *pl)
		737	{
		738	if (len <= 6)
		739	{
		740	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
		741	return;
		742	}
		743
		744	uint16 cmdid = net_uint16 ((uint8 *)buf);
		745	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
		746
		747	/* -1 is special - no repeat, but don't update */
		748	if (repeat != -1)
		749	pl->count = repeat;
		750
		751	buf += 6; //len -= 6;
		752
		753	execute_newserver_command (pl->ob, buf);
		754
		755	/* Perhaps something better should be done with a left over count.
		756	* Cleaning up the input should probably be done first - all actions
		757	* for the command that issued the count should be done before any other
		758	* commands.
		759	*/
		760	pl->count = 0;
		761
		762	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
		763	int time = fabs (pl->ob->speed) < 0.001
838	time = MAX_TIME * 100;	764	? time = MAX_TIME * 100
839	else
840	time = (int) (MAX_TIME / FABS (pl->ob->speed));	765	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
841		766
842	/* Send confirmation of command execution now */	767	/* Send confirmation of command execution now */
843		768	packet sl ("comc");
844	packet sl;
845	sl << "comc " << uint16 (pktlen) << uint32 (time);	769	sl << uint16 (cmdid) << uint32 (time);
846	Send_With_Handling (&pl->socket, &sl);	770	pl->ns->send_packet (sl);
847	}	771	}
848
849		772
850	/** This is a reply to a previous query. */	773	/** This is a reply to a previous query. */
851	void	774	void
852	ReplyCmd (char *buf, int len, player *pl)	775	ReplyCmd (char *buf, int len, client *ns)
853	{	776	{
		777	if (ns->state == ST_CUSTOM)
		778	{
		779	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		780	return;
		781	}
		782
		783	if (!ns->pl)
		784	return; //TODO: depends on the exact reply we are after
		785	//TODO: but right now, we always have a ns->pl
		786
		787	player *pl = ns->pl;
		788
854	/* This is to synthesize how the data would be stored if it	789	/* This is to synthesize how the data would be stored if it
855	* was normally entered. A bit of a hack, and should be cleaned up	790	* was normally entered. A bit of a hack, and should be cleaned up
856	* once all the X11 code is removed from the server.	791	* once all the X11 code is removed from the server.
857	*	792	*
858	* We pass 13 to many of the functions because this way they	793	* We pass 13 to many of the functions because this way they
859	* think it was the carriage return that was entered, and the	794	* think it was the carriage return that was entered, and the
860	* function then does not try to do additional input.	795	* function then does not try to do additional input.
861	*/	796	*/
862	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	797	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
863		798
864	/* this avoids any hacking here */	799	/* this avoids any hacking here */
865		800
866	switch (pl->state)	801	switch (ns->state)
867	{	802	{
868	case ST_PLAYING:	803	case ST_PLAYING:
869	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	804	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
870	break;	805	break;
871		806
872	case ST_PLAY_AGAIN:
873	/* We can check this for return value (2==quit). Maybe we
874	* should, and do something appropriate?
875	*/
876	receive_play_again (pl->ob, buf[0]);
877	break;
878
879	case ST_ROLL_STAT:
880	key_roll_stat (pl->ob, buf[0]);
881	break;
882
883	case ST_CHANGE_CLASS:	807	case ST_CHANGE_CLASS:
884
885	key_change_class (pl->ob, buf[0]);	808	key_change_class (pl->ob, buf[0]);
886	break;	809	break;
887		810
888	case ST_CONFIRM_QUIT:
889	key_confirm_quit (pl->ob, buf[0]);
890	break;
891
892	case ST_CONFIGURE:
893	LOG (llevError, "In client input handling, but into configure state\n");
894	pl->state = ST_PLAYING;
895	break;
896
897	case ST_GET_NAME:
898	receive_player_name (pl->ob, 13);
899	break;
900
901	case ST_GET_PASSWORD:
902	case ST_CONFIRM_PASSWORD:
903	receive_player_password (pl->ob, 13);
904	break;
905
906	case ST_GET_PARTY_PASSWORD: /* Get password for party */	811	case ST_GET_PARTY_PASSWORD: /* Get password for party */
907	receive_party_password (pl->ob, 13);	812	receive_party_password (pl->ob, 13);
908	break;	813	break;
909		814
910	default:	815	default:
911	LOG (llevError, "Unknown input state: %d\n", pl->state);	816	LOG (llevError, "Unknown input state: %d\n", ns->state);
912	}	817	}
913	}	818	}
914		819
915	/**	820	/**
916	* Client tells its version. If there is a mismatch, we close the	821	* Client tells its version. If there is a mismatch, we close the
…		…
918	* something older than the server. If we assume the client will be	823	* something older than the server. If we assume the client will be
919	* backwards compatible, having it be a later version should not be a	824	* backwards compatible, having it be a later version should not be a
920	* problem.	825	* problem.
921	*/	826	*/
922	void	827	void
923	VersionCmd (char *buf, int len, client_socket * ns)	828	VersionCmd (char *buf, int len, client * ns)
924	{	829	{
925	char *cp;
926	char version_warning[256];
927
928	if (!buf)	830	if (!buf)
929	{	831	{
930	LOG (llevError, "CS: received corrupted version command\n");	832	LOG (llevError, "CS: received corrupted version command\n");
931	return;	833	return;
932	}	834	}
933		835
934	ns->cs_version = atoi (buf);	836	ns->cs_version = atoi (buf);
935	ns->sc_version = ns->cs_version;	837	ns->sc_version = ns->cs_version;
		838
		839	LOG (llevDebug, "connection from client <%s>\n", buf);
		840
		841	//TODO: should log here just for statistics
		842
936	if (VERSION_CS != ns->cs_version)	843	//if (VERSION_CS != ns->cs_version)
937	{	844	// unchecked;
938	#ifdef ESRV_DEBUG	845
939	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
940	#endif
941	}
942	cp = strchr (buf + 1, ' ');	846	char *cp = strchr (buf + 1, ' ');
943	if (!cp)	847	if (!cp)
944	return;	848	return;
		849
945	ns->sc_version = atoi (cp);	850	ns->sc_version = atoi (cp);
		851
946	if (VERSION_SC != ns->sc_version)	852	//if (VERSION_SC != ns->sc_version)
947	{	853	// unchecked;
948	#ifdef ESRV_DEBUG	854
949	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
950	#endif
951	}
952	cp = strchr (cp + 1, ' ');	855	cp = strchr (cp + 1, ' ');
		856
953	if (cp)	857	if (cp)
954	{	858	{
955	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	859	assign (ns->version, cp + 1);
956		860
957	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
958
959	/* This is first implementation - i skip all beta DX clients with it
960	* Add later stuff here for other clients
961	*/
962
963	/* these are old dxclients */
964	/* Version 1024 added support for singular + plural name values -
965	* requiing this minimal value reduces complexity of that code, and it
966	* has been around for a long time.
967	*/
968	if (ns->sc_version < 1026)	861	if (ns->sc_version < 1026)
969	{	862	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
970	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
971	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	863	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
972	ns->send_packet (version_warning);
973	}
974
975	}	864	}
976	}	865	}
977		866
978	/** sound related functions. */	867	/** sound related functions. */
979
980	void	868	void
981	SetSound (char *buf, int len, client_socket * ns)	869	SetSound (char *buf, int len, client * ns)
982	{	870	{
983	ns->sound = atoi (buf);	871	ns->sound = atoi (buf);
984	}	872	}
985		873
986	/** client wants the map resent */	874	/** client wants the map resent */
987
988	void	875	void
989	MapRedrawCmd (char *buf, int len, player *pl)	876	MapRedrawCmd (char *buf, int len, player *pl)
990	{	877	{
991
992	/* This function is currently disabled; just clearing the map state results in	878	/* This function is currently disabled; just clearing the map state results in
993	* display errors. It should clear the cache and send a newmap command.	879	* display errors. It should clear the cache and send a newmap command.
994	* Unfortunately this solution does not work because some client versions send	880	* Unfortunately this solution does not work because some client versions send
995	* a mapredraw command after receiving a newmap command.	881	* a mapredraw command after receiving a newmap command.
996	*/	882	*/
997	#if 0
998	/* Okay, this is MAJOR UGLY. but the only way I know how to
999	* clear the "cache"
1000	*/
1001	memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1002	draw_client_map (pl->ob);
1003	#endif
1004	}	883	}
1005		884
1006	/**	885	/**
1007	* Moves an object (typically, container to inventory).	886	* Moves an object (typically, container to inventory).
1008	* syntax is: move (to) (tag) (nrof)	887	* syntax is: move (to) (tag) (nrof)
…		…
1011	MoveCmd (char *buf, int len, player *pl)	890	MoveCmd (char *buf, int len, player *pl)
1012	{	891	{
1013	int vals[3], i;	892	int vals[3], i;
1014		893
1015	/* A little funky here. We only cycle for 2 records, because	894	/* A little funky here. We only cycle for 2 records, because
1016	* we obviously am not going to find a space after the third	895	* we obviously are not going to find a space after the third
1017	* record. Perhaps we should just replace this with a	896	* record. Perhaps we should just replace this with a
1018	* sscanf?	897	* sscanf?
1019	*/	898	*/
1020	for (i = 0; i < 2; i++)	899	for (i = 0; i < 2; i++)
1021	{	900	{
1022	vals[i] = atoi (buf);	901	vals[i] = atoi (buf);
		902
1023	if (!(buf = strchr (buf, ' ')))	903	if (!(buf = strchr (buf, ' ')))
1024	{	904	{
1025	LOG (llevError, "Incomplete move command: %s\n", buf);	905	LOG (llevError, "Incomplete move command: %s\n", buf);
1026	return;	906	return;
1027	}	907	}
		908
1028	buf++;	909	buf++;
1029	}	910	}
		911
1030	vals[2] = atoi (buf);	912	vals[2] = atoi (buf);
1031		913
1032	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	914	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1033	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	915	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1034	}	916	}
1035
1036
1037		917
1038	/******************************************************************************	918	/******************************************************************************
1039	*	919	*
1040	* Start of commands the server sends to the client.	920	* Start of commands the server sends to the client.
1041	*	921	*
…		…
1044	/**	924	/**
1045	* Asks the client to query the user. This way, the client knows	925	* Asks the client to query the user. This way, the client knows
1046	* it needs to send something back (vs just printing out a message)	926	* it needs to send something back (vs just printing out a message)
1047	*/	927	*/
1048	void	928	void
1049	send_query (client_socket * ns, uint8 flags, char *text)	929	send_query (client *ns, uint8 flags, char *text)
1050	{	930	{
1051	char buf[MAX_BUF];
1052
1053	sprintf (buf, "query %d %s", flags, text ? text : "");	931	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1054	ns->send_packet (buf);
1055	}	932	}
1056		933
1057	#define AddIfInt64(Old,New,Type) if (Old != New) {\	934	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1058	Old = New; \	935	Old = New; \
1059	sl << uint8 (Type) << uint64 (New); \	936	sl << uint8 (Type) << uint64 (New); \
…		…
1089	esrv_update_stats (player *pl)	966	esrv_update_stats (player *pl)
1090	{	967	{
1091	char buf[MAX_BUF];	968	char buf[MAX_BUF];
1092	uint16 flags;	969	uint16 flags;
1093		970
1094	packet sl;	971	client *ns = pl->ns;
1095	sl << "stats ";	972	if (!ns)
		973	return;
1096		974
1097	if (pl->ob != NULL)	975	object *ob = pl->ob;
1098	{	976	if (!ob)
		977	return;
		978
		979	packet sl ("stats");
		980
1099	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	981	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1100	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	982	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1101	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	983	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1102	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	984	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1103	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	985	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1104	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	986	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1105	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	987	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1106	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1107	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1108	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1109	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	988	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1110	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	989	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		990	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		991	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		992	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1111	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	993	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1112	}
1113		994
1114	if (pl->socket.exp64)
1115	{
1116	uint8 s;
1117
1118	for (s = 0; s < NUM_SKILLS; s++)	995	for (int s = 0; s < NUM_SKILLS; s++)
1119	{	996	if (object *skill = pl->last_skill_ob[s])
1120	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	997	if (skill->stats.exp != ns->last_skill_exp [s])
1121	{	998	{
		999	ns->last_skill_exp [s] = skill->stats.exp;
		1000
1122	/* Always send along the level if exp changes. This is only	1001	/* Always send along the level if exp changes. This is only
1123	* 1 extra byte, but keeps processing simpler.	1002	* 1 extra byte, but keeps processing simpler.
1124	*/	1003	*/
1125	sl << uint8 (s + CS_STAT_SKILLINFO)	1004	sl << uint8 (s + CS_STAT_SKILLINFO)
1126	<< uint8 (pl->last_skill_ob[s]->level)	1005	<< uint8 (skill->level)
1127	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1006	<< uint64 (skill->stats.exp);
1128
1129	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1130	}	1007	}
1131	}
1132	}
1133		1008
1134	if (pl->socket.exp64)
1135	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1009	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1136	else
1137	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1138
1139	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1010	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1140	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1011	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1141	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1012	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1142	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1013	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1143	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1014	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1144	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1015	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1145	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1016	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1146	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1017	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1018
1147	flags = 0;	1019	flags = 0;
1148		1020
1149	if (pl->fire_on)	1021	if (pl->fire_on)
1150	flags |= SF_FIREON;	1022	flags |= SF_FIREON;
1151		1023
1152	if (pl->run_on)	1024	if (pl->run_on)
1153	flags |= SF_RUNON;	1025	flags |= SF_RUNON;
1154		1026
1155	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1027	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1156		1028
1157	if (pl->socket.sc_version < 1025)	1029	if (ns->sc_version < 1025)
1158	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1030	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1159	else	1031	else
1160	{
1161	int i;
1162
1163	for (i = 0; i < NROFATTACKS; i++)	1032	for (int i = 0; i < NROFATTACKS; i++)
1164	{	1033	{
1165	/* Skip ones we won't send */	1034	/* Skip ones we won't send */
1166	if (atnr_cs_stat[i] == -1)	1035	if (atnr_cs_stat[i] == -1)
1167	continue;	1036	continue;
1168		1037
1169	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1038	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1170	}	1039	}
1171	}
1172		1040
1173	if (pl->socket.monitor_spells)	1041	if (pl->ns->monitor_spells)
1174	{	1042	{
1175	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1043	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1176	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1044	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1177	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1045	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1178	}	1046	}
1179		1047
1180	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1048	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1181	AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);	1049	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1182	set_title (pl->ob, buf);	1050	set_title (ob, buf);
1183	AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);	1051	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1184		1052
1185	/* Only send it away if we have some actual data */	1053	/* Only send it away if we have some actual data */
1186	if (sl.length () > 6)	1054	if (sl.length () > 6)
1187	Send_With_Handling (&pl->socket, &sl);	1055	ns->send_packet (sl);
1188	}	1056	}
1189		1057
1190	/**	1058	/**
1191	* Tells the client that here is a player it should start using.	1059	* Tells the client that here is a player it should start using.
1192	*/	1060	*/
1193	void	1061	void
1194	esrv_new_player (player *pl, uint32 weight)	1062	esrv_new_player (player *pl, uint32 weight)
1195	{	1063	{
1196	pl->last_weight = weight;	1064	packet sl ("player");
1197
1198	packet sl;
1199	sl << "player ";
1200		1065
1201	sl << uint32 (pl->ob->count)	1066	sl << uint32 (pl->ob->count)
1202	<< uint32 (weight)	1067	<< uint32 (weight)
1203	<< uint32 (pl->ob->face->number)	1068	<< uint32 (pl->ob->face)
1204	<< data8 (pl->ob->name);	1069	<< data8 (pl->ob->name);
1205		1070
1206	Send_With_Handling (&pl->socket, &sl);	1071	pl->ns->last_weight = weight;
		1072	pl->ns->send_packet (sl);
1207	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1073	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208	}	1074	}
1209
1210	/**
1211	* Need to send an animation sequence to the client.
1212	* We will send appropriate face commands to the client if we haven't
1213	* sent them the face yet (this can become quite costly in terms of
1214	* how much we are sending - on the other hand, this should only happen
1215	* when the player logs in and picks stuff up.
1216	*/
1217	void
1218	esrv_send_animation (client_socket * ns, short anim_num)
1219	{
1220	int i;
1221
1222	/* Do some checking on the anim_num we got. Note that the animations
1223	* are added in contigous order, so if the number is in the valid
1224	* range, it must be a valid animation.
1225	*/
1226	if (anim_num < 0 || anim_num > num_animations)
1227	{
1228	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1229	return;
1230	}
1231
1232	packet sl;
1233
1234	sl << "anim "
1235	<< uint16 (anim_num)
1236	<< uint16 (0); /* flags - not used right now */
1237
1238	/* Build up the list of faces. Also, send any information (ie, the
1239	* the face itself) down to the client.
1240	*/
1241	for (i = 0; i < animations[anim_num].num_animations; i++)
1242	{
1243	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1244	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1245	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1246	}
1247
1248	Send_With_Handling (ns, &sl);
1249
1250	ns->anims_sent[anim_num] = 1;
1251	}
1252
1253		1075
1254	/******************************************************************************	1076	/******************************************************************************
1255	*	1077	*
1256	* Start of map related commands.	1078	* Start of map related commands.
1257	*	1079	*
1258	******************************************************************************/	1080	******************************************************************************/
1259		1081
1260	/**
1261	* This adds face_num to a map cell at x,y. If the client doesn't have
1262	* the face yet, we will also send it.
1263	*/
1264	static void
1265	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1266	{
1267	if (newmap->cells[x][y].count >= MAP_LAYERS)
1268	{
1269	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270	return;
1271	abort ();
1272	}
1273
1274	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1275	newmap->cells[x][y].count++;
1276
1277	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1278	esrv_send_face (ns, face_num, 0);
1279	}
1280
1281	struct LayerCell
1282	{
1283	uint16 xy;
1284	short face;
1285	};
1286
1287	struct MapLayer
1288	{
1289	int count;
1290	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1291	};
1292
1293	/** Checkes if map cells have changed */
1294	static int
1295	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1296	{
1297	int k;
1298
1299	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1300	return 1;
1301	for (k = 0; k < newmap->cells[i][j].count; k++)
1302	{
1303	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1304	{
1305	return 1;
1306	}
1307	}
1308	return 0;
1309	}
1310
1311	/**
1312	* Basically, what this does is pack the data into layers.
1313	* cnum is the client number, cur is the the buffer we put all of
1314	* this data into. we return the end of the data. layers is
1315	* how many layers of data we should back.
1316	*/
1317	static uint8 *
1318	compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1319	{
1320	int x, y, k;
1321	int face;
1322	unsigned char *fcur;
1323	struct MapLayer layers[MAP_LAYERS];
1324
1325	for (k = 0; k < MAP_LAYERS; k++)
1326	layers[k].count = 0;
1327	fcur = cur;
1328	for (x = 0; x < ns->mapx; x++)
1329	{
1330	for (y = 0; y < ns->mapy; y++)
1331	{
1332	if (!mapcellchanged (ns, x, y, newmap))
1333	continue;
1334	if (newmap->cells[x][y].count == 0)
1335	{
1336	*cur = x * ns->mapy + y; /* mark empty space */
1337	cur++;
1338	continue;
1339	}
1340	for (k = 0; k < newmap->cells[x][y].count; k++)
1341	{
1342	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1343	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1344	layers[k].count++;
1345	}
1346	}
1347	}
1348	/* If no data, return now. */
1349	if (fcur == cur && layers[0].count == 0)
1350	return cur;
1351	*cur = 255; /* mark end of explicitly cleared cells */
1352	cur++;
1353	/* First pack by layers. */
1354	for (k = 0; k < numlayers; k++)
1355	{
1356	if (layers[k].count == 0)
1357	break; /* once a layer is entirely empty, no layer below it can
1358	have anything in it either */
1359	/* Pack by entries in thie layer */
1360	for (x = 0; x < layers[k].count;)
1361	{
1362	fcur = cur;
1363	*cur = layers[k].lcells[x].face >> 8;
1364	cur++;
1365	*cur = layers[k].lcells[x].face & 0xFF;
1366	cur++;
1367	face = layers[k].lcells[x].face;
1368	/* Now, we back the redundant data into 1 byte xy pairings */
1369	for (y = x; y < layers[k].count; y++)
1370	{
1371	if (layers[k].lcells[y].face == face)
1372	{
1373	*cur = (uint8) layers[k].lcells[y].xy;
1374	cur++;
1375	layers[k].lcells[y].face = -1;
1376	}
1377	}
1378	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1379	/* forward over the now redundant data */
1380	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1381	x++;
1382	}
1383	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1384	}
1385	return cur;
1386	}
1387
1388	/** Clears a map cell */	1082	/** Clears a map cell */
1389	static void	1083	static void
1390	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1084	map_clearcell (struct MapCell *cell, int count)
1391	{	1085	{
1392	cell->faces[0] = face0;	1086	cell->faces[0] = 0;
1393	cell->faces[1] = face1;	1087	cell->faces[1] = 0;
1394	cell->faces[2] = face2;	1088	cell->faces[2] = 0;
		1089	cell->smooth[0] = 0;
		1090	cell->smooth[1] = 0;
		1091	cell->smooth[2] = 0;
1395	cell->count = count;	1092	cell->count = count;
1396	cell->stat_hp = 0;	1093	cell->stat_hp = 0;
1397	cell->flags = 0;	1094	cell->flags = 0;
1398	cell->player = 0;	1095	cell->player = 0;
1399	}	1096	}
1400		1097
1401	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1402	#define MAX_LAYERS 3	1098	#define MAX_LAYERS 3
1403
1404	/* Using a global really isn't a good approach, but saves the over head of
1405	* allocating and deallocating such a block of data each time run through,
1406	* and saves the space of allocating this in the socket object when we only
1407	* need it for this cycle. If the serve is ever threaded, this needs to be
1408	* re-examined.
1409	*/
1410
1411	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1412
1413	/**
1414	* Returns true if any of the heads for this
1415	* space is set. Returns false if all are blank - this is used
1416	* for empty space checking.
1417	*/
1418	static inline int
1419	have_head (int ax, int ay)
1420	{
1421
1422	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1423	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1424	return 1;
1425	return 0;
1426	}
1427
1428	/**
1429	* check_head is a bit simplistic version of update_space below.
1430	* basically, it only checks the that the head on space ax,ay at layer
1431	* needs to get sent - if so, it adds the data, sending the head
1432	* if needed, and returning 1. If this no data needs to get
1433	* sent, it returns zero.
1434	*/
1435	static int
1436	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1437	{
1438	short face_num;
1439
1440	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1442	else
1443	face_num = 0;
1444
1445	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1446	{
1447	sl << uint16 (face_num);
1448	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1449	esrv_send_face (&ns, face_num, 0);
1450
1451	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1452	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1453	return 1;
1454	}
1455
1456	return 0; /* No change */
1457	}
1458		1099
1459	/**	1100	/**
1460	* Removes the need to replicate the same code for each layer.	1101	* Removes the need to replicate the same code for each layer.
1461	* this returns true if this space is now in fact different than	1102	* this returns true if this space is now in fact different than
1462	* it was.	1103	* it was.
1463	* sl is the socklist this data is going into.	1104	* sl is the socklist this data is going into.
1464	* ns is the socket we are working on - all the info we care	1105	* ns is the socket we are working on - all the info we care
1465	* about is in this socket structure, so now need not pass the	1106	* about is in this socket structure, so now need not pass the
1466	* entire player object.	1107	* entire player object.
1467	* mx and my are map coordinate offsets for map mp
1468	* sx and sy are the offsets into the socket structure that
1469	* holds the old values.
1470	* layer is the layer to update, with 2 being the floor and 0 the	1108	* layer is the layer to update, with 2 being the floor and 0 the
1471	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	1109	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1472	* take. Interesting to note that before this function, the map1 function	1110	* take. Interesting to note that before this function, the map1 function
1473	* numbers the spaces differently - I think this was a leftover from	1111	* numbers the spaces differently - I think this was a leftover from
1474	* the map command, where the faces stack up. Sinces that is no longer	1112	* the map command, where the faces stack up. Sinces that is no longer
1475	* the case, it seems to make more sense to have these layer values	1113	* the case, it seems to make more sense to have these layer values
1476	* actually match.	1114	* actually match.
1477	*/	1115	*/
1478
1479	static int	1116	static int
1480	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1117	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1481	{	1118	{
1482	object *ob, *head;	1119	object *ob = ms.faces_obj [layer];
1483	uint16 face_num;
1484	int bx, by, i;
1485
1486	/* If there is a multipart object stored away, treat that as more important.
1487	* If not, then do the normal processing.
1488	*/
1489	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1490
1491	/* Check to see if this head is part of the set of objects
1492	* we would normally send for this space. If so, then
1493	* don't use the head value. We need to do the check
1494	* here and not when setting up the heads[] value for two reasons -
1495	* 1) the heads[] values will get used even if the space is not visible.
1496	* 2) its possible the head is not on the same map as a part, and I'd
1497	* rather not need to do the map translation overhead.
1498	* 3) We need to do some extra checking to make sure that we will
1499	* otherwise send the image as this layer, eg, either it matches
1500	* the head value, or is not multipart.
1501	*/
1502	if (head && !head->more)
1503	{
1504	for (i = 0; i < MAP_LAYERS; i++)
1505	{
1506	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1507	if (!ob)
1508	continue;
1509
1510	if (ob->head)
1511	ob = ob->head;
1512
1513	if (ob == head)
1514	{
1515	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1516	head = NULL;
1517	break;
1518	}
1519	}
1520	}
1521
1522	ob = head;
1523	if (!ob)
1524	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1525		1120
1526	/* If there is no object for this space, or if the face for the object	1121	/* If there is no object for this space, or if the face for the object
1527	* is the blank face, set the face number to zero.	1122	* is the blank face, set the face number to zero.
1528	* else if we have the stored head object for this space, that takes	1123	* else if we have the stored head object for this space, that takes
1529	* precedence over the other object for this space.	1124	* precedence over the other object for this space.
1530	* otherwise, we do special head processing	1125	* otherwise, we do special head processing
1531	*/	1126	*/
1532	if (!ob || ob->face == blank_face)	1127	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1533	face_num = 0;
1534	else if (head)
1535	{
1536	/* if this is a head that had previously been stored */
1537	face_num = ob->face->number;
1538	}
1539	else
1540	{
1541	/* if the faces for the different parts of a multipart object
1542	* are the same, we only want to send the bottom right most
1543	* portion of the object. That info is in the tail_.. values
1544	* of the head. Note that for the head itself, ob->head will
1545	* be null, so we only do this block if we are working on
1546	* a tail piece.
1547	*/
1548
1549	/* tail_x and tail_y will only be set in the head object. If
1550	* this is the head object and these are set, we proceed
1551	* with logic to only send bottom right. Similarly, if
1552	* this is one of the more parts but the head has those values
1553	* set, we want to do the processing. There can be cases where
1554	* the head is not visible but one of its parts is, so we just
1555	* can always expect that ob->arch->tail_x will be true for all
1556	* object we may want to display.
1557	*/
1558	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1559	{
1560
1561	if (ob->head)
1562	head = ob->head;
1563	else
1564	head = ob;
1565
1566	/* Basically figure out where the offset is from where we are right
1567	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1568	* piece is from the head, and the tail is where the tail is from the
1569	* head. Note that bx and by will equal sx and sy if we are already working
1570	* on the bottom right corner. If ob is the head, the clone values
1571	* will be zero, so the right thing will still happen.
1572	*/
1573	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1574	by = sy + head->arch->tail_y - ob->arch->clone.y;
1575
1576	/* I don't think this can ever happen, but better to check for it just
1577	* in case.
1578	*/
1579	if (bx < sx || by < sy)
1580	{
1581	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1582	face_num = 0;
1583	}
1584	/* single part object, multipart object with non merged faces,
1585	* of multipart object already at lower right.
1586	*/
1587	else if (bx == sx && by == sy)
1588	{
1589	face_num = ob->face->number;
1590
1591	/* if this face matches one stored away, clear that one away.
1592	* this code relies on the fact that the map1 commands
1593	* goes from 2 down to 0.
1594	*/
1595	for (i = 0; i < MAP_LAYERS; i++)
1596	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1597	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1598	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1599	}
1600	else
1601	{
1602	/* If this head is stored away, clear it - otherwise,
1603	* there can be cases where a object is on multiple layers -
1604	* we only want to send it once.
1605	*/
1606	face_num = head->face->number;
1607	for (i = 0; i < MAP_LAYERS; i++)
1608	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1609	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1610	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1611
1612	/* First, try to put the new head on the same layer. If that is used up,
1613	* then find another layer.
1614	*/
1615	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1616	{
1617	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1618	}
1619	else
1620	for (i = 0; i < MAX_LAYERS; i++)
1621	{
1622	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1623	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1624	{
1625	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1626	}
1627	}
1628	face_num = 0; /* Don't send this object - we'll send the head later */
1629	}
1630	}
1631	else
1632	{
1633	/* In this case, we are already at the lower right or single part object,
1634	* so nothing special
1635	*/
1636	face_num = ob->face->number;
1637
1638	/* clear out any head entries that have the same face as this one */
1639	for (bx = 0; bx < layer; bx++)
1640	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1641	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1642	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1643	}
1644	} /* else not already head object or blank face */
1645
1646	/* This is a real hack. Basically, if we have nothing to send for this layer,
1647	* but there is a head on the next layer, send that instead.
1648	* Without this, what happens is you can get the case where the player stands
1649	* on the same space as the head. However, if you have overlapping big objects
1650	* of the same type, what happens then is it doesn't think it needs to send
1651	* This tends to make stacking also work/look better.
1652	*/
1653	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1654	{
1655	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1656	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1657	}
1658
1659	/* Another hack - because of heads and whatnot, this face may match one
1660	* we already sent for a lower layer. In that case, don't send
1661	* this one.
1662	*/
1663	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1664	face_num = 0;
1665		1128
1666	/* We've gotten what face we want to use for the object. Now see if	1129	/* We've gotten what face we want to use for the object. Now see if
1667	* if it has changed since we last sent it to the client.	1130	* if it has changed since we last sent it to the client.
1668	*/	1131	*/
1669	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1132	if (lastcell.faces[layer] != face_num)
1670	{	1133	{
1671	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1134	lastcell.faces[layer] = face_num;
		1135
1672	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	1136	if (!ns.faces_sent[face_num])
		1137	if (ob)
		1138	ns.send_faces (ob);
		1139	else
1673	esrv_send_face (&ns, face_num, 0);	1140	ns.send_face (face_num);
1674		1141
1675	sl << uint16 (face_num);	1142	sl << uint16 (face_num);
1676	return 1;
1677	}
1678
1679	/* Nothing changed */
1680	return 0;
1681	}
1682
1683	/**
1684	* This function is mainly a copy of update_space,
1685	* except it handles update of the smoothing updates,
1686	* not the face updates.
1687	* Removes the need to replicate the same code for each layer.
1688	* this returns true if this smooth is now in fact different
1689	* than it was.
1690	* sl is the socklist this data is going into.
1691	* ns is the socket we are working on - all the info we care
1692	* about is in this socket structure, so know need to pass the
1693	* entire player object.
1694	* mx and my are map coordinate offsets for map mp
1695	* sx and sy are the offsets into the socket structure that
1696	* holds the old values.
1697	* layer is the layer to update, with 2 being the floor and 0 the
1698	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699	* take.
1700	*/
1701
1702	static inline int
1703	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704	{
1705	object *ob;
1706	int smoothlevel; /* old face_num; */
1707
1708	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1709
1710	/* If there is no object for this space, or if the face for the object
1711	* is the blank face, set the smoothlevel to zero.
1712	*/
1713	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1714	smoothlevel = 0;
1715	else
1716	{
1717	smoothlevel = ob->smoothlevel;
1718	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1719	SendSmooth (&ns, ob->face->number);
1720	} /* else not already head object or blank face */
1721
1722	/* We've gotten what face we want to use for the object. Now see if
1723	* if it has changed since we last sent it to the client.
1724	*/
1725	if (smoothlevel > 255)
1726	smoothlevel = 255;
1727	else if (smoothlevel < 0)
1728	smoothlevel = 0;
1729
1730	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1731	{
1732	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1733	sl << uint8 (smoothlevel);
1734	return 1;	1143	return 1;
1735	}	1144	}
1736		1145
1737	/* Nothing changed */	1146	/* Nothing changed */
1738	return 0;	1147	return 0;
…		…
1742	* Returns the size of a data for a map square as returned by	1151	* Returns the size of a data for a map square as returned by
1743	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries	1152	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744	* available.	1153	* available.
1745	*/	1154	*/
1746	int	1155	int
1747	getExtendedMapInfoSize (client_socket * ns)	1156	getExtendedMapInfoSize (client * ns)
1748	{	1157	{
1749	int result = 0;	1158	int result = 0;
1750		1159
1751	if (ns->ext_mapinfos)	1160	if (ns->ext_mapinfos)
1752	{	1161	{
1753	if (ns->EMI_smooth)	1162	if (ns->EMI_smooth)
1754	result += 1; /*One byte for smoothlevel */	1163	result += 1; /*One byte for smoothlevel */
1755	}	1164	}
		1165
1756	return result;	1166	return result;
		1167	}
		1168
		1169	// prefetch (and touch) all maps within a specific distancd
		1170	static void
		1171	prefetch_surrounding_maps (maptile *map, int distance)
		1172	{
		1173	map->last_access = runtime;
		1174
		1175	if (--distance)
		1176	for (int dir = 4; --dir; )
		1177	if (const shstr &path = map->tile_path [dir])
		1178	if (maptile *&neigh = map->tile_map [dir])
		1179	prefetch_surrounding_maps (neigh, distance);
		1180	else
		1181	neigh = maptile::find_async (path, map);
		1182	}
		1183
		1184	// prefetch a generous area around the player
		1185	static void
		1186	prefetch_surrounding_maps (object *op)
		1187	{
		1188	prefetch_surrounding_maps (op->map, 3);
1757	}	1189	}
1758		1190
1759	/**	1191	/**
1760	* This function uses the new map1 protocol command to send the map	1192	* This function uses the new map1 protocol command to send the map
1761	* to the client. It is necessary because the old map command supports	1193	* to the client. It is necessary because the old map command supports
…		…
1767	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1199	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1768	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1200	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1769	* and use the other 4 bits for other informatiion. For full documentation	1201	* and use the other 4 bits for other informatiion. For full documentation
1770	* of what we send, see the doc/Protocol file.	1202	* of what we send, see the doc/Protocol file.
1771	* I will describe internally what we do:	1203	* I will describe internally what we do:
1772	* the socket->lastmap shows how the map last looked when sent to the client.	1204	* the ns->lastmap shows how the map last looked when sent to the client.
1773	* in the lastmap structure, there is a cells array, which is set to the	1205	* in the lastmap structure, there is a cells array, which is set to the
1774	* maximum viewable size (As set in config.h).	1206	* maximum viewable size (As set in config.h).
1775	* in the cells, there are faces and a count value.	1207	* in the cells, there are faces and a count value.
1776	* we use the count value to hold the darkness value. If -1, then this space	1208	* we use the count value to hold the darkness value. If -1, then this space
1777	* is not viewable.	1209	* is not viewable.
…		…
1779	* look like.	1211	* look like.
1780	*/	1212	*/
1781	void	1213	void
1782	draw_client_map1 (object *pl)	1214	draw_client_map1 (object *pl)
1783	{	1215	{
1784	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1216	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1785	sint16 nx, ny;	1217	sint16 nx, ny;
1786	int estartlen, eoldlen;	1218	int estartlen, eoldlen;
1787	uint16 mask, emask;
1788	uint8 eentrysize;	1219	uint8 eentrysize;
1789	uint16 ewhatstart, ewhatflag;	1220	uint16 ewhatstart, ewhatflag;
1790	uint8 extendedinfos;	1221	uint8 extendedinfos;
1791	maptile *m;	1222	maptile *m;
1792		1223
1793	client_socket &socket = pl->contr->socket;	1224	client &socket = *pl->contr->ns;
		1225
		1226	if (!pl->active)
		1227	return;
1794		1228
1795	check_map_change (pl->contr);	1229	check_map_change (pl->contr);
		1230	prefetch_surrounding_maps (pl);
1796		1231
1797	packet sl;	1232	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1798	packet esl;	1233	packet esl;
1799		1234
1800	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1801	startlen = sl.length ();	1235	startlen = sl.length ();
1802		1236
1803	/*Extendedmapinfo structure initialisation */	1237	/*Extendedmapinfo structure initialisation */
1804	if (socket.ext_mapinfos)	1238	if (socket.ext_mapinfos)
1805	{	1239	{
…		…
1824	ewhatstart = 0;	1258	ewhatstart = 0;
1825	ewhatflag = 0;	1259	ewhatflag = 0;
1826	estartlen = 0;	1260	estartlen = 0;
1827	}	1261	}
1828		1262
1829	/* Init data to zero */
1830	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1831
1832	/* x,y are the real map locations. ax, ay are viewport relative	1263	/* x,y are the real map locations. ax, ay are viewport relative
1833	* locations.	1264	* locations.
1834	*/	1265	*/
1835	ay = 0;	1266	ay = 0;
1836		1267
…		…
1838	* but that started to get a bit messy to look at.	1269	* but that started to get a bit messy to look at.
1839	*/	1270	*/
1840	max_x = pl->x + (socket.mapx + 1) / 2;	1271	max_x = pl->x + (socket.mapx + 1) / 2;
1841	max_y = pl->y + (socket.mapy + 1) / 2;	1272	max_y = pl->y + (socket.mapy + 1) / 2;
1842		1273
1843	if (socket.mapmode == Map1aCmd)
1844	{
1845	max_x += MAX_HEAD_OFFSET;
1846	max_y += MAX_HEAD_OFFSET;
1847	}
1848
1849	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1274	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1850	{	1275	{
1851	ax = 0;	1276	ax = 0;
1852	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1277	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1853	{	1278	{
1854		1279	int emask, mask;
1855	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1280	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1856		1281
1857	/* If this space is out of the normal viewable area, we only check
1858	* the heads value ax or ay will only be greater than what
1859	* the client wants if using the map1a command - this is because
1860	* if the map1a command is not used, max_x and max_y will be
1861	* set to lower values.
1862	*/
1863	if (ax >= socket.mapx || ay >= socket.mapy)
1864	{
1865	int i, got_one;
1866
1867	oldlen = sl.length ();
1868
1869	sl << uint16 (mask);
1870
1871	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1872	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1873	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1874
1875	/* If all we are doing is sending 0 (blank) faces, we don't
1876	* actually need to send that - just the coordinates
1877	* with no faces tells the client to blank out the
1878	* space.
1879	*/
1880	got_one = 0;
1881	for (i = oldlen + 2; i < sl.length (); i++)
1882	if (sl.buf[i])
1883	got_one = 1;
1884
1885	if (got_one && (mask & 0xf))
1886	sl.buf[oldlen + 1] = mask & 0xff;
1887	else
1888	{ /*either all faces blank, either no face at all */
1889	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890	sl.reset (oldlen + 2);
1891	else
1892	sl.reset (oldlen);
1893	}
1894
1895	/*What concerns extendinfos, nothing to be done for now
1896	* (perhaps effects layer later)
1897	*/
1898	continue; /* don't do processing below */
1899	}
1900
1901	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1282	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1902
1903	d = pl->contr->blocked_los[ax][ay];
1904		1283
1905	/* If the coordinates are not valid, or it is too dark to see,	1284	/* If the coordinates are not valid, or it is too dark to see,
1906	* we tell the client as such	1285	* we tell the client as such
1907	*/	1286	*/
1908	nx = x;	1287	nx = x;
…		…
1916	* of the map, it shouldn't have a head	1295	* of the map, it shouldn't have a head
1917	*/	1296	*/
1918	if (lastcell.count != -1)	1297	if (lastcell.count != -1)
1919	{	1298	{
1920	sl << uint16 (mask);	1299	sl << uint16 (mask);
1921	map_clearcell (&lastcell, 0, 0, 0, -1);	1300	map_clearcell (&lastcell, -1);
1922	}	1301	}
		1302
		1303	continue;
1923	}	1304	}
		1305
		1306	m->touch ();
		1307
		1308	int d = pl->contr->blocked_los[ax][ay];
		1309
1924	else if (d > 3)	1310	if (d > 3)
1925	{	1311	{
		1312
1926	int need_send = 0, count;	1313	int need_send = 0, count;
1927		1314
1928	/* This block deals with spaces that are not visible for whatever	1315	/* This block deals with spaces that are not visible for whatever
1929	* reason. Still may need to send the head for this space.	1316	* reason. Still may need to send the head for this space.
1930	*/	1317	*/
1931		1318
1932	oldlen = sl.length ();	1319	oldlen = sl.length ();
1933		1320
1934	sl << uint16 (mask);	1321	sl << uint16 (mask);
…		…
1936	if (lastcell.count != -1)	1323	if (lastcell.count != -1)
1937	need_send = 1;	1324	need_send = 1;
1938		1325
1939	count = -1;	1326	count = -1;
1940		1327
1941	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1942	{
1943	/* Now check to see if any heads need to be sent */
1944
1945	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1946	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1948
1949	lastcell.count = count;
1950	}
1951	else
1952	{
1953	/* properly clear a previously sent big face */	1328	/* properly clear a previously sent big face */
1954	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1329	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1955	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1330	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1956	need_send = 1;	1331	need_send = 1;
1957		1332
1958	map_clearcell (&lastcell, 0, 0, 0, count);	1333	map_clearcell (&lastcell, count);
1959	}
1960		1334
1961	if ((mask & 0xf) || need_send)	1335	if ((mask & 0xf) || need_send)
1962	sl.buf[oldlen + 1] = mask & 0xff;	1336	sl[oldlen + 1] = mask & 0xff;
1963	else	1337	else
1964	sl.reset (oldlen);	1338	sl.reset (oldlen);
1965	}	1339	}
1966	else	1340	else
1967	{	1341	{
1968	/* In this block, the space is visible or there are head objects	1342	/* In this block, the space is visible.
1969	* we need to send.
1970	*/	1343	*/
1971		1344
1972	/* Rather than try to figure out what everything that we might	1345	/* Rather than try to figure out what everything that we might
1973	* need to send is, then form the packet after that,	1346	* need to send is, then form the packet after that,
1974	* we presume that we will in fact form a packet, and update	1347	* we presume that we will in fact form a packet, and update
…		…
1977	* is done.	1350	* is done.
1978	* I think this is simpler than doing a bunch of checks to see	1351	* I think this is simpler than doing a bunch of checks to see
1979	* what if anything we need to send, setting the bits, then	1352	* what if anything we need to send, setting the bits, then
1980	* doing those checks again to add the real data.	1353	* doing those checks again to add the real data.
1981	*/	1354	*/
1982	oldlen = sl.length ();	1355	oldlen = sl.length ();
1983	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1984	eoldlen = esl.length ();	1356	eoldlen = esl.length ();
1985	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1357
1986	sl << uint16 (mask);	1358	sl << uint16 (mask);
1987
1988	if (socket.ext_mapinfos)
1989	esl << uint16 (emask);
1990		1359
1991	unsigned char dummy;	1360	unsigned char dummy;
1992	unsigned char *last_ext = &dummy;	1361	unsigned char *last_ext = &dummy;
1993		1362
1994	/* Darkness changed */	1363	/* Darkness changed */
…		…
1997	mask |= 0x8;	1366	mask |= 0x8;
1998		1367
1999	if (socket.extmap)	1368	if (socket.extmap)
2000	{	1369	{
2001	*last_ext |= 0x80;	1370	*last_ext |= 0x80;
2002	last_ext = sl.buf + sl.length ();	1371	last_ext = &sl[sl.length ()];
2003	sl << uint8 (d);	1372	sl << uint8 (d);
2004	}	1373	}
2005	else	1374	else
2006	sl << uint8 (255 - 64 * d);	1375	sl << uint8 (255 - 64 * d);
2007	}	1376	}
2008		1377
2009	lastcell.count = d;	1378	lastcell.count = d;
		1379
		1380	mapspace &ms = m->at (nx, ny);
2010		1381
2011	if (socket.extmap)	1382	if (socket.extmap)
2012	{	1383	{
2013	uint8 stat_hp = 0;	1384	uint8 stat_hp = 0;
2014	uint8 stat_width = 0;	1385	uint8 stat_width = 0;
2015	uint8 flags = 0;	1386	uint8 flags = 0;
2016	UUID player = 0;	1387	UUID player = 0;
2017		1388
2018	// send hp information, if applicable	1389	// send hp information, if applicable
2019	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1390	if (object *op = ms.faces_obj [0])
2020	{	1391	{
2021	if (op->head || op->invisible)	1392	if (op->head || op->invisible)
2022	; // do not show	1393	; // do not show
2023	else if (op->type == PLAYER	1394	else if (op->type == PLAYER
2024	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1395	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
2041	{	1412	{
2042	lastcell.stat_hp = stat_hp;	1413	lastcell.stat_hp = stat_hp;
2043		1414
2044	mask |= 0x8;	1415	mask |= 0x8;
2045	*last_ext |= 0x80;	1416	*last_ext |= 0x80;
2046	last_ext = sl.buf + sl.length ();	1417	last_ext = &sl[sl.length ()];
2047		1418
2048	sl << uint8 (5) << uint8 (stat_hp);	1419	sl << uint8 (5) << uint8 (stat_hp);
2049		1420
2050	if (stat_width > 1)	1421	if (stat_width > 1)
2051	{	1422	{
2052	*last_ext |= 0x80;	1423	*last_ext |= 0x80;
2053	last_ext = sl.buf + sl.length ();	1424	last_ext = &sl[sl.length ()];
2054		1425
2055	sl << uint8 (6) << uint8 (stat_width);	1426	sl << uint8 (6) << uint8 (stat_width);
2056	}	1427	}
2057	}	1428	}
2058		1429
…		…
2060	{	1431	{
2061	lastcell.player = player;	1432	lastcell.player = player;
2062		1433
2063	mask |= 0x8;	1434	mask |= 0x8;
2064	*last_ext |= 0x80;	1435	*last_ext |= 0x80;
2065	last_ext = sl.buf + sl.length ();	1436	last_ext = &sl[sl.length ()];
2066		1437
2067	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1438	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068	}	1439	}
2069		1440
2070	if (lastcell.flags != flags)	1441	if (lastcell.flags != flags)
2071	{	1442	{
2072	lastcell.flags = flags;	1443	lastcell.flags = flags;
2073		1444
2074	mask |= 0x8;	1445	mask |= 0x8;
2075	*last_ext |= 0x80;	1446	*last_ext |= 0x80;
2076	last_ext = sl.buf + sl.length ();	1447	last_ext = &sl[sl.length ()];
2077		1448
2078	sl << uint8 (8) << uint8 (flags);	1449	sl << uint8 (8) << uint8 (flags);
2079	}	1450	}
2080	}	1451	}
2081		1452
2082	/* Floor face */	1453	/* Floor face */
2083	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1454	if (update_space (sl, socket, ms, lastcell, 2))
2084	mask |= 0x4;	1455	mask |= 0x4;
2085		1456
2086	if (socket.EMI_smooth)
2087	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2088	emask |= 0x4;
2089
2090	/* Middle face */	1457	/* Middle face */
2091	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1458	if (update_space (sl, socket, ms, lastcell, 1))
2092	mask |= 0x2;	1459	mask |= 0x2;
2093		1460
2094	if (socket.EMI_smooth)	1461	if (ms.player () == pl
2095	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1462	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2096	emask |= 0x2;
2097
2098	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2099	{	1463	{
		1464	// force player to be visible to himself if invisible
2100	if (lastcell.faces[0] != pl->face->number)	1465	if (lastcell.faces[0] != pl->face)
2101	{	1466	{
2102	lastcell.faces[0] = pl->face->number;	1467	lastcell.faces[0] = pl->face;
		1468
2103	mask |= 0x1;	1469	mask |= 0x1;
2104
2105	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2106	esrv_send_face (&socket, pl->face->number, 0);
2107
2108	sl << uint16 (pl->face->number);	1470	sl << uint16 (pl->face);
		1471
		1472	socket.send_faces (pl);
2109	}	1473	}
2110	}	1474	}
2111	else
2112	{
2113	/* Top face */	1475	/* Top face */
2114	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1476	else if (update_space (sl, socket, ms, lastcell, 0))
2115	mask |= 0x1;	1477	mask |= 0x1;
2116
2117	if (socket.EMI_smooth)
2118	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2119	emask |= 0x1;
2120	}	1478
2121		1479
2122	/* Check to see if we are in fact sending anything for this	1480	/* Check to see if we are in fact sending anything for this
2123	* space by checking the mask. If so, update the mask.	1481	* space by checking the mask. If so, update the mask.
2124	* if not, reset the len to that from before adding the mask	1482	* if not, reset the len to that from before adding the mask
2125	* value, so we don't send those bits.	1483	* value, so we don't send those bits.
2126	*/	1484	*/
2127	if (mask & 0xf)	1485	if (mask & 0xf)
2128	sl.buf[oldlen + 1] = mask & 0xff;	1486	sl[oldlen + 1] = mask & 0xff;
2129	else	1487	else
2130	sl.reset (oldlen);	1488	sl.reset (oldlen);
2131		1489
		1490	if (socket.ext_mapinfos)
		1491	esl << uint16 (emask);
		1492
		1493	if (socket.EMI_smooth)
		1494	{
		1495	for (int layer = 2+1; layer--; )
		1496	{
		1497	object *ob = ms.faces_obj [layer];
		1498
		1499	// If there is no object for this space, or if the face for the object
		1500	// is the blank face, set the smoothlevel to zero.
		1501	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1502
		1503	// We've gotten what face we want to use for the object. Now see if
		1504	// if it has changed since we last sent it to the client.
		1505	if (lastcell.smooth[layer] != smoothlevel)
		1506	{
		1507	lastcell.smooth[layer] = smoothlevel;
		1508	esl << uint8 (smoothlevel);
		1509	emask |= 1 << layer;
		1510	}
		1511	}
		1512
2132	if (emask & 0xf)	1513	if (emask & 0xf)
2133	esl.buf[eoldlen + 1] = emask & 0xff;	1514	esl[eoldlen + 1] = emask & 0xff;
2134	else	1515	else
2135	esl.reset (eoldlen);	1516	esl.reset (eoldlen);
		1517	}
2136	} /* else this is a viewable space */	1518	} /* else this is a viewable space */
2137	} /* for x loop */	1519	} /* for x loop */
2138	} /* for y loop */	1520	} /* for y loop */
2139		1521
2140	/* Verify that we in fact do need to send this */	1522	/* Verify that we in fact do need to send this */
…		…
2143	if (!(sl.length () > startlen || socket.sent_scroll))	1525	if (!(sl.length () > startlen || socket.sent_scroll))
2144	{	1526	{
2145	/* No map data will follow, so don't say the client	1527	/* No map data will follow, so don't say the client
2146	* it doesn't need draw!	1528	* it doesn't need draw!
2147	*/	1529	*/
2148	ewhatflag &= (~EMI_NOREDRAW);	1530	ewhatflag &= ~EMI_NOREDRAW;
2149	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	1531	esl[ewhatstart + 1] = ewhatflag & 0xff;
2150	}	1532	}
2151		1533
2152	if (esl.length () > estartlen)	1534	if (esl.length () > estartlen)
2153	Send_With_Handling (&socket, &esl);	1535	socket.send_packet (esl);
2154	}	1536	}
2155		1537
2156	if (sl.length () > startlen || socket.sent_scroll)	1538	if (sl.length () > startlen || socket.sent_scroll)
2157	{	1539	{
2158	Send_With_Handling (&socket, &sl);	1540	socket.send_packet (sl);
2159	socket.sent_scroll = 0;	1541	socket.sent_scroll = 0;
2160	}	1542	}
2161	}	1543	}
2162		1544
2163	/**	1545	/**
…		…
2165	*/	1547	*/
2166	void	1548	void
2167	draw_client_map (object *pl)	1549	draw_client_map (object *pl)
2168	{	1550	{
2169	int i, j;	1551	int i, j;
2170	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1552	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2171	New_Face *face, *floor;
2172	New_Face *floor2;
2173	int d, mflags;	1553	int mflags;
2174	struct Map newmap;	1554	struct Map newmap;
2175	maptile *m, *pm;	1555	maptile *m, *pm;
2176		1556
2177	if (pl->type != PLAYER)	1557	if (pl->type != PLAYER)
2178	{	1558	{
…		…
2189	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1569	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190	return;	1570	return;
2191		1571
2192	memset (&newmap, 0, sizeof (struct Map));	1572	memset (&newmap, 0, sizeof (struct Map));
2193		1573
2194	for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++)	1574	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2195	{
2196	for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++)	1575	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2197	{	1576	{
2198	ax = i;	1577	ax = i;
2199	ay = j;	1578	ay = j;
2200	m = pm;	1579	m = pm;
2201	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1580	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		1581
2202	if (mflags & P_OUT_OF_MAP)	1582	if (mflags & P_OUT_OF_MAP)
2203	continue;	1583	continue;
2204	if (mflags & P_NEED_UPDATE)	1584
2205	update_position (m, ax, ay);
2206	/* If a map is visible to the player, we don't want to swap it out	1585	/* If a map is visible to the player, we don't want to swap it out
2207	* just to reload it. This should really call something like	1586	* just to reload it. This should really call something like
2208	* swap_map, but this is much more efficient and 'good enough'	1587	* swap_map, but this is much more efficient and 'good enough'
2209	*/	1588	*/
2210	if (mflags & P_NEW_MAP)	1589	if (mflags & P_NEW_MAP)
2211	m->timeout = 50;	1590	m->timeout = 50;
2212	}	1591	}
2213	}	1592
2214	/* do LOS after calls to update_position */	1593	/* do LOS after calls to update_position */
2215	if (pl->contr->do_los)	1594	if (pl->contr->do_los)
2216	{	1595	{
2217	update_los (pl);	1596	update_los (pl);
2218	pl->contr->do_los = 0;	1597	pl->contr->do_los = 0;
…		…
2233		1612
2234	/*****************************************************************************/	1613	/*****************************************************************************/
2235	void	1614	void
2236	send_plugin_custom_message (object *pl, char *buf)	1615	send_plugin_custom_message (object *pl, char *buf)
2237	{	1616	{
2238	pl->contr->socket.send_packet (buf);	1617	pl->contr->ns->send_packet (buf);
2239	}	1618	}
2240		1619
2241	/**	1620	/**
2242	* This sends the skill number to name mapping. We ignore	1621	* This sends the skill number to name mapping. We ignore
2243	* the params - we always send the same info no matter what.	1622	* the params - we always send the same info no matter what.
2244	*/	1623	*/
2245	void	1624	void
2246	send_skill_info (client_socket *ns, char *params)	1625	send_skill_info (client *ns, char *params)
2247	{	1626	{
2248	packet sl;	1627	packet sl;
2249	sl << "replyinfo skill_info\n";	1628	sl << "replyinfo skill_info\n";
2250		1629
2251	for (int i = 1; i < NUM_SKILLS; i++)	1630	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2255	{	1634	{
2256	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1635	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257	fatal (0);	1636	fatal (0);
2258	}	1637	}
2259		1638
2260	Send_With_Handling (ns, &sl);	1639	ns->send_packet (sl);
2261	}	1640	}
2262		1641
2263	/**	1642	/**
2264	* This sends the spell path to name mapping. We ignore	1643	* This sends the spell path to name mapping. We ignore
2265	* the params - we always send the same info no matter what.	1644	* the params - we always send the same info no matter what.
2266	*/	1645	*/
2267	void	1646	void
2268	send_spell_paths (client_socket * ns, char *params)	1647	send_spell_paths (client * ns, char *params)
2269	{	1648	{
2270	packet sl;	1649	packet sl;
2271		1650
2272	sl << "replyinfo spell_paths\n";	1651	sl << "replyinfo spell_paths\n";
2273		1652
…		…
2278	{	1657	{
2279	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1658	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280	fatal (0);	1659	fatal (0);
2281	}	1660	}
2282		1661
2283	Send_With_Handling (ns, &sl);	1662	ns->send_packet (sl);
2284	}	1663	}
2285		1664
2286	/**	1665	/**
2287	* This looks for any spells the player may have that have changed their stats.	1666	* This looks for any spells the player may have that have changed their stats.
2288	* it then sends an updspell packet for each spell that has changed in this way	1667	* it then sends an updspell packet for each spell that has changed in this way
2289	*/	1668	*/
2290	void	1669	void
2291	esrv_update_spells (player *pl)	1670	esrv_update_spells (player *pl)
2292	{	1671	{
		1672	if (!pl->ns)
		1673	return;
		1674
2293	if (!pl->socket.monitor_spells)	1675	if (!pl->ns->monitor_spells)
2294	return;	1676	return;
2295		1677
2296	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1678	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297	{	1679	{
2298	if (spell->type == SPELL)	1680	if (spell->type == SPELL)
…		…
2328		1710
2329	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1711	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1712	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1713	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332		1714
2333	Send_With_Handling (&pl->socket, &sl);	1715	pl->ns->send_packet (sl);
2334	}	1716	}
2335	}	1717	}
2336	}	1718	}
2337	}	1719	}
2338		1720
2339	void	1721	void
2340	esrv_remove_spell (player *pl, object *spell)	1722	esrv_remove_spell (player *pl, object *spell)
2341	{	1723	{
2342	if (!pl->socket.monitor_spells)	1724	if (!pl->ns->monitor_spells)
2343	return;	1725	return;
2344		1726
2345	if (!pl || !spell || spell->env != pl->ob)	1727	if (!pl || !spell || spell->env != pl->ob)
2346	{	1728	{
2347	LOG (llevError, "Invalid call to esrv_remove_spell");	1729	LOG (llevError, "Invalid call to esrv_remove_spell");
2348	return;	1730	return;
2349	}	1731	}
2350		1732
2351	packet sl;	1733	packet sl ("delspell");
2352		1734
2353	sl << "delspell "
2354	<< uint32 (spell->count);	1735	sl << uint32 (spell->count);
2355		1736
2356	Send_With_Handling (&pl->socket, &sl);	1737	pl->ns->send_packet (sl);
2357	}	1738	}
2358		1739
2359	/* appends the spell *spell to the Socklist we will send the data to. */	1740	/* appends the spell *spell to the Socklist we will send the data to. */
2360	static void	1741	static void
2361	append_spell (player *pl, packet &sl, object *spell)	1742	append_spell (player *pl, packet &sl, object *spell)
2362	{	1743	{
2363	int len, i, skill = 0;	1744	int i, skill = 0;
2364		1745
2365	if (!(spell->name))	1746	if (!(spell->name))
2366	{	1747	{
2367	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1748	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2368	return;	1749	return;
…		…
2380	if (!strcmp (spell->skill, skill_names[i]))	1761	if (!strcmp (spell->skill, skill_names[i]))
2381	{	1762	{
2382	skill = i + CS_STAT_SKILLINFO;	1763	skill = i + CS_STAT_SKILLINFO;
2383	break;	1764	break;
2384	}	1765	}
		1766	}
		1767
		1768	// spells better have a face
		1769	if (!spell->face)
		1770	{
		1771	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1772	spell->face = face_find ("burnout.x11", blank_face);
2385	}	1773	}
2386		1774
2387	/* send the current values */	1775	/* send the current values */
2388	sl << uint32 (spell->count)	1776	sl << uint32 (spell->count)
2389	<< uint16 (spell->level)	1777	<< uint16 (spell->level)
…		…
2391	<< uint16 (spell->last_sp)	1779	<< uint16 (spell->last_sp)
2392	<< uint16 (spell->last_grace)	1780	<< uint16 (spell->last_grace)
2393	<< uint16 (spell->last_eat)	1781	<< uint16 (spell->last_eat)
2394	<< uint8 (skill)	1782	<< uint8 (skill)
2395	<< uint32 (spell->path_attuned)	1783	<< uint32 (spell->path_attuned)
2396	<< uint32 (spell->face ? spell->face->number : 0)	1784	<< uint32 (spell->face)
2397	<< data8 (spell->name)	1785	<< data8 (spell->name)
2398	<< data16 (spell->msg);	1786	<< data16 (spell->msg);
2399	}	1787	}
2400		1788
2401	/**	1789	/**
…		…
2409	{	1797	{
2410	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1798	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411	return;	1799	return;
2412	}	1800	}
2413		1801
2414	if (!pl->socket.monitor_spells)	1802	if (!pl->ns->monitor_spells)
2415	return;	1803	return;
2416		1804
2417	packet sl;	1805	packet sl ("addspell");
2418
2419	sl << "addspell ";
2420		1806
2421	if (!spell)	1807	if (!spell)
2422	{	1808	{
2423	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1809	for (spell = pl->ob->inv; spell; spell = spell->below)
2424	{	1810	{
2425	/* were we to simply keep appending data here, we could exceed	1811	/* were we to simply keep appending data here, we could exceed
2426	* MAXSOCKBUF if the player has enough spells to add, we know that	1812	* MAXSOCKBUF if the player has enough spells to add, we know that
2427	* append_spells will always append 19 data bytes, plus 4 length	1813	* append_spells will always append 19 data bytes, plus 4 length
2428	* bytes and 3 strings (because that is the spec) so we need to	1814	* bytes and 3 strings (because that is the spec) so we need to
…		…
2438	if (spell->type != SPELL)	1824	if (spell->type != SPELL)
2439	continue;	1825	continue;
2440		1826
2441	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1827	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442	{	1828	{
2443	Send_With_Handling (&pl->socket, &sl);	1829	pl->ns->send_packet (sl);
2444		1830
2445	sl.reset ();	1831	sl.reset ();
2446	sl << "addspell ";	1832	sl << "addspell ";
2447	}	1833	}
2448		1834
…		…
2462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1848	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463	fatal (0);	1849	fatal (0);
2464	}	1850	}
2465		1851
2466	/* finally, we can send the packet */	1852	/* finally, we can send the packet */
2467	Send_With_Handling (&pl->socket, &sl);	1853	pl->ns->send_packet (sl);
2468
2469	}	1854	}
2470		1855

Diff Legend

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