[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 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 & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
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	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	//+GPL
40		43
41	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
42	0,	45	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	46	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48	0,	51	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	52	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	55	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	56	int freedir[SIZEOFFREE] = {
60	0,	57	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	58	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	59	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	61	};
65		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
66	static void	70	static void
67	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
68	{	72	{
69	CALL_BEGIN (2);	73	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	77	CALL_END;
74	}	78	}
75		79
76	static void	80	static void
77	read_uuid (void)	81	read_uuid ()
78	{	82	{
79	char filename[MAX_BUF];	83	char filename[MAX_BUF];
80		84
81	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
82		86
…		…
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	106	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
104		108
105	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
106	{	110	{
…		…
133		137
134	void	138	void
135	UUID::init ()	139	UUID::init ()
136	{	140	{
137	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) \| digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz \|= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
138	}	207	}
139		208
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	210	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	211	compare_ob_value_lists_one (const object wants, const object has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
179	* check weight	248	* check weight
180	*/	249	*/
181	bool object::can_merge_slow (object ob1, object ob2)	250	bool object::can_merge_slow (object ob1, object ob2)
182	{	251	{
183	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
184	if (ob1 == ob2	253	if (ob1 == ob2
185	\|\| ob1->type != ob2->type	254	\|\| ob1->type != ob2->type
186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	255	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	256	\|\| ob1->name != ob2->name
		257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	258	return 0;
190		259
191	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	261	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	263	return 0;
198		264
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	266	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	267	* just can't ignore the been applied or identified flags, as they
…		…
217	\|\| ob1->magic != ob2->magic	283	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	284	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	285	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	286	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	287	\|\| ob1->animation_id != ob2->animation_id
222	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	288	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
223	\|\| ob1->client_type != ob2->client_type	289	\|\| ob1->client_type != ob2->client_type
224	\|\| ob1->materialname != ob2->materialname	290	\|\| ob1->material != ob2->material
225	\|\| ob1->lore != ob2->lore	291	\|\| ob1->lore != ob2->lore
226	\|\| ob1->subtype != ob2->subtype	292	\|\| ob1->subtype != ob2->subtype
227	\|\| ob1->move_type != ob2->move_type	293	\|\| ob1->move_type != ob2->move_type
228	\|\| ob1->move_block != ob2->move_block	294	\|\| ob1->move_block != ob2->move_block
229	\|\| ob1->move_allow != ob2->move_allow	295	\|\| ob1->move_allow != ob2->move_allow
230	\|\| ob1->move_on != ob2->move_on	296	\|\| ob1->move_on != ob2->move_on
231	\|\| ob1->move_off != ob2->move_off	297	\|\| ob1->move_off != ob2->move_off
232	\|\| ob1->move_slow != ob2->move_slow	298	\|\| ob1->move_slow != ob2->move_slow
233	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	299	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	302	return 0;
237		303
238	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	305	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	306	.reset (FLAG_REMOVED)
242	.any ())	307	.any ())
243	return 0;	308	return 0;
244		309
245	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
…		…
327	{	392	{
328	// see if we are in a container of sorts	393	// see if we are in a container of sorts
329	if (env)	394	if (env)
330	{	395	{
331	// the player inventory itself is always visible	396	// the player inventory itself is always visible
332	if (env->type == PLAYER)	397	if (env->is_player ())
333	return env;	398	return env;
334		399
335	// else a player could have our env open	400	// else a player could have our env open
336	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
337		402
338	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
339	// even if our inv is in a player.	404	// even if our inv is in a player.
340	if (envest->is_on_map ())	405	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
342	if (pl->container == env)	407	if (pl->container_ () == env)
343	return pl;	408	return pl;
344	}	409	}
345	else	410	else
346	{	411	{
347	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
351	\|\| this == pl->container)	416	\|\| pl->container_ () == this)
352	return pl;	417	return pl;
353	}	418	}
354	}	419	}
355		420
356	return 0;	421	return 0;
…		…
434	object_freezer freezer;	499	object_freezer freezer;
435	op->write (freezer);	500	op->write (freezer);
436	return freezer.as_string ();	501	return freezer.as_string ();
437	}	502	}
438		503
439	/*	504	char *
440	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
441	* multi-object 1 which is closest to the second object.
442	* If it's not a multi-object, it is returned.
443	*/
444	object *
445	get_nearest_part (object op, const object pl)
446	{	506	{
447	object tmp, closest;	507	return dump_object (this);
448	int last_dist, i;
449
450	if (!op->more)
451	return op;
452
453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
454	tmp;
455	tmp = tmp->more)
456	if ((i = distance (tmp, pl)) < last_dist)
457	closest = tmp, last_dist = i;
458
459	return closest;
460	}	508	}
461		509
462	/*	510	/*
463	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
464	* VERRRY slow.	512	* VERRRY slow.
…		…
466	object *	514	object *
467	find_object (tag_t i)	515	find_object (tag_t i)
468	{	516	{
469	for_all_objects (op)	517	for_all_objects (op)
470	if (op->count == i)	518	if (op->count == i)
		519	return op;
		520
		521	return 0;
		522	}
		523
		524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
471	return op;	534	return op;
472		535
473	return 0;	536	return 0;
474	}	537	}
475		538
…		…
558	update_stats ();	621	update_stats ();
559		622
560	new_draw_info_format (NDI_UNIQUE, 0, this,	623	new_draw_info_format (NDI_UNIQUE, 0, this,
561	"You try to balance all your items at once, "	624	"You try to balance all your items at once, "
562	"but the %s is just too much for your body. "	625	"but the %s is just too much for your body. "
563	"[You need to unapply some items first.]", &ob->name);	626	"[You need to unapply some items first - use the 'body' command to see "
		627	"how many items you cna wera on a specific body part.]", &ob->name);
564	return false;	628	return false;
565	}	629	}
566		630
567	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	631	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
568	}	632	}
…		…
637	tail = new_link;	701	tail = new_link;
638	}	702	}
639	}	703	}
640	}	704	}
641		705
642	if (speed < 0)	706	dst->activate ();
643	dst->speed_left -= rndm ();
644
645	dst->set_speed (dst->speed);
646	}	707	}
647		708
648	void	709	void
649	object::instantiate ()	710	object::instantiate ()
650	{	711	{
651	if (!uuid.seq) // HACK	712	if (!uuid.seq) // HACK
652	uuid = UUID::gen ();	713	uuid = UUID::gen ();
653		714
		715	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		716	if (flag [FLAG_RANDOM_SPEED] && speed)
		717	speed_left = - speed - rndm (); // TODO animation
		718	else
654	speed_left = -0.1f;	719	speed_left = -1.;
		720
655	/* copy the body_info to the body_used - this is only really	721	/* copy the body_info to the body_used - this is only really
656	* need for monsters, but doesn't hurt to do it for everything.	722	* need for monsters, but doesn't hurt to do it for everything.
657	* by doing so, when a monster is created, it has good starting	723	* by doing so, when a monster is created, it has good starting
658	* values for the body_used info, so when items are created	724	* values for the body_used info, so when items are created
659	* for it, they can be properly equipped.	725	* for it, they can be properly equipped.
…		…
667	object *	733	object *
668	object::clone ()	734	object::clone ()
669	{	735	{
670	object *neu = create ();	736	object *neu = create ();
671	copy_to (neu);	737	copy_to (neu);
		738
		739	// TODO: unclean state changes, should not be done in clone AND instantiate
		740	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		741	neu->speed_left = - neu->speed - rndm (); // TODO animation
		742
672	neu->map = map; // not copied by copy_to	743	neu->map = map; // not copied by copy_to
673	return neu;	744	return neu;
674	}	745	}
675		746
676	/*	747	/*
…		…
694	* This function needs to be called whenever the speed of an object changes.	765	* This function needs to be called whenever the speed of an object changes.
695	*/	766	*/
696	void	767	void
697	object::set_speed (float speed)	768	object::set_speed (float speed)
698	{	769	{
699	if (flag [FLAG_FREED] && speed)
700	{
701	LOG (llevError, "Object %s is freed but has speed.\n", &name);
702	speed = 0;
703	}
704
705	this->speed = speed;	770	this->speed = speed;
706		771
707	if (has_active_speed ())	772	if (has_active_speed ())
708	activate ();	773	activate ();
709	else	774	else
…		…
759		824
760	if (!(m.flags_ & P_UPTODATE))	825	if (!(m.flags_ & P_UPTODATE))
761	/* nop */;	826	/* nop */;
762	else if (action == UP_OBJ_INSERT)	827	else if (action == UP_OBJ_INSERT)
763	{	828	{
		829	#if 0
764	// this is likely overkill, TODO: revisit (schmorp)	830	// this is likely overkill, TODO: revisit (schmorp)
765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	831	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
766	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	832	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
767	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	833	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
768	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	834	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	835	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	836	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771	\|\| (m.move_on \| op->move_on ) != m.move_on	837	\|\| (m.move_on \| op->move_on ) != m.move_on
772	\|\| (m.move_off \| op->move_off ) != m.move_off	838	\|\| (m.move_off \| op->move_off ) != m.move_off
773	\|\| (m.move_slow \| op->move_slow) != m.move_slow	839	\|\| (m.move_slow \| op->move_slow) != m.move_slow
774	/* This isn't perfect, but I don't expect a lot of objects to	840	/* This isn't perfect, but I don't expect a lot of objects to
775	* have move_allow right now.	841	* have move_allow right now.
776	*/	842	*/
777	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	843	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
		844	m.invalidate ();
		845	#else
778	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	846	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
779	m.flags_ = 0;	847	m.invalidate ();
		848	#endif
780	}	849	}
781	/* if the object is being removed, we can't make intelligent	850	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	851	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	852	* that is being removed.
784	*/	853	*/
785	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	854	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	855	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	856	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	857	/* Nothing to do for that case */ ;
789	else	858	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	859	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		860
…		…
795		864
796	object::object ()	865	object::object ()
797	{	866	{
798	SET_FLAG (this, FLAG_REMOVED);	867	SET_FLAG (this, FLAG_REMOVED);
799		868
800	expmul = 1.0;	869	//expmul = 1.0; declared const for the time being
801	face = blank_face;	870	face = blank_face;
		871	material = MATERIAL_NULL;
802	}	872	}
803		873
804	object::~object ()	874	object::~object ()
805	{	875	{
806	unlink ();	876	unlink ();
…		…
835	/* If already on active list, don't do anything */	905	/* If already on active list, don't do anything */
836	if (active)	906	if (active)
837	return;	907	return;
838		908
839	if (has_active_speed ())	909	if (has_active_speed ())
		910	{
		911	if (flag [FLAG_FREED])
		912	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		913
840	actives.insert (this);	914	actives.insert (this);
		915	}
841	}	916	}
842		917
843	void	918	void
844	object::activate_recursive ()	919	object::activate_recursive ()
845	{	920	{
…		…
910	\|\| map->in_memory != MAP_ACTIVE	985	\|\| map->in_memory != MAP_ACTIVE
911	\|\| map->no_drop	986	\|\| map->no_drop
912	\|\| ms ().move_block == MOVE_ALL)	987	\|\| ms ().move_block == MOVE_ALL)
913	{	988	{
914	while (inv)	989	while (inv)
915	inv->destroy (true);	990	inv->destroy ();
916	}	991	}
917	else	992	else
918	{ /* Put objects in inventory onto this space */	993	{ /* Put objects in inventory onto this space */
919	while (inv)	994	while (inv)
920	{	995	{
…		…
924	\|\| op->flag [FLAG_NO_DROP]	999	\|\| op->flag [FLAG_NO_DROP]
925	\|\| op->type == RUNE	1000	\|\| op->type == RUNE
926	\|\| op->type == TRAP	1001	\|\| op->type == TRAP
927	\|\| op->flag [FLAG_IS_A_TEMPLATE]	1002	\|\| op->flag [FLAG_IS_A_TEMPLATE]
928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	1003	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
929	op->destroy (true);	1004	op->destroy ();
930	else	1005	else
931	map->insert (op, x, y);	1006	map->insert (op, x, y);
932	}	1007	}
933	}	1008	}
934	}	1009	}
…		…
963		1038
964	void	1039	void
965	object::do_destroy ()	1040	object::do_destroy ()
966	{	1041	{
967	if (flag [FLAG_IS_LINKED])	1042	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	1043	remove_link ();
969		1044
970	if (flag [FLAG_FRIENDLY])	1045	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	1046	remove_friendly_object (this);
972		1047
973	remove ();	1048	remove ();
…		…
998	attacked_by = 0;	1073	attacked_by = 0;
999	current_weapon = 0;	1074	current_weapon = 0;
1000	}	1075	}
1001		1076
1002	void	1077	void
1003	object::destroy (bool destroy_inventory)	1078	object::destroy ()
1004	{	1079	{
1005	if (destroyed ())	1080	if (destroyed ())
1006	return;	1081	return;
1007		1082
1008	if (!is_head () && !head->destroyed ())	1083	if (!is_head () && !head->destroyed ())
1009	{	1084	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1085	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1086	head->destroy ();
1012	return;	1087	return;
1013	}	1088	}
1014		1089
1015	destroy_inv (!destroy_inventory);	1090	destroy_inv (false);
1016		1091
1017	if (is_head ())	1092	if (is_head ())
1018	if (sound_destroy)	1093	if (sound_destroy)
1019	play_sound (sound_destroy);	1094	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1095	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1106	* the previous environment.
1032	*/	1107	*/
1033	void	1108	void
1034	object::do_remove ()	1109	object::do_remove ()
1035	{	1110	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1111	if (flag [FLAG_REMOVED])
1040	return;	1112	return;
1041		1113
1042	INVOKE_OBJECT (REMOVE, this);	1114	INVOKE_OBJECT (REMOVE, this);
1043		1115
…		…
1056	if (object *pl = visible_to ())	1128	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1129	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1130	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1131
1060	adjust_weight (env, -total_weight ());	1132	adjust_weight (env, -total_weight ());
		1133
		1134	object *pl = in_player ();
1061		1135
1062	/* we set up values so that it could be inserted into	1136	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1137	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1138	* to the caller to decide what we want to do.
1065	*/	1139	*/
…		…
1073		1147
1074	above = 0;	1148	above = 0;
1075	below = 0;	1149	below = 0;
1076	env = 0;	1150	env = 0;
1077		1151
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1152	if (pl && pl->is_player ())
1079	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.
1081	*/	1153	{
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1154	pl->contr->queue_stats_update ();
1083	otmp->update_stats ();	1155
		1156	if (glow_radius && pl->is_on_map ())
		1157	update_all_los (pl->map, pl->x, pl->y);
		1158	}
1084	}	1159	}
1085	else if (map)	1160	else if (map)
1086	{	1161	{
1087	map->dirty = true;	1162	map->dirty = true;
1088	mapspace &ms = this->ms ();	1163	mapspace &ms = this->ms ();
1089		1164
1090	if (object *pl = ms.player ())	1165	if (object *pl = ms.player ())
1091	{	1166	{
1092	if (type == PLAYER) // this == pl(!)	1167	if (is_player ())
1093	{	1168	{
		1169	if (!flag [FLAG_WIZPASS])
		1170	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1171
1094	// leaving a spot always closes any open container on the ground	1172	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1173	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1174	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1175	// that the CLOSE event is being sent.
1098	close_container ();	1176	close_container ();
1099		1177
1100	--map->players;	1178	--map->players;
1101	map->touch ();	1179	map->touch ();
1102	}	1180	}
1103	else if (pl->container == this)	1181	else if (pl->container_ () == this)
1104	{	1182	{
1105	// removing a container should close it	1183	// removing a container should close it
1106	close_container ();	1184	close_container ();
1107	}	1185	}
1108		1186
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1193	*(below ? &below->above : &ms.bot) = above;
1116		1194
1117	above = 0;	1195	above = 0;
1118	below = 0;	1196	below = 0;
1119		1197
1120	ms.flags_ = 0;	1198	ms.invalidate ();
1121		1199
1122	if (map->in_memory == MAP_SAVING)	1200	if (map->in_memory == MAP_SAVING)
1123	return;	1201	return;
1124		1202
1125	int check_walk_off = !flag [FLAG_NO_APPLY];	1203	int check_walk_off = !flag [FLAG_NO_APPLY];
1126		1204
1127	if (object *pl = ms.player ())	1205	if (object *pl = ms.player ())
1128	{	1206	{
1129	if (pl->container == this)	1207	if (pl->container_ () == this)
1130	/* If a container that the player is currently using somehow gets	1208	/* If a container that the player is currently using somehow gets
1131	* removed (most likely destroyed), update the player view	1209	* removed (most likely destroyed), update the player view
1132	* appropriately.	1210	* appropriately.
1133	*/	1211	*/
1134	pl->close_container ();	1212	pl->close_container ();
…		…
1138	//TODO: update floorbox to preserve ordering	1216	//TODO: update floorbox to preserve ordering
1139	if (pl->contr->ns)	1217	if (pl->contr->ns)
1140	pl->contr->ns->floorbox_update ();	1218	pl->contr->ns->floorbox_update ();
1141	}	1219	}
1142		1220
		1221	if (check_walk_off)
1143	for (tmp = ms.bot; tmp; tmp = tmp->above)	1222	for (object above, tmp = ms.bot; tmp; tmp = above)
1144	{	1223	{
		1224	above = tmp->above;
		1225
1145	/* No point updating the players look faces if he is the object	1226	/* No point updating the players look faces if he is the object
1146	* being removed.	1227	* being removed.
1147	*/	1228	*/
1148		1229
1149	/* See if object moving off should effect something */	1230	/* See if object moving off should effect something */
1150	if (check_walk_off
1151	&& ((move_type & tmp->move_off)	1231	if ((move_type & tmp->move_off)
1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1232	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1153	{
1154	move_apply (tmp, this, 0);	1233	move_apply (tmp, this, 0);
1155
1156	if (destroyed ())
1157	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1158	}	1234	}
1159		1235
1160	last = tmp;	1236	if (affects_los ())
1161	}
1162
1163	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1164	update_all_los (map, x, y);	1237	update_all_los (map, x, y);
1165	}	1238	}
1166	}	1239	}
1167		1240
1168	/*	1241	/*
…		…
1192	esrv_update_item (UPD_NROF, pl, top);	1265	esrv_update_item (UPD_NROF, pl, top);
1193		1266
1194	op->weight = 0; // cancel the addition above	1267	op->weight = 0; // cancel the addition above
1195	op->carrying = 0; // must be 0 already	1268	op->carrying = 0; // must be 0 already
1196		1269
1197	op->destroy (1);	1270	op->destroy ();
1198		1271
1199	return top;	1272	return top;
1200	}	1273	}
1201		1274
1202	return 0;	1275	return 0;
…		…
1210		1283
1211	object *prev = this;	1284	object *prev = this;
1212		1285
1213	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1286	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1214	{	1287	{
1215	object *op = arch_to_object (at);	1288	object *op = at->instance ();
1216		1289
1217	op->name = name;	1290	op->name = name;
1218	op->name_pl = name_pl;	1291	op->name_pl = name_pl;
1219	op->title = title;	1292	op->title = title;
1220		1293
…		…
1258	* Passing 0 for flag gives proper default values, so flag really only needs	1331	* Passing 0 for flag gives proper default values, so flag really only needs
1259	* to be set if special handling is needed.	1332	* to be set if special handling is needed.
1260	*	1333	*
1261	* Return value:	1334	* Return value:
1262	* new object if 'op' was merged with other object	1335	* new object if 'op' was merged with other object
1263	* NULL if 'op' was destroyed	1336	* NULL if there was an error (destroyed, blocked etc.)
1264	* just 'op' otherwise	1337	* just 'op' otherwise
1265	*/	1338	*/
1266	object *	1339	object *
1267	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1340	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1268	{	1341	{
1269	if (op->is_on_map ())
1270	{
1271	LOG (llevError, "insert_ob_in_map called for object already on map");
1272	abort ();
1273	}
1274
1275	if (op->env)
1276	{
1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1278	op->remove ();	1342	op->remove ();
1279	}
1280		1343
1281	if (op->face && !face_info (op->face))//D TODO: remove soon	1344	if (m == &freed_map)//D TODO: remove soon
1282	{//D	1345	{//D
1283	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1346	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1284	op->face = 1;//D
1285	}//D	1347	}//D
1286		1348
1287	/* Ideally, the caller figures this out. However, it complicates a lot	1349	/* Ideally, the caller figures this out. However, it complicates a lot
1288	* of areas of callers (eg, anything that uses find_free_spot would now	1350	* of areas of callers (eg, anything that uses find_free_spot would now
1289	* need extra work	1351	* need extra work
1290	*/	1352	*/
		1353	maptile *newmap = m;
1291	if (!xy_normalise (m, op->x, op->y))	1354	if (!xy_normalise (newmap, op->x, op->y))
1292	{	1355	{
1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1356	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294	return 0;	1357	return 0;
1295	}	1358	}
1296		1359
1297	if (object *more = op->more)	1360	if (object *more = op->more)
1298	if (!insert_ob_in_map (more, m, originator, flag))	1361	if (!insert_ob_in_map (more, m, originator, flag))
1299	return 0;	1362	return 0;
1300		1363
1301	CLEAR_FLAG (op, FLAG_REMOVED);	1364	op->flag [FLAG_REMOVED] = false;
1302		1365	op->env = 0;
1303	op->map = m;	1366	op->map = newmap;
		1367
1304	mapspace &ms = op->ms ();	1368	mapspace &ms = op->ms ();
1305		1369
1306	/* this has to be done after we translate the coordinates.	1370	/* this has to be done after we translate the coordinates.
1307	*/	1371	*/
1308	if (op->nrof && !(flag & INS_NO_MERGE))	1372	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1311	{	1375	{
1312	// TODO: we actually want to update tmp, not op,	1376	// TODO: we actually want to update tmp, not op,
1313	// but some caller surely breaks when we return tmp	1377	// but some caller surely breaks when we return tmp
1314	// from here :/	1378	// from here :/
1315	op->nrof += tmp->nrof;	1379	op->nrof += tmp->nrof;
1316	tmp->destroy (1);	1380	tmp->destroy ();
1317	}	1381	}
1318		1382
1319	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1383	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1320	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1384	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1321		1385
…		…
1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1393	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1330	abort ();	1394	abort ();
1331	}	1395	}
1332		1396
1333	if (!originator->is_on_map ())	1397	if (!originator->is_on_map ())
		1398	{
1334	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1399	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1335	op->debug_desc (), originator->debug_desc ());	1400	op->debug_desc (), originator->debug_desc ());
		1401	abort ();
		1402	}
1336		1403
1337	op->above = originator;	1404	op->above = originator;
1338	op->below = originator->below;	1405	op->below = originator->below;
1339	originator->below = op;	1406	originator->below = op;
1340		1407
…		…
1426	op->below = top;	1493	op->below = top;
1427	*(op->above ? &op->above->below : &ms.top) = op;	1494	*(op->above ? &op->above->below : &ms.top) = op;
1428	}	1495	}
1429	}	1496	}
1430		1497
1431	if (op->type == PLAYER)	1498	if (op->is_player ())
1432	{	1499	{
1433	op->contr->do_los = 1;	1500	op->contr->do_los = 1;
1434	++op->map->players;	1501	++op->map->players;
1435	op->map->touch ();	1502	op->map->touch ();
1436	}	1503	}
…		…
1451	* be far away from this change and not affected in any way -	1518	* be far away from this change and not affected in any way -
1452	* this should get redone to only look for players within range,	1519	* this should get redone to only look for players within range,
1453	* or just updating the P_UPTODATE for spaces within this area	1520	* or just updating the P_UPTODATE for spaces within this area
1454	* of effect may be sufficient.	1521	* of effect may be sufficient.
1455	*/	1522	*/
1456	if (op->map->darkness && (op->glow_radius != 0))	1523	if (op->affects_los ())
		1524	{
		1525	op->ms ().invalidate ();
1457	update_all_los (op->map, op->x, op->y);	1526	update_all_los (op->map, op->x, op->y);
		1527	}
1458		1528
1459	/* updates flags (blocked, alive, no magic, etc) for this map space */	1529	/* updates flags (blocked, alive, no magic, etc) for this map space */
1460	update_object (op, UP_OBJ_INSERT);	1530	update_object (op, UP_OBJ_INSERT);
1461		1531
1462	INVOKE_OBJECT (INSERT, op);	1532	INVOKE_OBJECT (INSERT, op);
…		…
1469	* blocked() and wall() work properly), and these flags are updated by	1539	* blocked() and wall() work properly), and these flags are updated by
1470	* update_object().	1540	* update_object().
1471	*/	1541	*/
1472		1542
1473	/* if this is not the head or flag has been passed, don't check walk on status */	1543	/* if this is not the head or flag has been passed, don't check walk on status */
1474	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1544	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1475	{	1545	{
1476	if (check_move_on (op, originator))	1546	if (check_move_on (op, originator))
1477	return 0;	1547	return 0;
1478		1548
1479	/* If we are a multi part object, lets work our way through the check	1549	/* If we are a multi part object, lets work our way through the check
…		…
1490	/* this function inserts an object in the map, but if it	1560	/* this function inserts an object in the map, but if it
1491	* finds an object of its own type, it'll remove that one first.	1561	* finds an object of its own type, it'll remove that one first.
1492	* op is the object to insert it under: supplies x and the map.	1562	* op is the object to insert it under: supplies x and the map.
1493	*/	1563	*/
1494	void	1564	void
1495	replace_insert_ob_in_map (const char arch_string, object op)	1565	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1496	{	1566	{
1497	/* first search for itself and remove any old instances */	1567	/* first search for itself and remove any old instances */
1498		1568
1499	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1569	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1500	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1570	if (tmp->arch->archname == archname) /* same archetype */
1501	tmp->destroy (1);	1571	tmp->destroy ();
1502		1572
1503	object *tmp = arch_to_object (archetype::find (arch_string));	1573	object *tmp = archetype::find (archname)->instance ();
1504		1574
1505	tmp->x = op->x;	1575	tmp->x = op->x;
1506	tmp->y = op->y;	1576	tmp->y = op->y;
1507		1577
1508	insert_ob_in_map (tmp, op->map, op, 0);	1578	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1513	{	1583	{
1514	if (where->env)	1584	if (where->env)
1515	return where->env->insert (this);	1585	return where->env->insert (this);
1516	else	1586	else
1517	return where->map->insert (this, where->x, where->y, originator, flags);	1587	return where->map->insert (this, where->x, where->y, originator, flags);
		1588	}
		1589
		1590	// check whether we can put this into the map, respect max_volume, max_items
		1591	bool
		1592	object::can_drop_at (maptile m, int x, int y, object originator)
		1593	{
		1594	mapspace &ms = m->at (x, y);
		1595
		1596	int items = ms.items ();
		1597
		1598	if (!items // testing !items ensures we can drop at least one item
		1599	\|\| (items < m->max_items
		1600	&& ms.volume () < m->max_volume))
		1601	return true;
		1602
		1603	if (originator && originator->is_player ())
		1604	originator->contr->failmsg (format (
		1605	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1606	query_name ()
		1607	));
		1608
		1609	return false;
1518	}	1610	}
1519		1611
1520	/*	1612	/*
1521	* decrease(object, number) decreases a specified number from	1613	* decrease(object, number) decreases a specified number from
1522	* the amount of an object. If the amount reaches 0, the object	1614	* the amount of an object. If the amount reaches 0, the object
…		…
1629	if (object *pl = tmp->visible_to ())	1721	if (object *pl = tmp->visible_to ())
1630	esrv_update_item (UPD_NROF, pl, tmp);	1722	esrv_update_item (UPD_NROF, pl, tmp);
1631		1723
1632	adjust_weight (this, op->total_weight ());	1724	adjust_weight (this, op->total_weight ());
1633		1725
1634	op->destroy (1);	1726	op->destroy ();
1635	op = tmp;	1727	op = tmp;
1636	goto inserted;	1728	goto inserted;
1637	}	1729	}
1638		1730
1639	op->owner = 0; // it's his/hers now. period.	1731	op->owner = 0; // it's his/hers now. period.
…		…
1657		1749
1658	adjust_weight (this, op->total_weight ());	1750	adjust_weight (this, op->total_weight ());
1659		1751
1660	inserted:	1752	inserted:
1661	/* reset the light list and los of the players on the map */	1753	/* reset the light list and los of the players on the map */
1662	if (op->glow_radius && map && map->darkness)	1754	if (op->glow_radius && is_on_map ())
		1755	{
		1756	update_stats ();
1663	update_all_los (map, x, y);	1757	update_all_los (map, x, y);
1664		1758	}
		1759	else if (is_player ())
1665	// if this is a player's inventory, update stats	1760	// if this is a player's inventory, update stats
1666	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1761	contr->queue_stats_update ();
1667	update_stats ();
1668		1762
1669	INVOKE_OBJECT (INSERT, this);	1763	INVOKE_OBJECT (INSERT, this);
1670		1764
1671	return op;	1765	return op;
1672	}	1766	}
…		…
1692	* on top.	1786	* on top.
1693	*/	1787	*/
1694	int	1788	int
1695	check_move_on (object op, object originator)	1789	check_move_on (object op, object originator)
1696	{	1790	{
		1791	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1792	return 0;
		1793
1697	object *tmp;	1794	object *tmp;
1698	maptile *m = op->map;	1795	maptile *m = op->map;
1699	int x = op->x, y = op->y;	1796	int x = op->x, y = op->y;
1700		1797
1701	MoveType move_on, move_slow, move_block;	1798	mapspace &ms = m->at (x, y);
1702		1799
1703	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1800	ms.update ();
1704	return 0;
1705		1801
1706	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1802	MoveType move_on = ms.move_on;
1707	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1803	MoveType move_slow = ms.move_slow;
1708	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1804	MoveType move_block = ms.move_block;
1709		1805
1710	/* if nothing on this space will slow op down or be applied,	1806	/* if nothing on this space will slow op down or be applied,
1711	* no need to do checking below. have to make sure move_type	1807	* no need to do checking below. have to make sure move_type
1712	* is set, as lots of objects don't have it set - we treat that	1808	* is set, as lots of objects don't have it set - we treat that
1713	* as walking.	1809	* as walking.
…		…
1724	return 0;	1820	return 0;
1725		1821
1726	/* The objects have to be checked from top to bottom.	1822	/* The objects have to be checked from top to bottom.
1727	* Hence, we first go to the top:	1823	* Hence, we first go to the top:
1728	*/	1824	*/
1729		1825	for (object next, tmp = ms.top; tmp; tmp = next)
1730	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1731	{
1732	/* Trim the search when we find the first other spell effect
1733	* this helps performance so that if a space has 50 spell objects,
1734	* we don't need to check all of them.
1735	*/
1736	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1737	break;
1738	}	1826	{
		1827	next = tmp->below;
1739		1828
1740	for (; tmp; tmp = tmp->below)
1741	{
1742	if (tmp == op)	1829	if (tmp == op)
1743	continue; /* Can't apply yourself */	1830	continue; /* Can't apply yourself */
1744		1831
1745	/* Check to see if one of the movement types should be slowed down.	1832	/* Check to see if one of the movement types should be slowed down.
1746	* Second check makes sure that the movement types not being slowed	1833	* Second check makes sure that the movement types not being slowed
…		…
1751	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1838	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1752	{	1839	{
1753	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1840	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1754	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1841	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1755	{	1842	{
1756
1757	float
1758	diff = tmp->move_slow_penalty * fabs (op->speed);	1843	float diff = tmp->move_slow_penalty * fabs (op->speed);
1759		1844
1760	if (op->type == PLAYER)	1845	if (op->is_player ())
1761	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1846	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1762	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1847	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1763	diff /= 4.0;	1848	diff /= 4.0;
1764		1849
1765	op->speed_left -= diff;	1850	op->speed_left -= diff;
1766	}	1851	}
1767	}	1852	}
…		…
1973	* head of the object should correspond for the entire object.	2058	* head of the object should correspond for the entire object.
1974	*/	2059	*/
1975	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2060	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1976	continue;	2061	continue;
1977		2062
1978	if (ob->blocked (m, pos.x, pos.y))	2063	if (ob->blocked (pos.m, pos.x, pos.y))
1979	continue;	2064	continue;
1980		2065
1981	altern [index++] = i;	2066	altern [index++] = i;
1982	}	2067	}
1983		2068
…		…
2051	* there is capable of.	2136	* there is capable of.
2052	*/	2137	*/
2053	int	2138	int
2054	find_dir (maptile m, int x, int y, object exclude)	2139	find_dir (maptile m, int x, int y, object exclude)
2055	{	2140	{
2056	int i, max = SIZEOFFREE, mflags;	2141	int max = SIZEOFFREE, mflags;
2057
2058	sint16 nx, ny;
2059	object *tmp;
2060	maptile *mp;
2061
2062	MoveType blocked, move_type;	2142	MoveType move_type;
2063		2143
2064	if (exclude && exclude->head_ () != exclude)	2144	if (exclude && exclude->head_ () != exclude)
2065	{	2145	{
2066	exclude = exclude->head;	2146	exclude = exclude->head;
2067	move_type = exclude->move_type;	2147	move_type = exclude->move_type;
…		…
2070	{	2150	{
2071	/* If we don't have anything, presume it can use all movement types. */	2151	/* If we don't have anything, presume it can use all movement types. */
2072	move_type = MOVE_ALL;	2152	move_type = MOVE_ALL;
2073	}	2153	}
2074		2154
2075	for (i = 1; i < max; i++)	2155	for (int i = 1; i < max; i++)
2076	{	2156	{
2077	mp = m;	2157	mapxy pos (m, x, y);
2078	nx = x + freearr_x[i];	2158	pos.move (i);
2079	ny = y + freearr_y[i];
2080		2159
2081	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2160	if (!pos.normalise ())
2082
2083	if (mflags & P_OUT_OF_MAP)
2084	max = maxfree[i];	2161	max = maxfree[i];
2085	else	2162	else
2086	{	2163	{
2087	mapspace &ms = mp->at (nx, ny);	2164	mapspace &ms = *pos;
2088		2165
2089	blocked = ms.move_block;
2090
2091	if ((move_type & blocked) == move_type)	2166	if ((move_type & ms.move_block) == move_type)
2092	max = maxfree[i];	2167	max = maxfree [i];
2093	else if (mflags & P_IS_ALIVE)	2168	else if (ms.flags () & P_IS_ALIVE)
2094	{	2169	{
2095	for (tmp = ms.bot; tmp; tmp = tmp->above)	2170	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2096	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2171	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2097	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2172	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2098	break;
2099
2100	if (tmp)
2101	return freedir[i];	2173	return freedir [i];
2102	}	2174	}
2103	}	2175	}
2104	}	2176	}
2105		2177
2106	return 0;	2178	return 0;
…		…
2181	* This basically means that if direction is 15, then it could either go	2253	* This basically means that if direction is 15, then it could either go
2182	* direction 4, 14, or 16 to get back to where we are.	2254	* direction 4, 14, or 16 to get back to where we are.
2183	* Moved from spell_util.c to object.c with the other related direction	2255	* Moved from spell_util.c to object.c with the other related direction
2184	* functions.	2256	* functions.
2185	*/	2257	*/
2186	int reduction_dir[SIZEOFFREE][3] = {	2258	static const int reduction_dir[SIZEOFFREE][3] = {
2187	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2188	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2189	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2190	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2191	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2287	int	2359	int
2288	can_pick (const object who, const object item)	2360	can_pick (const object who, const object item)
2289	{	2361	{
2290	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2362	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2291	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2292	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2364	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2293	}	2365	}
2294		2366
2295	/*	2367	/*
2296	* create clone from object to another	2368	* create clone from object to another
2297	*/	2369	*/
…		…
2329	return tmp;	2401	return tmp;
2330		2402
2331	return 0;	2403	return 0;
2332	}	2404	}
2333		2405
2334	const shstr &	2406	shstr_tmp
2335	object::kv_get (const shstr &key) const	2407	object::kv_get (shstr_tmp key) const
2336	{	2408	{
2337	for (key_value *kv = key_values; kv; kv = kv->next)	2409	for (key_value *kv = key_values; kv; kv = kv->next)
2338	if (kv->key == key)	2410	if (kv->key == key)
2339	return kv->value;	2411	return kv->value;
2340		2412
2341	return shstr_null;	2413	return shstr ();
2342	}	2414	}
2343		2415
2344	void	2416	void
2345	object::kv_set (const shstr &key, const shstr &value)	2417	object::kv_set (shstr_tmp key, shstr_tmp value)
2346	{	2418	{
2347	for (key_value *kv = key_values; kv; kv = kv->next)	2419	for (key_value *kv = key_values; kv; kv = kv->next)
2348	if (kv->key == key)	2420	if (kv->key == key)
2349	{	2421	{
2350	kv->value = value;	2422	kv->value = value;
…		…
2359		2431
2360	key_values = kv;	2432	key_values = kv;
2361	}	2433	}
2362		2434
2363	void	2435	void
2364	object::kv_del (const shstr &key)	2436	object::kv_del (shstr_tmp key)
2365	{	2437	{
2366	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2438	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2367	if ((*kvp)->key == key)	2439	if ((*kvp)->key == key)
2368	{	2440	{
2369	key_value kv = kvp;	2441	key_value kv = kvp;
…		…
2462	{	2534	{
2463	return map ? map->region (x, y)	2535	return map ? map->region (x, y)
2464	: region::default_region ();	2536	: region::default_region ();
2465	}	2537	}
2466		2538
2467	const materialtype_t *
2468	object::dominant_material () const
2469	{
2470	if (materialtype_t *mt = name_to_material (materialname))
2471	return mt;
2472
2473	return name_to_material (shstr_unknown);
2474	}
2475
2476	void	2539	void
2477	object::open_container (object *new_container)	2540	object::open_container (object *new_container)
2478	{	2541	{
2479	if (container == new_container)	2542	if (container == new_container)
2480	return;	2543	return;
…		…
2500	container = 0;	2563	container = 0;
2501		2564
2502	// client needs item update to make it work, client bug requires this to be separate	2565	// client needs item update to make it work, client bug requires this to be separate
2503	esrv_update_item (UPD_FLAGS, this, old_container);	2566	esrv_update_item (UPD_FLAGS, this, old_container);
2504		2567
2505	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2568	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2506	play_sound (sound_find ("chest_close"));	2569	play_sound (sound_find ("chest_close"));
2507	}	2570	}
2508		2571
2509	if (new_container)	2572	if (new_container)
2510	{	2573	{
…		…
2514	// TODO: this does not seem to serve any purpose anymore?	2577	// TODO: this does not seem to serve any purpose anymore?
2515	#if 0	2578	#if 0
2516	// insert the "Close Container" object.	2579	// insert the "Close Container" object.
2517	if (archetype *closer = new_container->other_arch)	2580	if (archetype *closer = new_container->other_arch)
2518	{	2581	{
2519	object *closer = arch_to_object (new_container->other_arch);	2582	object *closer = new_container->other_arch->instance ();
2520	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2583	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2521	new_container->insert (closer);	2584	new_container->insert (closer);
2522	}	2585	}
2523	#endif	2586	#endif
2524		2587
2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2588	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2526		2589
2527	// make sure the container is available, client bug requires this to be separate	2590	// make sure the container is available, client bug requires this to be separate
2528	esrv_send_item (this, new_container);	2591	esrv_send_item (this, new_container);
2529		2592
2530	new_container->flag [FLAG_APPLIED] = true;	2593	new_container->flag [FLAG_APPLIED] = true;
…		…
2538	// else if (!old_container->env && contr && contr->ns)	2601	// else if (!old_container->env && contr && contr->ns)
2539	// contr->ns->floorbox_reset ();	2602	// contr->ns->floorbox_reset ();
2540	}	2603	}
2541		2604
2542	object *	2605	object *
2543	object::force_find (const shstr name)	2606	object::force_find (shstr_tmp name)
2544	{	2607	{
2545	/* cycle through his inventory to look for the MARK we want to	2608	/* cycle through his inventory to look for the MARK we want to
2546	* place	2609	* place
2547	*/	2610	*/
2548	for (object *tmp = inv; tmp; tmp = tmp->below)	2611	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2550	return splay (tmp);	2613	return splay (tmp);
2551		2614
2552	return 0;	2615	return 0;
2553	}	2616	}
2554		2617
		2618	//-GPL
		2619
2555	void	2620	void
		2621	object::force_set_timer (int duration)
		2622	{
		2623	this->duration = 1;
		2624	this->speed_left = -1.f;
		2625
		2626	this->set_speed (duration ? 1.f / duration : 0.f);
		2627	}
		2628
		2629	object *
2556	object::force_add (const shstr name, int duration)	2630	object::force_add (shstr_tmp name, int duration)
2557	{	2631	{
2558	if (object *force = force_find (name))	2632	if (object *force = force_find (name))
2559	force->destroy ();	2633	force->destroy ();
2560		2634
2561	object *force = get_archetype (FORCE_NAME);	2635	object *force = get_archetype (FORCE_NAME);
2562		2636
2563	force->slaying = name;	2637	force->slaying = name;
2564	force->stats.food = 1;	2638	force->force_set_timer (duration);
2565	force->speed_left = -1.f;
2566
2567	force->set_speed (duration ? 1.f / duration : 0.f);
2568	force->flag [FLAG_IS_USED_UP] = true;
2569	force->flag [FLAG_APPLIED] = true;	2639	force->flag [FLAG_APPLIED] = true;
2570		2640
2571	insert (force);	2641	return insert (force);
2572	}	2642	}
2573		2643
2574	void	2644	void
2575	object::play_sound (faceidx sound)	2645	object::play_sound (faceidx sound) const
2576	{	2646	{
2577	if (!sound)	2647	if (!sound)
2578	return;	2648	return;
2579		2649
2580	if (flag [FLAG_REMOVED])	2650	if (is_on_map ())
		2651	map->play_sound (sound, x, y);
		2652	else if (object *pl = in_player ())
		2653	pl->contr->play_sound (sound);
		2654	}
		2655
		2656	void
		2657	object::say_msg (const char *msg) const
		2658	{
		2659	if (is_on_map ())
		2660	map->say_msg (msg, x, y);
		2661	else if (object *pl = in_player ())
		2662	pl->contr->play_sound (sound);
		2663	}
		2664
		2665	void
		2666	object::make_noise ()
		2667	{
		2668	// we do not model noise in the map, so instead put
		2669	// a temporary light into the noise source
		2670	// could use the map instead, but that's less reliable for our
		2671	// goal, which is to make invisibility a bit harder to exploit
		2672
		2673	// currently only works sensibly for players
		2674	if (!is_player ())
2581	return;	2675	return;
2582		2676
2583	if (env)	2677	// find old force, or create new one
2584	{	2678	object *force = force_find (shstr_noise_force);
2585	if (object *pl = in_player ())	2679
2586	pl->contr->play_sound (sound);	2680	if (force)
2587	}	2681	force->speed_left = -1.f; // patch old speed up
2588	else	2682	else
2589	map->play_sound (sound, x, y);	2683	{
2590	}	2684	force = archetype::get (shstr_noise_force);
2591		2685
		2686	force->slaying = shstr_noise_force;
		2687	force->stats.food = 1;
		2688	force->speed_left = -1.f;
		2689
		2690	force->set_speed (1.f / 4.f);
		2691	force->flag [FLAG_IS_USED_UP] = true;
		2692	force->flag [FLAG_APPLIED] = true;
		2693
		2694	insert (force);
		2695	}
		2696	}
		2697
		2698	void object::change_move_type (MoveType mt)
		2699	{
		2700	if (move_type == mt)
		2701	return;
		2702
		2703	if (is_on_map ())
		2704	{
		2705	// we are on the map, so handle move_on/off effects
		2706	remove ();
		2707	move_type = mt;
		2708	map->insert (this, x, y, this);
		2709	}
		2710	else
		2711	move_type = mt;
		2712	}
		2713

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs. Revision 1.314 by root, Fri Mar 26 00:59:20 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 2010 UTC