ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.301 by root, Mon Nov 9 18:47:56 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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>
…		…
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
		42
		43	//+GPL
40		44
41	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
42	0,	46	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	47	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,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	52	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	53	-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,	54	-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	55	-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	};	56	};
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] = {	57	int freedir[SIZEOFFREE] = {
60	0,	58	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	59	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,	60	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	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
64	};	69	};
65		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
…		…
96		101
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	103	_exit (1);
99	}	104	}
100		105
101	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	107	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
104		109
105	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
106	{	111	{
…		…
133		138
134	void	139	void
135	UUID::init ()	140	UUID::init ()
136	{	141	{
137	read_uuid ();	142	read_uuid ();
		143	}
		144
		145	bool
		146	UUID::parse (const char *s)
		147	{
		148	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		149	return false;
		150
		151	seq = 0;
		152
		153	while (*s != '>')
		154	{
		155	if (*s < '0')
		156	return false;
		157
		158	// this gives nice branchless code with gcc
		159	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		160	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		161
		162	seq = (seq << 4) | digit;
		163
		164	++s;
		165	}
		166
		167	return true;
		168	}
		169
		170	char *
		171	UUID::append (char *buf) const
		172	{
		173	*buf++ = '<';
		174	*buf++ = '1';
		175	*buf++ = '.';
		176
		177	uint64_t seq = this->seq;
		178	const int bits = 64;
		179	char nz = 0;
		180	static const char tohex [] = "0123456789abcdef";
		181
		182	// assert (len >= 3 + bits / 4 + 1 + 1);
		183	for (int i = bits / 4; --i; )
		184	{
		185	uint8_t digit = seq >> (bits - 4);
		186
		187	*buf = tohex [digit];
		188	nz |= digit;
		189	buf += nz ? 1 : 0;
		190	seq <<= 4;
		191	}
		192
		193	// last digit is special - always emit
		194	uint8_t digit = seq >> (bits - 4);
		195	*buf++ = tohex [digit];
		196
		197	*buf++ = '>';
		198
		199	return buf;
		200	}
		201
		202	char *
		203	UUID::c_str () const
		204	{
		205	static char buf [MAX_LEN];
		206	*append (buf) = 0;
		207	return buf;
138	}	208	}
139		209
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	210	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	211	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	212	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
181	bool object::can_merge_slow (object *ob1, object *ob2)	251	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	252	{
183	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
184	if (ob1 == ob2	254	if (ob1 == ob2
185	|| ob1->type != ob2->type	255	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed	256	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187	|| ob1->value != ob2->value	257	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	258	|| ob1->name != ob2->name)
189	return 0;	259	return 0;
190		260
191	/* Do not merge objects if nrof would overflow. First part checks	261	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	262	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	263	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;	264	return 0;
198		265
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	266	/* 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	267	* 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	268	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		274
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		277
211	if (ob1->arch->name != ob2->arch->name	278	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	279	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	280	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	281	|| ob1->msg != ob2->msg
215	|| ob1->weight != ob2->weight	282	|| ob1->weight != ob2->weight
216	|| ob1->attacktype != ob2->attacktype	283	|| ob1->attacktype != ob2->attacktype
217	|| ob1->magic != ob2->magic	284	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	285	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	286	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	287	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	288	|| ob1->animation_id != ob2->animation_id
		289	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	|| ob1->client_type != ob2->client_type	290	|| ob1->client_type != ob2->client_type
223	|| ob1->materialname != ob2->materialname	291	|| ob1->materialname != ob2->materialname
224	|| ob1->lore != ob2->lore	292	|| ob1->lore != ob2->lore
225	|| ob1->subtype != ob2->subtype	293	|| ob1->subtype != ob2->subtype
226	|| ob1->move_type != ob2->move_type	294	|| ob1->move_type != ob2->move_type
227	|| ob1->move_block != ob2->move_block	295	|| ob1->move_block != ob2->move_block
228	|| ob1->move_allow != ob2->move_allow	296	|| ob1->move_allow != ob2->move_allow
229	|| ob1->move_on != ob2->move_on	297	|| ob1->move_on != ob2->move_on
230	|| ob1->move_off != ob2->move_off	298	|| ob1->move_off != ob2->move_off
231	|| ob1->move_slow != ob2->move_slow	299	|| ob1->move_slow != ob2->move_slow
232	|| ob1->move_slow_penalty != ob2->move_slow_penalty	300	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	301	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	302	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	303	return 0;
236		304
237	if ((ob1->flag ^ ob2->flag)	305	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	306	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	307	.reset (FLAG_REMOVED)
241	.any ())	308	.any ())
242	return 0;	309	return 0;
243		310
244	/* This is really a spellbook check - we should in general	311	/* This is really a spellbook check - we should in general
…		…
326	{	393	{
327	// see if we are in a container of sorts	394	// see if we are in a container of sorts
328	if (env)	395	if (env)
329	{	396	{
330	// the player inventory itself is always visible	397	// the player inventory itself is always visible
331	if (env->type == PLAYER)	398	if (env->is_player ())
332	return env;	399	return env;
333		400
334	// else a player could have our env open	401	// else a player could have our env open
335	object *envest = env->outer_env ();	402	object *envest = env->outer_env_or_self ();
336		403
337	// the player itself is always on a map, so we will find him here	404	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	405	// even if our inv is in a player.
339	if (envest->is_on_map ())	406	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	407	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	408	if (pl->container_ () == env)
342	return pl;	409	return pl;
343	}	410	}
344	else	411	else
345	{	412	{
346	// maybe there is a player standing on the same mapspace	413	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	414	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	415	if (object *pl = ms ().player ())
349	if (!pl->container || this == pl->container)	416	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		417	|| pl->container_ () == this)
350	return pl;	418	return pl;
351	}	419	}
352	}	420	}
353		421
354	return 0;	422	return 0;
355	}	423	}
356		424
357	// adjust weight per container type ("of holding")	425	// adjust weight per container type ("of holding")
358	static sint32	426	static sint32
359	weight_adjust (object *op, sint32 weight)	427	weight_adjust_for (object *op, sint32 weight)
360	{	428	{
361	return op->type == CONTAINER	429	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	431	: weight;
364	}	432	}
…		…
370	static void	438	static void
371	adjust_weight (object *op, sint32 weight)	439	adjust_weight (object *op, sint32 weight)
372	{	440	{
373	while (op)	441	while (op)
374	{	442	{
		443	// adjust by actual difference to account for rounding errors
		444	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	445	weight = weight_adjust_for (op, op->carrying)
		446	- weight_adjust_for (op, op->carrying - weight);
376		447
377	if (!weight)	448	if (!weight)
378	return;	449	return;
379		450
380	op->carrying += weight;	451	op->carrying += weight;
…		…
403	op->update_weight ();	474	op->update_weight ();
404		475
405	sum += op->total_weight ();	476	sum += op->total_weight ();
406	}	477	}
407		478
408	sum = weight_adjust (this, sum);	479	sum = weight_adjust_for (this, sum);
409		480
410	if (sum != carrying)	481	if (sum != carrying)
411	{	482	{
412	carrying = sum;	483	carrying = sum;
413		484
…		…
429	object_freezer freezer;	500	object_freezer freezer;
430	op->write (freezer);	501	op->write (freezer);
431	return freezer.as_string ();	502	return freezer.as_string ();
432	}	503	}
433		504
434	/*	505	char *
435	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
436	* multi-object 1 which is closest to the second object.
437	* If it's not a multi-object, it is returned.
438	*/
439	object *
440	get_nearest_part (object *op, const object *pl)
441	{	507	{
442	object *tmp, *closest;	508	return dump_object (this);
443	int last_dist, i;
444
445	if (!op->more)
446	return op;
447
448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
449	tmp;
450	tmp = tmp->more)
451	if ((i = distance (tmp, pl)) < last_dist)
452	closest = tmp, last_dist = i;
453
454	return closest;
455	}	509	}
456		510
457	/*	511	/*
458	* Returns the object which has the count-variable equal to the argument.	512	* Returns the object which has the count-variable equal to the argument.
459	* VERRRY slow.	513	* VERRRY slow.
…		…
475	*/	529	*/
476	object *	530	object *
477	find_object_name (const char *str)	531	find_object_name (const char *str)
478	{	532	{
479	shstr_cmp str_ (str);	533	shstr_cmp str_ (str);
480	object *op;
481		534
		535	if (str_)
482	for_all_objects (op)	536	for_all_objects (op)
483	if (op->name == str_)	537	if (op->name == str_)
484	break;	538	return op;
485		539
486	return op;	540	return 0;
487	}	541	}
488		542
489	/*	543	/*
490	* Sets the owner and sets the skill and exp pointers to owner's current	544	* Sets the owner and sets the skill and exp pointers to owner's current
491	* skill and experience objects.	545	* skill and experience objects.
…		…
553	update_stats ();	607	update_stats ();
554		608
555	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
556	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
557	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
558	"[You need to unapply some items first.]", &ob->name);	612	"[You need to unapply some items first - use the 'body' command to see "
		613	"how many items you cna wera on a specific body part.]", &ob->name);
559	return false;	614	return false;
560	}	615	}
561		616
562	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
563	}	618	}
…		…
635	}	690	}
636		691
637	if (speed < 0)	692	if (speed < 0)
638	dst->speed_left -= rndm ();	693	dst->speed_left -= rndm ();
639		694
640	dst->set_speed (dst->speed);	695	dst->activate ();
641	}	696	}
642		697
643	void	698	void
644	object::instantiate ()	699	object::instantiate ()
645	{	700	{
…		…
689	* This function needs to be called whenever the speed of an object changes.	744	* This function needs to be called whenever the speed of an object changes.
690	*/	745	*/
691	void	746	void
692	object::set_speed (float speed)	747	object::set_speed (float speed)
693	{	748	{
694	if (flag [FLAG_FREED] && speed)
695	{
696	LOG (llevError, "Object %s is freed but has speed.\n", &name);
697	speed = 0;
698	}
699
700	this->speed = speed;	749	this->speed = speed;
701		750
702	if (has_active_speed ())	751	if (has_active_speed ())
703	activate ();	752	activate ();
704	else	753	else
…		…
754		803
755	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
756	/* nop */;	805	/* nop */;
757	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
758	{	807	{
		808	#if 0
759	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
760	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
761	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
762	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	812	|| (op->is_player () && !(m.flags_ & P_PLAYER))
763	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
764	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
765	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766	|| (m.move_on | op->move_on ) != m.move_on	816	|| (m.move_on | op->move_on ) != m.move_on
767	|| (m.move_off | op->move_off ) != m.move_off	817	|| (m.move_off | op->move_off ) != m.move_off
768	|| (m.move_slow | op->move_slow) != m.move_slow	818	|| (m.move_slow | op->move_slow) != m.move_slow
769	/* This isn't perfect, but I don't expect a lot of objects to	819	/* This isn't perfect, but I don't expect a lot of objects to
770	* to have move_allow right now.	820	* have move_allow right now.
771	*/	821	*/
772	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	822	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		823	m.invalidate ();
		824	#else
773	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	825	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
774	m.flags_ = 0;	826	m.invalidate ();
		827	#endif
775	}	828	}
776	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
777	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
778	* that is being removed.	831	* that is being removed.
779	*/	832	*/
780	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
781	m.flags_ = 0;	834	m.invalidate ();
782	else if (action == UP_OBJ_FACE)	835	else if (action == UP_OBJ_FACE)
783	/* Nothing to do for that case */ ;	836	/* Nothing to do for that case */ ;
784	else	837	else
785	LOG (llevError, "update_object called with invalid action: %d\n", action);	838	LOG (llevError, "update_object called with invalid action: %d\n", action);
786		839
…		…
790		843
791	object::object ()	844	object::object ()
792	{	845	{
793	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
794		847
795	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
796	face = blank_face;	849	face = blank_face;
797	}	850	}
798		851
799	object::~object ()	852	object::~object ()
800	{	853	{
…		…
830	/* If already on active list, don't do anything */	883	/* If already on active list, don't do anything */
831	if (active)	884	if (active)
832	return;	885	return;
833		886
834	if (has_active_speed ())	887	if (has_active_speed ())
		888	{
		889	if (flag [FLAG_FREED])
		890	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		891
835	actives.insert (this);	892	actives.insert (this);
		893	}
836	}	894	}
837		895
838	void	896	void
839	object::activate_recursive ()	897	object::activate_recursive ()
840	{	898	{
…		…
901	* drop on that space.	959	* drop on that space.
902	*/	960	*/
903	if (!drop_to_ground	961	if (!drop_to_ground
904	|| !map	962	|| !map
905	|| map->in_memory != MAP_ACTIVE	963	|| map->in_memory != MAP_ACTIVE
906	|| map->nodrop	964	|| map->no_drop
907	|| ms ().move_block == MOVE_ALL)	965	|| ms ().move_block == MOVE_ALL)
908	{	966	{
909	while (inv)	967	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	968	inv->destroy ();
913	}
914	}	969	}
915	else	970	else
916	{ /* Put objects in inventory onto this space */	971	{ /* Put objects in inventory onto this space */
917	while (inv)	972	while (inv)
918	{	973	{
…		…
922	|| op->flag [FLAG_NO_DROP]	977	|| op->flag [FLAG_NO_DROP]
923	|| op->type == RUNE	978	|| op->type == RUNE
924	|| op->type == TRAP	979	|| op->type == TRAP
925	|| op->flag [FLAG_IS_A_TEMPLATE]	980	|| op->flag [FLAG_IS_A_TEMPLATE]
926	|| op->flag [FLAG_DESTROY_ON_DEATH])	981	|| op->flag [FLAG_DESTROY_ON_DEATH])
927	op->destroy (true);	982	op->destroy ();
928	else	983	else
929	map->insert (op, x, y);	984	map->insert (op, x, y);
930	}	985	}
931	}	986	}
932	}	987	}
…		…
940		995
941	static struct freed_map : maptile	996	static struct freed_map : maptile
942	{	997	{
943	freed_map ()	998	freed_map ()
944	{	999	{
945	path = "<freed objects map>";	1000	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	1001	name = "/internal/freed_objects_map";
947	width = 3;	1002	width = 3;
948	height = 3;	1003	height = 3;
949	nodrop = 1;	1004	no_drop = 1;
		1005	no_reset = 1;
950		1006
951	alloc ();	1007	alloc ();
952	in_memory = MAP_ACTIVE;	1008	in_memory = MAP_ACTIVE;
953	}	1009	}
		1010
		1011	~freed_map ()
		1012	{
		1013	destroy ();
		1014	}
954	} freed_map; // freed objects are moved here to avoid crashes	1015	} freed_map; // freed objects are moved here to avoid crashes
955		1016
956	void	1017	void
957	object::do_destroy ()	1018	object::do_destroy ()
958	{	1019	{
959	if (flag [FLAG_IS_LINKED])	1020	if (flag [FLAG_IS_LINKED])
960	remove_button_link (this);	1021	remove_link ();
961		1022
962	if (flag [FLAG_FRIENDLY])	1023	if (flag [FLAG_FRIENDLY])
963	remove_friendly_object (this);	1024	remove_friendly_object (this);
964		1025
965	remove ();	1026	remove ();
…		…
990	attacked_by = 0;	1051	attacked_by = 0;
991	current_weapon = 0;	1052	current_weapon = 0;
992	}	1053	}
993		1054
994	void	1055	void
995	object::destroy (bool destroy_inventory)	1056	object::destroy ()
996	{	1057	{
997	if (destroyed ())	1058	if (destroyed ())
998	return;	1059	return;
999		1060
1000	if (!is_head () && !head->destroyed ())	1061	if (!is_head () && !head->destroyed ())
1001	{	1062	{
1002	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1063	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1003	head->destroy (destroy_inventory);	1064	head->destroy ();
1004	return;	1065	return;
1005	}	1066	}
1006		1067
1007	destroy_inv (!destroy_inventory);	1068	destroy_inv (false);
1008		1069
1009	if (is_head ())	1070	if (is_head ())
1010	if (sound_destroy)	1071	if (sound_destroy)
1011	play_sound (sound_destroy);	1072	play_sound (sound_destroy);
1012	else if (flag [FLAG_MONSTER])	1073	else if (flag [FLAG_MONSTER])
…		…
1023	* the previous environment.	1084	* the previous environment.
1024	*/	1085	*/
1025	void	1086	void
1026	object::do_remove ()	1087	object::do_remove ()
1027	{	1088	{
1028	object *tmp, *last = 0;
1029	object *otmp;
1030
1031	if (flag [FLAG_REMOVED])	1089	if (flag [FLAG_REMOVED])
1032	return;	1090	return;
1033		1091
1034	INVOKE_OBJECT (REMOVE, this);	1092	INVOKE_OBJECT (REMOVE, this);
1035		1093
…		…
1049	esrv_del_item (pl->contr, count);	1107	esrv_del_item (pl->contr, count);
1050	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1108	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1051		1109
1052	adjust_weight (env, -total_weight ());	1110	adjust_weight (env, -total_weight ());
1053		1111
1054	*(above ? &above->below : &env->inv) = below;	1112	object *pl = in_player ();
1055
1056	if (below)
1057	below->above = above;
1058		1113
1059	/* we set up values so that it could be inserted into	1114	/* we set up values so that it could be inserted into
1060	* the map, but we don't actually do that - it is up	1115	* the map, but we don't actually do that - it is up
1061	* to the caller to decide what we want to do.	1116	* to the caller to decide what we want to do.
1062	*/	1117	*/
1063	map = env->map;	1118	map = env->map;
1064	x = env->x;	1119	x = env->x;
1065	y = env->y;	1120	y = env->y;
		1121
		1122	// make sure cmov optimisation is applicable
		1123	*(above ? &above->below : &env->inv) = below;
		1124	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1125
1066	above = 0;	1126	above = 0;
1067	below = 0;	1127	below = 0;
1068	env = 0;	1128	env = 0;
1069		1129
1070	/* NO_FIX_PLAYER is set when a great many changes are being	1130	/* NO_FIX_PLAYER is set when a great many changes are being
1071	* made to players inventory. If set, avoiding the call	1131	* made to players inventory. If set, avoiding the call
1072	* to save cpu time.	1132	* to save cpu time.
1073	*/	1133	*/
1074	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1134	if (pl)
		1135	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1136	{
1075	otmp->update_stats ();	1137	pl->update_stats ();
		1138
		1139	if (glow_radius && pl->is_on_map ())
		1140	update_all_los (pl->map, pl->x, pl->y);
		1141	}
1076	}	1142	}
1077	else if (map)	1143	else if (map)
1078	{	1144	{
1079	map->dirty = true;	1145	map->dirty = true;
1080	mapspace &ms = this->ms ();	1146	mapspace &ms = this->ms ();
1081		1147
1082	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1083	{	1149	{
1084	if (type == PLAYER) // this == pl(!)	1150	if (is_player ())
1085	{	1151	{
		1152	if (!flag [FLAG_WIZPASS])
		1153	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1154
1086	// leaving a spot always closes any open container on the ground	1155	// leaving a spot always closes any open container on the ground
1087	if (container && !container->env)	1156	if (container && !container->env)
1088	// this causes spurious floorbox updates, but it ensures	1157	// this causes spurious floorbox updates, but it ensures
1089	// that the CLOSE event is being sent.	1158	// that the CLOSE event is being sent.
1090	close_container ();	1159	close_container ();
1091		1160
1092	--map->players;	1161	--map->players;
1093	map->touch ();	1162	map->touch ();
1094	}	1163	}
1095	else if (pl->container == this)	1164	else if (pl->container_ () == this)
1096	{	1165	{
1097	// removing a container should close it	1166	// removing a container should close it
1098	close_container ();	1167	close_container ();
1099	}	1168	}
1100		1169
1101	esrv_del_item (pl->contr, count);	1170	esrv_del_item (pl->contr, count);
1102	}	1171	}
1103		1172
1104	/* link the object above us */	1173	/* link the object above us */
1105	if (above)	1174	// re-link, make sure compiler can easily use cmove
1106	above->below = below;	1175	*(above ? &above->below : &ms.top) = below;
1107	else	1176	*(below ? &below->above : &ms.bot) = above;
1108	ms.top = below; /* we were top, set new top */
1109
1110	/* Relink the object below us, if there is one */
1111	if (below)
1112	below->above = above;
1113	else
1114	{
1115	/* Nothing below, which means we need to relink map object for this space
1116	* use translated coordinates in case some oddness with map tiling is
1117	* evident
1118	*/
1119	if (GET_MAP_OB (map, x, y) != this)
1120	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1121
1122	ms.bot = above; /* goes on above it. */
1123	}
1124		1177
1125	above = 0;	1178	above = 0;
1126	below = 0;	1179	below = 0;
1127		1180
		1181	ms.invalidate ();
		1182
1128	if (map->in_memory == MAP_SAVING)	1183	if (map->in_memory == MAP_SAVING)
1129	return;	1184	return;
1130		1185
1131	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1132		1187
1133	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1134	{	1189	{
1135	if (pl->container == this)	1190	if (pl->container_ () == this)
1136	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1137	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1138	* appropriately.	1193	* appropriately.
1139	*/	1194	*/
1140	pl->close_container ();	1195	pl->close_container ();
…		…
1144	//TODO: update floorbox to preserve ordering	1199	//TODO: update floorbox to preserve ordering
1145	if (pl->contr->ns)	1200	if (pl->contr->ns)
1146	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1147	}	1202	}
1148		1203
		1204	if (check_walk_off)
1149	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1150	{	1206	{
		1207	above = tmp->above;
		1208
1151	/* No point updating the players look faces if he is the object	1209	/* No point updating the players look faces if he is the object
1152	* being removed.	1210	* being removed.
1153	*/	1211	*/
1154		1212
1155	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1156	if (check_walk_off
1157	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1158	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1159	{
1160	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1161
1162	if (destroyed ())
1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164	}	1217	}
1165		1218
1166	last = tmp;	1219	if (affects_los ())
1167	}
1168
1169	/* last == NULL if there are no objects on this space */
1170	//TODO: this makes little sense, why only update the topmost object?
1171	if (!last)
1172	map->at (x, y).flags_ = 0;
1173	else
1174	update_object (last, UP_OBJ_REMOVE);
1175
1176	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1177	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1178	}	1221	}
1179	}	1222	}
1180		1223
1181	/*	1224	/*
…		…
1205	esrv_update_item (UPD_NROF, pl, top);	1248	esrv_update_item (UPD_NROF, pl, top);
1206		1249
1207	op->weight = 0; // cancel the addition above	1250	op->weight = 0; // cancel the addition above
1208	op->carrying = 0; // must be 0 already	1251	op->carrying = 0; // must be 0 already
1209		1252
1210	op->destroy (1);	1253	op->destroy ();
1211		1254
1212	return top;	1255	return top;
1213	}	1256	}
1214		1257
1215	return 0;	1258	return 0;
…		…
1243	* job preparing multi-part monsters.	1286	* job preparing multi-part monsters.
1244	*/	1287	*/
1245	object *	1288	object *
1246	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1289	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1247	{	1290	{
		1291	op->remove ();
		1292
1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1293	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1249	{	1294	{
1250	tmp->x = x + tmp->arch->x;	1295	tmp->x = x + tmp->arch->x;
1251	tmp->y = y + tmp->arch->y;	1296	tmp->y = y + tmp->arch->y;
1252	}	1297	}
…		…
1275	* just 'op' otherwise	1320	* just 'op' otherwise
1276	*/	1321	*/
1277	object *	1322	object *
1278	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1323	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1279	{	1324	{
1280	assert (!op->flag [FLAG_FREED]);
1281
1282	op->remove ();	1325	op->remove ();
		1326
		1327	if (m == &freed_map)//D TODO: remove soon
		1328	{//D
		1329	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1330	}//D
1283		1331
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* of areas of callers (eg, anything that uses find_free_spot would now	1333	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1334	* need extra work
1287	*/	1335	*/
		1336	maptile *newmap = m;
1288	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1289	{	1338	{
1290	op->destroy (1);	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291	return 0;	1340	return 0;
1292	}	1341	}
1293		1342
1294	if (object *more = op->more)	1343	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1296	return 0;	1345	return 0;
1297		1346
1298	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1299		1348	op->env = 0;
1300	op->map = m;	1349	op->map = newmap;
		1350
1301	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1302		1352
1303	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1304	*/	1354	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1307	if (object::can_merge (op, tmp))	1357	if (object::can_merge (op, tmp))
1308	{	1358	{
1309	// TODO: we atcually want to update tmp, not op,	1359	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1360	// but some caller surely breaks when we return tmp
1311	// from here :/	1361	// from here :/
1312	op->nrof += tmp->nrof;	1362	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1363	tmp->destroy ();
1314	}	1364	}
1315		1365
1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1366	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1367	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1318		1368
…		…
1325	{	1375	{
1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1376	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327	abort ();	1377	abort ();
1328	}	1378	}
1329		1379
		1380	if (!originator->is_on_map ())
		1381	{
		1382	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1383	op->debug_desc (), originator->debug_desc ());
		1384	abort ();
		1385	}
		1386
1330	op->above = originator;	1387	op->above = originator;
1331	op->below = originator->below;	1388	op->below = originator->below;
1332
1333	if (op->below)
1334	op->below->above = op;
1335	else
1336	ms.bot = op;
1337
1338	/* since *below* originator, no need to update top */
1339	originator->below = op;	1389	originator->below = op;
		1390
		1391	*(op->below ? &op->below->above : &ms.bot) = op;
1340	}	1392	}
1341	else	1393	else
1342	{	1394	{
1343	object *top, *floor = NULL;	1395	object *floor = 0;
1344		1396	object *top = ms.top;
1345	top = ms.bot;
1346		1397
1347	/* If there are other objects, then */	1398	/* If there are other objects, then */
1348	if (top)	1399	if (top)
1349	{	1400	{
1350	object *last = 0;
1351
1352	/*	1401	/*
1353	* If there are multiple objects on this space, we do some trickier handling.	1402	* If there are multiple objects on this space, we do some trickier handling.
1354	* We've already dealt with merging if appropriate.	1403	* We've already dealt with merging if appropriate.
1355	* Generally, we want to put the new object on top. But if	1404	* Generally, we want to put the new object on top. But if
1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1359	* once we get to them. This reduces the need to traverse over all of	1408	* once we get to them. This reduces the need to traverse over all of
1360	* them when adding another one - this saves quite a bit of cpu time	1409	* them when adding another one - this saves quite a bit of cpu time
1361	* when lots of spells are cast in one area. Currently, it is presumed	1410	* when lots of spells are cast in one area. Currently, it is presumed
1362	* that flying non pickable objects are spell objects.	1411	* that flying non pickable objects are spell objects.
1363	*/	1412	*/
1364	for (top = ms.bot; top; top = top->above)	1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1414	{
1366	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1415	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1367	floor = top;	1416	floor = tmp;
1368		1417
1369	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1418	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1370	{	1419	{
1371	/* We insert above top, so we want this object below this */	1420	/* We insert above top, so we want this object below this */
1372	top = top->below;	1421	top = tmp->below;
1373	break;	1422	break;
1374	}	1423	}
1375		1424
1376	last = top;	1425	top = tmp;
1377	}	1426	}
1378
1379	/* Don't want top to be NULL, so set it to the last valid object */
1380	top = last;
1381		1427
1382	/* We let update_position deal with figuring out what the space	1428	/* We let update_position deal with figuring out what the space
1383	* looks like instead of lots of conditions here.	1429	* looks like instead of lots of conditions here.
1384	* makes things faster, and effectively the same result.	1430	* makes things faster, and effectively the same result.
1385	*/	1431	*/
…		…
1392	*/	1438	*/
1393	if (!(flag & INS_ON_TOP)	1439	if (!(flag & INS_ON_TOP)
1394	&& ms.flags () & P_BLOCKSVIEW	1440	&& ms.flags () & P_BLOCKSVIEW
1395	&& (op->face && !faces [op->face].visibility))	1441	&& (op->face && !faces [op->face].visibility))
1396	{	1442	{
		1443	object *last;
		1444
1397	for (last = top; last != floor; last = last->below)	1445	for (last = top; last != floor; last = last->below)
1398	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1446	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1399	break;	1447	break;
1400		1448
1401	/* Check to see if we found the object that blocks view,	1449	/* Check to see if we found the object that blocks view,
…		…
1409	} /* If objects on this space */	1457	} /* If objects on this space */
1410		1458
1411	if (flag & INS_ABOVE_FLOOR_ONLY)	1459	if (flag & INS_ABOVE_FLOOR_ONLY)
1412	top = floor;	1460	top = floor;
1413		1461
1414	/* Top is the object that our object (op) is going to get inserted above.	1462	// insert object above top, or bottom-most if top = 0
1415	*/
1416
1417	/* First object on this space */
1418	if (!top)	1463	if (!top)
1419	{	1464	{
		1465	op->below = 0;
1420	op->above = ms.bot;	1466	op->above = ms.bot;
1421
1422	if (op->above)
1423	op->above->below = op;
1424
1425	op->below = 0;
1426	ms.bot = op;	1467	ms.bot = op;
		1468
		1469	*(op->above ? &op->above->below : &ms.top) = op;
1427	}	1470	}
1428	else	1471	else
1429	{ /* get inserted into the stack above top */	1472	{
1430	op->above = top->above;	1473	op->above = top->above;
1431
1432	if (op->above)
1433	op->above->below = op;	1474	top->above = op;
1434		1475
1435	op->below = top;	1476	op->below = top;
1436	top->above = op;	1477	*(op->above ? &op->above->below : &ms.top) = op;
1437	}	1478	}
		1479	}
1438		1480
1439	if (!op->above)	1481	if (op->is_player ())
1440	ms.top = op;
1441	} /* else not INS_BELOW_ORIGINATOR */
1442
1443	if (op->type == PLAYER)
1444	{	1482	{
1445	op->contr->do_los = 1;	1483	op->contr->do_los = 1;
1446	++op->map->players;	1484	++op->map->players;
1447	op->map->touch ();	1485	op->map->touch ();
1448	}	1486	}
…		…
1463	* be far away from this change and not affected in any way -	1501	* be far away from this change and not affected in any way -
1464	* this should get redone to only look for players within range,	1502	* this should get redone to only look for players within range,
1465	* or just updating the P_UPTODATE for spaces within this area	1503	* or just updating the P_UPTODATE for spaces within this area
1466	* of effect may be sufficient.	1504	* of effect may be sufficient.
1467	*/	1505	*/
1468	if (op->map->darkness && (op->glow_radius != 0))	1506	if (op->affects_los ())
		1507	{
		1508	op->ms ().invalidate ();
1469	update_all_los (op->map, op->x, op->y);	1509	update_all_los (op->map, op->x, op->y);
		1510	}
1470		1511
1471	/* updates flags (blocked, alive, no magic, etc) for this map space */	1512	/* updates flags (blocked, alive, no magic, etc) for this map space */
1472	update_object (op, UP_OBJ_INSERT);	1513	update_object (op, UP_OBJ_INSERT);
1473		1514
1474	INVOKE_OBJECT (INSERT, op);	1515	INVOKE_OBJECT (INSERT, op);
…		…
1481	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1482	* update_object().	1523	* update_object().
1483	*/	1524	*/
1484		1525
1485	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* if this is not the head or flag has been passed, don't check walk on status */
1486	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1487	{	1528	{
1488	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1489	return 0;	1530	return 0;
1490		1531
1491	/* If we are a multi part object, lets work our way through the check	1532	/* If we are a multi part object, lets work our way through the check
…		…
1502	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1503	* finds an object of its own type, it'll remove that one first.	1544	* finds an object of its own type, it'll remove that one first.
1504	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1505	*/	1546	*/
1506	void	1547	void
1507	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1508	{	1549	{
1509	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1510		1551
1511	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1512	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1513	tmp->destroy (1);	1554	tmp->destroy ();
1514		1555
1515	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = arch_to_object (archetype::find (archname));
1516		1557
1517	tmp->x = op->x;	1558	tmp->x = op->x;
1518	tmp->y = op->y;	1559	tmp->y = op->y;
1519		1560
1520	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1525	{	1566	{
1526	if (where->env)	1567	if (where->env)
1527	return where->env->insert (this);	1568	return where->env->insert (this);
1528	else	1569	else
1529	return where->map->insert (this, where->x, where->y, originator, flags);	1570	return where->map->insert (this, where->x, where->y, originator, flags);
		1571	}
		1572
		1573	// check whether we can put this into the map, respect max_volume, max_items
		1574	bool
		1575	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1576	{
		1577	mapspace &ms = m->at (x, y);
		1578
		1579	int items = ms.items ();
		1580
		1581	if (!items // testing !items ensures we can drop at least one item
		1582	|| (items < m->max_items
		1583	&& ms.volume () < m->max_volume))
		1584	return true;
		1585
		1586	if (originator && originator->is_player ())
		1587	originator->contr->failmsg (format (
		1588	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1589	query_name ()
		1590	));
		1591
		1592	return false;
1530	}	1593	}
1531		1594
1532	/*	1595	/*
1533	* decrease(object, number) decreases a specified number from	1596	* decrease(object, number) decreases a specified number from
1534	* the amount of an object. If the amount reaches 0, the object	1597	* the amount of an object. If the amount reaches 0, the object
…		…
1542	if (!nr)	1605	if (!nr)
1543	return true;	1606	return true;
1544		1607
1545	nr = min (nr, nrof);	1608	nr = min (nr, nrof);
1546		1609
		1610	if (nrof > nr)
		1611	{
1547	nrof -= nr;	1612	nrof -= nr;
1548
1549	if (nrof)
1550	{
1551	adjust_weight (env, -weight * nr); // carrying == 0	1613	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1552		1614
1553	if (object *pl = visible_to ())	1615	if (object *pl = visible_to ())
1554	esrv_update_item (UPD_NROF, pl, this);	1616	esrv_update_item (UPD_NROF, pl, this);
1555		1617
1556	return true;	1618	return true;
1557	}	1619	}
1558	else	1620	else
1559	{	1621	{
1560	destroy (1);	1622	destroy ();
1561	return false;	1623	return false;
1562	}	1624	}
1563	}	1625	}
1564		1626
1565	/*	1627	/*
…		…
1582	}	1644	}
1583	else	1645	else
1584	{	1646	{
1585	decrease (nr);	1647	decrease (nr);
1586		1648
1587	object *op = object_create_clone (this);	1649	object *op = deep_clone ();
1588	op->nrof = nr;	1650	op->nrof = nr;
1589	return op;	1651	return op;
1590	}	1652	}
1591	}	1653	}
1592		1654
…		…
1642	if (object *pl = tmp->visible_to ())	1704	if (object *pl = tmp->visible_to ())
1643	esrv_update_item (UPD_NROF, pl, tmp);	1705	esrv_update_item (UPD_NROF, pl, tmp);
1644		1706
1645	adjust_weight (this, op->total_weight ());	1707	adjust_weight (this, op->total_weight ());
1646		1708
1647	op->destroy (1);	1709	op->destroy ();
1648	op = tmp;	1710	op = tmp;
1649	goto inserted;	1711	goto inserted;
1650	}	1712	}
1651		1713
1652	op->owner = 0; // it's his/hers now. period.	1714	op->owner = 0; // it's his/hers now. period.
…		…
1670		1732
1671	adjust_weight (this, op->total_weight ());	1733	adjust_weight (this, op->total_weight ());
1672		1734
1673	inserted:	1735	inserted:
1674	/* reset the light list and los of the players on the map */	1736	/* reset the light list and los of the players on the map */
1675	if (op->glow_radius && map && map->darkness)	1737	if (op->glow_radius && is_on_map ())
		1738	{
		1739	update_stats ();
1676	update_all_los (map, x, y);	1740	update_all_los (map, x, y);
1677		1741	}
		1742	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1678	// if this is a player's inventory, update stats	1743	// if this is a player's inventory, update stats
1679	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1680	update_stats ();	1744	update_stats ();
1681		1745
1682	INVOKE_OBJECT (INSERT, this);	1746	INVOKE_OBJECT (INSERT, this);
1683		1747
1684	return op;	1748	return op;
…		…
1705	* on top.	1769	* on top.
1706	*/	1770	*/
1707	int	1771	int
1708	check_move_on (object *op, object *originator)	1772	check_move_on (object *op, object *originator)
1709	{	1773	{
		1774	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1775	return 0;
		1776
1710	object *tmp;	1777	object *tmp;
1711	maptile *m = op->map;	1778	maptile *m = op->map;
1712	int x = op->x, y = op->y;	1779	int x = op->x, y = op->y;
1713		1780
1714	MoveType move_on, move_slow, move_block;	1781	mapspace &ms = m->at (x, y);
1715		1782
1716	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1783	ms.update ();
1717	return 0;
1718		1784
1719	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1785	MoveType move_on = ms.move_on;
1720	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1786	MoveType move_slow = ms.move_slow;
1721	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1787	MoveType move_block = ms.move_block;
1722		1788
1723	/* if nothing on this space will slow op down or be applied,	1789	/* if nothing on this space will slow op down or be applied,
1724	* no need to do checking below. have to make sure move_type	1790	* no need to do checking below. have to make sure move_type
1725	* is set, as lots of objects don't have it set - we treat that	1791	* is set, as lots of objects don't have it set - we treat that
1726	* as walking.	1792	* as walking.
…		…
1737	return 0;	1803	return 0;
1738		1804
1739	/* The objects have to be checked from top to bottom.	1805	/* The objects have to be checked from top to bottom.
1740	* Hence, we first go to the top:	1806	* Hence, we first go to the top:
1741	*/	1807	*/
1742		1808	for (object *next, *tmp = ms.top; tmp; tmp = next)
1743	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1744	{
1745	/* Trim the search when we find the first other spell effect
1746	* this helps performance so that if a space has 50 spell objects,
1747	* we don't need to check all of them.
1748	*/
1749	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1750	break;
1751	}	1809	{
		1810	next = tmp->below;
1752		1811
1753	for (; tmp; tmp = tmp->below)
1754	{
1755	if (tmp == op)	1812	if (tmp == op)
1756	continue; /* Can't apply yourself */	1813	continue; /* Can't apply yourself */
1757		1814
1758	/* Check to see if one of the movement types should be slowed down.	1815	/* Check to see if one of the movement types should be slowed down.
1759	* Second check makes sure that the movement types not being slowed	1816	* Second check makes sure that the movement types not being slowed
…		…
1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1821	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1765	{	1822	{
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1823	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1824	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1825	{
1769
1770	float
1771	diff = tmp->move_slow_penalty * fabs (op->speed);	1826	float diff = tmp->move_slow_penalty * fabs (op->speed);
1772		1827
1773	if (op->type == PLAYER)	1828	if (op->is_player ())
1774	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1829	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1775	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1830	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1776	diff /= 4.0;	1831	diff /= 4.0;
1777		1832
1778	op->speed_left -= diff;	1833	op->speed_left -= diff;
1779	}	1834	}
1780	}	1835	}
…		…
1813	LOG (llevError, "Present_arch called outside map.\n");	1868	LOG (llevError, "Present_arch called outside map.\n");
1814	return NULL;	1869	return NULL;
1815	}	1870	}
1816		1871
1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1872	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1818	if (tmp->arch == at)	1873	if (tmp->arch->archname == at->archname)
1819	return tmp;	1874	return tmp;
1820		1875
1821	return NULL;	1876	return NULL;
1822	}	1877	}
1823		1878
…		…
1887	* The first matching object is returned, or NULL if none.	1942	* The first matching object is returned, or NULL if none.
1888	*/	1943	*/
1889	object *	1944	object *
1890	present_arch_in_ob (const archetype *at, const object *op)	1945	present_arch_in_ob (const archetype *at, const object *op)
1891	{	1946	{
1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1947	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1893	if (tmp->arch == at)	1948	if (tmp->arch->archname == at->archname)
1894	return tmp;	1949	return tmp;
1895		1950
1896	return NULL;	1951	return NULL;
1897	}	1952	}
1898		1953
…		…
1986	* head of the object should correspond for the entire object.	2041	* head of the object should correspond for the entire object.
1987	*/	2042	*/
1988	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2043	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1989	continue;	2044	continue;
1990		2045
1991	if (ob->blocked (m, pos.x, pos.y))	2046	if (ob->blocked (pos.m, pos.x, pos.y))
1992	continue;	2047	continue;
1993		2048
1994	altern [index++] = i;	2049	altern [index++] = i;
1995	}	2050	}
1996		2051
…		…
2064	* there is capable of.	2119	* there is capable of.
2065	*/	2120	*/
2066	int	2121	int
2067	find_dir (maptile *m, int x, int y, object *exclude)	2122	find_dir (maptile *m, int x, int y, object *exclude)
2068	{	2123	{
2069	int i, max = SIZEOFFREE, mflags;	2124	int max = SIZEOFFREE, mflags;
2070
2071	sint16 nx, ny;
2072	object *tmp;
2073	maptile *mp;
2074
2075	MoveType blocked, move_type;	2125	MoveType move_type;
2076		2126
2077	if (exclude && exclude->head_ () != exclude)	2127	if (exclude && exclude->head_ () != exclude)
2078	{	2128	{
2079	exclude = exclude->head;	2129	exclude = exclude->head;
2080	move_type = exclude->move_type;	2130	move_type = exclude->move_type;
…		…
2083	{	2133	{
2084	/* If we don't have anything, presume it can use all movement types. */	2134	/* If we don't have anything, presume it can use all movement types. */
2085	move_type = MOVE_ALL;	2135	move_type = MOVE_ALL;
2086	}	2136	}
2087		2137
2088	for (i = 1; i < max; i++)	2138	for (int i = 1; i < max; i++)
2089	{	2139	{
2090	mp = m;	2140	mapxy pos (m, x, y);
2091	nx = x + freearr_x[i];	2141	pos.move (i);
2092	ny = y + freearr_y[i];
2093		2142
2094	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2143	if (!pos.normalise ())
2095
2096	if (mflags & P_OUT_OF_MAP)
2097	max = maxfree[i];	2144	max = maxfree[i];
2098	else	2145	else
2099	{	2146	{
2100	mapspace &ms = mp->at (nx, ny);	2147	mapspace &ms = *pos;
2101		2148
2102	blocked = ms.move_block;
2103
2104	if ((move_type & blocked) == move_type)	2149	if ((move_type & ms.move_block) == move_type)
2105	max = maxfree[i];	2150	max = maxfree [i];
2106	else if (mflags & P_IS_ALIVE)	2151	else if (ms.flags () & P_IS_ALIVE)
2107	{	2152	{
2108	for (tmp = ms.bot; tmp; tmp = tmp->above)	2153	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2109	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2154	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2110	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2155	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2111	break;
2112
2113	if (tmp)
2114	return freedir[i];	2156	return freedir [i];
2115	}	2157	}
2116	}	2158	}
2117	}	2159	}
2118		2160
2119	return 0;	2161	return 0;
…		…
2194	* This basically means that if direction is 15, then it could either go	2236	* This basically means that if direction is 15, then it could either go
2195	* direction 4, 14, or 16 to get back to where we are.	2237	* direction 4, 14, or 16 to get back to where we are.
2196	* Moved from spell_util.c to object.c with the other related direction	2238	* Moved from spell_util.c to object.c with the other related direction
2197	* functions.	2239	* functions.
2198	*/	2240	*/
2199	int reduction_dir[SIZEOFFREE][3] = {	2241	static const int reduction_dir[SIZEOFFREE][3] = {
2200	{0, 0, 0}, /* 0 */	2242	{0, 0, 0}, /* 0 */
2201	{0, 0, 0}, /* 1 */	2243	{0, 0, 0}, /* 1 */
2202	{0, 0, 0}, /* 2 */	2244	{0, 0, 0}, /* 2 */
2203	{0, 0, 0}, /* 3 */	2245	{0, 0, 0}, /* 3 */
2204	{0, 0, 0}, /* 4 */	2246	{0, 0, 0}, /* 4 */
…		…
2300	int	2342	int
2301	can_pick (const object *who, const object *item)	2343	can_pick (const object *who, const object *item)
2302	{	2344	{
2303	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2345	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2304	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2346	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2305	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2347	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2306	}	2348	}
2307		2349
2308	/*	2350	/*
2309	* create clone from object to another	2351	* create clone from object to another
2310	*/	2352	*/
2311	object *	2353	object *
2312	object_create_clone (object *asrc)	2354	object::deep_clone ()
2313	{	2355	{
		2356	assert (("deep_clone called on non-head object", is_head ()));
		2357
2314	object *dst = 0;	2358	object *dst = clone ();
2315		2359
2316	if (!asrc)
2317	return 0;
2318
2319	object *src = asrc->head_ ();
2320
2321	object *prev = 0;	2360	object *prev = dst;
2322	for (object *part = src; part; part = part->more)	2361	for (object *part = this->more; part; part = part->more)
2323	{	2362	{
2324	object *tmp = part->clone ();	2363	object *tmp = part->clone ();
2325
2326	tmp->x -= src->x;
2327	tmp->y -= src->y;
2328
2329	if (!part->head)
2330	{
2331	dst = tmp;
2332	tmp->head = 0;
2333	}
2334	else
2335	tmp->head = dst;	2364	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2365	prev->more = tmp;
2341
2342	prev = tmp;	2366	prev = tmp;
2343	}	2367	}
2344		2368
2345	for (object *item = src->inv; item; item = item->below)	2369	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2370	insert_ob_in_ob (item->deep_clone (), dst);
2347		2371
2348	return dst;	2372	return dst;
2349	}	2373	}
2350		2374
2351	/* This returns the first object in who's inventory that	2375	/* This returns the first object in who's inventory that
…		…
2360	return tmp;	2384	return tmp;
2361		2385
2362	return 0;	2386	return 0;
2363	}	2387	}
2364		2388
2365	const shstr &	2389	shstr_tmp
2366	object::kv_get (const shstr &key) const	2390	object::kv_get (shstr_tmp key) const
2367	{	2391	{
2368	for (key_value *kv = key_values; kv; kv = kv->next)	2392	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (kv->key == key)	2393	if (kv->key == key)
2370	return kv->value;	2394	return kv->value;
2371		2395
2372	return shstr_null;	2396	return shstr ();
2373	}	2397	}
2374		2398
2375	void	2399	void
2376	object::kv_set (const shstr &key, const shstr &value)	2400	object::kv_set (shstr_tmp key, shstr_tmp value)
2377	{	2401	{
2378	for (key_value *kv = key_values; kv; kv = kv->next)	2402	for (key_value *kv = key_values; kv; kv = kv->next)
2379	if (kv->key == key)	2403	if (kv->key == key)
2380	{	2404	{
2381	kv->value = value;	2405	kv->value = value;
…		…
2390		2414
2391	key_values = kv;	2415	key_values = kv;
2392	}	2416	}
2393		2417
2394	void	2418	void
2395	object::kv_del (const shstr &key)	2419	object::kv_del (shstr_tmp key)
2396	{	2420	{
2397	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2421	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2398	if ((*kvp)->key == key)	2422	if ((*kvp)->key == key)
2399	{	2423	{
2400	key_value *kv = *kvp;	2424	key_value *kv = *kvp;
…		…
2459	{	2483	{
2460	char flagdesc[512];	2484	char flagdesc[512];
2461	char info2[256 * 4];	2485	char info2[256 * 4];
2462	char *p = info;	2486	char *p = info;
2463		2487
2464	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2488	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2465	count,	2489	count,
2466	uuid.c_str (),	2490	uuid.c_str (),
2467	&name,	2491	&name,
2468	title ? "\",title:\"" : "",	2492	title ? ",title:\"" : "",
2469	title ? (const char *)title : "",	2493	title ? (const char *)title : "",
		2494	title ? "\"" : "",
2470	flag_desc (flagdesc, 512), type);	2495	flag_desc (flagdesc, 512), type);
2471		2496
2472	if (!flag[FLAG_REMOVED] && env)	2497	if (!flag[FLAG_REMOVED] && env)
2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2498	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2474		2499
…		…
2530	container = 0;	2555	container = 0;
2531		2556
2532	// client needs item update to make it work, client bug requires this to be separate	2557	// client needs item update to make it work, client bug requires this to be separate
2533	esrv_update_item (UPD_FLAGS, this, old_container);	2558	esrv_update_item (UPD_FLAGS, this, old_container);
2534		2559
2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2560	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2536	play_sound (sound_find ("chest_close"));	2561	play_sound (sound_find ("chest_close"));
2537	}	2562	}
2538		2563
2539	if (new_container)	2564	if (new_container)
2540	{	2565	{
…		…
2550	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2575	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2551	new_container->insert (closer);	2576	new_container->insert (closer);
2552	}	2577	}
2553	#endif	2578	#endif
2554		2579
2555	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2580	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2556		2581
2557	// make sure the container is available, client bug requires this to be separate	2582	// make sure the container is available, client bug requires this to be separate
2558	esrv_send_item (this, new_container);	2583	esrv_send_item (this, new_container);
2559		2584
2560	new_container->flag [FLAG_APPLIED] = true;	2585	new_container->flag [FLAG_APPLIED] = true;
…		…
2568	// else if (!old_container->env && contr && contr->ns)	2593	// else if (!old_container->env && contr && contr->ns)
2569	// contr->ns->floorbox_reset ();	2594	// contr->ns->floorbox_reset ();
2570	}	2595	}
2571		2596
2572	object *	2597	object *
2573	object::force_find (const shstr name)	2598	object::force_find (shstr_tmp name)
2574	{	2599	{
2575	/* cycle through his inventory to look for the MARK we want to	2600	/* cycle through his inventory to look for the MARK we want to
2576	* place	2601	* place
2577	*/	2602	*/
2578	for (object *tmp = inv; tmp; tmp = tmp->below)	2603	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2580	return splay (tmp);	2605	return splay (tmp);
2581		2606
2582	return 0;	2607	return 0;
2583	}	2608	}
2584		2609
		2610	//-GPL
		2611
2585	void	2612	void
		2613	object::force_set_timer (int duration)
		2614	{
		2615	this->duration = 1;
		2616	this->speed_left = -1.f;
		2617
		2618	this->set_speed (duration ? 1.f / duration : 0.f);
		2619	}
		2620
		2621	object *
2586	object::force_add (const shstr name, int duration)	2622	object::force_add (shstr_tmp name, int duration)
2587	{	2623	{
2588	if (object *force = force_find (name))	2624	if (object *force = force_find (name))
2589	force->destroy ();	2625	force->destroy ();
2590		2626
2591	object *force = get_archetype (FORCE_NAME);	2627	object *force = get_archetype (FORCE_NAME);
2592		2628
2593	force->slaying = name;	2629	force->slaying = name;
2594	force->stats.food = 1;	2630	force->force_set_timer (duration);
2595	force->speed_left = -1.f;
2596
2597	force->set_speed (duration ? 1.f / duration : 0.f);
2598	force->flag [FLAG_IS_USED_UP] = true;
2599	force->flag [FLAG_APPLIED] = true;	2631	force->flag [FLAG_APPLIED] = true;
2600		2632
2601	insert (force);	2633	return insert (force);
2602	}	2634	}
2603		2635
2604	void	2636	void
2605	object::play_sound (faceidx sound)	2637	object::play_sound (faceidx sound) const
2606	{	2638	{
2607	if (!sound)	2639	if (!sound)
2608	return;	2640	return;
2609		2641
2610	if (flag [FLAG_REMOVED])	2642	if (is_on_map ())
		2643	map->play_sound (sound, x, y);
		2644	else if (object *pl = in_player ())
		2645	pl->contr->play_sound (sound);
		2646	}
		2647
		2648	void
		2649	object::say_msg (const char *msg) const
		2650	{
		2651	if (is_on_map ())
		2652	map->say_msg (msg, x, y);
		2653	else if (object *pl = in_player ())
		2654	pl->contr->play_sound (sound);
		2655	}
		2656
		2657	void
		2658	object::make_noise ()
		2659	{
		2660	// we do not model noise in the map, so instead put
		2661	// a temporary light into the noise source
		2662	// could use the map instead, but that's less reliable for our
		2663	// goal, which is to make invisibility a bit harder to exploit
		2664
		2665	// currently only works sensibly for players
		2666	if (!is_player ())
2611	return;	2667	return;
2612		2668
2613	if (env)	2669	// find old force, or create new one
2614	{	2670	object *force = force_find (shstr_noise_force);
2615	if (object *pl = in_player ())	2671
2616	pl->contr->play_sound (sound);	2672	if (force)
2617	}	2673	force->speed_left = -1.f; // patch old speed up
2618	else	2674	else
2619	map->play_sound (sound, x, y);	2675	{
2620	}	2676	force = archetype::get (shstr_noise_force);
2621		2677
		2678	force->slaying = shstr_noise_force;
		2679	force->stats.food = 1;
		2680	force->speed_left = -1.f;
		2681
		2682	force->set_speed (1.f / 4.f);
		2683	force->flag [FLAG_IS_USED_UP] = true;
		2684	force->flag [FLAG_APPLIED] = true;
		2685
		2686	insert (force);
		2687	}
		2688	}
		2689

Diff Legend

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