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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs.
Revision 1.168 by root, Tue Apr 6 22:59:28 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		450
466	/*	451	/*
467	#define MSG_TYPE_BOOK 1	452	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2	453	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3	454	#define MSG_TYPE_PAPER 3
…		…
486	while (1)	471	while (1)
487	{	472	{
488	/* 1. Extract an info */	473	/* 1. Extract an info */
489	info = nextinfo;	474	info = nextinfo;
490		475
491	while ((info < len) && (buf[info] == ' '))	476	while ((info < len) && (buf [info] == ' '))
492	info++;	477	info++;
493		478
494	if (info >= len)	479	if (info >= len)
495	break;	480	break;
496		481
497	nextinfo = info + 1;	482	nextinfo = info + 1;
498		483
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))	484	while ((nextinfo < len) && (buf [nextinfo] != ' '))
500	nextinfo++;	485	nextinfo++;
501		486
502	if (nextinfo - info >= 49) /Erroneous info asked /	487	if (nextinfo - info >= 49) /Erroneous info asked /
503	continue;	488	continue;
504		489
505	strncpy (command, &(buf[info]), nextinfo - info);	490	memcpy (command, buf + info, nextinfo - info);
506	command[nextinfo - info] = '\0';	491	command [nextinfo - info] = 0;
		492
507	/* 2. Interpret info */	493	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);	494	i = sscanf (command, "%d", &flag);
509		495
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	496	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables \|= (1 << flag);	497	ns->supported_readables \|= (1 << flag);
…		…
545	return;	531	return;
546		532
547	buf++;	533	buf++;
548	}	534	}
549		535
550	execute_newserver_command (pl->ob, (char *) buf);	536	execute_newserver_command (pl->ob, (char *)buf);
551		537
552	/* Perhaps something better should be done with a left over count.	538	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	539	* 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	540	* for the command that issued the count should be done before any other
555	* commands.	541	* commands.
…		…
589	* commands.	575	* commands.
590	*/	576	*/
591	pl->count = 0;	577	pl->count = 0;
592		578
593	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	579	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
594	int time = fabs (pl->ob->speed) < 0.001	580	int time = pl->ob->has_active_speed ()
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	581	? (int) (MAX_TIME / pl->ob->speed)
		582	: MAX_TIME * 100;
597		583
598	/* Send confirmation of command execution now */	584	/* Send confirmation of command execution now */
599	packet sl ("comc");	585	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);	586	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);	587	pl->ns->send_packet (sl);
…		…
747	* Get player's current range attack in obuf.	733	* Get player's current range attack in obuf.
748	*/	734	*/
749	static void	735	static void
750	rangetostring (player pl, char obuf)	736	rangetostring (player pl, char obuf)
751	{	737	{
752	dynbuf_text buf;	738	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		739
		740	#if 0
		741	// print ranged/chosen_skill etc. objects every call
		742	printf ("%s %s => %s (%s)\n",
		743	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		744	pl->combat_ob ? &pl->combat_ob->name : "-",
		745	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		746	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		747	);
		748	#endif
753		749
754	if (pl->ranged_ob)	750	if (pl->ranged_ob)
755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	751	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756		752
757	if (pl->combat_ob)	753	if (pl->combat_ob)
…		…
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	829	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	830	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	831	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		832
837	for (int s = 0; s < NUM_SKILLS; s++)	833	for (int s = 0; s < NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	834	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	835	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	836	{
841	ns->last_skill_exp [s] = skill->stats.exp;	837	ns->last_skill_exp [s] = skill->stats.exp;
842		838
843	/* Always send along the level if exp changes. This is only	839	/* Always send along the level if exp changes. This is only
…		…
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	847	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	848	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	849	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	850	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	851	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	852	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	853	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);	854	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);	855	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860		856
861	flags = 0;	857	flags = 0;
862		858
863	if (opl->fire_on)	859	if (opl->fire_on)
…		…
866	if (opl->run_on)	862	if (opl->run_on)
867	flags \|= SF_RUNON;	863	flags \|= SF_RUNON;
868		864
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	865	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		866
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++)	867	for (int i = 0; i < NROFATTACKS; i++)
875	{	868	{
876	/* Skip ones we won't send */	869	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	870	if (atnr_cs_stat[i] == -1)
878	continue;	871	continue;
879		872
880	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	873	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
881	}	874	}
882		875
883	if (pl->ns->monitor_spells)	876	if (pl->ns->monitor_spells)
884	{	877	{
885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	878	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);	879	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
…		…
912	<< uint32 (pl->ob->face)	905	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	906	<< data8 (pl->ob->name);
914		907
915	pl->ns->last_weight = weight;	908	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	909	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	910	}
919		911
920	/******************************************************************************	912	/******************************************************************************
921	*	913	*
922	* Start of map related commands.	914	* Start of map related commands.
…		…
989		981
990	/* Nothing changed */	982	/* Nothing changed */
991	return 0;	983	return 0;
992	}	984	}
993		985
994	/**	986	//-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		987
1013	// prefetch (and touch) all maps within a specific distancd	988	// prefetch (and touch) all maps within a specific distancd
1014	static void	989	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)	990	prefetch_surrounding_maps (maptile *map, int distance)
1016	{	991	{
1017	map->last_access = runtime;	992	map->touch ();
1018		993
1019	if (--distance)	994	if (--distance)
1020	for (int dir = 4; --dir; )	995	for (int dir = 4; dir--; )
1021	if (const shstr &path = map->tile_path [dir])	996	if (const shstr &path = map->tile_path [dir])
1022	if (maptile *&neigh = map->tile_map [dir])	997	if (maptile *&neigh = map->tile_map [dir])
1023	prefetch_surrounding_maps (neigh, distance);	998	prefetch_surrounding_maps (neigh, distance);
1024	else	999	else
1025	neigh = maptile::find_async (path, map);	1000	neigh = maptile::find_async (path, map);
…		…
1030	prefetch_surrounding_maps (object *op)	1005	prefetch_surrounding_maps (object *op)
1031	{	1006	{
1032	prefetch_surrounding_maps (op->map, 3);	1007	prefetch_surrounding_maps (op->map, 3);
1033	}	1008	}
1034		1009
		1010	//+GPL
		1011
1035	/**	1012	/**
1036	* Draws client map.	1013	* Draws client map.
1037	*/	1014	*/
1038	void	1015	void
1039	draw_client_map (player *pl)	1016	draw_client_map (player *pl)
1040	{	1017	{
1041	object *ob = pl->observe;	1018	object *ob = pl->viewpoint;
1042	if (!ob->active)	1019	if (!pl->observe->active)
1043	return;	1020	return;
1044
1045	maptile *plmap = ob->map;
1046		1021
1047	/* If player is just joining the game, he isn't here yet, so the map	1022	/* 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	1023	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	1024	* be OK once they really log in.
1050	*/	1025	*/
1051	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	1026	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1052	return;	1027	return;
1053		1028
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	1029	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		1030
1060	check_map_change (pl);	1031	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	1032	prefetch_surrounding_maps (pl->ob);
1062		1033
1063	/* do LOS after calls to update_position */	1034	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	1035	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	1036	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1066	else if (pl->do_los)
1067	{	1037	{
1068	update_los (ob);
1069	pl->do_los = 0;	1038	pl->do_los = 0;
		1039	pl->update_los ();
1070	}	1040	}
1071		1041
1072	/**	1042	/**
1073	* This function uses the new map1 protocol command to send the map	1043	* 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	1044	* to the client. It is necessary because the old map command supports
…		…
1093	*/	1063	*/
1094		1064
1095	client &socket = *pl->ns;	1065	client &socket = *pl->ns;
1096		1066
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1067	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1098	packet esl;
1099		1068
1100	startlen = sl.length ();	1069	startlen = sl.length ();
1101		1070
1102	/Extendedmapinfo structure initialisation /	1071	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	1072	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		1073
1107	if (socket.EMI_smooth)	1074	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos \|= EMI_SMOOTH;	1075	int ax = dx + hx;
		1076	int ay = dy + hy;
1109		1077
1110	ewhatstart = esl.length ();	1078	int mask = (ax << 10) \| (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1079	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		1080
1118	estartlen = esl.length ();	1081	/* If the coordinates are not valid, or it is too dark to see,
1119	}	1082	* we tell the client as such
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/	1083	*/
1124	ay = 0;	1084	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	{	1085	{
1134	sint16 nx, ny;	1086	/* space is out of map. Update space and clear values
1135	maptile *m = 0;	1087	* if this hasn't already been done. If the space is out
1136		1088	* of the map, it shouldn't have a head.
1137	ax = 0;	1089	*/
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1090	if (lastcell.count != -1)
1139	{	1091	{
1140	// check to see if we can simply go one right quickly	1092	sl << uint16 (mask);
		1093	map_clearcell (&lastcell, -1);
1141	++nx;	1094	}
1142	if (m && nx >= m->width)	1095
		1096	continue;
		1097	}
		1098
		1099	int d = pl->blocked_los_uc (dx, dy);
		1100
		1101	if (d > 3)
		1102	{
		1103	/* This block deals with spaces that are not visible for whatever
		1104	* reason. Still may need to send the head for this space.
		1105	*/
		1106	if (lastcell.count != -1
		1107	\|\| lastcell.faces[0]
		1108	\|\| lastcell.faces[1]
		1109	\|\| lastcell.faces[2]
		1110	\|\| lastcell.stat_hp
		1111	\|\| lastcell.flags
		1112	\|\| lastcell.player)
		1113	sl << uint16 (mask);
		1114
		1115	/* properly clear a previously sent big face */
		1116	map_clearcell (&lastcell, -1);
		1117	}
		1118	else
		1119	{
		1120	/* In this block, the space is visible.
		1121	*/
		1122
		1123	/* Rather than try to figure out what everything that we might
		1124	* need to send is, then form the packet after that,
		1125	* we presume that we will in fact form a packet, and update
		1126	* the bits by what we do actually send. If we send nothing,
		1127	* we just back out sl.length () to the old value, and no harm
		1128	* is done.
		1129	* I think this is simpler than doing a bunch of checks to see
		1130	* what if anything we need to send, setting the bits, then
		1131	* doing those checks again to add the real data.
		1132	*/
		1133	oldlen = sl.length ();
		1134
		1135	sl << uint16 (mask);
		1136
		1137	unsigned char dummy;
		1138	unsigned char *last_ext = &dummy;
		1139
		1140	/* Darkness changed */
		1141	if (lastcell.count != d)
		1142	{
1143	m = 0;	1143	mask \|= 0x8;
1144		1144
1145	if (!m)	1145	*last_ext \|= 0x80;
		1146	last_ext = &sl[sl.length ()];
		1147	sl << uint8 (d);
		1148	}
		1149
		1150	lastcell.count = d;
		1151
		1152	mapspace &ms = m->at (nx, ny);
		1153	ms.update ();
		1154
		1155	// extmap handling
		1156	uint8 stat_hp = 0;
		1157	uint8 stat_width = 0;
		1158	uint8 flags = 0;
		1159	tag_t player = 0;
		1160
		1161	// send hp information, if applicable
		1162	if (object *op = ms.faces_obj [0])
		1163	if (op->is_head () && !op->invisible)
1146	{	1164	{
1147	nx = x; ny = y; m = plmap;	1165	if (op->stats.maxhp > op->stats.hp
1148		1166	&& op->stats.maxhp > 0
1149	if (xy_normalise (m, nx, ny))	1167	&& (op->type == PLAYER
1150	m->touch ();	1168	\|\| op->type == DOOR // does not work, have maxhp 0
1151	else	1169	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1170	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1171	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1152	m = 0;	1172	{
		1173	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1174	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1175	}
		1176
		1177	if (expect_false (op->has_dialogue ()))
		1178	flags \|= 1;
		1179
		1180	if (expect_false (op->type == PLAYER))
		1181	player = op == ob ? pl->ob->count
		1182	: op == pl->ob ? ob->count
		1183	: op->count;
1153	}	1184	}
1154		1185
1155	int emask, mask;	1186	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	{	1187	{
1165	/* space is out of map. Update space and clear values	1188	lastcell.stat_hp = stat_hp;
1166	* if this hasn't already been done. If the space is out	1189
1167	* of the map, it shouldn't have a head	1190	mask \|= 0x8;
1168	*/	1191	*last_ext \|= 0x80;
1169	if (lastcell.count != -1)	1192	last_ext = &sl[sl.length ()];
		1193
		1194	sl << uint8 (5) << uint8 (stat_hp);
		1195
		1196	if (stat_width > 1)
1170	{	1197	{
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;	1198	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];	1199	last_ext = &sl[sl.length ()];
1241	sl << uint8 (d);	1200
1242	}	1201	sl << uint8 (6) << uint8 (stat_width);
1243	else
1244	sl << uint8 (255 - 64 * d);
1245	}	1202	}
		1203	}
1246		1204
1247	lastcell.count = d;	1205	if (expect_false (lastcell.player != player))
1248
1249	mapspace &ms = m->at (nx, ny);
1250	ms.update ();
1251
1252	if (socket.extmap)
1253	{	1206	{
1254	uint8 stat_hp = 0;	1207	lastcell.player = player;
1255	uint8 stat_width = 0;
1256	uint8 flags = 0;
1257	tag_t player = 0;
1258		1208
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) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1268	{
1269	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1270	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1271	}
1272
1273	if (op->msg && op->msg[0] == '@')
1274	flags \|= 1;
1275
1276	if (op->type == PLAYER)
1277	player = op->count;
1278	}
1279
1280	if (lastcell.stat_hp != stat_hp)
1281	{
1282	lastcell.stat_hp = stat_hp;
1283
1284	mask \|= 0x8;	1209	mask \|= 0x8;
1285	*last_ext \|= 0x80;	1210	*last_ext \|= 0x80;
1286	last_ext = &sl[sl.length ()];	1211	last_ext = &sl[sl.length ()];
1287		1212
1288	sl << uint8 (5) << uint8 (stat_hp);
1289
1290	if (stat_width > 1)
1291	{
1292	*last_ext \|= 0x80;
1293	last_ext = &sl[sl.length ()];
1294
1295	sl << uint8 (6) << uint8 (stat_width);
1296	}
1297	}
1298
1299	if (lastcell.player != player)
1300	{
1301	lastcell.player = player;
1302
1303	mask \|= 0x8;
1304	*last_ext \|= 0x80;
1305	last_ext = &sl[sl.length ()];
1306
1307	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1213	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1308	}	1214	}
1309		1215
1310	if (lastcell.flags != flags)	1216	if (expect_false (lastcell.flags != flags))
1311	{	1217	{
1312	lastcell.flags = flags;	1218	lastcell.flags = flags;
1313		1219
1314	mask \|= 0x8;	1220	mask \|= 0x8;
1315	*last_ext \|= 0x80;	1221	*last_ext \|= 0x80;
1316	last_ext = &sl[sl.length ()];	1222	last_ext = &sl[sl.length ()];
1317		1223
1318	sl << uint8 (8) << uint8 (flags);	1224	sl << uint8 (8) << uint8 (flags);
1319	}
1320	}	1225	}
1321		1226
		1227	// faces
		1228
1322	/* Floor face */	1229	/* Floor face */
1323	if (update_space (sl, socket, ms, lastcell, 2))	1230	if (update_space (sl, socket, ms, lastcell, 2))
1324	mask \|= 0x4;	1231	mask \|= 0x4;
1325		1232
1326	/* Middle face */	1233	/* Middle face */
1327	if (update_space (sl, socket, ms, lastcell, 1))	1234	if (update_space (sl, socket, ms, lastcell, 1))
1328	mask \|= 0x2;	1235	mask \|= 0x2;
1329		1236
		1237	if (expect_false (ob->invisible)
		1238	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330	if (ms.player () == ob	1239	&& ms.player () == ob)
1331	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1332	{	1240	{
1333	// force player to be visible to himself if invisible	1241	// force player to be visible to himself if invisible
1334	if (lastcell.faces[0] != ob->face)	1242	if (lastcell.faces[0] != ob->face)
1335	{	1243	{
1336	lastcell.faces[0] = ob->face;	1244	lastcell.faces[0] = ob->face;
1337		1245
1338	mask \|= 0x1;
1339	sl << uint16 (ob->face);
1340
1341	socket.send_faces (ob);
1342	}
1343	}
1344	/* Top face */
1345	else if (update_space (sl, socket, ms, lastcell, 0))
1346	mask \|= 0x1;	1246	mask \|= 0x1;
		1247	sl << uint16 (ob->face);
1347		1248
		1249	socket.send_faces (ob);
		1250	}
		1251	}
		1252	/* Top face */
		1253	else if (update_space (sl, socket, ms, lastcell, 0))
		1254	mask \|= 0x1;
		1255
1348	/* Check to see if we are in fact sending anything for this	1256	/* Check to see if we are in fact sending anything for this
1349	* space by checking the mask. If so, update the mask.	1257	* space by checking the mask. If so, update the mask.
1350	* if not, reset the len to that from before adding the mask	1258	* if not, reset the len to that from before adding the mask
1351	* value, so we don't send those bits.	1259	* value, so we don't send those bits.
1352	*/	1260	*/
1353	if (mask & 0xf)	1261	if (mask & 0xf)
1354	sl[oldlen + 1] = mask & 0xff;	1262	sl[oldlen + 1] = mask & 0xff;
1355	else	1263	else
1356	sl.reset (oldlen);	1264	sl.reset (oldlen);
1357
1358	if (socket.ext_mapinfos)
1359	esl << uint16 (emask);
1360
1361	if (socket.EMI_smooth)
1362	{
1363	for (int layer = 2+1; layer--; )
1364	{
1365	object *ob = ms.faces_obj [layer];
1366
1367	// If there is no object for this space, or if the face for the object
1368	// is the blank face, set the smoothlevel to zero.
1369	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1370
1371	// We've gotten what face we want to use for the object. Now see if
1372	// if it has changed since we last sent it to the client.
1373	if (lastcell.smooth[layer] != smoothlevel)
1374	{
1375	lastcell.smooth[layer] = smoothlevel;
1376	esl << uint8 (smoothlevel);
1377	emask \|= 1 << layer;
1378	}
1379	}
1380
1381	if (emask & 0xf)
1382	esl[eoldlen + 1] = emask & 0xff;
1383	else
1384	esl.reset (eoldlen);
1385	}
1386	} /* else this is a viewable space */	1265	} /* else this is a viewable space */
1387	} /* for x loop */	1266	ordered_mapwalk_end
1388	} /* for y loop */
1389		1267
1390	socket.flush_fx ();	1268	socket.flush_fx ();
1391
1392	/* Verify that we in fact do need to send this */
1393	if (socket.ext_mapinfos)
1394	{
1395	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1396	{
1397	/* No map data will follow, so don't say the client
1398	* it doesn't need draw!
1399	*/
1400	ewhatflag &= ~EMI_NOREDRAW;
1401	esl[ewhatstart + 1] = ewhatflag & 0xff;
1402	}
1403
1404	if (esl.length () > estartlen)
1405	socket.send_packet (esl);
1406	}
1407		1269
1408	if (sl.length () > startlen \|\| socket.sent_scroll)	1270	if (sl.length () > startlen \|\| socket.sent_scroll)
1409	{	1271	{
1410	socket.send_packet (sl);	1272	socket.send_packet (sl);
1411	socket.sent_scroll = 0;	1273	socket.sent_scroll = 0;
1412	}	1274	}
1413	}	1275	}
1414		1276
1415	/*****************************************************************************/
1416	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1417	/* a player. Of course, the client need to know the command to be able to */
1418	/* manage it ! */
1419	/*****************************************************************************/
1420	void
1421	send_plugin_custom_message (object pl, char buf)
1422	{
1423	pl->contr->ns->send_packet (buf);
1424	}
1425
1426	/**
1427	* This sends the skill number to name mapping. We ignore
1428	* the params - we always send the same info no matter what.
1429	*/
1430	void
1431	send_skill_info (client ns, char params)
1432	{
1433	packet sl;
1434	sl << "replyinfo skill_info\n";
1435
1436	for (int i = 1; i < NUM_SKILLS; i++)
1437	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1438
1439	if (sl.length () > MAXSOCKBUF)
1440	{
1441	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442	fatal (0);
1443	}
1444
1445	ns->send_packet (sl);
1446	}
1447
1448	/**
1449	* This sends the spell path to name mapping. We ignore
1450	* the params - we always send the same info no matter what.
1451	*/
1452	void
1453	send_spell_paths (client * ns, char *params)
1454	{
1455	packet sl;
1456
1457	sl << "replyinfo spell_paths\n";
1458
1459	for (int i = 0; i < NRSPELLPATHS; i++)
1460	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461
1462	if (sl.length () > MAXSOCKBUF)
1463	{
1464	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465	fatal (0);
1466	}
1467
1468	ns->send_packet (sl);
1469	}
1470
1471	/**	1277	/**
1472	* This looks for any spells the player may have that have changed their stats.	1278	* This looks for any spells the player may have that have changed their stats.
1473	* it then sends an updspell packet for each spell that has changed in this way	1279	* it then sends an updspell packet for each spell that has changed in this way
1474	*/	1280	*/
1475	void	1281	void
1476	esrv_update_spells (player *pl)	1282	esrv_update_spells (player *pl)
1477	{	1283	{
1478	if (!pl->ns)	1284	if (!pl->ns)
1479	return;	1285	return;
1480		1286
		1287	pl->ns->update_spells = false;
		1288
1481	if (!pl->ns->monitor_spells)	1289	if (!pl->ns->monitor_spells)
1482	return;	1290	return;
1483		1291
1484	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1292	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1485	{
1486	if (spell->type == SPELL)	1293	if (spell->type == SPELL)
1487	{	1294	{
1488	int flags = 0;	1295	int flags = 0;
		1296	int val;
1489		1297
1490	/* check if we need to update it */	1298	/* check if we need to update it */
1491	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1299	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1300	if (spell->cached_sp != val)
1492	{	1301	{
1493	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1302	spell->cached_sp = val;
1494	flags \|= UPD_SP_MANA;	1303	flags \|= UPD_SP_MANA;
1495	}	1304	}
1496		1305
1497	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1306	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1307	if (spell->cached_grace != val)
1498	{	1308	{
1499	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1309	spell->cached_grace = val;
1500	flags \|= UPD_SP_GRACE;	1310	flags \|= UPD_SP_GRACE;
1501	}	1311	}
1502		1312
1503	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1313	val = casting_level (pl->ob, spell);
		1314	if (spell->cached_eat != val)
1504	{	1315	{
1505	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1316	spell->cached_eat = val;
1506	flags \|= UPD_SP_DAMAGE;	1317	flags \|= UPD_SP_LEVEL;
1507	}	1318	}
1508		1319
1509	if (flags)	1320	if (flags)
1510	{	1321	{
1511	packet sl;	1322	packet sl;
1512		1323
1513	sl << "updspell "	1324	sl << "updspell "
1514	<< uint8 (flags)	1325	<< uint8 (flags)
1515	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1516		1327
1517	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1518	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1329	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1519	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1330	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1520		1331
1521	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1522	}	1333	}
1523	}	1334	}
1524	}
1525	}	1335	}
1526		1336
1527	void	1337	void
1528	esrv_remove_spell (player pl, object spell)	1338	esrv_remove_spell (player pl, object spell)
1529	{	1339	{
…		…
1556	}	1366	}
1557		1367
1558	/* store costs and damage in the object struct, to compare to later */	1368	/* store costs and damage in the object struct, to compare to later */
1559	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1369	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1560	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1370	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1561	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1371	spell->cached_eat = casting_level (pl->ob, spell);
1562		1372
1563	/* figure out which skill it uses, if it uses one */	1373	/* figure out which skill it uses, if it uses one */
1564	if (spell->skill)	1374	if (spell->skill)
1565	{	1375	if (object *tmp = pl->find_skill (spell->skill))
1566	for (i = 1; i < NUM_SKILLS; i++)
1567	if (!strcmp (spell->skill, skill_names[i]))
1568	{
1569	skill = i + CS_STAT_SKILLINFO;	1376	skill = tmp->subtype + CS_STAT_SKILLINFO;
1570	break;
1571	}
1572	}
1573		1377
1574	// spells better have a face	1378	// spells better have a face
1575	if (!spell->face)	1379	if (!spell->face)
1576	{	1380	{
1577	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1381	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1661	/* finally, we can send the packet */	1465	/* finally, we can send the packet */
1662	pl->ns->flush_fx ();	1466	pl->ns->flush_fx ();
1663	pl->ns->send_packet (sl);	1467	pl->ns->send_packet (sl);
1664	}	1468	}
1665		1469
		1470	//-GPL
		1471

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs. Revision 1.168 by root, Tue Apr 6 22:59:28 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs.
Revision 1.168 by root, Tue Apr 6 22:59:28 2010 UTC