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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs. Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07:43 2007 UTC