ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC vs.
Revision 1.176 by root, Thu Apr 29 15:59:10 2010 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
…		…
41		44
42	#include <global.h>	45	#include <global.h>
43	#include <sproto.h>	46	#include <sproto.h>
44		47
45	#include <living.h>	48	#include <living.h>
46	#include <commands.h>
47		49
48	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	51	* it should work here.
50	*/	52	*/
51	#include <sys/types.h>	53	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	66	* program to the value we use when sending STATS command to the
65	* client. If a value is -1, then we don't send that to the	67	* client. If a value is -1, then we don't send that to the
66	* client.	68	* client.
67	*/	69	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
76	-1 /* Chaos */ , -1 /* Counterspell */ ,	78	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
79	-1, /* Internal */	95	-1, /* Internal */
80	-1, /* life stealing */	96	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
82	};	98	};
…		…
98	*/	114	*/
99	mx = ns->mapx;	115	mx = ns->mapx;
100	my = ns->mapy;	116	my = ns->mapy;
101		117
102	/* the x and y here are coordinates for the new map, i.e. if we moved	118	/* the x and y here are coordinates for the new map, i.e. if we moved
103	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	119	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104	* if the destination x or y coordinate is outside the viewable	120	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	121	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	122	* are preserved, and the check_head thinks it needs to clear them.
107	*/	123	*/
108	for (x = 0; x < mx; x++)	124	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	125	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx || y >= ns->mapy)	126	if (x >= ns->mapx || y >= ns->mapy)
113	/* clear cells outside the viewable area */	127	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	128	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)	129	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116	/* clear newly visible tiles within the viewable area */	130	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	131	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	132	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	133	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		134
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	135	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		136
125	/* Make sure that the next "map1" command will be sent (even if it is	137	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	138	* empty).
…		…
141	pl->ns->send_packet ("newmap");	153	pl->ns->send_packet ("newmap");
142		154
143	pl->ns->floorbox_reset ();	155	pl->ns->floorbox_reset ();
144	}	156	}
145		157
		158	static void
		159	send_map_info (player *pl)
		160	{
		161	client &socket = *pl->ns;
		162	object *ob = pl->viewpoint;
		163
		164	if (socket.mapinfocmd)
		165	{
		166	if (ob->map && ob->map->path[0])
		167	{
		168	int flags = 0;
		169
		170	if (ob->map->tile_path[0]) flags |= 1;
		171	if (ob->map->tile_path[1]) flags |= 2;
		172	if (ob->map->tile_path[2]) flags |= 4;
		173	if (ob->map->tile_path[3]) flags |= 8;
		174
		175	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		176	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		177	ob->map->width, ob->map->height, &ob->map->path);
		178	}
		179	else
		180	socket.send_packet ("mapinfo current");
		181	}
		182	}
		183
146	/** check for map/region change and send new map data */	184	/** check for map/region change and send new map data */
147	static void	185	static void
148	check_map_change (player *pl)	186	check_map_change (player *pl)
149	{	187	{
150	client &socket = *pl->ns;	188	client &socket = *pl->ns;
151	object *ob = pl->observe;	189	object *ob = pl->viewpoint;
		190
		191	region *reg = ob->region ();
		192	if (socket.current_region != reg)
		193	{
		194	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		195	socket.current_region = reg;
		196	}
		197
		198	// first try to aovid a full newmap on tiled map scrolls
		199	if (socket.current_map != ob->map && !socket.force_newmap)
		200	{
		201	rv_vector rv;
		202
		203	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		204
		205	// manhattan distance is very handy here
		206	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		207	{
		208	socket.current_map = ob->map;
		209	socket.current_x = ob->x;
		210	socket.current_y = ob->y;
		211
		212	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		213	socket.floorbox_reset ();
		214	send_map_info (pl);
		215	}
		216	}
152		217
153	if (socket.current_map != ob->map || socket.force_newmap)	218	if (socket.current_map != ob->map || socket.force_newmap)
154	{	219	{
155	clear_map (pl);	220	clear_map (pl);
156	socket.current_map = ob->map;	221	socket.current_map = ob->map;
157		222	send_map_info (pl);
158	if (socket.mapinfocmd)
159	{
160	if (ob->map && ob->map->path[0])
161	{
162	int flags = 0;
163
164	if (ob->map->tile_path[0]) flags |= 1;
165	if (ob->map->tile_path[1]) flags |= 2;
166	if (ob->map->tile_path[2]) flags |= 4;
167	if (ob->map->tile_path[3]) flags |= 8;
168
169	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171	ob->map->width, ob->map->height, &ob->map->path);
172	}
173	else
174	socket.send_packet ("mapinfo current");
175	}
176	}	223	}
177	else if (socket.current_x != ob->x || socket.current_y != ob->y)	224	else if (socket.current_x != ob->x || socket.current_y != ob->y)
178	{	225	{
179	int dx = ob->x - socket.current_x;	226	int dx = ob->x - socket.current_x;
180	int dy = ob->y - socket.current_y;	227	int dy = ob->y - socket.current_y;
181		228
182	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184	else
185	{
186	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	229	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187	socket.floorbox_reset ();	230	socket.floorbox_reset ();
188	}
189	}	231	}
190		232
191	socket.current_x = ob->x;	233	socket.current_x = ob->x;
192	socket.current_y = ob->y;	234	socket.current_y = ob->y;
		235	}
193		236
194	region *reg = ob->region ();	237	/**
195	if (socket.current_region != reg)	238	* This sends the skill number to name mapping. We ignore
196	{	239	* the params - we always send the same info no matter what.
197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	240	*/
198	socket.current_region = reg;	241	static void
199	}	242	send_skill_info (client *ns, char *params)
		243	{
		244	packet sl;
		245	sl << "replyinfo skill_info\n";
		246
		247	for (int i = 0; i < skillvec.size (); ++i)
		248	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		249
		250	if (sl.length () > MAXSOCKBUF)
		251	cleanup ("buffer overflow in send_skill_info!");
		252
		253	ns->send_packet (sl);
		254	}
		255
		256	/**
		257	* This sends the spell path to name mapping. We ignore
		258	* the params - we always send the same info no matter what.
		259	*/
		260	static void
		261	send_spell_paths (client * ns, char *params)
		262	{
		263	packet sl;
		264
		265	sl << "replyinfo spell_paths\n";
		266
		267	for (int i = 0; i < NRSPELLPATHS; i++)
		268	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		269
		270	if (sl.length () > MAXSOCKBUF)
		271	cleanup ("buffer overflow in send_spell_paths!");
		272
		273	ns->send_packet (sl);
200	}	274	}
201		275
202	/**	276	/**
203	* RequestInfo is sort of a meta command. There is some specific	277	* RequestInfo is sort of a meta command. There is some specific
204	* request of information, but we call other functions to provide	278	* request of information, but we call other functions to provide
…		…
217	{	291	{
218	*params++ = 0;	292	*params++ = 0;
219	break;	293	break;
220	}	294	}
221		295
222	if (!strcmp (buf, "image_info"))
223	send_image_info (ns, params);
224	else if (!strcmp (buf, "image_sums"))
225	send_image_sums (ns, params);
226	else if (!strcmp (buf, "skill_info"))	296	if (!strcmp (buf, "skill_info"))
227	send_skill_info (ns, params);	297	send_skill_info (ns, params);
228	else if (!strcmp (buf, "spell_paths"))	298	else if (!strcmp (buf, "spell_paths"))
229	send_spell_paths (ns, params);	299	send_spell_paths (ns, params);
230	else	300	else
231	{	301	{
…		…
247	ExtiCmd (char *buf, int len, client *ns)	317	ExtiCmd (char *buf, int len, client *ns)
248	{	318	{
249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	319	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250	}	320	}
251		321
		322	//-GPL
		323
252	void	324	void
253	client::mapinfo_queue_clear ()	325	client::mapinfo_queue_clear ()
254	{	326	{
255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	327	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256	free (*i);	328	free (*i);
…		…
263	{	335	{
264	char *token = buf;	336	char *token = buf;
265	buf += strlen (buf) + 9;	337	buf += strlen (buf) + 9;
266		338
267	// initial map and its origin	339	// initial map and its origin
268	maptile *map = pl->observe->map;	340	maptile *map = pl->viewpoint->map;
269	int mapx = pl->ns->mapx / 2 - pl->observe->x;	341	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270	int mapy = pl->ns->mapy / 2 - pl->observe->y;	342	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271	int max_distance = 8; // limit maximum path length to something generous	343	int max_distance = 8; // limit maximum path length to something generous
272		344
273	while (*buf && map && max_distance)	345	while (*buf && map && max_distance)
274	{	346	{
275	int dir = *buf++ - '1';	347	int dir = *buf++ - '1';
…		…
380	AddMeCmd (char *buf, int len, client *ns)	452	AddMeCmd (char *buf, int len, client *ns)
381	{	453	{
382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	454	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383	}	455	}
384		456
385	/** Reply to ExtendedInfos command */	457	//+GPL
386	void
387	ToggleExtendedInfos (char *buf, int len, client * ns)
388	{
389	char cmdback[MAX_BUF];
390	char command[50];
391	int info, nextinfo;
392
393	cmdback[0] = '\0';
394	nextinfo = 0;
395
396	while (1)
397	{
398	/* 1. Extract an info */
399	info = nextinfo;
400
401	while ((info < len) && (buf[info] == ' '))
402	info++;
403
404	if (info >= len)
405	break;
406
407	nextinfo = info + 1;
408
409	while ((nextinfo < len) && (buf[nextinfo] != ' '))
410	nextinfo++;
411
412	if (nextinfo - info >= 49) /*Erroneous info asked */
413	continue;
414
415	strncpy (command, &(buf[info]), nextinfo - info);
416
417	/* 2. Interpret info */
418	if (!strcmp ("smooth", command))
419	/* Toggle smoothing */
420	ns->EMI_smooth = !ns->EMI_smooth;
421	else
422	/*bad value */;
423
424	/*3. Next info */
425	}
426
427	strcpy (cmdback, "ExtendedInfoSet");
428
429	if (ns->EMI_smooth)
430	{
431	strcat (cmdback, " ");
432	strcat (cmdback, "smoothing");
433	}
434
435	ns->send_packet (cmdback);
436	}
437
438	/*
439	#define MSG_TYPE_BOOK 1
440	#define MSG_TYPE_CARD 2
441	#define MSG_TYPE_PAPER 3
442	#define MSG_TYPE_SIGN 4
443	#define MSG_TYPE_MONUMENT 5
444	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
445
446	/** Reply to ExtendedInfos command */
447	void
448	ToggleExtendedText (char *buf, int len, client * ns)
449	{
450	char cmdback[MAX_BUF];
451	char temp[10];
452	char command[50];
453	int info, nextinfo, i, flag;
454
455	cmdback[0] = '\0';
456
457	nextinfo = 0;
458	while (1)
459	{
460	/* 1. Extract an info */
461	info = nextinfo;
462
463	while ((info < len) && (buf[info] == ' '))
464	info++;
465
466	if (info >= len)
467	break;
468
469	nextinfo = info + 1;
470
471	while ((nextinfo < len) && (buf[nextinfo] != ' '))
472	nextinfo++;
473
474	if (nextinfo - info >= 49) /*Erroneous info asked */
475	continue;
476
477	strncpy (command, &(buf[info]), nextinfo - info);
478	command[nextinfo - info] = '\0';
479	/* 2. Interpret info */
480	i = sscanf (command, "%d", &flag);
481
482	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483	ns->supported_readables |= (1 << flag);
484	/*3. Next info */
485	}
486
487	/* Send resulting state */
488	strcpy (cmdback, "ExtendedTextSet");
489
490	for (i = 0; i <= MSG_TYPE_LAST; i++)
491	if (ns->supported_readables & (1 << i))
492	{
493	strcat (cmdback, " ");
494	snprintf (temp, sizeof (temp), "%d", i);
495	strcat (cmdback, temp);
496	}
497
498	ns->send_packet (cmdback);
499	}
500		458
501	/**	459	/**
502	* This handles the general commands from the client (ie, north, fire, cast,	460	* This handles the general commands from the client (ie, north, fire, cast,
503	* etc.)	461	* etc.)
504	*/	462	*/
…		…
517	return;	475	return;
518		476
519	buf++;	477	buf++;
520	}	478	}
521		479
522	execute_newserver_command (pl->ob, (char *) buf);	480	execute_newserver_command (pl->ob, (char *)buf);
523		481
524	/* Perhaps something better should be done with a left over count.	482	/* Perhaps something better should be done with a left over count.
525	* Cleaning up the input should probably be done first - all actions	483	* Cleaning up the input should probably be done first - all actions
526	* for the command that issued the count should be done before any other	484	* for the command that issued the count should be done before any other
527	* commands.	485	* commands.
…		…
561	* commands.	519	* commands.
562	*/	520	*/
563	pl->count = 0;	521	pl->count = 0;
564		522
565	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	523	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
566	int time = fabs (pl->ob->speed) < 0.001	524	int time = pl->ob->has_active_speed ()
567	? time = MAX_TIME * 100
568	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	525	? (int) (MAX_TIME / pl->ob->speed)
		526	: MAX_TIME * 100;
569		527
570	/* Send confirmation of command execution now */	528	/* Send confirmation of command execution now */
571	packet sl ("comc");	529	packet sl ("comc");
572	sl << uint16 (cmdid) << uint32 (time);	530	sl << uint16 (cmdid) << uint32 (time);
573	pl->ns->send_packet (sl);	531	pl->ns->send_packet (sl);
…		…
615	LOG (llevError, "Unknown input state: %d\n", ns->state);	573	LOG (llevError, "Unknown input state: %d\n", ns->state);
616	}	574	}
617	}	575	}
618		576
619	/**	577	/**
620	* Client tells its version. If there is a mismatch, we close the	578	* Client tells its version info.
621	* socket. In real life, all we should care about is the client having
622	* something older than the server. If we assume the client will be
623	* backwards compatible, having it be a later version should not be a
624	* problem.
625	*/	579	*/
626	void	580	void
627	VersionCmd (char *buf, int len, client * ns)	581	VersionCmd (char *buf, int len, client *ns)
628	{	582	{
629	if (!buf)	583	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
630	{
631	LOG (llevError, "CS: received corrupted version command\n");
632	return;
633	}
634
635	ns->cs_version = atoi (buf);
636	ns->sc_version = ns->cs_version;
637
638	LOG (llevDebug, "connection from client <%s>\n", buf);
639
640	//TODO: should log here just for statistics
641
642	//if (VERSION_CS != ns->cs_version)
643	// unchecked;
644
645	char *cp = strchr (buf + 1, ' ');
646	if (!cp)
647	return;
648
649	ns->sc_version = atoi (cp);
650
651	//if (VERSION_SC != ns->sc_version)
652	// unchecked;
653
654	cp = strchr (cp + 1, ' ');
655
656	if (cp)
657	{
658	ns->version = cp + 1;
659
660	if (ns->sc_version < 1026)
661	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
662	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
663	}
664	}	584	}
665		585
666	/** sound related functions. */	586	/** sound related functions. */
667	void	587	void
668	SetSound (char *buf, int len, client * ns)	588	SetSound (char *buf, int len, client * ns)
…		…
686	* syntax is: move (to) (tag) (nrof)	606	* syntax is: move (to) (tag) (nrof)
687	*/	607	*/
688	void	608	void
689	MoveCmd (char *buf, int len, player *pl)	609	MoveCmd (char *buf, int len, player *pl)
690	{	610	{
691	int vals[3], i;	611	int to, tag, nrof;
692		612
693	/* A little funky here. We only cycle for 2 records, because	613	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694	* we obviously are not going to find a space after the third
695	* record. Perhaps we should just replace this with a
696	* sscanf?
697	*/
698	for (i = 0; i < 2; i++)
699	{	614	{
700	vals[i] = atoi (buf);
701
702	if (!(buf = strchr (buf, ' ')))
703	{
704	LOG (llevError, "Incomplete move command: %s\n", buf);	615	LOG (llevError, "Incomplete move command: %s\n", buf);
705	return;	616	return;
706	}
707
708	buf++;
709	}	617	}
710		618
711	vals[2] = atoi (buf);	619	esrv_move_object (pl->ob, to, tag, nrof);
712
713	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715	}	620	}
716		621
717	/******************************************************************************	622	/******************************************************************************
718	*	623	*
719	* Start of commands the server sends to the client.	624	* Start of commands the server sends to the client.
…		…
734	* Get player's current range attack in obuf.	639	* Get player's current range attack in obuf.
735	*/	640	*/
736	static void	641	static void
737	rangetostring (player *pl, char *obuf)	642	rangetostring (player *pl, char *obuf)
738	{	643	{
739	dynbuf_text buf;	644	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		645
		646	#if 0
		647	// print ranged/chosen_skill etc. objects every call
		648	printf ("%s %s => %s (%s)\n",
		649	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		650	pl->combat_ob ? &pl->combat_ob->name : "-",
		651	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		652	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		653	);
		654	#endif
740		655
741	if (pl->ranged_ob)	656	if (pl->ranged_ob)
742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	657	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743		658
744	if (pl->combat_ob)	659	if (pl->combat_ob)
…		…
790	* commands for now.	705	* commands for now.
791	*/	706	*/
792	void	707	void
793	esrv_update_stats (player *pl)	708	esrv_update_stats (player *pl)
794	{	709	{
795	char buf[MAX_BUF];
796	uint16 flags;
797
798	client *ns = pl->ns;	710	client *ns = pl->ns;
799	if (!ns)	711	if (!ns)
800	return;	712	return;
801		713
802	object *ob = pl->observe;	714	object *ob = pl->observe;
…		…
819	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	731	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	732	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	733	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	734	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823		735
824	for (int s = 0; s < NUM_SKILLS; s++)	736	for (int s = 0; s < CS_NUM_SKILLS; s++)
825	if (object *skill = opl->last_skill_ob[s])	737	if (object *skill = opl->last_skill_ob [s])
826	if (skill->stats.exp != ns->last_skill_exp [s])	738	if (skill->stats.exp != ns->last_skill_exp [s])
827	{	739	{
828	ns->last_skill_exp [s] = skill->stats.exp;	740	ns->last_skill_exp [s] = skill->stats.exp;
829		741
830	/* Always send along the level if exp changes. This is only	742	/* Always send along the level if exp changes. This is only
831	* 1 extra byte, but keeps processing simpler.	743	* 1 extra byte, but keeps processing simpler.
832	*/	744	*/
833	sl << uint8 (s + CS_STAT_SKILLINFO)	745	sl << uint8 (CS_STAT_SKILLINFO + s)
834	<< uint8 (skill->level)	746	<< uint8 (skill->level)
835	<< uint64 (skill->stats.exp);	747	<< uint64 (skill->stats.exp);
836	}	748	}
837		749
838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	750	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	751	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	752	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	753	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	754	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	755	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	756	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	757	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	758	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847		759
848	flags = 0;	760	int flags = (opl->fire_on ? SF_FIREON : 0)
849		761	| (opl->run_on ? SF_RUNON : 0);
850	if (opl->fire_on)
851	flags |= SF_FIREON;
852
853	if (opl->run_on)
854	flags |= SF_RUNON;
855		762
856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	763	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857		764
858	if (ns->sc_version < 1025)
859	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860	else
861	for (int i = 0; i < NROFATTACKS; i++)	765	for (int i = 0; i < NROFATTACKS; i++)
862	{
863	/* Skip ones we won't send */	766	/* Skip ones we won't send */
864	if (atnr_cs_stat[i] == -1)	767	if (atnr_cs_stat[i] >= 0)
865	continue;
866
867	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	768	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868	}
869		769
870	if (pl->ns->monitor_spells)	770	if (pl->ns->monitor_spells)
871	{	771	{
872	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	772	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	773	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
874	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	774	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
875	}	775	}
876		776
		777	char buf[MAX_BUF];
877	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	778	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	779	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879	set_title (ob, buf);	780	set_title (ob, buf);
880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	781	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881		782
…		…
886		787
887	/**	788	/**
888	* Tells the client that here is a player it should start using.	789	* Tells the client that here is a player it should start using.
889	*/	790	*/
890	void	791	void
891	esrv_new_player (player *pl, uint32 weight)	792	esrv_new_player (player *pl)
892	{	793	{
		794	sint32 weight = pl->ob->client_weight ();
		795
893	packet sl ("player");	796	packet sl ("player");
894		797
895	sl << uint32 (pl->ob->count)	798	sl << uint32 (pl->ob->count)
896	<< uint32 (weight)	799	<< uint32 (weight)
897	<< uint32 (pl->ob->face)	800	<< uint32 (pl->ob->face)
898	<< data8 (pl->ob->name);	801	<< data8 (pl->ob->name);
899		802
900	pl->ns->last_weight = weight;	803	pl->ns->last_weight = weight;
901	pl->ns->send_packet (sl);	804	pl->ns->send_packet (sl);
902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903	}	805	}
904		806
905	/******************************************************************************	807	/******************************************************************************
906	*	808	*
907	* Start of map related commands.	809	* Start of map related commands.
…		…
974		876
975	/* Nothing changed */	877	/* Nothing changed */
976	return 0;	878	return 0;
977	}	879	}
978		880
979	/**	881	//-GPL
980	* Returns the size of a data for a map square as returned by
981	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982	* available.
983	*/
984	int
985	getExtendedMapInfoSize (client * ns)
986	{
987	int result = 0;
988		882
989	if (ns->ext_mapinfos)	883	// prefetch maps in an area of PREFETCH x PREFETCH around the player
990	{	884	#define PREFETCH 40
991	if (ns->EMI_smooth)
992	result += 1; /*One byte for smoothlevel */
993	}
994
995	return result;
996	}
997
998	// prefetch (and touch) all maps within a specific distancd
999	static void
1000	prefetch_surrounding_maps (maptile *map, int distance)
1001	{
1002	map->last_access = runtime;
1003
1004	if (--distance)
1005	for (int dir = 4; --dir; )
1006	if (const shstr &path = map->tile_path [dir])
1007	if (maptile *&neigh = map->tile_map [dir])
1008	prefetch_surrounding_maps (neigh, distance);
1009	else
1010	neigh = maptile::find_async (path, map);
1011	}
1012		885
1013	// prefetch a generous area around the player	886	// prefetch a generous area around the player
1014	static void	887	static void
1015	prefetch_surrounding_maps (object *op)	888	prefetch_surrounding_maps (object *op)
1016	{	889	{
1017	prefetch_surrounding_maps (op->map, 3);	890	for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
		891	op->x - PREFETCH , op->y - PREFETCH ,
		892	op->x + PREFETCH + 1, op->y + PREFETCH + 1);
		893	rect->m;
		894	++rect)
		895	rect->m->touch ();
1018	}	896	}
		897
		898	//+GPL
1019		899
1020	/**	900	/**
1021	* Draws client map.	901	* Draws client map.
1022	*/	902	*/
1023	void	903	void
1024	draw_client_map (player *pl)	904	draw_client_map (player *pl)
1025	{	905	{
1026	object *ob = pl->observe;	906	object *ob = pl->viewpoint;
1027	if (!ob->active)	907	if (!pl->observe->active)
1028	return;	908	return;
1029
1030	maptile *plmap = ob->map;
1031		909
1032	/* If player is just joining the game, he isn't here yet, so the map	910	/* If player is just joining the game, he isn't here yet, so the map
1033	* can get swapped out. If so, don't try to send them a map. All will	911	* can get swapped out. If so, don't try to send them a map. All will
1034	* be OK once they really log in.	912	* be OK once they really log in.
1035	*/	913	*/
1036	if (!plmap || plmap->in_memory != MAP_ACTIVE)	914	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1037	return;	915	return;
1038		916
1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040	int estartlen, eoldlen;	917	int startlen, oldlen;
1041	uint8 eentrysize;
1042	uint16 ewhatstart, ewhatflag;
1043	uint8 extendedinfos;
1044		918
1045	check_map_change (pl);	919	check_map_change (pl);
1046	prefetch_surrounding_maps (pl->ob);	920	prefetch_surrounding_maps (pl->ob);
1047		921
1048	/* do LOS after calls to update_position */	922	/* do LOS after calls to update_position */
1049	if (ob != pl->ob)	923	/* unfortunately, we need to udpate los when observing, currently */
1050	clear_los (pl);	924	if (pl->do_los || pl->viewpoint != pl->ob)
1051	else if (pl->do_los)
1052	{	925	{
1053	update_los (ob);
1054	pl->do_los = 0;	926	pl->do_los = 0;
		927	pl->update_los ();
1055	}	928	}
1056		929
1057	/**	930	/**
1058	* This function uses the new map1 protocol command to send the map	931	* This function uses the new map1 protocol command to send the map
1059	* to the client. It is necessary because the old map command supports	932	* to the client. It is necessary because the old map command supports
…		…
1078	*/	951	*/
1079		952
1080	client &socket = *pl->ns;	953	client &socket = *pl->ns;
1081		954
1082	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	955	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1083	packet esl;
1084		956
1085	startlen = sl.length ();	957	startlen = sl.length ();
1086		958
1087	/*Extendedmapinfo structure initialisation */	959	int hx = socket.mapx / 2;
1088	if (socket.ext_mapinfos)	960	int hy = socket.mapy / 2;
1089	{
1090	extendedinfos = EMI_NOREDRAW;
1091		961
1092	if (socket.EMI_smooth)	962	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1093	extendedinfos |= EMI_SMOOTH;	963	int ax = dx + hx;
		964	int ay = dy + hy;
1094		965
1095	ewhatstart = esl.length ();	966	int mask = (ax << 10) | (ay << 4);
1096	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	967	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1097	could need to be taken away */
1098	eentrysize = getExtendedMapInfoSize (&socket);
1099	esl << "mapextended "
1100	<< uint8 (extendedinfos)
1101	<< uint8 (eentrysize);
1102		968
1103	estartlen = esl.length ();	969	/* If the coordinates are not valid, or it is too dark to see,
1104	}	970	* we tell the client as such
1105
1106	/* x,y are the real map locations. ax, ay are viewport relative
1107	* locations.
1108	*/	971	*/
1109	ay = 0;	972	if (!m)
1110
1111	/* We could do this logic as conditionals in the if statement,
1112	* but that started to get a bit messy to look at.
1113	*/
1114	max_x = ob->x + (socket.mapx + 1) / 2;
1115	max_y = ob->y + (socket.mapy + 1) / 2;
1116
1117	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118	{	973	{
1119	sint16 nx, ny;	974	/* space is out of map. Update space and clear values
1120	maptile *m = 0;	975	* if this hasn't already been done. If the space is out
1121		976	* of the map, it shouldn't have a head.
1122	ax = 0;	977	*/
1123	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	978	if (lastcell.count != -1)
1124	{	979	{
1125	// check to see if we can simply go one right quickly	980	sl << uint16 (mask);
		981	map_clearcell (&lastcell, -1);
1126	++nx;	982	}
1127	if (m && nx >= m->width)	983
		984	continue;
		985	}
		986
		987	int d = pl->blocked_los_uc (dx, dy);
		988
		989	if (d > 3)
		990	{
		991	/* This block deals with spaces that are not visible for whatever
		992	* reason. Still may need to send the head for this space.
		993	*/
		994	if (lastcell.count != -1
		995	|| lastcell.faces[0]
		996	|| lastcell.faces[1]
		997	|| lastcell.faces[2]
		998	|| lastcell.stat_hp
		999	|| lastcell.flags
		1000	|| lastcell.player)
		1001	sl << uint16 (mask);
		1002
		1003	/* properly clear a previously sent big face */
		1004	map_clearcell (&lastcell, -1);
		1005	}
		1006	else
		1007	{
		1008	/* In this block, the space is visible.
		1009	*/
		1010
		1011	/* Rather than try to figure out what everything that we might
		1012	* need to send is, then form the packet after that,
		1013	* we presume that we will in fact form a packet, and update
		1014	* the bits by what we do actually send. If we send nothing,
		1015	* we just back out sl.length () to the old value, and no harm
		1016	* is done.
		1017	* I think this is simpler than doing a bunch of checks to see
		1018	* what if anything we need to send, setting the bits, then
		1019	* doing those checks again to add the real data.
		1020	*/
		1021	oldlen = sl.length ();
		1022
		1023	sl << uint16 (mask);
		1024
		1025	unsigned char dummy;
		1026	unsigned char *last_ext = &dummy;
		1027
		1028	/* Darkness changed */
		1029	if (lastcell.count != d)
		1030	{
1128	m = 0;	1031	mask |= 0x8;
1129		1032
1130	if (!m)	1033	*last_ext |= 0x80;
		1034	last_ext = &sl[sl.length ()];
		1035	sl << uint8 (d);
		1036	}
		1037
		1038	lastcell.count = d;
		1039
		1040	mapspace &ms = m->at (nx, ny);
		1041	ms.update ();
		1042
		1043	// extmap handling
		1044	uint8 stat_hp = 0;
		1045	uint8 stat_width = 0;
		1046	uint8 flags = 0;
		1047	tag_t player = 0;
		1048
		1049	// send hp information, if applicable
		1050	if (object *op = ms.faces_obj [0])
		1051	if (op->is_head () && !op->invisible)
1131	{	1052	{
1132	nx = x; ny = y; m = plmap;	1053	if (op->stats.maxhp > op->stats.hp
1133		1054	&& op->stats.maxhp > 0
1134	if (xy_normalise (m, nx, ny))	1055	&& (op->type == PLAYER
1135	m->touch ();	1056	|| op->type == DOOR // does not work, have maxhp 0
1136	else	1057	|| op->flag [FLAG_MONSTER]
		1058	|| op->flag [FLAG_ALIVE]
		1059	|| op->flag [FLAG_GENERATOR]))
1137	m = 0;	1060	{
		1061	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1062	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1063	}
		1064
		1065	if (expect_false (op->has_dialogue ()))
		1066	flags |= 1;
		1067
		1068	if (expect_false (op->type == PLAYER))
		1069	player = op == ob ? pl->ob->count
		1070	: op == pl->ob ? ob->count
		1071	: op->count;
1138	}	1072	}
1139		1073
1140	int emask, mask;	1074	if (expect_false (lastcell.stat_hp != stat_hp))
1141	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1142
1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1144
1145	/* If the coordinates are not valid, or it is too dark to see,
1146	* we tell the client as such
1147	*/
1148	if (!m)
1149	{	1075	{
1150	/* space is out of map. Update space and clear values	1076	lastcell.stat_hp = stat_hp;
1151	* if this hasn't already been done. If the space is out	1077
1152	* of the map, it shouldn't have a head	1078	mask |= 0x8;
1153	*/	1079	*last_ext |= 0x80;
1154	if (lastcell.count != -1)	1080	last_ext = &sl[sl.length ()];
		1081
		1082	sl << uint8 (5) << uint8 (stat_hp);
		1083
		1084	if (stat_width > 1)
1155	{	1085	{
1156	sl << uint16 (mask);
1157	map_clearcell (&lastcell, -1);
1158	}
1159
1160	continue;
1161	}
1162
1163	int d = pl->blocked_los[ax][ay];
1164
1165	if (d > 3)
1166	{
1167
1168	int need_send = 0, count;
1169
1170	/* This block deals with spaces that are not visible for whatever
1171	* reason. Still may need to send the head for this space.
1172	*/
1173
1174	oldlen = sl.length ();
1175
1176	sl << uint16 (mask);
1177
1178	if (lastcell.count != -1)
1179	need_send = 1;
1180
1181	count = -1;
1182
1183	/* properly clear a previously sent big face */
1184	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1186	need_send = 1;
1187
1188	map_clearcell (&lastcell, count);
1189
1190	if ((mask & 0xf) || need_send)
1191	sl[oldlen + 1] = mask & 0xff;
1192	else
1193	sl.reset (oldlen);
1194	}
1195	else
1196	{
1197	/* In this block, the space is visible.
1198	*/
1199
1200	/* Rather than try to figure out what everything that we might
1201	* need to send is, then form the packet after that,
1202	* we presume that we will in fact form a packet, and update
1203	* the bits by what we do actually send. If we send nothing,
1204	* we just back out sl.length () to the old value, and no harm
1205	* is done.
1206	* I think this is simpler than doing a bunch of checks to see
1207	* what if anything we need to send, setting the bits, then
1208	* doing those checks again to add the real data.
1209	*/
1210	oldlen = sl.length ();
1211	eoldlen = esl.length ();
1212
1213	sl << uint16 (mask);
1214
1215	unsigned char dummy;
1216	unsigned char *last_ext = &dummy;
1217
1218	/* Darkness changed */
1219	if (lastcell.count != d && socket.darkness)
1220	{
1221	mask |= 0x8;
1222
1223	if (socket.extmap)
1224	{
1225	*last_ext |= 0x80;	1086	*last_ext |= 0x80;
1226	last_ext = &sl[sl.length ()];	1087	last_ext = &sl[sl.length ()];
1227	sl << uint8 (d);	1088
1228	}	1089	sl << uint8 (6) << uint8 (stat_width);
1229	else
1230	sl << uint8 (255 - 64 * d);
1231	}	1090	}
		1091	}
1232		1092
1233	lastcell.count = d;	1093	if (expect_false (lastcell.player != player))
1234
1235	mapspace &ms = m->at (nx, ny);
1236	ms.update ();
1237
1238	if (socket.extmap)
1239	{	1094	{
1240	uint8 stat_hp = 0;	1095	lastcell.player = player;
1241	uint8 stat_width = 0;
1242	uint8 flags = 0;
1243	tag_t player = 0;
1244		1096
1245	// send hp information, if applicable
1246	if (object *op = ms.faces_obj [0])
1247	if (op->is_head () && !op->invisible)
1248	{
1249	if (op->stats.maxhp > op->stats.hp
1250	&& op->stats.maxhp > 0
1251	&& (op->type == PLAYER
1252	|| op->type == DOOR // does not work, have maxhp 0
1253	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1254	{
1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257	}
1258
1259	if (op->msg && op->msg[0] == '@')
1260	flags |= 1;
1261
1262	if (op->type == PLAYER && op != ob)
1263	player = op->count;
1264	}
1265
1266	if (lastcell.stat_hp != stat_hp)
1267	{
1268	lastcell.stat_hp = stat_hp;
1269
1270	mask |= 0x8;	1097	mask |= 0x8;
1271	*last_ext |= 0x80;	1098	*last_ext |= 0x80;
1272	last_ext = &sl[sl.length ()];	1099	last_ext = &sl[sl.length ()];
1273		1100
1274	sl << uint8 (5) << uint8 (stat_hp);
1275
1276	if (stat_width > 1)
1277	{
1278	*last_ext |= 0x80;
1279	last_ext = &sl[sl.length ()];
1280
1281	sl << uint8 (6) << uint8 (stat_width);
1282	}
1283	}
1284
1285	if (lastcell.player != player)
1286	{
1287	lastcell.player = player;
1288
1289	mask |= 0x8;
1290	*last_ext |= 0x80;
1291	last_ext = &sl[sl.length ()];
1292
1293	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1101	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1294	}	1102	}
1295		1103
1296	if (lastcell.flags != flags)	1104	if (expect_false (lastcell.flags != flags))
1297	{	1105	{
1298	lastcell.flags = flags;	1106	lastcell.flags = flags;
1299		1107
1300	mask |= 0x8;	1108	mask |= 0x8;
1301	*last_ext |= 0x80;	1109	*last_ext |= 0x80;
1302	last_ext = &sl[sl.length ()];	1110	last_ext = &sl[sl.length ()];
1303		1111
1304	sl << uint8 (8) << uint8 (flags);	1112	sl << uint8 (8) << uint8 (flags);
1305	}
1306	}	1113	}
1307		1114
		1115	// faces
		1116
1308	/* Floor face */	1117	/* Floor face */
1309	if (update_space (sl, socket, ms, lastcell, 2))	1118	if (update_space (sl, socket, ms, lastcell, 2))
1310	mask |= 0x4;	1119	mask |= 0x4;
1311		1120
1312	/* Middle face */	1121	/* Middle face */
1313	if (update_space (sl, socket, ms, lastcell, 1))	1122	if (update_space (sl, socket, ms, lastcell, 1))
1314	mask |= 0x2;	1123	mask |= 0x2;
1315		1124
		1125	if (expect_false (ob->invisible)
		1126	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1316	if (ms.player () == ob	1127	&& ms.player () == ob)
1317	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1318	{	1128	{
1319	// force player to be visible to himself if invisible	1129	// force player to be visible to himself if invisible
1320	if (lastcell.faces[0] != ob->face)	1130	if (lastcell.faces[0] != ob->face)
1321	{	1131	{
1322	lastcell.faces[0] = ob->face;	1132	lastcell.faces[0] = ob->face;
1323		1133
1324	mask |= 0x1;
1325	sl << uint16 (ob->face);
1326
1327	socket.send_faces (ob);
1328	}
1329	}
1330	/* Top face */
1331	else if (update_space (sl, socket, ms, lastcell, 0))
1332	mask |= 0x1;	1134	mask |= 0x1;
		1135	sl << uint16 (ob->face);
1333		1136
		1137	socket.send_faces (ob);
		1138	}
		1139	}
		1140	/* Top face */
		1141	else if (update_space (sl, socket, ms, lastcell, 0))
		1142	mask |= 0x1;
		1143
1334	/* Check to see if we are in fact sending anything for this	1144	/* Check to see if we are in fact sending anything for this
1335	* space by checking the mask. If so, update the mask.	1145	* space by checking the mask. If so, update the mask.
1336	* if not, reset the len to that from before adding the mask	1146	* if not, reset the len to that from before adding the mask
1337	* value, so we don't send those bits.	1147	* value, so we don't send those bits.
1338	*/	1148	*/
1339	if (mask & 0xf)	1149	if (mask & 0xf)
1340	sl[oldlen + 1] = mask & 0xff;	1150	sl[oldlen + 1] = mask & 0xff;
1341	else	1151	else
1342	sl.reset (oldlen);	1152	sl.reset (oldlen);
1343
1344	if (socket.ext_mapinfos)
1345	esl << uint16 (emask);
1346
1347	if (socket.EMI_smooth)
1348	{
1349	for (int layer = 2+1; layer--; )
1350	{
1351	object *ob = ms.faces_obj [layer];
1352
1353	// If there is no object for this space, or if the face for the object
1354	// is the blank face, set the smoothlevel to zero.
1355	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1356
1357	// We've gotten what face we want to use for the object. Now see if
1358	// if it has changed since we last sent it to the client.
1359	if (lastcell.smooth[layer] != smoothlevel)
1360	{
1361	lastcell.smooth[layer] = smoothlevel;
1362	esl << uint8 (smoothlevel);
1363	emask |= 1 << layer;
1364	}
1365	}
1366
1367	if (emask & 0xf)
1368	esl[eoldlen + 1] = emask & 0xff;
1369	else
1370	esl.reset (eoldlen);
1371	}
1372	} /* else this is a viewable space */	1153	} /* else this is a viewable space */
1373	} /* for x loop */	1154	ordered_mapwalk_end
1374	} /* for y loop */
1375		1155
1376	socket.flush_fx ();	1156	socket.flush_fx ();
1377
1378	/* Verify that we in fact do need to send this */
1379	if (socket.ext_mapinfos)
1380	{
1381	if (!(sl.length () > startlen || socket.sent_scroll))
1382	{
1383	/* No map data will follow, so don't say the client
1384	* it doesn't need draw!
1385	*/
1386	ewhatflag &= ~EMI_NOREDRAW;
1387	esl[ewhatstart + 1] = ewhatflag & 0xff;
1388	}
1389
1390	if (esl.length () > estartlen)
1391	socket.send_packet (esl);
1392	}
1393		1157
1394	if (sl.length () > startlen || socket.sent_scroll)	1158	if (sl.length () > startlen || socket.sent_scroll)
1395	{	1159	{
1396	socket.send_packet (sl);	1160	socket.send_packet (sl);
1397	socket.sent_scroll = 0;	1161	socket.sent_scroll = 0;
1398	}	1162	}
1399	}	1163	}
1400		1164
1401	/*****************************************************************************/
1402	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1403	/* a player. Of course, the client need to know the command to be able to */
1404	/* manage it ! */
1405	/*****************************************************************************/
1406	void
1407	send_plugin_custom_message (object *pl, char *buf)
1408	{
1409	pl->contr->ns->send_packet (buf);
1410	}
1411
1412	/**
1413	* This sends the skill number to name mapping. We ignore
1414	* the params - we always send the same info no matter what.
1415	*/
1416	void
1417	send_skill_info (client *ns, char *params)
1418	{
1419	packet sl;
1420	sl << "replyinfo skill_info\n";
1421
1422	for (int i = 1; i < NUM_SKILLS; i++)
1423	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1424
1425	if (sl.length () > MAXSOCKBUF)
1426	{
1427	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1428	fatal (0);
1429	}
1430
1431	ns->send_packet (sl);
1432	}
1433
1434	/**
1435	* This sends the spell path to name mapping. We ignore
1436	* the params - we always send the same info no matter what.
1437	*/
1438	void
1439	send_spell_paths (client * ns, char *params)
1440	{
1441	packet sl;
1442
1443	sl << "replyinfo spell_paths\n";
1444
1445	for (int i = 0; i < NRSPELLPATHS; i++)
1446	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1447
1448	if (sl.length () > MAXSOCKBUF)
1449	{
1450	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1451	fatal (0);
1452	}
1453
1454	ns->send_packet (sl);
1455	}
1456
1457	/**	1165	/**
1458	* This looks for any spells the player may have that have changed their stats.	1166	* This looks for any spells the player may have that have changed their stats.
1459	* it then sends an updspell packet for each spell that has changed in this way	1167	* it then sends an updspell packet for each spell that has changed in this way
1460	*/	1168	*/
1461	void	1169	void
1462	esrv_update_spells (player *pl)	1170	esrv_update_spells (player *pl)
1463	{	1171	{
1464	if (!pl->ns)	1172	if (!pl->ns)
1465	return;	1173	return;
1466		1174
		1175	pl->ns->update_spells = false;
		1176
1467	if (!pl->ns->monitor_spells)	1177	if (!pl->ns->monitor_spells)
1468	return;	1178	return;
1469		1179
1470	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1180	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1471	{
1472	if (spell->type == SPELL)	1181	if (spell->type == SPELL)
1473	{	1182	{
1474	int flags = 0;	1183	int flags = 0;
		1184	int val;
1475		1185
1476	/* check if we need to update it */	1186	/* check if we need to update it */
1477	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1187	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1188	if (spell->cached_sp != val)
1478	{	1189	{
1479	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1190	spell->cached_sp = val;
1480	flags |= UPD_SP_MANA;	1191	flags |= UPD_SP_MANA;
1481	}	1192	}
1482		1193
1483	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1194	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1195	if (spell->cached_grace != val)
1484	{	1196	{
1485	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1197	spell->cached_grace = val;
1486	flags |= UPD_SP_GRACE;	1198	flags |= UPD_SP_GRACE;
1487	}	1199	}
1488		1200
1489	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1201	val = casting_level (pl->ob, spell);
		1202	if (spell->cached_eat != val)
1490	{	1203	{
1491	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1204	spell->cached_eat = val;
1492	flags |= UPD_SP_DAMAGE;	1205	flags |= UPD_SP_LEVEL;
1493	}	1206	}
1494		1207
1495	if (flags)	1208	if (flags)
1496	{	1209	{
1497	packet sl;	1210	packet sl;
1498		1211
1499	sl << "updspell "	1212	sl << "updspell "
1500	<< uint8 (flags)	1213	<< uint8 (flags)
1501	<< uint32 (spell->count);	1214	<< uint32 (spell->count);
1502		1215
1503	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1216	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1504	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1217	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1505	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1218	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1506		1219
1507	pl->ns->send_packet (sl);	1220	pl->ns->send_packet (sl);
1508	}	1221	}
1509	}	1222	}
1510	}
1511	}	1223	}
1512		1224
1513	void	1225	void
1514	esrv_remove_spell (player *pl, object *spell)	1226	esrv_remove_spell (player *pl, object *spell)
1515	{	1227	{
…		…
1540	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1252	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1541	return;	1253	return;
1542	}	1254	}
1543		1255
1544	/* store costs and damage in the object struct, to compare to later */	1256	/* store costs and damage in the object struct, to compare to later */
1545	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1257	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1546	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1258	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1547	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1259	spell->cached_eat = casting_level (pl->ob, spell);
1548		1260
1549	/* figure out which skill it uses, if it uses one */	1261	/* figure out which skill it uses, if it uses one */
1550	if (spell->skill)	1262	if (spell->skill)
1551	{	1263	if (object *tmp = pl->find_skill (spell->skill))
1552	for (i = 1; i < NUM_SKILLS; i++)	1264	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1553	if (!strcmp (spell->skill, skill_names[i]))
1554	{
1555	skill = i + CS_STAT_SKILLINFO;
1556	break;
1557	}
1558	}
1559		1265
1560	// spells better have a face	1266	// spells better have a face
1561	if (!spell->face)	1267	if (!spell->face)
1562	{	1268	{
1563	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1269	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1568		1274
1569	/* send the current values */	1275	/* send the current values */
1570	sl << uint32 (spell->count)	1276	sl << uint32 (spell->count)
1571	<< uint16 (spell->level)	1277	<< uint16 (spell->level)
1572	<< uint16 (spell->casting_time)	1278	<< uint16 (spell->casting_time)
1573	<< uint16 (spell->last_sp)	1279	<< uint16 (spell->cached_sp)
1574	<< uint16 (spell->last_grace)	1280	<< uint16 (spell->cached_grace)
1575	<< uint16 (spell->last_eat)	1281	<< uint16 (spell->cached_eat)
1576	<< uint8 (skill)	1282	<< uint8 (skill)
1577	<< uint32 (spell->path_attuned)	1283	<< uint32 (spell->path_attuned)
1578	<< uint32 (spell->face)	1284	<< uint32 (spell->face)
1579	<< data8 (spell->name)	1285	<< data8 (spell->name)
1580	<< data16 (spell->msg);	1286	<< data16 (spell->msg);
…		…
1637	}	1343	}
1638	else	1344	else
1639	append_spell (pl, sl, spell);	1345	append_spell (pl, sl, spell);
1640		1346
1641	if (sl.length () > MAXSOCKBUF)	1347	if (sl.length () > MAXSOCKBUF)
1642	{
1643	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1348	cleanup ("buffer overflow in esrv_add_spells!");
1644	fatal (0);
1645	}
1646		1349
1647	/* finally, we can send the packet */	1350	/* finally, we can send the packet */
1648	pl->ns->flush_fx ();	1351	pl->ns->flush_fx ();
1649	pl->ns->send_packet (sl);	1352	pl->ns->send_packet (sl);
1650	}	1353	}
1651		1354
		1355	//-GPL
		1356

Diff Legend

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