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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 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,2008 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] = { CS_STAT_RES_PHYS,
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
…		…
98	*/	100	*/
99	mx = ns->mapx;	101	mx = ns->mapx;
100	my = ns->mapy;	102	my = ns->mapy;
101		103
102	/* the x and y here are coordinates for the new map, i.e. if we moved	104	/* 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,	105	* (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	106	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	107	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	108	* are preserved, and the check_head thinks it needs to clear them.
107	*/	109	*/
108	for (x = 0; x < mx; x++)	110	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	111	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	112	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	113	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	114	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)	115	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 */	116	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	118	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		120
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	121	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		122
125	/* Make sure that the next "map1" command will be sent (even if it is	123	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	124	* empty).
…		…
145		143
146	static void	144	static void
147	send_map_info (player *pl)	145	send_map_info (player *pl)
148	{	146	{
149	client &socket = *pl->ns;	147	client &socket = *pl->ns;
150	object *ob = pl->observe;	148	object *ob = pl->viewpoint;
151		149
152	if (socket.mapinfocmd)	150	if (socket.mapinfocmd)
153	{	151	{
154	if (ob->map && ob->map->path[0])	152	if (ob->map && ob->map->path[0])
155	{	153	{
…		…
172	/** check for map/region change and send new map data */	170	/** check for map/region change and send new map data */
173	static void	171	static void
174	check_map_change (player *pl)	172	check_map_change (player *pl)
175	{	173	{
176	client &socket = *pl->ns;	174	client &socket = *pl->ns;
177	object *ob = pl->observe;	175	object *ob = pl->viewpoint;
178		176
179	region *reg = ob->region ();	177	region *reg = ob->region ();
180	if (socket.current_region != reg)	178	if (socket.current_region != reg)
181	{	179	{
182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	180	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
…		…
212	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	210	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
213	{	211	{
214	int dx = ob->x - socket.current_x;	212	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	213	int dy = ob->y - socket.current_y;
216		214
217	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
218	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219	else
220	{
221	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	215	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	216	socket.floorbox_reset ();
223	}
224	}	217	}
225		218
226	socket.current_x = ob->x;	219	socket.current_x = ob->x;
227	socket.current_y = ob->y;	220	socket.current_y = ob->y;
		221	}
		222
		223	/**
		224	* This sends the skill number to name mapping. We ignore
		225	* the params - we always send the same info no matter what.
		226	*/
		227	static void
		228	send_skill_info (client ns, char params)
		229	{
		230	packet sl;
		231	sl << "replyinfo skill_info\n";
		232
		233	for (int i = 1; i < NUM_SKILLS; i++)
		234	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
		235
		236	if (sl.length () > MAXSOCKBUF)
		237	{
		238	LOG (llevError, "Buffer overflow in send_skill_info!\n");
		239	fatal (0);
		240	}
		241
		242	ns->send_packet (sl);
		243	}
		244
		245	/**
		246	* This sends the spell path to name mapping. We ignore
		247	* the params - we always send the same info no matter what.
		248	*/
		249	static void
		250	send_spell_paths (client * ns, char *params)
		251	{
		252	packet sl;
		253
		254	sl << "replyinfo spell_paths\n";
		255
		256	for (int i = 0; i < NRSPELLPATHS; i++)
		257	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		258
		259	if (sl.length () > MAXSOCKBUF)
		260	{
		261	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
		262	fatal (0);
		263	}
		264
		265	ns->send_packet (sl);
228	}	266	}
229		267
230	/**	268	/**
231	* RequestInfo is sort of a meta command. There is some specific	269	* RequestInfo is sort of a meta command. There is some specific
232	* request of information, but we call other functions to provide	270	* request of information, but we call other functions to provide
…		…
245	{	283	{
246	*params++ = 0;	284	*params++ = 0;
247	break;	285	break;
248	}	286	}
249		287
250	if (!strcmp (buf, "image_info"))
251	send_image_info (ns, params);
252	else if (!strcmp (buf, "image_sums"))
253	send_image_sums (ns, params);
254	else if (!strcmp (buf, "skill_info"))	288	if (!strcmp (buf, "skill_info"))
255	send_skill_info (ns, params);	289	send_skill_info (ns, params);
256	else if (!strcmp (buf, "spell_paths"))	290	else if (!strcmp (buf, "spell_paths"))
257	send_spell_paths (ns, params);	291	send_spell_paths (ns, params);
258	else	292	else
259	{	293	{
…		…
275	ExtiCmd (char buf, int len, client ns)	309	ExtiCmd (char buf, int len, client ns)
276	{	310	{
277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	311	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278	}	312	}
279		313
		314	//-GPL
		315
280	void	316	void
281	client::mapinfo_queue_clear ()	317	client::mapinfo_queue_clear ()
282	{	318	{
283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	319	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284	free (*i);	320	free (*i);
…		…
291	{	327	{
292	char *token = buf;	328	char *token = buf;
293	buf += strlen (buf) + 9;	329	buf += strlen (buf) + 9;
294		330
295	// initial map and its origin	331	// initial map and its origin
296	maptile *map = pl->observe->map;	332	maptile *map = pl->viewpoint->map;
297	int mapx = pl->ns->mapx / 2 - pl->observe->x;	333	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298	int mapy = pl->ns->mapy / 2 - pl->observe->y;	334	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299	int max_distance = 8; // limit maximum path length to something generous	335	int max_distance = 8; // limit maximum path length to something generous
300		336
301	while (*buf && map && max_distance)	337	while (*buf && map && max_distance)
302	{	338	{
303	int dir = *buf++ - '1';	339	int dir = *buf++ - '1';
…		…
408	AddMeCmd (char buf, int len, client ns)	444	AddMeCmd (char buf, int len, client ns)
409	{	445	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	446	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	447	}
412		448
413	/** Reply to ExtendedInfos command */	449	//+GPL
414	void
415	ToggleExtendedInfos (char buf, int len, client ns)
416	{
417	char cmdback[MAX_BUF];
418	char command[50];
419	int info, nextinfo;
420
421	cmdback[0] = '\0';
422	nextinfo = 0;
423
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /Erroneous info asked /
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444
445	/* 2. Interpret info */
446	if (!strcmp ("smooth", command))
447	/* Toggle smoothing */
448	ns->EMI_smooth = !ns->EMI_smooth;
449	else
450	/bad value /;
451
452	/3. Next info /
453	}
454
455	strcpy (cmdback, "ExtendedInfoSet");
456
457	if (ns->EMI_smooth)
458	{
459	strcat (cmdback, " ");
460	strcat (cmdback, "smoothing");
461	}
462
463	ns->send_packet (cmdback);
464	}
465
466	/*
467	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3
470	#define MSG_TYPE_SIGN 4
471	#define MSG_TYPE_MONUMENT 5
472	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
473
474	/** Reply to ExtendedInfos command */
475	void
476	ToggleExtendedText (char buf, int len, client ns)
477	{
478	char cmdback[MAX_BUF];
479	char temp[10];
480	char command[50];
481	int info, nextinfo, i, flag;
482
483	cmdback[0] = '\0';
484
485	nextinfo = 0;
486	while (1)
487	{
488	/* 1. Extract an info */
489	info = nextinfo;
490
491	while ((info < len) && (buf[info] == ' '))
492	info++;
493
494	if (info >= len)
495	break;
496
497	nextinfo = info + 1;
498
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))
500	nextinfo++;
501
502	if (nextinfo - info >= 49) /Erroneous info asked /
503	continue;
504
505	strncpy (command, &(buf[info]), nextinfo - info);
506	command[nextinfo - info] = '\0';
507	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);
509
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables \|= (1 << flag);
512	/3. Next info /
513	}
514
515	/* Send resulting state */
516	strcpy (cmdback, "ExtendedTextSet");
517
518	for (i = 0; i <= MSG_TYPE_LAST; i++)
519	if (ns->supported_readables & (1 << i))
520	{
521	strcat (cmdback, " ");
522	snprintf (temp, sizeof (temp), "%d", i);
523	strcat (cmdback, temp);
524	}
525
526	ns->send_packet (cmdback);
527	}
528		450
529	/**	451	/**
530	* This handles the general commands from the client (ie, north, fire, cast,	452	* This handles the general commands from the client (ie, north, fire, cast,
531	* etc.)	453	* etc.)
532	*/	454	*/
…		…
545	return;	467	return;
546		468
547	buf++;	469	buf++;
548	}	470	}
549		471
550	execute_newserver_command (pl->ob, (char *) buf);	472	execute_newserver_command (pl->ob, (char *)buf);
551		473
552	/* Perhaps something better should be done with a left over count.	474	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	475	* Cleaning up the input should probably be done first - all actions
554	* for the command that issued the count should be done before any other	476	* for the command that issued the count should be done before any other
555	* commands.	477	* commands.
…		…
589	* commands.	511	* commands.
590	*/	512	*/
591	pl->count = 0;	513	pl->count = 0;
592		514
593	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	515	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
594	int time = fabs (pl->ob->speed) < 0.001	516	int time = pl->ob->has_active_speed ()
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	517	? (int) (MAX_TIME / pl->ob->speed)
		518	: MAX_TIME * 100;
597		519
598	/* Send confirmation of command execution now */	520	/* Send confirmation of command execution now */
599	packet sl ("comc");	521	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);	522	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);	523	pl->ns->send_packet (sl);
…		…
643	LOG (llevError, "Unknown input state: %d\n", ns->state);	565	LOG (llevError, "Unknown input state: %d\n", ns->state);
644	}	566	}
645	}	567	}
646		568
647	/**	569	/**
648	* Client tells its version. If there is a mismatch, we close the	570	* Client tells its version info.
649	* socket. In real life, all we should care about is the client having
650	* something older than the server. If we assume the client will be
651	* backwards compatible, having it be a later version should not be a
652	* problem.
653	*/	571	*/
654	void	572	void
655	VersionCmd (char buf, int len, client ns)	573	VersionCmd (char buf, int len, client ns)
656	{	574	{
657	if (!buf)	575	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
658	{
659	LOG (llevError, "CS: received corrupted version command\n");
660	return;
661	}
662
663	ns->cs_version = atoi (buf);
664	ns->sc_version = ns->cs_version;
665
666	LOG (llevDebug, "connection from client <%s>\n", buf);
667
668	//TODO: should log here just for statistics
669
670	//if (VERSION_CS != ns->cs_version)
671	// unchecked;
672
673	char *cp = strchr (buf + 1, ' ');
674	if (!cp)
675	return;
676
677	ns->sc_version = atoi (cp);
678
679	//if (VERSION_SC != ns->sc_version)
680	// unchecked;
681
682	cp = strchr (cp + 1, ' ');
683
684	if (cp)
685	{
686	ns->version = cp + 1;
687
688	if (ns->sc_version < 1026)
689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
690	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
691	}
692	}	576	}
693		577
694	/** sound related functions. */	578	/** sound related functions. */
695	void	579	void
696	SetSound (char buf, int len, client ns)	580	SetSound (char buf, int len, client ns)
…		…
747	* Get player's current range attack in obuf.	631	* Get player's current range attack in obuf.
748	*/	632	*/
749	static void	633	static void
750	rangetostring (player pl, char obuf)	634	rangetostring (player pl, char obuf)
751	{	635	{
752	dynbuf_text buf;	636	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		637
		638	#if 0
		639	// print ranged/chosen_skill etc. objects every call
		640	printf ("%s %s => %s (%s)\n",
		641	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		642	pl->combat_ob ? &pl->combat_ob->name : "-",
		643	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		644	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		645	);
		646	#endif
753		647
754	if (pl->ranged_ob)	648	if (pl->ranged_ob)
755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	649	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756		650
757	if (pl->combat_ob)	651	if (pl->combat_ob)
…		…
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	727	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	728	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	729	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		730
837	for (int s = 0; s < NUM_SKILLS; s++)	731	for (int s = 0; s < NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	732	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	733	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	734	{
841	ns->last_skill_exp [s] = skill->stats.exp;	735	ns->last_skill_exp [s] = skill->stats.exp;
842		736
843	/* Always send along the level if exp changes. This is only	737	/* Always send along the level if exp changes. This is only
…		…
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	745	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	746	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	747	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	748	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	749	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	750	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	751	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	752	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
859	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	753	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860		754
861	flags = 0;	755	flags = 0;
862		756
863	if (opl->fire_on)	757	if (opl->fire_on)
…		…
866	if (opl->run_on)	760	if (opl->run_on)
867	flags \|= SF_RUNON;	761	flags \|= SF_RUNON;
868		762
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	763	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		764
871	if (ns->sc_version < 1025)
872	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
873	else
874	for (int i = 0; i < NROFATTACKS; i++)	765	for (int i = 0; i < NROFATTACKS; i++)
875	{	766	{
876	/* Skip ones we won't send */	767	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	768	if (atnr_cs_stat[i] == -1)
878	continue;	769	continue;
879		770
880	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	771	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
881	}	772	}
882		773
883	if (pl->ns->monitor_spells)	774	if (pl->ns->monitor_spells)
884	{	775	{
885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	776	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
886	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	777	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
…		…
912	<< uint32 (pl->ob->face)	803	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	804	<< data8 (pl->ob->name);
914		805
915	pl->ns->last_weight = weight;	806	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	807	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	808	}
919		809
920	/******************************************************************************	810	/******************************************************************************
921	*	811	*
922	* Start of map related commands.	812	* Start of map related commands.
…		…
989		879
990	/* Nothing changed */	880	/* Nothing changed */
991	return 0;	881	return 0;
992	}	882	}
993		883
994	/**	884	//-GPL
995	* Returns the size of a data for a map square as returned by
996	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
997	* available.
998	*/
999	int
1000	getExtendedMapInfoSize (client * ns)
1001	{
1002	int result = 0;
1003
1004	if (ns->ext_mapinfos)
1005	{
1006	if (ns->EMI_smooth)
1007	result += 1; /One byte for smoothlevel /
1008	}
1009
1010	return result;
1011	}
1012		885
1013	// prefetch (and touch) all maps within a specific distancd	886	// prefetch (and touch) all maps within a specific distancd
1014	static void	887	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)	888	prefetch_surrounding_maps (maptile *map, int distance)
1016	{	889	{
1017	map->last_access = runtime;	890	map->touch ();
1018		891
1019	if (--distance)	892	if (--distance)
1020	for (int dir = 4; --dir; )	893	for (int dir = 4; dir--; )
1021	if (const shstr &path = map->tile_path [dir])	894	if (const shstr &path = map->tile_path [dir])
1022	if (maptile *&neigh = map->tile_map [dir])	895	if (maptile *&neigh = map->tile_map [dir])
1023	prefetch_surrounding_maps (neigh, distance);	896	prefetch_surrounding_maps (neigh, distance);
1024	else	897	else
1025	neigh = maptile::find_async (path, map);	898	neigh = maptile::find_async (path, map);
…		…
1030	prefetch_surrounding_maps (object *op)	903	prefetch_surrounding_maps (object *op)
1031	{	904	{
1032	prefetch_surrounding_maps (op->map, 3);	905	prefetch_surrounding_maps (op->map, 3);
1033	}	906	}
1034		907
		908	//+GPL
		909
1035	/**	910	/**
1036	* Draws client map.	911	* Draws client map.
1037	*/	912	*/
1038	void	913	void
1039	draw_client_map (player *pl)	914	draw_client_map (player *pl)
1040	{	915	{
1041	object *ob = pl->observe;	916	object *ob = pl->viewpoint;
1042	if (!ob->active)	917	if (!pl->observe->active)
1043	return;	918	return;
1044
1045	maptile *plmap = ob->map;
1046		919
1047	/* If player is just joining the game, he isn't here yet, so the map	920	/* If player is just joining the game, he isn't here yet, so the map
1048	* can get swapped out. If so, don't try to send them a map. All will	921	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	922	* be OK once they really log in.
1050	*/	923	*/
1051	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	924	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1052	return;	925	return;
1053		926
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	927	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		928
1060	check_map_change (pl);	929	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	930	prefetch_surrounding_maps (pl->ob);
1062		931
1063	/* do LOS after calls to update_position */	932	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	933	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	934	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1066	else if (pl->do_los)
1067	{	935	{
1068	update_los (ob);
1069	pl->do_los = 0;	936	pl->do_los = 0;
		937	pl->update_los ();
1070	}	938	}
1071		939
1072	/**	940	/**
1073	* This function uses the new map1 protocol command to send the map	941	* This function uses the new map1 protocol command to send the map
1074	* to the client. It is necessary because the old map command supports	942	* to the client. It is necessary because the old map command supports
…		…
1093	*/	961	*/
1094		962
1095	client &socket = *pl->ns;	963	client &socket = *pl->ns;
1096		964
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	965	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1098	packet esl;
1099		966
1100	startlen = sl.length ();	967	startlen = sl.length ();
1101		968
1102	/Extendedmapinfo structure initialisation /	969	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	970	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		971
1107	if (socket.EMI_smooth)	972	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos \|= EMI_SMOOTH;	973	int ax = dx + hx;
		974	int ay = dy + hy;
1109		975
1110	ewhatstart = esl.length ();	976	int mask = (ax << 10) \| (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	977	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112	could need to be taken away */
1113	eentrysize = getExtendedMapInfoSize (&socket);
1114	esl << "mapextended "
1115	<< uint8 (extendedinfos)
1116	<< uint8 (eentrysize);
1117		978
1118	estartlen = esl.length ();	979	/* If the coordinates are not valid, or it is too dark to see,
1119	}	980	* we tell the client as such
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/	981	*/
1124	ay = 0;	982	if (!m)
1125
1126	/* We could do this logic as conditionals in the if statement,
1127	* but that started to get a bit messy to look at.
1128	*/
1129	max_x = ob->x + (socket.mapx + 1) / 2;
1130	max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133	{	983	{
1134	sint16 nx, ny;	984	/* space is out of map. Update space and clear values
1135	maptile *m = 0;	985	* if this hasn't already been done. If the space is out
1136		986	* of the map, it shouldn't have a head.
1137	ax = 0;	987	*/
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	988	if (lastcell.count != -1)
1139	{	989	{
1140	// check to see if we can simply go one right quickly	990	sl << uint16 (mask);
		991	map_clearcell (&lastcell, -1);
1141	++nx;	992	}
1142	if (m && nx >= m->width)	993
		994	continue;
		995	}
		996
		997	int d = pl->blocked_los_uc (dx, dy);
		998
		999	if (d > 3)
		1000	{
		1001	/* This block deals with spaces that are not visible for whatever
		1002	* reason. Still may need to send the head for this space.
		1003	*/
		1004	if (lastcell.count != -1
		1005	\|\| lastcell.faces[0]
		1006	\|\| lastcell.faces[1]
		1007	\|\| lastcell.faces[2]
		1008	\|\| lastcell.stat_hp
		1009	\|\| lastcell.flags
		1010	\|\| lastcell.player)
		1011	sl << uint16 (mask);
		1012
		1013	/* properly clear a previously sent big face */
		1014	map_clearcell (&lastcell, -1);
		1015	}
		1016	else
		1017	{
		1018	/* In this block, the space is visible.
		1019	*/
		1020
		1021	/* Rather than try to figure out what everything that we might
		1022	* need to send is, then form the packet after that,
		1023	* we presume that we will in fact form a packet, and update
		1024	* the bits by what we do actually send. If we send nothing,
		1025	* we just back out sl.length () to the old value, and no harm
		1026	* is done.
		1027	* I think this is simpler than doing a bunch of checks to see
		1028	* what if anything we need to send, setting the bits, then
		1029	* doing those checks again to add the real data.
		1030	*/
		1031	oldlen = sl.length ();
		1032
		1033	sl << uint16 (mask);
		1034
		1035	unsigned char dummy;
		1036	unsigned char *last_ext = &dummy;
		1037
		1038	/* Darkness changed */
		1039	if (lastcell.count != d)
		1040	{
1143	m = 0;	1041	mask \|= 0x8;
1144		1042
1145	if (!m)	1043	*last_ext \|= 0x80;
		1044	last_ext = &sl[sl.length ()];
		1045	sl << uint8 (d);
		1046	}
		1047
		1048	lastcell.count = d;
		1049
		1050	mapspace &ms = m->at (nx, ny);
		1051	ms.update ();
		1052
		1053	// extmap handling
		1054	uint8 stat_hp = 0;
		1055	uint8 stat_width = 0;
		1056	uint8 flags = 0;
		1057	tag_t player = 0;
		1058
		1059	// send hp information, if applicable
		1060	if (object *op = ms.faces_obj [0])
		1061	if (op->is_head () && !op->invisible)
1146	{	1062	{
1147	nx = x; ny = y; m = plmap;	1063	if (op->stats.maxhp > op->stats.hp
1148		1064	&& op->stats.maxhp > 0
1149	if (xy_normalise (m, nx, ny))	1065	&& (op->type == PLAYER
1150	m->touch ();	1066	\|\| op->type == DOOR // does not work, have maxhp 0
1151	else	1067	\|\| op->flag [FLAG_MONSTER]
		1068	\|\| op->flag [FLAG_ALIVE]
		1069	\|\| op->flag [FLAG_GENERATOR]))
1152	m = 0;	1070	{
		1071	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1072	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1073	}
		1074
		1075	if (expect_false (op->has_dialogue ()))
		1076	flags \|= 1;
		1077
		1078	if (expect_false (op->type == PLAYER))
		1079	player = op == ob ? pl->ob->count
		1080	: op == pl->ob ? ob->count
		1081	: op->count;
1153	}	1082	}
1154		1083
1155	int emask, mask;	1084	if (expect_false (lastcell.stat_hp != stat_hp))
1156	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1157
1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160	/* If the coordinates are not valid, or it is too dark to see,
1161	* we tell the client as such
1162	*/
1163	if (!m)
1164	{	1085	{
1165	/* space is out of map. Update space and clear values	1086	lastcell.stat_hp = stat_hp;
1166	* if this hasn't already been done. If the space is out	1087
1167	* of the map, it shouldn't have a head	1088	mask \|= 0x8;
1168	*/	1089	*last_ext \|= 0x80;
1169	if (lastcell.count != -1)	1090	last_ext = &sl[sl.length ()];
		1091
		1092	sl << uint8 (5) << uint8 (stat_hp);
		1093
		1094	if (stat_width > 1)
1170	{	1095	{
1171	sl << uint16 (mask);
1172	map_clearcell (&lastcell, -1);
1173	}
1174
1175	continue;
1176	}
1177
1178	int d = pl->blocked_los[ax][ay];
1179
1180	if (d > 3)
1181	{
1182	int need_send = 0, count;
1183
1184	/* This block deals with spaces that are not visible for whatever
1185	* reason. Still may need to send the head for this space.
1186	*/
1187
1188	oldlen = sl.length ();
1189
1190	sl << uint16 (mask);
1191
1192	if (lastcell.count != -1)
1193	need_send = 1;
1194
1195	count = -1;
1196
1197	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1198	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1199	need_send = 1;
1200
1201	/* properly clear a previously sent big face */
1202	map_clearcell (&lastcell, count);
1203
1204	if ((mask & 0xf) \|\| need_send)
1205	sl[oldlen + 1] = mask & 0xff;
1206	else
1207	sl.reset (oldlen);
1208	}
1209	else
1210	{
1211	/* In this block, the space is visible.
1212	*/
1213
1214	/* Rather than try to figure out what everything that we might
1215	* need to send is, then form the packet after that,
1216	* we presume that we will in fact form a packet, and update
1217	* the bits by what we do actually send. If we send nothing,
1218	* we just back out sl.length () to the old value, and no harm
1219	* is done.
1220	* I think this is simpler than doing a bunch of checks to see
1221	* what if anything we need to send, setting the bits, then
1222	* doing those checks again to add the real data.
1223	*/
1224	oldlen = sl.length ();
1225	eoldlen = esl.length ();
1226
1227	sl << uint16 (mask);
1228
1229	unsigned char dummy;
1230	unsigned char *last_ext = &dummy;
1231
1232	/* Darkness changed */
1233	if (lastcell.count != d && socket.darkness)
1234	{
1235	mask \|= 0x8;
1236
1237	if (socket.extmap)
1238	{
1239	*last_ext \|= 0x80;	1096	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];	1097	last_ext = &sl[sl.length ()];
1241	sl << uint8 (d);	1098
1242	}	1099	sl << uint8 (6) << uint8 (stat_width);
1243	else
1244	sl << uint8 (255 - 64 * d);
1245	}	1100	}
		1101	}
1246		1102
1247	lastcell.count = d;	1103	if (expect_false (lastcell.player != player))
1248
1249	mapspace &ms = m->at (nx, ny);
1250	ms.update ();
1251
1252	if (socket.extmap)
1253	{	1104	{
1254	uint8 stat_hp = 0;	1105	lastcell.player = player;
1255	uint8 stat_width = 0;
1256	uint8 flags = 0;
1257	tag_t player = 0;
1258		1106
1259	// send hp information, if applicable
1260	if (object *op = ms.faces_obj [0])
1261	if (op->is_head () && !op->invisible)
1262	{
1263	if (op->stats.maxhp > op->stats.hp
1264	&& op->stats.maxhp > 0
1265	&& (op->type == PLAYER
1266	\|\| op->type == DOOR // does not work, have maxhp 0
1267	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1268	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1269	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1270	{
1271	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1272	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1273	}
1274
1275	if (op->has_dialogue ())
1276	flags \|= 1;
1277
1278	if (op->type == PLAYER)
1279	player = op == ob ? pl->ob->count
1280	: op == pl->ob ? ob->count
1281	: op->count;
1282	}
1283
1284	if (lastcell.stat_hp != stat_hp)
1285	{
1286	lastcell.stat_hp = stat_hp;
1287
1288	mask \|= 0x8;	1107	mask \|= 0x8;
1289	*last_ext \|= 0x80;	1108	*last_ext \|= 0x80;
1290	last_ext = &sl[sl.length ()];	1109	last_ext = &sl[sl.length ()];
1291		1110
1292	sl << uint8 (5) << uint8 (stat_hp);
1293
1294	if (stat_width > 1)
1295	{
1296	*last_ext \|= 0x80;
1297	last_ext = &sl[sl.length ()];
1298
1299	sl << uint8 (6) << uint8 (stat_width);
1300	}
1301	}
1302
1303	if (lastcell.player != player)
1304	{
1305	lastcell.player = player;
1306
1307	mask \|= 0x8;
1308	*last_ext \|= 0x80;
1309	last_ext = &sl[sl.length ()];
1310
1311	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1111	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1312	}	1112	}
1313		1113
1314	if (lastcell.flags != flags)	1114	if (expect_false (lastcell.flags != flags))
1315	{	1115	{
1316	lastcell.flags = flags;	1116	lastcell.flags = flags;
1317		1117
1318	mask \|= 0x8;	1118	mask \|= 0x8;
1319	*last_ext \|= 0x80;	1119	*last_ext \|= 0x80;
1320	last_ext = &sl[sl.length ()];	1120	last_ext = &sl[sl.length ()];
1321		1121
1322	sl << uint8 (8) << uint8 (flags);	1122	sl << uint8 (8) << uint8 (flags);
1323	}
1324	}	1123	}
1325		1124
		1125	// faces
		1126
1326	/* Floor face */	1127	/* Floor face */
1327	if (update_space (sl, socket, ms, lastcell, 2))	1128	if (update_space (sl, socket, ms, lastcell, 2))
1328	mask \|= 0x4;	1129	mask \|= 0x4;
1329		1130
1330	/* Middle face */	1131	/* Middle face */
1331	if (update_space (sl, socket, ms, lastcell, 1))	1132	if (update_space (sl, socket, ms, lastcell, 1))
1332	mask \|= 0x2;	1133	mask \|= 0x2;
1333		1134
		1135	if (expect_false (ob->invisible)
		1136	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1334	if (ms.player () == ob	1137	&& ms.player () == ob)
1335	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1336	{	1138	{
1337	// force player to be visible to himself if invisible	1139	// force player to be visible to himself if invisible
1338	if (lastcell.faces[0] != ob->face)	1140	if (lastcell.faces[0] != ob->face)
1339	{	1141	{
1340	lastcell.faces[0] = ob->face;	1142	lastcell.faces[0] = ob->face;
1341		1143
1342	mask \|= 0x1;
1343	sl << uint16 (ob->face);
1344
1345	socket.send_faces (ob);
1346	}
1347	}
1348	/* Top face */
1349	else if (update_space (sl, socket, ms, lastcell, 0))
1350	mask \|= 0x1;	1144	mask \|= 0x1;
		1145	sl << uint16 (ob->face);
1351		1146
		1147	socket.send_faces (ob);
		1148	}
		1149	}
		1150	/* Top face */
		1151	else if (update_space (sl, socket, ms, lastcell, 0))
		1152	mask \|= 0x1;
		1153
1352	/* Check to see if we are in fact sending anything for this	1154	/* Check to see if we are in fact sending anything for this
1353	* space by checking the mask. If so, update the mask.	1155	* space by checking the mask. If so, update the mask.
1354	* if not, reset the len to that from before adding the mask	1156	* if not, reset the len to that from before adding the mask
1355	* value, so we don't send those bits.	1157	* value, so we don't send those bits.
1356	*/	1158	*/
1357	if (mask & 0xf)	1159	if (mask & 0xf)
1358	sl[oldlen + 1] = mask & 0xff;	1160	sl[oldlen + 1] = mask & 0xff;
1359	else	1161	else
1360	sl.reset (oldlen);	1162	sl.reset (oldlen);
1361
1362	if (socket.ext_mapinfos)
1363	esl << uint16 (emask);
1364
1365	if (socket.EMI_smooth)
1366	{
1367	for (int layer = 2+1; layer--; )
1368	{
1369	object *ob = ms.faces_obj [layer];
1370
1371	// If there is no object for this space, or if the face for the object
1372	// is the blank face, set the smoothlevel to zero.
1373	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1374
1375	// We've gotten what face we want to use for the object. Now see if
1376	// if it has changed since we last sent it to the client.
1377	if (lastcell.smooth[layer] != smoothlevel)
1378	{
1379	lastcell.smooth[layer] = smoothlevel;
1380	esl << uint8 (smoothlevel);
1381	emask \|= 1 << layer;
1382	}
1383	}
1384
1385	if (emask & 0xf)
1386	esl[eoldlen + 1] = emask & 0xff;
1387	else
1388	esl.reset (eoldlen);
1389	}
1390	} /* else this is a viewable space */	1163	} /* else this is a viewable space */
1391	} /* for x loop */	1164	ordered_mapwalk_end
1392	} /* for y loop */
1393		1165
1394	socket.flush_fx ();	1166	socket.flush_fx ();
1395
1396	/* Verify that we in fact do need to send this */
1397	if (socket.ext_mapinfos)
1398	{
1399	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1400	{
1401	/* No map data will follow, so don't say the client
1402	* it doesn't need draw!
1403	*/
1404	ewhatflag &= ~EMI_NOREDRAW;
1405	esl[ewhatstart + 1] = ewhatflag & 0xff;
1406	}
1407
1408	if (esl.length () > estartlen)
1409	socket.send_packet (esl);
1410	}
1411		1167
1412	if (sl.length () > startlen \|\| socket.sent_scroll)	1168	if (sl.length () > startlen \|\| socket.sent_scroll)
1413	{	1169	{
1414	socket.send_packet (sl);	1170	socket.send_packet (sl);
1415	socket.sent_scroll = 0;	1171	socket.sent_scroll = 0;
1416	}	1172	}
1417	}	1173	}
1418		1174
1419	/*****************************************************************************/
1420	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1421	/* a player. Of course, the client need to know the command to be able to */
1422	/* manage it ! */
1423	/*****************************************************************************/
1424	void
1425	send_plugin_custom_message (object pl, char buf)
1426	{
1427	pl->contr->ns->send_packet (buf);
1428	}
1429
1430	/**
1431	* This sends the skill number to name mapping. We ignore
1432	* the params - we always send the same info no matter what.
1433	*/
1434	void
1435	send_skill_info (client ns, char params)
1436	{
1437	packet sl;
1438	sl << "replyinfo skill_info\n";
1439
1440	for (int i = 1; i < NUM_SKILLS; i++)
1441	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1442
1443	if (sl.length () > MAXSOCKBUF)
1444	{
1445	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446	fatal (0);
1447	}
1448
1449	ns->send_packet (sl);
1450	}
1451
1452	/**
1453	* This sends the spell path to name mapping. We ignore
1454	* the params - we always send the same info no matter what.
1455	*/
1456	void
1457	send_spell_paths (client * ns, char *params)
1458	{
1459	packet sl;
1460
1461	sl << "replyinfo spell_paths\n";
1462
1463	for (int i = 0; i < NRSPELLPATHS; i++)
1464	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465
1466	if (sl.length () > MAXSOCKBUF)
1467	{
1468	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469	fatal (0);
1470	}
1471
1472	ns->send_packet (sl);
1473	}
1474
1475	/**	1175	/**
1476	* This looks for any spells the player may have that have changed their stats.	1176	* This looks for any spells the player may have that have changed their stats.
1477	* it then sends an updspell packet for each spell that has changed in this way	1177	* it then sends an updspell packet for each spell that has changed in this way
1478	*/	1178	*/
1479	void	1179	void
1480	esrv_update_spells (player *pl)	1180	esrv_update_spells (player *pl)
1481	{	1181	{
1482	if (!pl->ns)	1182	if (!pl->ns)
1483	return;	1183	return;
1484		1184
		1185	pl->ns->update_spells = false;
		1186
1485	if (!pl->ns->monitor_spells)	1187	if (!pl->ns->monitor_spells)
1486	return;	1188	return;
1487		1189
1488	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1190	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1489	{
1490	if (spell->type == SPELL)	1191	if (spell->type == SPELL)
1491	{	1192	{
1492	int flags = 0;	1193	int flags = 0;
		1194	int val;
1493		1195
1494	/* check if we need to update it */	1196	/* check if we need to update it */
1495	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1197	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1198	if (spell->cached_sp != val)
1496	{	1199	{
1497	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1200	spell->cached_sp = val;
1498	flags \|= UPD_SP_MANA;	1201	flags \|= UPD_SP_MANA;
1499	}	1202	}
1500		1203
1501	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1204	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1205	if (spell->cached_grace != val)
1502	{	1206	{
1503	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1207	spell->cached_grace = val;
1504	flags \|= UPD_SP_GRACE;	1208	flags \|= UPD_SP_GRACE;
1505	}	1209	}
1506		1210
1507	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1211	val = casting_level (pl->ob, spell);
		1212	if (spell->cached_eat != val)
1508	{	1213	{
1509	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1214	spell->cached_eat = val;
1510	flags \|= UPD_SP_DAMAGE;	1215	flags \|= UPD_SP_LEVEL;
1511	}	1216	}
1512		1217
1513	if (flags)	1218	if (flags)
1514	{	1219	{
1515	packet sl;	1220	packet sl;
1516		1221
1517	sl << "updspell "	1222	sl << "updspell "
1518	<< uint8 (flags)	1223	<< uint8 (flags)
1519	<< uint32 (spell->count);	1224	<< uint32 (spell->count);
1520		1225
1521	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1226	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1227	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1523	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1228	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1524		1229
1525	pl->ns->send_packet (sl);	1230	pl->ns->send_packet (sl);
1526	}	1231	}
1527	}	1232	}
1528	}
1529	}	1233	}
1530		1234
1531	void	1235	void
1532	esrv_remove_spell (player pl, object spell)	1236	esrv_remove_spell (player pl, object spell)
1533	{	1237	{
…		…
1560	}	1264	}
1561		1265
1562	/* store costs and damage in the object struct, to compare to later */	1266	/* store costs and damage in the object struct, to compare to later */
1563	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1267	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1564	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1268	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1269	spell->cached_eat = casting_level (pl->ob, spell);
1566		1270
1567	/* figure out which skill it uses, if it uses one */	1271	/* figure out which skill it uses, if it uses one */
1568	if (spell->skill)	1272	if (spell->skill)
1569	{	1273	if (object *tmp = pl->find_skill (spell->skill))
1570	for (i = 1; i < NUM_SKILLS; i++)
1571	if (!strcmp (spell->skill, skill_names[i]))
1572	{
1573	skill = i + CS_STAT_SKILLINFO;	1274	skill = tmp->subtype + CS_STAT_SKILLINFO;
1574	break;
1575	}
1576	}
1577		1275
1578	// spells better have a face	1276	// spells better have a face
1579	if (!spell->face)	1277	if (!spell->face)
1580	{	1278	{
1581	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1279	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1665	/* finally, we can send the packet */	1363	/* finally, we can send the packet */
1666	pl->ns->flush_fx ();	1364	pl->ns->flush_fx ();
1667	pl->ns->send_packet (sl);	1365	pl->ns->send_packet (sl);
1668	}	1366	}
1669		1367
		1368	//-GPL
		1369

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs. Revision 1.171 by root, Sun Apr 11 00:34:07 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 2010 UTC