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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.36 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 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
114	* complexities for the client, and probably doesn't make	97	* complexities for the client, and probably doesn't make
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
120	if (ns->mapmode == Map1aCmd)
121	{
122	mx += MAX_HEAD_OFFSET;
123	my += MAX_HEAD_OFFSET;
124	}
125		102
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
…		…
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	ns->send_packet ("addme_success");
550
551	settings = oldsettings;
552	}	569	}
553		570
554	/** Reply to ExtendedInfos command */	571	/** Reply to ExtendedInfos command */
555	void	572	void
556	ToggleExtendedInfos (char buf, int len, client_socket ns)	573	ToggleExtendedInfos (char buf, int len, client ns)
557	{	574	{
558	char cmdback[MAX_BUF];	575	char cmdback[MAX_BUF];
559	char command[50];	576	char command[50];
560	int info, nextinfo;	577	int info, nextinfo;
561		578
…		…
612	#define MSG_TYPE_MONUMENT 5	629	#define MSG_TYPE_MONUMENT 5
613	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	630	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614		631
615	/** Reply to ExtendedInfos command */	632	/** Reply to ExtendedInfos command */
616	void	633	void
617	ToggleExtendedText (char buf, int len, client_socket ns)	634	ToggleExtendedText (char buf, int len, client ns)
618	{	635	{
619	char cmdback[MAX_BUF];	636	char cmdback[MAX_BUF];
620	char temp[10];	637	char temp[10];
621	char command[50];	638	char command[50];
622	int info, nextinfo, i, flag;	639	int info, nextinfo, i, flag;
…		…
673	* 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
674	* 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
675	* client.	692	* client.
676	*/	693	*/
677	static void	694	static void
678	SendSmooth (client_socket * ns, uint16 face)	695	SendSmooth (client *ns, uint16 face)
679	{	696	{
680	uint16 smoothface;	697	uint16 smoothface;
681		698
682	/* 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
683	* again.	700	* again.
684	*/	701	*/
685	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	702	if (!FindSmooth (face, &smoothface))
686	{	703	{
687		704
688	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);
689	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	706	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
690	return;	707	return;
691	}	708	}
692		709
693	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
694	esrv_send_face (ns, smoothface, 0);	711	esrv_send_face (ns, smoothface, 0);
695		712
696	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	713	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
697		714
698	packet sl;	715	packet sl ("smooth");
699		716
700	sl << "smooth "
701	<< uint16 (face)	717	sl << uint16 (face)
702	<< uint16 (smoothface);	718	<< uint16 (smoothface);
703		719
704	Send_With_Handling (ns, &sl);	720	ns->send_packet (sl);
705	}	721	}
706		722
707	/**	723	/**
708	* Tells client the picture it has to use	724	* Tells client the picture it has to use
709	* to smooth a picture number given as argument.	725	* to smooth a picture number given as argument.
710	*/	726	*/
711	void	727	void
712	AskSmooth (char buf, int len, client_socket ns)	728	AskSmooth (char buf, int len, client ns)
713	{	729	{
714	uint16 facenbr;	730	SendSmooth (ns, atoi (buf));
715
716	facenbr = atoi (buf);
717	SendSmooth (ns, facenbr);
718	}	731	}
719		732
720	/**	733	/**
721	* 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,
722	* etc.)	735	* etc.)
723	*/	736	*/
724	void	737	void
725	PlayerCmd (char buf, int len, player pl)	738	PlayerCmd (char buf, int len, player pl)
726	{	739	{
727
728	/* The following should never happen with a proper or honest client.
729	* Therefore, the error message doesn't have to be too clear - if
730	* someone is playing with a hacked/non working client, this gives them
731	* an idea of the problem, but they deserve what they get
732	*/
733	if (pl->state != ST_PLAYING)
734	{
735	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
736	return;
737	}
738	/* Check if there is a count. In theory, a zero count could also be	740	/* Check if there is a count. In theory, a zero count could also be
739	* sent, so check for that also.	741	* sent, so check for that also.
740	*/	742	*/
741	if (atoi (buf) \|\| buf[0] == '0')	743	if (atoi (buf) \|\| buf[0] == '0')
742	{	744	{
743	pl->count = atoi ((char *) buf);	745	pl->count = atoi ((char *) buf);
		746
744	buf = strchr (buf, ' '); /* advance beyond the numbers */	747	buf = strchr (buf, ' '); /* advance beyond the numbers */
745	if (!buf)	748	if (!buf)
746	{
747	#ifdef ESRV_DEBUG
748	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749	#endif
750	return;	749	return;
751	}	750
752	buf++;	751	buf++;
753	}	752	}
754	/* This should not happen anymore. */	753
755	if (pl->ob->speed_left < -1.0)
756	{
757	LOG (llevError, "Player has negative time - shouldn't do command.\n");
758	}
759	/* In c_new.c */
760	execute_newserver_command (pl->ob, (char *) buf);	754	execute_newserver_command (pl->ob, (char *) buf);
		755
761	/* Perhaps something better should be done with a left over count.	756	/* Perhaps something better should be done with a left over count.
762	* Cleaning up the input should probably be done first - all actions	757	* Cleaning up the input should probably be done first - all actions
763	* for the command that issued the count should be done before any other	758	* for the command that issued the count should be done before any other
764	* commands.	759	* commands.
765	*/	760	*/
766
767	pl->count = 0;	761	pl->count = 0;
768
769	}	762	}
770		763
771		764
772	/**	765	/**
773	* 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,
774	* etc.). It is a lot like PlayerCmd above, but is called with the	767	* etc.). It is a lot like PlayerCmd above, but is called with the
775	* 'ncom' method which gives more information back to the client so it	768	* 'ncom' method which gives more information back to the client so it
776	* can throttle.	769	* can throttle.
777	*/	770	*/
778	void	771	void
779	NewPlayerCmd (uint8 * buf, int len, player *pl)	772	NewPlayerCmd (char buf, int len, player pl)
780	{	773	{
781	int time, repeat;
782	char command[MAX_BUF];
783	int pktlen;
784
785	if (len < 7)	774	if (len <= 6)
786	{	775	{
787	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);
788	return;	777	return;
789	}	778	}
790		779
791	pktlen = net_uint16 (buf);	780	uint16 cmdid = net_uint16 ((uint8 *)buf);
792	repeat = net_uint32 (buf + 2);	781	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793		782
794	/* -1 is special - no repeat, but don't update */	783	/* -1 is special - no repeat, but don't update */
795	if (repeat != -1)	784	if (repeat != -1)
796	pl->count = repeat;	785	pl->count = repeat;
797		786
798	if ((len - 4) >= MAX_BUF)	787	buf += 6; //len -= 6;
799	len = MAX_BUF - 5;
800		788
801	strncpy ((char ) command, (char ) buf + 6, len - 4);
802	command[len - 4] = '\0';
803
804	/* The following should never happen with a proper or honest client.
805	* Therefore, the error message doesn't have to be too clear - if
806	* someone is playing with a hacked/non working client, this gives them
807	* an idea of the problem, but they deserve what they get
808	*/
809	if (pl->state != ST_PLAYING)
810	{
811	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
812	return;
813	}
814
815	/* This should not happen anymore. */
816	if (pl->ob->speed_left < -1.0)
817	LOG (llevError, "Player has negative time - shouldn't do command.\n");
818
819	/* In c_new.c */
820	execute_newserver_command (pl->ob, (char *) command);	789	execute_newserver_command (pl->ob, buf);
		790
821	/* Perhaps something better should be done with a left over count.	791	/* Perhaps something better should be done with a left over count.
822	* Cleaning up the input should probably be done first - all actions	792	* Cleaning up the input should probably be done first - all actions
823	* for the command that issued the count should be done before any other	793	* for the command that issued the count should be done before any other
824	* commands.	794	* commands.
825	*/	795	*/
826	pl->count = 0;	796	pl->count = 0;
827		797
828	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
829	time = MAX_TIME * 100;	800	? time = MAX_TIME * 100
830	else
831	time = (int) (MAX_TIME / FABS (pl->ob->speed));	801	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
832		802
833	/* Send confirmation of command execution now */	803	/* Send confirmation of command execution now */
834		804	packet sl ("comc");
835	packet sl;
836	sl << "comc " << uint16 (pktlen) << uint32 (time);	805	sl << uint16 (cmdid) << uint32 (time);
837	Send_With_Handling (pl->socket, &sl);	806	pl->ns->send_packet (sl);
838	}	807	}
839
840		808
841	/** This is a reply to a previous query. */	809	/** This is a reply to a previous query. */
842	void	810	void
843	ReplyCmd (char buf, int len, player pl)	811	ReplyCmd (char buf, int len, client ns)
844	{	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
845	/* 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
846	* 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
847	* once all the X11 code is removed from the server.	827	* once all the X11 code is removed from the server.
848	*	828	*
849	* 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
850	* think it was the carriage return that was entered, and the	830	* think it was the carriage return that was entered, and the
851	* function then does not try to do additional input.	831	* function then does not try to do additional input.
852	*/	832	*/
853	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	833	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
854		834
855	/* this avoids any hacking here */	835	/* this avoids any hacking here */
856		836
857	switch (pl->state)	837	switch (ns->state)
858	{	838	{
859	case ST_PLAYING:	839	case ST_PLAYING:
860	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861	break;	841	break;
862		842
863	case ST_PLAY_AGAIN:
864	/* We can check this for return value (2==quit). Maybe we
865	* should, and do something appropriate?
866	*/
867	receive_play_again (pl->ob, buf[0]);
868	break;
869
870	case ST_ROLL_STAT:
871	key_roll_stat (pl->ob, buf[0]);
872	break;
873
874	case ST_CHANGE_CLASS:	843	case ST_CHANGE_CLASS:
875
876	key_change_class (pl->ob, buf[0]);	844	key_change_class (pl->ob, buf[0]);
877	break;	845	break;
878		846
879	case ST_CONFIRM_QUIT:
880	key_confirm_quit (pl->ob, buf[0]);
881	break;
882
883	case ST_CONFIGURE:
884	LOG (llevError, "In client input handling, but into configure state\n");
885	pl->state = ST_PLAYING;
886	break;
887
888	case ST_GET_NAME:
889	receive_player_name (pl->ob, 13);
890	break;
891
892	case ST_GET_PASSWORD:
893	case ST_CONFIRM_PASSWORD:
894	receive_player_password (pl->ob, 13);
895	break;
896
897	case ST_GET_PARTY_PASSWORD: /* Get password for party */	847	case ST_GET_PARTY_PASSWORD: /* Get password for party */
898	receive_party_password (pl->ob, 13);	848	receive_party_password (pl->ob, 13);
899	break;	849	break;
900		850
901	default:	851	default:
902	LOG (llevError, "Unknown input state: %d\n", pl->state);	852	LOG (llevError, "Unknown input state: %d\n", ns->state);
903	}	853	}
904	}	854	}
905		855
906	/**	856	/**
907	* 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
…		…
909	* 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
910	* 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
911	* problem.	861	* problem.
912	*/	862	*/
913	void	863	void
914	VersionCmd (char buf, int len, client_socket ns)	864	VersionCmd (char buf, int len, client ns)
915	{	865	{
916	char *cp;
917	char version_warning[256];
918
919	if (!buf)	866	if (!buf)
920	{	867	{
921	LOG (llevError, "CS: received corrupted version command\n");	868	LOG (llevError, "CS: received corrupted version command\n");
922	return;	869	return;
923	}	870	}
924		871
925	ns->cs_version = atoi (buf);	872	ns->cs_version = atoi (buf);
926	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
927	if (VERSION_CS != ns->cs_version)	879	//if (VERSION_CS != ns->cs_version)
928	{	880	// unchecked;
929	#ifdef ESRV_DEBUG	881
930	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931	#endif
932	}
933	cp = strchr (buf + 1, ' ');	882	char *cp = strchr (buf + 1, ' ');
934	if (!cp)	883	if (!cp)
935	return;	884	return;
		885
936	ns->sc_version = atoi (cp);	886	ns->sc_version = atoi (cp);
		887
937	if (VERSION_SC != ns->sc_version)	888	//if (VERSION_SC != ns->sc_version)
938	{	889	// unchecked;
939	#ifdef ESRV_DEBUG	890
940	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941	#endif
942	}
943	cp = strchr (cp + 1, ' ');	891	cp = strchr (cp + 1, ' ');
		892
944	if (cp)	893	if (cp)
945	{	894	{
946	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	895	assign (ns->version, cp + 1);
947		896
948	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
949
950	/* This is first implementation - i skip all beta DX clients with it
951	* Add later stuff here for other clients
952	*/
953
954	/* these are old dxclients */
955	/* Version 1024 added support for singular + plural name values -
956	* requiing this minimal value reduces complexity of that code, and it
957	* has been around for a long time.
958	*/
959	if (ns->sc_version < 1026)	897	if (ns->sc_version < 1026)
960	{	898	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
961	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
962	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");	899	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
963	ns->send_packet (version_warning);
964	}
965
966	}	900	}
967	}	901	}
968		902
969	/** sound related functions. */	903	/** sound related functions. */
970
971	void	904	void
972	SetSound (char buf, int len, client_socket ns)	905	SetSound (char buf, int len, client ns)
973	{	906	{
974	ns->sound = atoi (buf);	907	ns->sound = atoi (buf);
975	}	908	}
976		909
977	/** client wants the map resent */	910	/** client wants the map resent */
978
979	void	911	void
980	MapRedrawCmd (char buf, int len, player pl)	912	MapRedrawCmd (char buf, int len, player pl)
981	{	913	{
982
983	/* 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
984	* 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.
985	* Unfortunately this solution does not work because some client versions send	916	* Unfortunately this solution does not work because some client versions send
986	* a mapredraw command after receiving a newmap command.	917	* a mapredraw command after receiving a newmap command.
987	*/	918	*/
988	#if 0
989	/* Okay, this is MAJOR UGLY. but the only way I know how to
990	* clear the "cache"
991	*/
992	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
993	draw_client_map (pl->ob);
994	#endif
995	}	919	}
996		920
997	/**	921	/**
998	* Moves an object (typically, container to inventory).	922	* Moves an object (typically, container to inventory).
999	* syntax is: move (to) (tag) (nrof)	923	* syntax is: move (to) (tag) (nrof)
…		…
1002	MoveCmd (char buf, int len, player pl)	926	MoveCmd (char buf, int len, player pl)
1003	{	927	{
1004	int vals[3], i;	928	int vals[3], i;
1005		929
1006	/* A little funky here. We only cycle for 2 records, because	930	/* A little funky here. We only cycle for 2 records, because
1007	* 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
1008	* record. Perhaps we should just replace this with a	932	* record. Perhaps we should just replace this with a
1009	* sscanf?	933	* sscanf?
1010	*/	934	*/
1011	for (i = 0; i < 2; i++)	935	for (i = 0; i < 2; i++)
1012	{	936	{
1013	vals[i] = atoi (buf);	937	vals[i] = atoi (buf);
		938
1014	if (!(buf = strchr (buf, ' ')))	939	if (!(buf = strchr (buf, ' ')))
1015	{	940	{
1016	LOG (llevError, "Incomplete move command: %s\n", buf);	941	LOG (llevError, "Incomplete move command: %s\n", buf);
1017	return;	942	return;
1018	}	943	}
		944
1019	buf++;	945	buf++;
1020	}	946	}
		947
1021	vals[2] = atoi (buf);	948	vals[2] = atoi (buf);
1022		949
1023	/* 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]);*/
1024	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	951	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025	}	952	}
1026
1027
1028		953
1029	/******************************************************************************	954	/******************************************************************************
1030	*	955	*
1031	* Start of commands the server sends to the client.	956	* Start of commands the server sends to the client.
1032	*	957	*
…		…
1035	/**	960	/**
1036	* 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
1037	* 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)
1038	*/	963	*/
1039	void	964	void
1040	send_query (client_socket * ns, uint8 flags, char *text)	965	send_query (client ns, uint8 flags, char text)
1041	{	966	{
1042	char buf[MAX_BUF];
1043
1044	sprintf (buf, "query %d %s", flags, text ? text : "");	967	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045	ns->send_packet (buf);
1046	}	968	}
1047		969
1048	#define AddIfInt64(Old,New,Type) if (Old != New) {\	970	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049	Old = New; \	971	Old = New; \
1050	sl << uint8 (Type) << uint64 (New); \	972	sl << uint8 (Type) << uint64 (New); \
…		…
1080	esrv_update_stats (player *pl)	1002	esrv_update_stats (player *pl)
1081	{	1003	{
1082	char buf[MAX_BUF];	1004	char buf[MAX_BUF];
1083	uint16 flags;	1005	uint16 flags;
1084		1006
1085	packet sl;	1007	client *ns = pl->ns;
1086	sl << "stats ";	1008	if (!ns)
		1009	return;
1087		1010
1088	if (pl->ob != NULL)	1011	object *ob = pl->ob;
1089	{	1012	if (!ob)
		1013	return;
		1014
		1015	packet sl ("stats");
		1016
1090	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1091	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1092	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1019	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1093	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1020	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1094	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1021	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1095	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1022	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1096	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1023	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1097	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1098	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1099	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1100	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1024	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1101	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);
1102	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1103	}
1104		1030
1105	if (pl->socket->exp64)
1106	{
1107	uint8 s;
1108
1109	for (s = 0; s < NUM_SKILLS; s++)	1031	for (int s = 0; s < NUM_SKILLS; s++)
1110	{	1032	if (object *skill = pl->last_skill_ob[s])
1111	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1033	if (skill->stats.exp != ns->last_skill_exp [s])
1112	{	1034	{
		1035	ns->last_skill_exp [s] = skill->stats.exp;
		1036
1113	/* Always send along the level if exp changes. This is only	1037	/* Always send along the level if exp changes. This is only
1114	* 1 extra byte, but keeps processing simpler.	1038	* 1 extra byte, but keeps processing simpler.
1115	*/	1039	*/
1116	sl << uint8 (s + CS_STAT_SKILLINFO)	1040	sl << uint8 (s + CS_STAT_SKILLINFO)
1117	<< uint8 (pl->last_skill_ob[s]->level)	1041	<< uint8 (skill->level)
1118	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1042	<< uint64 (skill->stats.exp);
1119
1120	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1121	}	1043	}
1122	}
1123	}
1124		1044
1125	if (pl->socket->exp64)
1126	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1045	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1127	else
1128	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1129
1130	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1131	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1132	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1133	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1134	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1135	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1136	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);
1137	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
1138	flags = 0;	1055	flags = 0;
1139		1056
1140	if (pl->fire_on)	1057	if (pl->fire_on)
1141	flags \|= SF_FIREON;	1058	flags \|= SF_FIREON;
1142		1059
1143	if (pl->run_on)	1060	if (pl->run_on)
1144	flags \|= SF_RUNON;	1061	flags \|= SF_RUNON;
1145		1062
1146	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1147		1064
1148	if (pl->socket->sc_version < 1025)	1065	if (ns->sc_version < 1025)
1149	{ 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) }
1150	else	1067	else
1151	{
1152	int i;
1153
1154	for (i = 0; i < NROFATTACKS; i++)	1068	for (int i = 0; i < NROFATTACKS; i++)
1155	{	1069	{
1156	/* Skip ones we won't send */	1070	/* Skip ones we won't send */
1157	if (atnr_cs_stat[i] == -1)	1071	if (atnr_cs_stat[i] == -1)
1158	continue;	1072	continue;
1159		1073
1160	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]);
1161	}	1075	}
1162	}
1163		1076
1164	if (pl->socket->monitor_spells)	1077	if (pl->ns->monitor_spells)
1165	{	1078	{
1166	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);
1167	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);
1168	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);
1169	}	1082	}
1170		1083
1171	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 */
1172	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1173	set_title (pl->ob, buf);	1086	set_title (ob, buf);
1174	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1175		1088
1176	/* Only send it away if we have some actual data */	1089	/* Only send it away if we have some actual data */
1177	if (sl.length () > 6)	1090	if (sl.length () > 6)
1178	Send_With_Handling (pl->socket, &sl);	1091	ns->send_packet (sl);
1179	}	1092	}
1180		1093
1181	/**	1094	/**
1182	* 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.
1183	*/	1096	*/
1184	void	1097	void
1185	esrv_new_player (player *pl, uint32 weight)	1098	esrv_new_player (player *pl, uint32 weight)
1186	{	1099	{
1187	pl->last_weight = weight;	1100	packet sl ("player");
1188
1189	packet sl;
1190	sl << "player ";
1191		1101
1192	sl << uint32 (pl->ob->count)	1102	sl << uint32 (pl->ob->count)
1193	<< uint32 (weight)	1103	<< uint32 (weight)
1194	<< uint32 (pl->ob->face->number)	1104	<< uint32 (pl->ob->face)
1195	<< data8 (pl->ob->name);	1105	<< data8 (pl->ob->name);
1196		1106
1197	Send_With_Handling (pl->socket, &sl);	1107	pl->ns->last_weight = weight;
		1108	pl->ns->send_packet (sl);
1198	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1199	}	1110	}
1200		1111
1201	/**	1112	/**
1202	* Need to send an animation sequence to the client.	1113	* Need to send an animation sequence to the client.
…		…
1204	* 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
1205	* 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
1206	* when the player logs in and picks stuff up.	1117	* when the player logs in and picks stuff up.
1207	*/	1118	*/
1208	void	1119	void
1209	esrv_send_animation (client_socket * ns, short anim_num)	1120	esrv_send_animation (client * ns, short anim_num)
1210	{	1121	{
1211	int i;
1212
1213	/* 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
1214	* 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
1215	* range, it must be a valid animation.	1124	* range, it must be a valid animation.
1216	*/	1125	*/
1217	if (anim_num < 0 \|\| anim_num > num_animations)	1126	if (anim_num < 0 \|\| anim_num > num_animations)
1218	{	1127	{
1219	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);
1220	return;	1129	return;
1221	}	1130	}
1222		1131
1223	packet sl;	1132	packet sl ("anim");
1224		1133
1225	sl << "anim "
1226	<< uint16 (anim_num)	1134	sl << uint16 (anim_num)
1227	<< uint16 (0); /* flags - not used right now */	1135	<< uint16 (0); /* flags - not used right now */
1228		1136
1229	/* 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
1230	* the face itself) down to the client.	1138	* the face itself) down to the client.
1231	*/	1139	*/
1232	for (i = 0; i < animations[anim_num].num_animations; i++)	1140	for (int i = 0; i < animations[anim_num].num_animations; i++)
1233	{	1141	{
1234	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))
1235	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1143	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1144
1236	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 */
1237	}	1146	}
1238		1147
1239	Send_With_Handling (ns, &sl);	1148	ns->send_packet (sl);
1240		1149
1241	ns->anims_sent[anim_num] = 1;	1150	ns->anims_sent[anim_num] = 1;
1242	}	1151	}
1243		1152
1244		1153
…		…
1246	*	1155	*
1247	* Start of map related commands.	1156	* Start of map related commands.
1248	*	1157	*
1249	******************************************************************************/	1158	******************************************************************************/
1250		1159
1251	/**
1252	* This adds face_num to a map cell at x,y. If the client doesn't have
1253	* the face yet, we will also send it.
1254	*/
1255	static void
1256	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1257	{
1258	if (newmap->cells[x][y].count >= MAP_LAYERS)
1259	{
1260	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261	return;
1262	abort ();
1263	}
1264
1265	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266	newmap->cells[x][y].count++;
1267
1268	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269	esrv_send_face (ns, face_num, 0);
1270	}
1271
1272	struct LayerCell
1273	{
1274	uint16 xy;
1275	short face;
1276	};
1277
1278	struct MapLayer
1279	{
1280	int count;
1281	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1282	};
1283
1284	/** Checkes if map cells have changed */
1285	static int
1286	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1287	{
1288	int k;
1289
1290	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1291	return 1;
1292	for (k = 0; k < newmap->cells[i][j].count; k++)
1293	{
1294	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1295	{
1296	return 1;
1297	}
1298	}
1299	return 0;
1300	}
1301
1302	/**
1303	* Basically, what this does is pack the data into layers.
1304	* cnum is the client number, cur is the the buffer we put all of
1305	* this data into. we return the end of the data. layers is
1306	* how many layers of data we should back.
1307	*/
1308	static uint8 *
1309	compactlayer (client_socket * ns, unsigned char cur, int numlayers, struct Map newmap)
1310	{
1311	int x, y, k;
1312	int face;
1313	unsigned char *fcur;
1314	struct MapLayer layers[MAP_LAYERS];
1315
1316	for (k = 0; k < MAP_LAYERS; k++)
1317	layers[k].count = 0;
1318	fcur = cur;
1319	for (x = 0; x < ns->mapx; x++)
1320	{
1321	for (y = 0; y < ns->mapy; y++)
1322	{
1323	if (!mapcellchanged (ns, x, y, newmap))
1324	continue;
1325	if (newmap->cells[x][y].count == 0)
1326	{
1327	cur = x ns->mapy + y; /* mark empty space */
1328	cur++;
1329	continue;
1330	}
1331	for (k = 0; k < newmap->cells[x][y].count; k++)
1332	{
1333	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1334	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1335	layers[k].count++;
1336	}
1337	}
1338	}
1339	/* If no data, return now. */
1340	if (fcur == cur && layers[0].count == 0)
1341	return cur;
1342	cur = 255; / mark end of explicitly cleared cells */
1343	cur++;
1344	/* First pack by layers. */
1345	for (k = 0; k < numlayers; k++)
1346	{
1347	if (layers[k].count == 0)
1348	break; /* once a layer is entirely empty, no layer below it can
1349	have anything in it either */
1350	/* Pack by entries in thie layer */
1351	for (x = 0; x < layers[k].count;)
1352	{
1353	fcur = cur;
1354	*cur = layers[k].lcells[x].face >> 8;
1355	cur++;
1356	*cur = layers[k].lcells[x].face & 0xFF;
1357	cur++;
1358	face = layers[k].lcells[x].face;
1359	/* Now, we back the redundant data into 1 byte xy pairings */
1360	for (y = x; y < layers[k].count; y++)
1361	{
1362	if (layers[k].lcells[y].face == face)
1363	{
1364	*cur = (uint8) layers[k].lcells[y].xy;
1365	cur++;
1366	layers[k].lcells[y].face = -1;
1367	}
1368	}
1369	(cur - 1) = (cur - 1) \| 128; /* mark for end of xy's; 1111 < 128 /
1370	/* forward over the now redundant data */
1371	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1372	x++;
1373	}
1374	fcur = fcur \| 128; /* mark for end of faces at this layer */
1375	}
1376	return cur;
1377	}
1378
1379	/** Clears a map cell */	1160	/** Clears a map cell */
1380	static void	1161	static void
1381	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1162	map_clearcell (struct MapCell *cell, int count)
1382	{	1163	{
1383	cell->faces[0] = face0;	1164	cell->faces[0] = 0;
1384	cell->faces[1] = face1;	1165	cell->faces[1] = 0;
1385	cell->faces[2] = face2;	1166	cell->faces[2] = 0;
1386	cell->count = count;	1167	cell->count = count;
1387	cell->stat_hp = 0;	1168	cell->stat_hp = 0;
1388	cell->flags = 0;	1169	cell->flags = 0;
1389	cell->player = 0;	1170	cell->player = 0;
1390	}	1171	}
1391		1172
1392	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1393	#define MAX_LAYERS 3	1173	#define MAX_LAYERS 3
1394
1395	/* Using a global really isn't a good approach, but saves the over head of
1396	* allocating and deallocating such a block of data each time run through,
1397	* and saves the space of allocating this in the socket object when we only
1398	* need it for this cycle. If the serve is ever threaded, this needs to be
1399	* re-examined.
1400	*/
1401
1402	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1403
1404	/**
1405	* Returns true if any of the heads for this
1406	* space is set. Returns false if all are blank - this is used
1407	* for empty space checking.
1408	*/
1409	static inline int
1410	have_head (int ax, int ay)
1411	{
1412
1413	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1414	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415	return 1;
1416	return 0;
1417	}
1418
1419	/**
1420	* check_head is a bit simplistic version of update_space below.
1421	* basically, it only checks the that the head on space ax,ay at layer
1422	* needs to get sent - if so, it adds the data, sending the head
1423	* if needed, and returning 1. If this no data needs to get
1424	* sent, it returns zero.
1425	*/
1426	static int
1427	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1428	{
1429	short face_num;
1430
1431	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1433	else
1434	face_num = 0;
1435
1436	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1437	{
1438	sl << uint16 (face_num);
1439	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1440	esrv_send_face (&ns, face_num, 0);
1441
1442	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1443	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1444	return 1;
1445	}
1446
1447	return 0; /* No change */
1448	}
1449		1174
1450	/**	1175	/**
1451	* Removes the need to replicate the same code for each layer.	1176	* Removes the need to replicate the same code for each layer.
1452	* 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
1453	* it was.	1178	* it was.
…		…
1464	* numbers the spaces differently - I think this was a leftover from	1189	* numbers the spaces differently - I think this was a leftover from
1465	* the map command, where the faces stack up. Sinces that is no longer	1190	* the map command, where the faces stack up. Sinces that is no longer
1466	* the case, it seems to make more sense to have these layer values	1191	* the case, it seems to make more sense to have these layer values
1467	* actually match.	1192	* actually match.
1468	*/	1193	*/
1469
1470	static int	1194	static int
1471	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)
1472	{	1196	{
1473	object ob, head;
1474	uint16 face_num;	1197	uint16 face_num;
1475	int bx, by, i;	1198	int bx, by, i;
1476		1199
1477	/* If there is a multipart object stored away, treat that as more important.
1478	* If not, then do the normal processing.
1479	*/
1480	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1481
1482	/* Check to see if this head is part of the set of objects
1483	* we would normally send for this space. If so, then
1484	* don't use the head value. We need to do the check
1485	* here and not when setting up the heads[] value for two reasons -
1486	* 1) the heads[] values will get used even if the space is not visible.
1487	* 2) its possible the head is not on the same map as a part, and I'd
1488	* rather not need to do the map translation overhead.
1489	* 3) We need to do some extra checking to make sure that we will
1490	* otherwise send the image as this layer, eg, either it matches
1491	* the head value, or is not multipart.
1492	*/
1493	if (head && !head->more)
1494	{
1495	for (i = 0; i < MAP_LAYERS; i++)
1496	{
1497	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1498	if (!ob)
1499	continue;
1500
1501	if (ob->head)
1502	ob = ob->head;
1503
1504	if (ob == head)
1505	{
1506	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1507	head = NULL;
1508	break;
1509	}
1510	}
1511	}
1512
1513	ob = head;
1514	if (!ob)
1515	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1516		1201
1517	/* 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
1518	* is the blank face, set the face number to zero.	1203	* is the blank face, set the face number to zero.
1519	* 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
1520	* precedence over the other object for this space.	1205	* precedence over the other object for this space.
1521	* otherwise, we do special head processing	1206	* otherwise, we do special head processing
1522	*/	1207	*/
1523	if (!ob \|\| ob->face == blank_face)	1208	if (!ob \|\| ob->face == blank_face)
1524	face_num = 0;	1209	face_num = 0;
1525	else if (head)
1526	{
1527	/* if this is a head that had previously been stored */
1528	face_num = ob->face->number;
1529	}
1530	else	1210	else
1531	{
1532	/* if the faces for the different parts of a multipart object
1533	* are the same, we only want to send the bottom right most
1534	* portion of the object. That info is in the tail_.. values
1535	* of the head. Note that for the head itself, ob->head will
1536	* be null, so we only do this block if we are working on
1537	* a tail piece.
1538	*/
1539
1540	/* tail_x and tail_y will only be set in the head object. If
1541	* this is the head object and these are set, we proceed
1542	* with logic to only send bottom right. Similarly, if
1543	* this is one of the more parts but the head has those values
1544	* set, we want to do the processing. There can be cases where
1545	* the head is not visible but one of its parts is, so we just
1546	* can always expect that ob->arch->tail_x will be true for all
1547	* object we may want to display.
1548	*/
1549	if ((ob->arch->tail_x \|\| ob->arch->tail_y) \|\| (ob->head && (ob->head->arch->tail_x \|\| ob->head->arch->tail_y)))
1550	{
1551
1552	if (ob->head)
1553	head = ob->head;
1554	else
1555	head = ob;
1556
1557	/* Basically figure out where the offset is from where we are right
1558	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1559	* piece is from the head, and the tail is where the tail is from the
1560	* head. Note that bx and by will equal sx and sy if we are already working
1561	* on the bottom right corner. If ob is the head, the clone values
1562	* will be zero, so the right thing will still happen.
1563	*/
1564	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1565	by = sy + head->arch->tail_y - ob->arch->clone.y;
1566
1567	/* I don't think this can ever happen, but better to check for it just
1568	* in case.
1569	*/
1570	if (bx < sx \|\| by < sy)
1571	{
1572	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1573	face_num = 0;
1574	}
1575	/* single part object, multipart object with non merged faces,
1576	* of multipart object already at lower right.
1577	*/
1578	else if (bx == sx && by == sy)
1579	{
1580	face_num = ob->face->number;
1581
1582	/* if this face matches one stored away, clear that one away.
1583	* this code relies on the fact that the map1 commands
1584	* goes from 2 down to 0.
1585	*/
1586	for (i = 0; i < MAP_LAYERS; i++)
1587	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1588	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1589	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1590	}
1591	else
1592	{
1593	/* If this head is stored away, clear it - otherwise,
1594	* there can be cases where a object is on multiple layers -
1595	* we only want to send it once.
1596	*/
1597	face_num = head->face->number;
1598	for (i = 0; i < MAP_LAYERS; i++)
1599	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1600	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1601	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1602
1603	/* First, try to put the new head on the same layer. If that is used up,
1604	* then find another layer.
1605	*/
1606	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1607	{
1608	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1609	}
1610	else
1611	for (i = 0; i < MAX_LAYERS; i++)
1612	{
1613	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL \|\|
1614	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1615	{
1616	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1617	}
1618	}
1619	face_num = 0; /* Don't send this object - we'll send the head later */
1620	}
1621	}
1622	else
1623	{
1624	/* 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,
1625	* so nothing special	1212	* so nothing special
1626	*/
1627	face_num = ob->face->number;
1628
1629	/* clear out any head entries that have the same face as this one */
1630	for (bx = 0; bx < layer; bx++)
1631	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1632	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1633	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1634	}
1635	} /* else not already head object or blank face */
1636
1637	/* This is a real hack. Basically, if we have nothing to send for this layer,
1638	* but there is a head on the next layer, send that instead.
1639	* Without this, what happens is you can get the case where the player stands
1640	* on the same space as the head. However, if you have overlapping big objects
1641	* of the same type, what happens then is it doesn't think it needs to send
1642	* This tends to make stacking also work/look better.
1643	*/	1213	*/
1644	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1645	{
1646	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1647	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1648	}
1649
1650	/* Another hack - because of heads and whatnot, this face may match one
1651	* we already sent for a lower layer. In that case, don't send
1652	* this one.
1653	*/
1654	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1655	face_num = 0;	1214	face_num = ob->face;
1656		1215
1657	/* 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
1658	* 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.
1659	*/	1218	*/
1660	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
…		…
1687	* holds the old values.	1246	* holds the old values.
1688	* 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
1689	* 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
1690	* take.	1249	* take.
1691	*/	1250	*/
1692
1693	static inline int	1251	static inline int
1694	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)
1695	{	1253	{
1696	object *ob;	1254	object *ob;
1697	int smoothlevel; /* old face_num; */	1255	int smoothlevel; /* old face_num; */
1698		1256
1699	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1700		1258
1701	/* 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
1702	* is the blank face, set the smoothlevel to zero.	1260	* is the blank face, set the smoothlevel to zero.
1703	*/	1261	*/
1704	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1262	if (!ob \|\| ob->face == blank_face)
1705	smoothlevel = 0;	1263	smoothlevel = 0;
1706	else	1264	else
1707	{	1265	{
1708	smoothlevel = ob->smoothlevel;	1266	smoothlevel = ob->smoothlevel;
1709	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1710	SendSmooth (&ns, ob->face->number);	1268	SendSmooth (&ns, ob->face);
1711	} /* else not already head object or blank face */	1269	} /* else not already head object or blank face */
1712		1270
1713	/* 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
1714	* 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.
1715	*/	1273	*/
…		…
1733	* 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
1734	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries	1292	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
1735	* available.	1293	* available.
1736	*/	1294	*/
1737	int	1295	int
1738	getExtendedMapInfoSize (client_socket * ns)	1296	getExtendedMapInfoSize (client * ns)
1739	{	1297	{
1740	int result = 0;	1298	int result = 0;
1741		1299
1742	if (ns->ext_mapinfos)	1300	if (ns->ext_mapinfos)
1743	{	1301	{
1744	if (ns->EMI_smooth)	1302	if (ns->EMI_smooth)
1745	result += 1; /One byte for smoothlevel /	1303	result += 1; /One byte for smoothlevel /
1746	}	1304	}
		1305
1747	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);
1748	}	1329	}
1749		1330
1750	/**	1331	/**
1751	* 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
1752	* 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
…		…
1758	* 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
1759	* 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,
1760	* 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
1761	* of what we send, see the doc/Protocol file.	1342	* of what we send, see the doc/Protocol file.
1762	* I will describe internally what we do:	1343	* I will describe internally what we do:
1763	* 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.
1764	* 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
1765	* maximum viewable size (As set in config.h).	1346	* maximum viewable size (As set in config.h).
1766	* in the cells, there are faces and a count value.	1347	* in the cells, there are faces and a count value.
1767	* we use the count value to hold the darkness value. If -1, then this space	1348	* we use the count value to hold the darkness value. If -1, then this space
1768	* is not viewable.	1349	* is not viewable.
…		…
1779	uint8 eentrysize;	1360	uint8 eentrysize;
1780	uint16 ewhatstart, ewhatflag;	1361	uint16 ewhatstart, ewhatflag;
1781	uint8 extendedinfos;	1362	uint8 extendedinfos;
1782	maptile *m;	1363	maptile *m;
1783		1364
1784	client_socket &socket = *pl->contr->socket;	1365	client &socket = *pl->contr->ns;
		1366
		1367	if (!pl->active)
		1368	return;
1785		1369
1786	check_map_change (pl->contr);	1370	check_map_change (pl->contr);
		1371	prefetch_surrounding_maps (pl);
1787		1372
1788	packet sl;	1373	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1789	packet esl;	1374	packet esl;
1790		1375
1791	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1792	startlen = sl.length ();	1376	startlen = sl.length ();
1793		1377
1794	/Extendedmapinfo structure initialisation /	1378	/Extendedmapinfo structure initialisation /
1795	if (socket.ext_mapinfos)	1379	if (socket.ext_mapinfos)
1796	{	1380	{
…		…
1815	ewhatstart = 0;	1399	ewhatstart = 0;
1816	ewhatflag = 0;	1400	ewhatflag = 0;
1817	estartlen = 0;	1401	estartlen = 0;
1818	}	1402	}
1819		1403
1820	/* Init data to zero */
1821	memset (heads, 0, sizeof (object ) MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1822
1823	/* x,y are the real map locations. ax, ay are viewport relative	1404	/* x,y are the real map locations. ax, ay are viewport relative
1824	* locations.	1405	* locations.
1825	*/	1406	*/
1826	ay = 0;	1407	ay = 0;
1827		1408
…		…
1829	* but that started to get a bit messy to look at.	1410	* but that started to get a bit messy to look at.
1830	*/	1411	*/
1831	max_x = pl->x + (socket.mapx + 1) / 2;	1412	max_x = pl->x + (socket.mapx + 1) / 2;
1832	max_y = pl->y + (socket.mapy + 1) / 2;	1413	max_y = pl->y + (socket.mapy + 1) / 2;
1833		1414
1834	if (socket.mapmode == Map1aCmd)
1835	{
1836	max_x += MAX_HEAD_OFFSET;
1837	max_y += MAX_HEAD_OFFSET;
1838	}
1839
1840	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1415	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1841	{	1416	{
1842	ax = 0;	1417	ax = 0;
1843	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1418	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1844	{	1419	{
1845
1846	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1420	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1847
1848	/* If this space is out of the normal viewable area, we only check
1849	* the heads value ax or ay will only be greater than what
1850	* the client wants if using the map1a command - this is because
1851	* if the map1a command is not used, max_x and max_y will be
1852	* set to lower values.
1853	*/
1854	if (ax >= socket.mapx \|\| ay >= socket.mapy)
1855	{
1856	int i, got_one;
1857
1858	oldlen = sl.length ();
1859
1860	sl << uint16 (mask);
1861
1862	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1863	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1864	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1865
1866	/* If all we are doing is sending 0 (blank) faces, we don't
1867	* actually need to send that - just the coordinates
1868	* with no faces tells the client to blank out the
1869	* space.
1870	*/
1871	got_one = 0;
1872	for (i = oldlen + 2; i < sl.length (); i++)
1873	if (sl.buf[i])
1874	got_one = 1;
1875
1876	if (got_one && (mask & 0xf))
1877	sl.buf[oldlen + 1] = mask & 0xff;
1878	else
1879	{ /either all faces blank, either no face at all /
1880	if (mask & 0xf) /at least 1 face, we know it's blank, only send coordinates /
1881	sl.reset (oldlen + 2);
1882	else
1883	sl.reset (oldlen);
1884	}
1885
1886	/*What concerns extendinfos, nothing to be done for now
1887	* (perhaps effects layer later)
1888	*/
1889	continue; /* don't do processing below */
1890	}
1891		1421
1892	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1893		1423
1894	d = pl->contr->blocked_los[ax][ay];	1424	d = pl->contr->blocked_los[ax][ay];
1895		1425
…		…
1907	* of the map, it shouldn't have a head	1437	* of the map, it shouldn't have a head
1908	*/	1438	*/
1909	if (lastcell.count != -1)	1439	if (lastcell.count != -1)
1910	{	1440	{
1911	sl << uint16 (mask);	1441	sl << uint16 (mask);
1912	map_clearcell (&lastcell, 0, 0, 0, -1);	1442	map_clearcell (&lastcell, -1);
1913	}	1443	}
1914	}	1444	}
1915	else if (d > 3)	1445	else if (d > 3)
1916	{	1446	{
		1447	m->touch ();
		1448
1917	int need_send = 0, count;	1449	int need_send = 0, count;
1918		1450
1919	/* This block deals with spaces that are not visible for whatever	1451	/* This block deals with spaces that are not visible for whatever
1920	* reason. Still may need to send the head for this space.	1452	* reason. Still may need to send the head for this space.
1921	*/	1453	*/
1922		1454
1923	oldlen = sl.length ();	1455	oldlen = sl.length ();
1924		1456
1925	sl << uint16 (mask);	1457	sl << uint16 (mask);
…		…
1927	if (lastcell.count != -1)	1459	if (lastcell.count != -1)
1928	need_send = 1;	1460	need_send = 1;
1929		1461
1930	count = -1;	1462	count = -1;
1931		1463
1932	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1933	{
1934	/* Now check to see if any heads need to be sent */
1935
1936	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1937	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1938	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1939
1940	lastcell.count = count;
1941	}
1942	else
1943	{
1944	/* properly clear a previously sent big face */	1464	/* properly clear a previously sent big face */
1945	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0	1465	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0
1946	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)	1466	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1947	need_send = 1;	1467	need_send = 1;
1948		1468
1949	map_clearcell (&lastcell, 0, 0, 0, count);	1469	map_clearcell (&lastcell, count);
1950	}
1951		1470
1952	if ((mask & 0xf) \|\| need_send)	1471	if ((mask & 0xf) \|\| need_send)
1953	sl.buf[oldlen + 1] = mask & 0xff;	1472	sl[oldlen + 1] = mask & 0xff;
1954	else	1473	else
1955	sl.reset (oldlen);	1474	sl.reset (oldlen);
1956	}	1475	}
1957	else	1476	else
1958	{	1477	{
		1478	m->touch ();
		1479
1959	/* In this block, the space is visible or there are head objects	1480	/* In this block, the space is visible.
1960	* we need to send.
1961	*/	1481	*/
1962		1482
1963	/* Rather than try to figure out what everything that we might	1483	/* Rather than try to figure out what everything that we might
1964	* need to send is, then form the packet after that,	1484	* need to send is, then form the packet after that,
1965	* we presume that we will in fact form a packet, and update	1485	* we presume that we will in fact form a packet, and update
…		…
1988	mask \|= 0x8;	1508	mask \|= 0x8;
1989		1509
1990	if (socket.extmap)	1510	if (socket.extmap)
1991	{	1511	{
1992	*last_ext \|= 0x80;	1512	*last_ext \|= 0x80;
1993	last_ext = sl.buf + sl.length ();	1513	last_ext = &sl[sl.length ()];
1994	sl << uint8 (d);	1514	sl << uint8 (d);
1995	}	1515	}
1996	else	1516	else
1997	sl << uint8 (255 - 64 * d);	1517	sl << uint8 (255 - 64 * d);
1998	}	1518	}
…		…
2032	{	1552	{
2033	lastcell.stat_hp = stat_hp;	1553	lastcell.stat_hp = stat_hp;
2034		1554
2035	mask \|= 0x8;	1555	mask \|= 0x8;
2036	*last_ext \|= 0x80;	1556	*last_ext \|= 0x80;
2037	last_ext = sl.buf + sl.length ();	1557	last_ext = &sl[sl.length ()];
2038		1558
2039	sl << uint8 (5) << uint8 (stat_hp);	1559	sl << uint8 (5) << uint8 (stat_hp);
2040		1560
2041	if (stat_width > 1)	1561	if (stat_width > 1)
2042	{	1562	{
2043	*last_ext \|= 0x80;	1563	*last_ext \|= 0x80;
2044	last_ext = sl.buf + sl.length ();	1564	last_ext = &sl[sl.length ()];
2045		1565
2046	sl << uint8 (6) << uint8 (stat_width);	1566	sl << uint8 (6) << uint8 (stat_width);
2047	}	1567	}
2048	}	1568	}
2049		1569
…		…
2051	{	1571	{
2052	lastcell.player = player;	1572	lastcell.player = player;
2053		1573
2054	mask \|= 0x8;	1574	mask \|= 0x8;
2055	*last_ext \|= 0x80;	1575	*last_ext \|= 0x80;
2056	last_ext = sl.buf + sl.length ();	1576	last_ext = &sl[sl.length ()];
2057		1577
2058	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1578	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2059	}	1579	}
2060		1580
2061	if (lastcell.flags != flags)	1581	if (lastcell.flags != flags)
2062	{	1582	{
2063	lastcell.flags = flags;	1583	lastcell.flags = flags;
2064		1584
2065	mask \|= 0x8;	1585	mask \|= 0x8;
2066	*last_ext \|= 0x80;	1586	*last_ext \|= 0x80;
2067	last_ext = sl.buf + sl.length ();	1587	last_ext = &sl[sl.length ()];
2068		1588
2069	sl << uint8 (8) << uint8 (flags);	1589	sl << uint8 (8) << uint8 (flags);
2070	}	1590	}
2071	}	1591	}
2072		1592
…		…
2086	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1606	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2087	emask \|= 0x2;	1607	emask \|= 0x2;
2088		1608
2089	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	1609	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2090	{	1610	{
2091	if (lastcell.faces[0] != pl->face->number)	1611	if (lastcell.faces[0] != pl->face)
2092	{	1612	{
2093	lastcell.faces[0] = pl->face->number;	1613	lastcell.faces[0] = pl->face;
2094	mask \|= 0x1;	1614	mask \|= 0x1;
2095		1615
2096	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))	1616	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
2097	esrv_send_face (&socket, pl->face->number, 0);	1617	esrv_send_face (&socket, pl->face, 0);
2098		1618
2099	sl << uint16 (pl->face->number);	1619	sl << uint16 (pl->face);
2100	}	1620	}
2101	}	1621	}
2102	else	1622	else
2103	{	1623	{
2104	/* Top face */	1624	/* Top face */
…		…
2114	* space by checking the mask. If so, update the mask.	1634	* space by checking the mask. If so, update the mask.
2115	* if not, reset the len to that from before adding the mask	1635	* if not, reset the len to that from before adding the mask
2116	* value, so we don't send those bits.	1636	* value, so we don't send those bits.
2117	*/	1637	*/
2118	if (mask & 0xf)	1638	if (mask & 0xf)
2119	sl.buf[oldlen + 1] = mask & 0xff;	1639	sl[oldlen + 1] = mask & 0xff;
2120	else	1640	else
2121	sl.reset (oldlen);	1641	sl.reset (oldlen);
2122		1642
2123	if (emask & 0xf)	1643	if (emask & 0xf)
2124	esl.buf[eoldlen + 1] = emask & 0xff;	1644	esl[eoldlen + 1] = emask & 0xff;
2125	else	1645	else
2126	esl.reset (eoldlen);	1646	esl.reset (eoldlen);
2127	} /* else this is a viewable space */	1647	} /* else this is a viewable space */
2128	} /* for x loop */	1648	} /* for x loop */
2129	} /* for y loop */	1649	} /* for y loop */
…		…
2135	{	1655	{
2136	/* No map data will follow, so don't say the client	1656	/* No map data will follow, so don't say the client
2137	* it doesn't need draw!	1657	* it doesn't need draw!
2138	*/	1658	*/
2139	ewhatflag &= (~EMI_NOREDRAW);	1659	ewhatflag &= (~EMI_NOREDRAW);
2140	esl.buf[ewhatstart + 1] = ewhatflag & 0xff;	1660	esl[ewhatstart + 1] = ewhatflag & 0xff;
2141	}	1661	}
2142		1662
2143	if (esl.length () > estartlen)	1663	if (esl.length () > estartlen)
2144	Send_With_Handling (&socket, &esl);	1664	socket.send_packet (esl);
2145	}	1665	}
2146		1666
2147	if (sl.length () > startlen \|\| socket.sent_scroll)	1667	if (sl.length () > startlen \|\| socket.sent_scroll)
2148	{	1668	{
2149	Send_With_Handling (&socket, &sl);	1669	socket.send_packet (sl);
2150	socket.sent_scroll = 0;	1670	socket.sent_scroll = 0;
2151	}	1671	}
2152	}	1672	}
2153		1673
2154	/**	1674	/**
…		…
2156	*/	1676	*/
2157	void	1677	void
2158	draw_client_map (object *pl)	1678	draw_client_map (object *pl)
2159	{	1679	{
2160	int i, j;	1680	int i, j;
2161	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1681	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2162	New_Face face, floor;
2163	New_Face *floor2;
2164	int d, mflags;	1682	int mflags;
2165	struct Map newmap;	1683	struct Map newmap;
2166	maptile m, pm;	1684	maptile m, pm;
2167		1685
2168	if (pl->type != PLAYER)	1686	if (pl->type != PLAYER)
2169	{	1687	{
…		…
2180	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1698	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2181	return;	1699	return;
2182		1700
2183	memset (&newmap, 0, sizeof (struct Map));	1701	memset (&newmap, 0, sizeof (struct Map));
2184		1702
2185	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1703	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2186	{
2187	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1704	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2188	{	1705	{
2189	ax = i;	1706	ax = i;
2190	ay = j;	1707	ay = j;
2191	m = pm;	1708	m = pm;
2192	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1709	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		1710
2193	if (mflags & P_OUT_OF_MAP)	1711	if (mflags & P_OUT_OF_MAP)
2194	continue;	1712	continue;
2195	if (mflags & P_NEED_UPDATE)	1713
2196	update_position (m, ax, ay);
2197	/* If a map is visible to the player, we don't want to swap it out	1714	/* If a map is visible to the player, we don't want to swap it out
2198	* just to reload it. This should really call something like	1715	* just to reload it. This should really call something like
2199	* swap_map, but this is much more efficient and 'good enough'	1716	* swap_map, but this is much more efficient and 'good enough'
2200	*/	1717	*/
2201	if (mflags & P_NEW_MAP)	1718	if (mflags & P_NEW_MAP)
2202	m->timeout = 50;	1719	m->timeout = 50;
2203	}	1720	}
2204	}	1721
2205	/* do LOS after calls to update_position */	1722	/* do LOS after calls to update_position */
2206	if (pl->contr->do_los)	1723	if (pl->contr->do_los)
2207	{	1724	{
2208	update_los (pl);	1725	update_los (pl);
2209	pl->contr->do_los = 0;	1726	pl->contr->do_los = 0;
…		…
2224		1741
2225	/*****************************************************************************/	1742	/*****************************************************************************/
2226	void	1743	void
2227	send_plugin_custom_message (object pl, char buf)	1744	send_plugin_custom_message (object pl, char buf)
2228	{	1745	{
2229	pl->contr->socket->send_packet (buf);	1746	pl->contr->ns->send_packet (buf);
2230	}	1747	}
2231		1748
2232	/**	1749	/**
2233	* This sends the skill number to name mapping. We ignore	1750	* This sends the skill number to name mapping. We ignore
2234	* the params - we always send the same info no matter what.	1751	* the params - we always send the same info no matter what.
2235	*/	1752	*/
2236	void	1753	void
2237	send_skill_info (client_socket ns, char params)	1754	send_skill_info (client ns, char params)
2238	{	1755	{
2239	packet sl;	1756	packet sl;
2240	sl << "replyinfo skill_info\n";	1757	sl << "replyinfo skill_info\n";
2241		1758
2242	for (int i = 1; i < NUM_SKILLS; i++)	1759	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2246	{	1763	{
2247	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1764	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2248	fatal (0);	1765	fatal (0);
2249	}	1766	}
2250		1767
2251	Send_With_Handling (ns, &sl);	1768	ns->send_packet (sl);
2252	}	1769	}
2253		1770
2254	/**	1771	/**
2255	* This sends the spell path to name mapping. We ignore	1772	* This sends the spell path to name mapping. We ignore
2256	* the params - we always send the same info no matter what.	1773	* the params - we always send the same info no matter what.
2257	*/	1774	*/
2258	void	1775	void
2259	send_spell_paths (client_socket * ns, char *params)	1776	send_spell_paths (client * ns, char *params)
2260	{	1777	{
2261	packet sl;	1778	packet sl;
2262		1779
2263	sl << "replyinfo spell_paths\n";	1780	sl << "replyinfo spell_paths\n";
2264		1781
…		…
2269	{	1786	{
2270	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1787	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2271	fatal (0);	1788	fatal (0);
2272	}	1789	}
2273		1790
2274	Send_With_Handling (ns, &sl);	1791	ns->send_packet (sl);
2275	}	1792	}
2276		1793
2277	/**	1794	/**
2278	* This looks for any spells the player may have that have changed their stats.	1795	* This looks for any spells the player may have that have changed their stats.
2279	* it then sends an updspell packet for each spell that has changed in this way	1796	* it then sends an updspell packet for each spell that has changed in this way
2280	*/	1797	*/
2281	void	1798	void
2282	esrv_update_spells (player *pl)	1799	esrv_update_spells (player *pl)
2283	{	1800	{
		1801	if (!pl->ns)
		1802	return;
		1803
2284	if (!pl->socket->monitor_spells)	1804	if (!pl->ns->monitor_spells)
2285	return;	1805	return;
2286		1806
2287	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1807	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2288	{	1808	{
2289	if (spell->type == SPELL)	1809	if (spell->type == SPELL)
…		…
2319		1839
2320	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1840	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2321	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1841	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2322	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1842	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2323		1843
2324	Send_With_Handling (pl->socket, &sl);	1844	pl->ns->send_packet (sl);
2325	}	1845	}
2326	}	1846	}
2327	}	1847	}
2328	}	1848	}
2329		1849
2330	void	1850	void
2331	esrv_remove_spell (player pl, object spell)	1851	esrv_remove_spell (player pl, object spell)
2332	{	1852	{
2333	if (!pl->socket->monitor_spells)	1853	if (!pl->ns->monitor_spells)
2334	return;	1854	return;
2335		1855
2336	if (!pl \|\| !spell \|\| spell->env != pl->ob)	1856	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2337	{	1857	{
2338	LOG (llevError, "Invalid call to esrv_remove_spell");	1858	LOG (llevError, "Invalid call to esrv_remove_spell");
2339	return;	1859	return;
2340	}	1860	}
2341		1861
2342	packet sl;	1862	packet sl ("delspell");
2343		1863
2344	sl << "delspell "
2345	<< uint32 (spell->count);	1864	sl << uint32 (spell->count);
2346		1865
2347	Send_With_Handling (pl->socket, &sl);	1866	pl->ns->send_packet (sl);
2348	}	1867	}
2349		1868
2350	/* appends the spell spell to the Socklist we will send the data to. /	1869	/* appends the spell spell to the Socklist we will send the data to. /
2351	static void	1870	static void
2352	append_spell (player pl, packet &sl, object spell)	1871	append_spell (player pl, packet &sl, object spell)
2353	{	1872	{
2354	int len, i, skill = 0;	1873	int i, skill = 0;
2355		1874
2356	if (!(spell->name))	1875	if (!(spell->name))
2357	{	1876	{
2358	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1877	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2359	return;	1878	return;
…		…
2371	if (!strcmp (spell->skill, skill_names[i]))	1890	if (!strcmp (spell->skill, skill_names[i]))
2372	{	1891	{
2373	skill = i + CS_STAT_SKILLINFO;	1892	skill = i + CS_STAT_SKILLINFO;
2374	break;	1893	break;
2375	}	1894	}
		1895	}
		1896
		1897	// spells better have a face
		1898	if (!spell->face)
		1899	{
		1900	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1901	spell->face = face_find ("burnout.x11", blank_face);
2376	}	1902	}
2377		1903
2378	/* send the current values */	1904	/* send the current values */
2379	sl << uint32 (spell->count)	1905	sl << uint32 (spell->count)
2380	<< uint16 (spell->level)	1906	<< uint16 (spell->level)
…		…
2382	<< uint16 (spell->last_sp)	1908	<< uint16 (spell->last_sp)
2383	<< uint16 (spell->last_grace)	1909	<< uint16 (spell->last_grace)
2384	<< uint16 (spell->last_eat)	1910	<< uint16 (spell->last_eat)
2385	<< uint8 (skill)	1911	<< uint8 (skill)
2386	<< uint32 (spell->path_attuned)	1912	<< uint32 (spell->path_attuned)
2387	<< uint32 (spell->face ? spell->face->number : 0)	1913	<< uint32 (spell->face)
2388	<< data8 (spell->name)	1914	<< data8 (spell->name)
2389	<< data16 (spell->msg);	1915	<< data16 (spell->msg);
2390	}	1916	}
2391		1917
2392	/**	1918	/**
…		…
2400	{	1926	{
2401	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1927	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2402	return;	1928	return;
2403	}	1929	}
2404		1930
2405	if (!pl->socket->monitor_spells)	1931	if (!pl->ns->monitor_spells)
2406	return;	1932	return;
2407		1933
2408	packet sl;	1934	packet sl ("addspell");
2409
2410	sl << "addspell ";
2411		1935
2412	if (!spell)	1936	if (!spell)
2413	{	1937	{
2414	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1938	for (spell = pl->ob->inv; spell; spell = spell->below)
2415	{	1939	{
2416	/* were we to simply keep appending data here, we could exceed	1940	/* were we to simply keep appending data here, we could exceed
2417	* MAXSOCKBUF if the player has enough spells to add, we know that	1941	* MAXSOCKBUF if the player has enough spells to add, we know that
2418	* append_spells will always append 19 data bytes, plus 4 length	1942	* append_spells will always append 19 data bytes, plus 4 length
2419	* bytes and 3 strings (because that is the spec) so we need to	1943	* bytes and 3 strings (because that is the spec) so we need to
…		…
2429	if (spell->type != SPELL)	1953	if (spell->type != SPELL)
2430	continue;	1954	continue;
2431		1955
2432	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1956	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2433	{	1957	{
2434	Send_With_Handling (pl->socket, &sl);	1958	pl->ns->send_packet (sl);
2435		1959
2436	sl.reset ();	1960	sl.reset ();
2437	sl << "addspell ";	1961	sl << "addspell ";
2438	}	1962	}
2439		1963
…		…
2453	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1977	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2454	fatal (0);	1978	fatal (0);
2455	}	1979	}
2456		1980
2457	/* finally, we can send the packet */	1981	/* finally, we can send the packet */
2458	Send_With_Handling (pl->socket, &sl);	1982	pl->ns->send_packet (sl);
2459	}	1983	}
2460		1984

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.36 by root, Thu Dec 14 04:30:33 2006 UTC vs. Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.36 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC