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.261 by root, Wed Oct 1 16:04:16 2008 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 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	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
40		49
41	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
42	0,	51	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	52	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,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	57	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	58	-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,	59	-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	60	-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	};	61	};
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] = {	62	int freedir[SIZEOFFREE] = {
60	0,	63	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	64	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,	65	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	66	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	};	67	};
65		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
66	static void	76	static void
67	write_uuid (uval64 skip, bool sync)	77	write_uuid (uval64 skip, bool sync)
68	{	78	{
69	CALL_BEGIN (2);	79	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	80	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	83	CALL_END;
74	}	84	}
75		85
76	static void	86	static void
77	read_uuid (void)	87	read_uuid ()
78	{	88	{
79	char filename[MAX_BUF];	89	char filename[MAX_BUF];
80		90
81	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
82		92
…		…
96		106
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	108	_exit (1);
99	}	109	}
100		110
101	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	112	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
104		114
105	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
106	{	116	{
…		…
133		143
134	void	144	void
135	UUID::init ()	145	UUID::init ()
136	{	146	{
137	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) | digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz |= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
138	}	213	}
139		214
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	216	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	217	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
179	* check weight	254	* check weight
180	*/	255	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	256	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	257	{
183	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
184	if (ob1 == ob2	259	if (ob1 == ob2
185	|| ob1->type != ob2->type	260	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	261	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	262	|| ob1->name != ob2->name
		263	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	264	return 0;
190		265
191	/* Do not merge objects if nrof would overflow, assume nrof	266	/* Do not merge objects if nrof would overflow, assume nrof
192	* is always 0 .. 2**31-1 */	267	* is always 0 .. 2**31-1 */
193	if (ob1->nrof > 0x7fffffff - ob2->nrof)	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
197	* This is to the comparison of the flags below will be OK. We	272	* This is to the comparison of the flags below will be OK. We
198	* just can't ignore the been applied or identified flags, as they	273	* just can't ignore the been applied or identified flags, as they
199	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
200	* flags lose any meaning.	275	* flags lose any meaning.
201	*/	276	*/
202	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
204		279
205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
207		282
208	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
209	|| ob1->name != ob2->name	284	|| ob1->name != ob2->name
210	|| ob1->title != ob2->title	285	|| ob1->title != ob2->title
211	|| ob1->msg != ob2->msg	286	|| ob1->msg != ob2->msg
…		…
214	|| ob1->magic != ob2->magic	289	|| ob1->magic != ob2->magic
215	|| ob1->slaying != ob2->slaying	290	|| ob1->slaying != ob2->slaying
216	|| ob1->skill != ob2->skill	291	|| ob1->skill != ob2->skill
217	|| ob1->value != ob2->value	292	|| ob1->value != ob2->value
218	|| ob1->animation_id != ob2->animation_id	293	|| ob1->animation_id != ob2->animation_id
219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	294	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
220	|| ob1->client_type != ob2->client_type	295	|| ob1->client_type != ob2->client_type
221	|| ob1->materialname != ob2->materialname	296	|| ob1->material != ob2->material
222	|| ob1->lore != ob2->lore	297	|| ob1->lore != ob2->lore
223	|| ob1->subtype != ob2->subtype	298	|| ob1->subtype != ob2->subtype
224	|| ob1->move_type != ob2->move_type	299	|| ob1->move_type != ob2->move_type
225	|| ob1->move_block != ob2->move_block	300	|| ob1->move_block != ob2->move_block
226	|| ob1->move_allow != ob2->move_allow	301	|| ob1->move_allow != ob2->move_allow
227	|| ob1->move_on != ob2->move_on	302	|| ob1->move_on != ob2->move_on
228	|| ob1->move_off != ob2->move_off	303	|| ob1->move_off != ob2->move_off
229	|| ob1->move_slow != ob2->move_slow	304	|| ob1->move_slow != ob2->move_slow
230	|| ob1->move_slow_penalty != ob2->move_slow_penalty	305	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	308	return 0;
234		309
235	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
…		…
260		335
261	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
262	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
263	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
264	*/	339	*/
265	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
266	return 0;	341	return 0;
267		342
268	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
269	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
270	* check?	345	* check?
271	*/	346	*/
272	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
273	return 0;	348	return 0;
274		349
275	switch (ob1->type)	350	switch (ob1->type)
276	{	351	{
277	case SCROLL:	352	case SCROLL:
…		…
323	{	398	{
324	// see if we are in a container of sorts	399	// see if we are in a container of sorts
325	if (env)	400	if (env)
326	{	401	{
327	// the player inventory itself is always visible	402	// the player inventory itself is always visible
328	if (env->type == PLAYER)	403	if (env->is_player ())
329	return env;	404	return env;
330		405
331	// else a player could have our env open	406	// else a player could have our env open
332	object *envest = env->outer_env ();	407	object *envest = env->outer_env_or_self ();
333		408
334	// the player itself is always on a map, so we will find him here	409	// the player itself is always on a map, so we will find him here
335	// even if our inv is in a player.	410	// even if our inv is in a player.
336	if (envest->is_on_map ())	411	if (envest->is_on_map ())
337	if (object *pl = envest->ms ().player ())	412	if (object *pl = envest->ms ().player ())
338	if (pl->container == env)	413	if (pl->container_ () == env)
339	return pl;	414	return pl;
340	}	415	}
341	else	416	else
342	{	417	{
343	// maybe there is a player standing on the same mapspace	418	// maybe there is a player standing on the same mapspace
344	// this will catch the case where "this" is a player	419	// this will catch the case where "this" is a player
345	if (object *pl = ms ().player ())	420	if (object *pl = ms ().player ())
346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	421	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347	|| this == pl->container)	422	|| pl->container_ () == this)
348	return pl;	423	return pl;
349	}	424	}
350	}	425	}
351		426
352	return 0;	427	return 0;
…		…
430	object_freezer freezer;	505	object_freezer freezer;
431	op->write (freezer);	506	op->write (freezer);
432	return freezer.as_string ();	507	return freezer.as_string ();
433	}	508	}
434		509
435	/*	510	char *
436	* get_nearest_part(multi-object, object 2) returns the part of the	511	object::as_string ()
437	* multi-object 1 which is closest to the second object.
438	* If it's not a multi-object, it is returned.
439	*/
440	object *
441	get_nearest_part (object *op, const object *pl)
442	{	512	{
443	object *tmp, *closest;	513	return dump_object (this);
444	int last_dist, i;
445
446	if (!op->more)
447	return op;
448
449	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450	tmp;
451	tmp = tmp->more)
452	if ((i = distance (tmp, pl)) < last_dist)
453	closest = tmp, last_dist = i;
454
455	return closest;
456	}	514	}
457		515
458	/*	516	/*
459	* Returns the object which has the count-variable equal to the argument.	517	* Returns the object which has the count-variable equal to the argument.
460	* VERRRY slow.	518	* VERRRY slow.
…		…
462	object *	520	object *
463	find_object (tag_t i)	521	find_object (tag_t i)
464	{	522	{
465	for_all_objects (op)	523	for_all_objects (op)
466	if (op->count == i)	524	if (op->count == i)
		525	return op;
		526
		527	return 0;
		528	}
		529
		530	/*
		531	* Returns the object which has the uuid equal to the argument.
		532	* MOAR VERRRY slow.
		533	*/
		534
		535	object *
		536	find_object_uuid (UUID i)
		537	{
		538	for_all_objects (op)
		539	if (op->uuid == i)
467	return op;	540	return op;
468		541
469	return 0;	542	return 0;
470	}	543	}
471		544
…		…
505	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	578	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
506	return;	579	return;
507	}	580	}
508		581
509	this->owner = owner;	582	this->owner = owner;
510	}
511
512	int
513	object::slottype () const
514	{
515	if (type == SKILL)
516	{
517	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
518	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
519	}
520	else
521	{
522	if (slot [body_combat].info) return slot_combat;
523	if (slot [body_range ].info) return slot_ranged;
524	}
525
526	return slot_none;
527	}
528
529	bool
530	object::change_weapon (object *ob)
531	{
532	if (current_weapon == ob)
533	return true;
534
535	if (chosen_skill)
536	chosen_skill->flag [FLAG_APPLIED] = false;
537
538	current_weapon = ob;
539	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
540
541	if (chosen_skill)
542	chosen_skill->flag [FLAG_APPLIED] = true;
543
544	update_stats ();
545
546	if (ob)
547	{
548	// now check wether any body locations became invalid, in which case
549	// we cannot apply the weapon at the moment.
550	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
551	if (slot[i].used < 0)
552	{
553	current_weapon = chosen_skill = 0;
554	update_stats ();
555
556	new_draw_info_format (NDI_UNIQUE, 0, this,
557	"You try to balance all your items at once, "
558	"but the %s is just too much for your body. "
559	"[You need to unapply some items first.]", &ob->name);
560	return false;
561	}
562
563	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564	}
565	else
566	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
567
568	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
569	{
570	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
571	&name, ob->debug_desc ());
572	return false;
573	}
574
575	return true;
576	}	583	}
577		584
578	/* Zero the key_values on op, decrementing the shared-string	585	/* Zero the key_values on op, decrementing the shared-string
579	* refcounts and freeing the links.	586	* refcounts and freeing the links.
580	*/	587	*/
…		…
633	tail = new_link;	640	tail = new_link;
634	}	641	}
635	}	642	}
636	}	643	}
637		644
638	if (speed < 0)
639	dst->speed_left -= rndm ();
640
641	dst->activate ();	645	dst->activate ();
642	}	646	}
643		647
644	void	648	void
645	object::instantiate ()	649	object::instantiate ()
646	{	650	{
647	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
648	uuid = UUID::gen ();	652	uuid = UUID::gen ();
649		653
		654	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		655	if (flag [FLAG_RANDOM_SPEED] && speed)
		656	speed_left = - speed - rndm (); // TODO animation
		657	else
650	speed_left = -0.1f;	658	speed_left = -1.;
		659
651	/* copy the body_info to the body_used - this is only really	660	/* copy the body_info to the body_used - this is only really
652	* need for monsters, but doesn't hurt to do it for everything.	661	* need for monsters, but doesn't hurt to do it for everything.
653	* by doing so, when a monster is created, it has good starting	662	* by doing so, when a monster is created, it has good starting
654	* values for the body_used info, so when items are created	663	* values for the body_used info, so when items are created
655	* for it, they can be properly equipped.	664	* for it, they can be properly equipped.
…		…
663	object *	672	object *
664	object::clone ()	673	object::clone ()
665	{	674	{
666	object *neu = create ();	675	object *neu = create ();
667	copy_to (neu);	676	copy_to (neu);
		677
		678	// TODO: unclean state changes, should not be done in clone AND instantiate
		679	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		680	neu->speed_left = - neu->speed - rndm (); // TODO animation
		681
668	neu->map = map; // not copied by copy_to	682	neu->map = map; // not copied by copy_to
669	return neu;	683	return neu;
670	}	684	}
671		685
672	/*	686	/*
…		…
675	* be called to update the face variable, _and_ how it looks on the map.	689	* be called to update the face variable, _and_ how it looks on the map.
676	*/	690	*/
677	void	691	void
678	update_turn_face (object *op)	692	update_turn_face (object *op)
679	{	693	{
680	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
681	return;	695	return;
682		696
683	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
684	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
685	}	699	}
…		…
690	* This function needs to be called whenever the speed of an object changes.	704	* This function needs to be called whenever the speed of an object changes.
691	*/	705	*/
692	void	706	void
693	object::set_speed (float speed)	707	object::set_speed (float speed)
694	{	708	{
695	if (flag [FLAG_FREED] && speed)
696	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	speed = 0;
699	}
700
701	this->speed = speed;	709	this->speed = speed;
702		710
703	if (has_active_speed ())	711	if (has_active_speed ())
704	activate ();	712	activate ();
705	else	713	else
…		…
755		763
756	if (!(m.flags_ & P_UPTODATE))	764	if (!(m.flags_ & P_UPTODATE))
757	/* nop */;	765	/* nop */;
758	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
759	{	767	{
		768	#if 0
760	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
762	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
763	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	|| (op->is_player () && !(m.flags_ & P_PLAYER))
764	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
766	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
767	|| (m.move_on | op->move_on ) != m.move_on	776	|| (m.move_on | op->move_on ) != m.move_on
768	|| (m.move_off | op->move_off ) != m.move_off	777	|| (m.move_off | op->move_off ) != m.move_off
769	|| (m.move_slow | op->move_slow) != m.move_slow	778	|| (m.move_slow | op->move_slow) != m.move_slow
770	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	780	* have move_allow right now.
772	*/	781	*/
773	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	782	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		783	m.invalidate ();
		784	#else
774	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	785	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
775	m.flags_ = 0;	786	m.invalidate ();
		787	#endif
776	}	788	}
777	/* if the object is being removed, we can't make intelligent	789	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	790	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	791	* that is being removed.
780	*/	792	*/
781	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	793	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782	m.flags_ = 0;	794	m.invalidate ();
783	else if (action == UP_OBJ_FACE)	795	else if (action == UP_OBJ_FACE)
784	/* Nothing to do for that case */ ;	796	/* Nothing to do for that case */ ;
785	else	797	else
786	LOG (llevError, "update_object called with invalid action: %d\n", action);	798	LOG (llevError, "update_object called with invalid action: %d\n", action);
787		799
…		…
789	update_object (op->more, action);	801	update_object (op->more, action);
790	}	802	}
791		803
792	object::object ()	804	object::object ()
793	{	805	{
794	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
795		807
796	expmul = 1.0;	808	//expmul = 1.0; declared const for the time being
797	face = blank_face;	809	face = blank_face;
		810	material = MATERIAL_NULL;
798	}	811	}
799		812
800	object::~object ()	813	object::~object ()
801	{	814	{
802	unlink ();	815	unlink ();
803		816
804	free_key_values (this);	817	free_key_values (this);
805	}	818	}
806
807	static int object_count;
808		819
809	void object::link ()	820	void object::link ()
810	{	821	{
811	assert (!index);//D	822	assert (!index);//D
812	uuid = UUID::gen ();	823	uuid = UUID::gen ();
813	count = ++object_count;
814		824
815	refcnt_inc ();	825	refcnt_inc ();
816	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
817	}	830	}
818		831
819	void object::unlink ()	832	void object::unlink ()
820	{	833	{
821	if (!index)	834	if (!index)
822	return;	835	return;
		836
		837	++destroy_count;
823		838
824	objects.erase (this);	839	objects.erase (this);
825	refcnt_dec ();	840	refcnt_dec ();
826	}	841	}
827		842
…		…
830	{	845	{
831	/* If already on active list, don't do anything */	846	/* If already on active list, don't do anything */
832	if (active)	847	if (active)
833	return;	848	return;
834		849
835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838	if (has_active_speed ())	850	if (has_active_speed ())
		851	{
		852	if (flag [FLAG_FREED])
		853	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		854
839	actives.insert (this);	855	actives.insert (this);
		856	}
840	}	857	}
841		858
842	void	859	void
843	object::activate_recursive ()	860	object::activate_recursive ()
844	{	861	{
…		…
930	map->insert (op, x, y);	947	map->insert (op, x, y);
931	}	948	}
932	}	949	}
933	}	950	}
934		951
		952	/*
		953	* Remove and free all objects in the inventory of the given object.
		954	* Unlike destroy_inv, this assumes the *this is destroyed as well
		955	* well, so we can (and have to!) take shortcuts.
		956	*/
		957	void
		958	object::destroy_inv_fast ()
		959	{
		960	while (object *op = inv)
		961	{
		962	// remove from object the fast way
		963	op->flag [FLAG_REMOVED] = true;
		964	op->env = 0;
		965	if ((inv = inv->below))
		966	inv->above = 0;
		967
		968	// then destroy
		969	op->destroy ();
		970	}
		971	}
		972
		973	void
		974	object::freelist_free (int count)
		975	{
		976	while (count-- && freelist)
		977	{
		978	freelist_item *next = freelist->next;
		979	// count is being "destroyed"
		980
		981	sfree ((char *)freelist, sizeof (object));
		982
		983	freelist = next;
		984	--free_count;
		985	}
		986	}
		987
		988	object *
935	object *object::create ()	989	object::create ()
936	{	990	{
937	object *op = new object;	991	object *op;
		992
		993	if (freelist)
		994	{
		995	freelist_item li = *freelist;
		996	memset (freelist, 0, sizeof (object));
		997
		998	op = new (freelist) object;
		999	op->count = li.count;
		1000
		1001	freelist = li.next;
		1002	--free_count;
		1003	}
		1004	else
		1005	{
		1006	void *ni = salloc0<char> (sizeof (object));
		1007
		1008	op = new(ni) object;
		1009
		1010	op->count = ++object_count;
		1011	}
		1012
938	op->link ();	1013	op->link ();
		1014
939	return op;	1015	return op;
		1016	}
		1017
		1018	void
		1019	object::do_delete ()
		1020	{
		1021	uint32_t count = this->count;
		1022
		1023	this->~object ();
		1024
		1025	freelist_item *li = (freelist_item *)this;
		1026	li->next = freelist;
		1027	li->count = count;
		1028
		1029	freelist = li;
		1030	++free_count;
940	}	1031	}
941		1032
942	static struct freed_map : maptile	1033	static struct freed_map : maptile
943	{	1034	{
944	freed_map ()	1035	freed_map ()
…		…
962		1053
963	void	1054	void
964	object::do_destroy ()	1055	object::do_destroy ()
965	{	1056	{
966	if (flag [FLAG_IS_LINKED])	1057	if (flag [FLAG_IS_LINKED])
967	remove_button_link (this);	1058	remove_link ();
968		1059
969	if (flag [FLAG_FRIENDLY])	1060	if (flag [FLAG_FRIENDLY])
970	remove_friendly_object (this);	1061	remove_friendly_object (this);
971		1062
972	remove ();	1063	remove ();
…		…
1009	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1100	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010	head->destroy ();	1101	head->destroy ();
1011	return;	1102	return;
1012	}	1103	}
1013		1104
1014	destroy_inv (false);	1105	destroy_inv_fast ();
1015		1106
1016	if (is_head ())	1107	if (is_head ())
1017	if (sound_destroy)	1108	if (sound_destroy)
1018	play_sound (sound_destroy);	1109	play_sound (sound_destroy);
1019	else if (flag [FLAG_MONSTER])	1110	else if (flag [FLAG_MONSTER])
…		…
1030	* the previous environment.	1121	* the previous environment.
1031	*/	1122	*/
1032	void	1123	void
1033	object::do_remove ()	1124	object::do_remove ()
1034	{	1125	{
1035	object *tmp, *last = 0;
1036	object *otmp;
1037
1038	if (flag [FLAG_REMOVED])	1126	if (flag [FLAG_REMOVED])
1039	return;	1127	return;
1040		1128
1041	INVOKE_OBJECT (REMOVE, this);	1129	INVOKE_OBJECT (REMOVE, this);
1042		1130
…		…
1055	if (object *pl = visible_to ())	1143	if (object *pl = visible_to ())
1056	esrv_del_item (pl->contr, count);	1144	esrv_del_item (pl->contr, count);
1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1145	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058		1146
1059	adjust_weight (env, -total_weight ());	1147	adjust_weight (env, -total_weight ());
		1148
		1149	object *pl = in_player ();
1060		1150
1061	/* we set up values so that it could be inserted into	1151	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	1152	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	1153	* to the caller to decide what we want to do.
1064	*/	1154	*/
…		…
1072		1162
1073	above = 0;	1163	above = 0;
1074	below = 0;	1164	below = 0;
1075	env = 0;	1165	env = 0;
1076		1166
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1167	if (pl && pl->is_player ())
1078	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.
1080	*/	1168	{
1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1169	if (expect_false (pl->contr->combat_ob == this))
1082	otmp->update_stats ();	1170	{
		1171	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1172	pl->contr->combat_ob = 0;
		1173	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1174	}
		1175
		1176	if (expect_false (pl->contr->ranged_ob == this))
		1177	{
		1178	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1179	pl->contr->ranged_ob = 0;
		1180	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1181	}
		1182
		1183	pl->contr->queue_stats_update ();
		1184
		1185	if (expect_false (glow_radius) && pl->is_on_map ())
		1186	update_all_los (pl->map, pl->x, pl->y);
		1187	}
1083	}	1188	}
1084	else if (map)	1189	else if (map)
1085	{	1190	{
1086	map->dirty = true;	1191	map->dirty = true;
1087	mapspace &ms = this->ms ();	1192	mapspace &ms = this->ms ();
1088		1193
1089	if (object *pl = ms.player ())	1194	if (object *pl = ms.player ())
1090	{	1195	{
1091	if (type == PLAYER) // this == pl(!)	1196	if (is_player ())
1092	{	1197	{
		1198	if (!flag [FLAG_WIZPASS])
		1199	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1200
1093	// leaving a spot always closes any open container on the ground	1201	// leaving a spot always closes any open container on the ground
1094	if (container && !container->env)	1202	if (container && !container->env)
1095	// this causes spurious floorbox updates, but it ensures	1203	// this causes spurious floorbox updates, but it ensures
1096	// that the CLOSE event is being sent.	1204	// that the CLOSE event is being sent.
1097	close_container ();	1205	close_container ();
1098		1206
1099	--map->players;	1207	--map->players;
1100	map->touch ();	1208	map->touch ();
1101	}	1209	}
1102	else if (pl->container == this)	1210	else if (pl->container_ () == this)
1103	{	1211	{
1104	// removing a container should close it	1212	// removing a container should close it
1105	close_container ();	1213	close_container ();
1106	}	1214	}
1107		1215	else
1108	esrv_del_item (pl->contr, count);	1216	esrv_del_item (pl->contr, count);
1109	}	1217	}
1110		1218
1111	/* link the object above us */	1219	/* link the object above us */
1112	// re-link, make sure compiler can easily use cmove	1220	// re-link, make sure compiler can easily use cmove
1113	*(above ? &above->below : &ms.top) = below;	1221	*(above ? &above->below : &ms.top) = below;
1114	*(below ? &below->above : &ms.bot) = above;	1222	*(below ? &below->above : &ms.bot) = above;
1115		1223
1116	above = 0;	1224	above = 0;
1117	below = 0;	1225	below = 0;
1118		1226
1119	ms.flags_ = 0;	1227	ms.invalidate ();
1120		1228
1121	if (map->in_memory == MAP_SAVING)	1229	if (map->in_memory == MAP_SAVING)
1122	return;	1230	return;
1123		1231
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1232	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1233
1126	if (object *pl = ms.player ())	1234	if (object *pl = ms.player ())
1127	{	1235	{
1128	if (pl->container == this)	1236	if (pl->container_ () == this)
1129	/* If a container that the player is currently using somehow gets	1237	/* If a container that the player is currently using somehow gets
1130	* removed (most likely destroyed), update the player view	1238	* removed (most likely destroyed), update the player view
1131	* appropriately.	1239	* appropriately.
1132	*/	1240	*/
1133	pl->close_container ();	1241	pl->close_container ();
…		…
1137	//TODO: update floorbox to preserve ordering	1245	//TODO: update floorbox to preserve ordering
1138	if (pl->contr->ns)	1246	if (pl->contr->ns)
1139	pl->contr->ns->floorbox_update ();	1247	pl->contr->ns->floorbox_update ();
1140	}	1248	}
1141		1249
		1250	if (check_walk_off)
1142	for (tmp = ms.bot; tmp; tmp = tmp->above)	1251	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1143	{	1252	{
		1253	above = tmp->above;
		1254
1144	/* No point updating the players look faces if he is the object	1255	/* No point updating the players look faces if he is the object
1145	* being removed.	1256	* being removed.
1146	*/	1257	*/
1147		1258
1148	/* See if object moving off should effect something */	1259	/* See if object moving off should effect something */
1149	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1260	if ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1261	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152	{
1153	move_apply (tmp, this, 0);	1262	move_apply (tmp, this, 0);
1154
1155	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1263	}
1158		1264
1159	last = tmp;	1265	if (affects_los ())
1160	}
1161
1162	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163	update_all_los (map, x, y);	1266	update_all_los (map, x, y);
1164	}	1267	}
1165	}	1268	}
1166		1269
1167	/*	1270	/*
…		…
1209		1312
1210	object *prev = this;	1313	object *prev = this;
1211		1314
1212	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1315	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1213	{	1316	{
1214	object *op = arch_to_object (at);	1317	object *op = at->instance ();
1215		1318
1216	op->name = name;	1319	op->name = name;
1217	op->name_pl = name_pl;	1320	op->name_pl = name_pl;
1218	op->title = title;	1321	op->title = title;
1219		1322
…		…
1257	* Passing 0 for flag gives proper default values, so flag really only needs	1360	* Passing 0 for flag gives proper default values, so flag really only needs
1258	* to be set if special handling is needed.	1361	* to be set if special handling is needed.
1259	*	1362	*
1260	* Return value:	1363	* Return value:
1261	* new object if 'op' was merged with other object	1364	* new object if 'op' was merged with other object
1262	* NULL if 'op' was destroyed	1365	* NULL if there was an error (destroyed, blocked etc.)
1263	* just 'op' otherwise	1366	* just 'op' otherwise
1264	*/	1367	*/
1265	object *	1368	object *
1266	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1369	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1267	{	1370	{
…		…
1274		1377
1275	/* Ideally, the caller figures this out. However, it complicates a lot	1378	/* Ideally, the caller figures this out. However, it complicates a lot
1276	* of areas of callers (eg, anything that uses find_free_spot would now	1379	* of areas of callers (eg, anything that uses find_free_spot would now
1277	* need extra work	1380	* need extra work
1278	*/	1381	*/
		1382	maptile *newmap = m;
1279	if (!xy_normalise (m, op->x, op->y))	1383	if (!xy_normalise (newmap, op->x, op->y))
1280	{	1384	{
1281	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1385	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282	return 0;	1386	return 0;
1283	}	1387	}
1284		1388
1285	if (object *more = op->more)	1389	if (object *more = op->more)
1286	if (!insert_ob_in_map (more, m, originator, flag))	1390	if (!insert_ob_in_map (more, m, originator, flag))
1287	return 0;	1391	return 0;
1288		1392
1289	CLEAR_FLAG (op, FLAG_REMOVED);	1393	op->flag [FLAG_REMOVED] = false;
1290		1394	op->env = 0;
1291	op->map = m;	1395	op->map = newmap;
		1396
1292	mapspace &ms = op->ms ();	1397	mapspace &ms = op->ms ();
1293		1398
1294	/* this has to be done after we translate the coordinates.	1399	/* this has to be done after we translate the coordinates.
1295	*/	1400	*/
1296	if (op->nrof && !(flag & INS_NO_MERGE))	1401	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1302	// from here :/	1407	// from here :/
1303	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1304	tmp->destroy ();	1409	tmp->destroy ();
1305	}	1410	}
1306		1411
1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1412	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1309		1414
1310	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1311	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1312		1417
1313	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1314	{	1419	{
1315	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1420	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1316	{	1421	{
1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1422	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1318	abort ();	1423	abort ();
1319	}	1424	}
1320		1425
1321	if (!originator->is_on_map ())	1426	if (!originator->is_on_map ())
		1427	{
1322	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1428	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323	op->debug_desc (), originator->debug_desc ());	1429	op->debug_desc (), originator->debug_desc ());
		1430	abort ();
		1431	}
1324		1432
1325	op->above = originator;	1433	op->above = originator;
1326	op->below = originator->below;	1434	op->below = originator->below;
1327	originator->below = op;	1435	originator->below = op;
1328		1436
…		…
1348	* when lots of spells are cast in one area. Currently, it is presumed	1456	* when lots of spells are cast in one area. Currently, it is presumed
1349	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1350	*/	1458	*/
1351	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1352	{	1460	{
1353	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1461	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1354	floor = tmp;	1462	floor = tmp;
1355		1463
1356	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1464	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1357	{	1465	{
1358	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1359	top = tmp->below;	1467	top = tmp->below;
1360	break;	1468	break;
1361	}	1469	}
…		…
1379	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1380	{	1488	{
1381	object *last;	1489	object *last;
1382		1490
1383	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1384	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1385	break;	1493	break;
1386		1494
1387	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1388	* and make sure we have a below pointer for it so that	1496	* and make sure we have a below pointer for it so that
1389	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1414	op->below = top;	1522	op->below = top;
1415	*(op->above ? &op->above->below : &ms.top) = op;	1523	*(op->above ? &op->above->below : &ms.top) = op;
1416	}	1524	}
1417	}	1525	}
1418		1526
1419	if (op->type == PLAYER)	1527	if (op->is_player ())
1420	{	1528	{
1421	op->contr->do_los = 1;	1529	op->contr->do_los = 1;
1422	++op->map->players;	1530	++op->map->players;
1423	op->map->touch ();	1531	op->map->touch ();
1424	}	1532	}
…		…
1439	* be far away from this change and not affected in any way -	1547	* be far away from this change and not affected in any way -
1440	* this should get redone to only look for players within range,	1548	* this should get redone to only look for players within range,
1441	* or just updating the P_UPTODATE for spaces within this area	1549	* or just updating the P_UPTODATE for spaces within this area
1442	* of effect may be sufficient.	1550	* of effect may be sufficient.
1443	*/	1551	*/
1444	if (op->map->darkness && (op->glow_radius != 0))	1552	if (op->affects_los ())
		1553	{
		1554	op->ms ().invalidate ();
1445	update_all_los (op->map, op->x, op->y);	1555	update_all_los (op->map, op->x, op->y);
		1556	}
1446		1557
1447	/* updates flags (blocked, alive, no magic, etc) for this map space */	1558	/* updates flags (blocked, alive, no magic, etc) for this map space */
1448	update_object (op, UP_OBJ_INSERT);	1559	update_object (op, UP_OBJ_INSERT);
1449		1560
1450	INVOKE_OBJECT (INSERT, op);	1561	INVOKE_OBJECT (INSERT, op);
…		…
1457	* blocked() and wall() work properly), and these flags are updated by	1568	* blocked() and wall() work properly), and these flags are updated by
1458	* update_object().	1569	* update_object().
1459	*/	1570	*/
1460		1571
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1572	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1573	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1463	{	1574	{
1464	if (check_move_on (op, originator))	1575	if (check_move_on (op, originator))
1465	return 0;	1576	return 0;
1466		1577
1467	/* If we are a multi part object, lets work our way through the check	1578	/* If we are a multi part object, lets work our way through the check
…		…
1478	/* this function inserts an object in the map, but if it	1589	/* this function inserts an object in the map, but if it
1479	* finds an object of its own type, it'll remove that one first.	1590	* finds an object of its own type, it'll remove that one first.
1480	* op is the object to insert it under: supplies x and the map.	1591	* op is the object to insert it under: supplies x and the map.
1481	*/	1592	*/
1482	void	1593	void
1483	replace_insert_ob_in_map (const char *arch_string, object *op)	1594	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1484	{	1595	{
1485	/* first search for itself and remove any old instances */	1596	/* first search for itself and remove any old instances */
1486		1597
1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1598	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1599	if (tmp->arch->archname == archname) /* same archetype */
1489	tmp->destroy ();	1600	tmp->destroy ();
1490		1601
1491	object *tmp = arch_to_object (archetype::find (arch_string));	1602	object *tmp = archetype::find (archname)->instance ();
1492		1603
1493	tmp->x = op->x;	1604	tmp->x = op->x;
1494	tmp->y = op->y;	1605	tmp->y = op->y;
1495		1606
1496	insert_ob_in_map (tmp, op->map, op, 0);	1607	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1501	{	1612	{
1502	if (where->env)	1613	if (where->env)
1503	return where->env->insert (this);	1614	return where->env->insert (this);
1504	else	1615	else
1505	return where->map->insert (this, where->x, where->y, originator, flags);	1616	return where->map->insert (this, where->x, where->y, originator, flags);
		1617	}
		1618
		1619	// check whether we can put this into the map, respect max_volume, max_items
		1620	bool
		1621	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1622	{
		1623	mapspace &ms = m->at (x, y);
		1624
		1625	int items = ms.items ();
		1626
		1627	if (!items // testing !items ensures we can drop at least one item
		1628	|| (items < m->max_items
		1629	&& ms.volume () < m->max_volume))
		1630	return true;
		1631
		1632	if (originator && originator->is_player ())
		1633	originator->contr->failmsgf (
		1634	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1635	query_name ()
		1636	);
		1637
		1638	return false;
1506	}	1639	}
1507		1640
1508	/*	1641	/*
1509	* decrease(object, number) decreases a specified number from	1642	* decrease(object, number) decreases a specified number from
1510	* the amount of an object. If the amount reaches 0, the object	1643	* the amount of an object. If the amount reaches 0, the object
…		…
1645		1778
1646	adjust_weight (this, op->total_weight ());	1779	adjust_weight (this, op->total_weight ());
1647		1780
1648	inserted:	1781	inserted:
1649	/* reset the light list and los of the players on the map */	1782	/* reset the light list and los of the players on the map */
1650	if (op->glow_radius && map && map->darkness)	1783	if (op->glow_radius && is_on_map ())
		1784	{
		1785	update_stats ();
1651	update_all_los (map, x, y);	1786	update_all_los (map, x, y);
1652		1787	}
		1788	else if (is_player ())
1653	// if this is a player's inventory, update stats	1789	// if this is a player's inventory, update stats
1654	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1790	contr->queue_stats_update ();
1655	update_stats ();
1656		1791
1657	INVOKE_OBJECT (INSERT, this);	1792	INVOKE_OBJECT (INSERT, this);
1658		1793
1659	return op;	1794	return op;
1660	}	1795	}
…		…
1680	* on top.	1815	* on top.
1681	*/	1816	*/
1682	int	1817	int
1683	check_move_on (object *op, object *originator)	1818	check_move_on (object *op, object *originator)
1684	{	1819	{
		1820	if (op->flag [FLAG_NO_APPLY])
		1821	return 0;
		1822
1685	object *tmp;	1823	object *tmp;
1686	maptile *m = op->map;	1824	maptile *m = op->map;
1687	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
1688		1826
1689	MoveType move_on, move_slow, move_block;	1827	mapspace &ms = m->at (x, y);
1690		1828
1691	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1829	ms.update ();
1692	return 0;
1693		1830
1694	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1831	MoveType move_on = ms.move_on;
1695	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1832	MoveType move_slow = ms.move_slow;
1696	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1833	MoveType move_block = ms.move_block;
1697		1834
1698	/* if nothing on this space will slow op down or be applied,	1835	/* if nothing on this space will slow op down or be applied,
1699	* no need to do checking below. have to make sure move_type	1836	* no need to do checking below. have to make sure move_type
1700	* is set, as lots of objects don't have it set - we treat that	1837	* is set, as lots of objects don't have it set - we treat that
1701	* as walking.	1838	* as walking.
…		…
1712	return 0;	1849	return 0;
1713		1850
1714	/* The objects have to be checked from top to bottom.	1851	/* The objects have to be checked from top to bottom.
1715	* Hence, we first go to the top:	1852	* Hence, we first go to the top:
1716	*/	1853	*/
1717		1854	for (object *next, *tmp = ms.top; tmp; tmp = next)
1718	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1719	{
1720	/* Trim the search when we find the first other spell effect
1721	* this helps performance so that if a space has 50 spell objects,
1722	* we don't need to check all of them.
1723	*/
1724	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1725	break;
1726	}	1855	{
		1856	next = tmp->below;
1727		1857
1728	for (; tmp; tmp = tmp->below)
1729	{
1730	if (tmp == op)	1858	if (tmp == op)
1731	continue; /* Can't apply yourself */	1859	continue; /* Can't apply yourself */
1732		1860
1733	/* Check to see if one of the movement types should be slowed down.	1861	/* Check to see if one of the movement types should be slowed down.
1734	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1735	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1736	* space doesn't slow down swimming (for example), if you can't actually	1864	* space doesn't slow down swimming (for example), if you can't actually
1737	* swim on that space, can't use it to avoid the penalty.	1865	* swim on that space, can't use it to avoid the penalty.
1738	*/	1866	*/
1739	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1740	{	1868	{
1741	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1742	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1870	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1743	{	1871	{
1744
1745	float
1746	diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
1747		1873
1748	if (op->type == PLAYER)	1874	if (op->is_player ())
1749	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1875	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1750	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1876	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1751	diff /= 4.0;	1877	diff /= 4.0;
1752		1878
1753	op->speed_left -= diff;	1879	op->speed_left -= diff;
1754	}	1880	}
1755	}	1881	}
…		…
1877	void	2003	void
1878	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1879	{	2005	{
1880	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1881	{	2007	{
1882	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1883	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1884	}	2010	}
1885	}	2011	}
1886		2012
1887	/*	2013	/*
…		…
1890	void	2016	void
1891	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1892	{	2018	{
1893	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1894	{	2020	{
1895	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1896	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1897	}	2023	}
1898	}	2024	}
1899		2025
1900	/*	2026	/*
…		…
1961	* head of the object should correspond for the entire object.	2087	* head of the object should correspond for the entire object.
1962	*/	2088	*/
1963	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2089	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1964	continue;	2090	continue;
1965		2091
1966	if (ob->blocked (m, pos.x, pos.y))	2092	if (ob->blocked (pos.m, pos.x, pos.y))
1967	continue;	2093	continue;
1968		2094
1969	altern [index++] = i;	2095	altern [index++] = i;
1970	}	2096	}
1971		2097
…		…
2039	* there is capable of.	2165	* there is capable of.
2040	*/	2166	*/
2041	int	2167	int
2042	find_dir (maptile *m, int x, int y, object *exclude)	2168	find_dir (maptile *m, int x, int y, object *exclude)
2043	{	2169	{
2044	int i, max = SIZEOFFREE, mflags;	2170	int max = SIZEOFFREE, mflags;
2045
2046	sint16 nx, ny;
2047	object *tmp;
2048	maptile *mp;
2049
2050	MoveType blocked, move_type;	2171	MoveType move_type;
2051		2172
2052	if (exclude && exclude->head_ () != exclude)	2173	if (exclude && exclude->head_ () != exclude)
2053	{	2174	{
2054	exclude = exclude->head;	2175	exclude = exclude->head;
2055	move_type = exclude->move_type;	2176	move_type = exclude->move_type;
…		…
2058	{	2179	{
2059	/* If we don't have anything, presume it can use all movement types. */	2180	/* If we don't have anything, presume it can use all movement types. */
2060	move_type = MOVE_ALL;	2181	move_type = MOVE_ALL;
2061	}	2182	}
2062		2183
2063	for (i = 1; i < max; i++)	2184	for (int i = 1; i < max; i++)
2064	{	2185	{
2065	mp = m;	2186	mapxy pos (m, x, y);
2066	nx = x + freearr_x[i];	2187	pos.move (i);
2067	ny = y + freearr_y[i];
2068		2188
2069	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2189	if (!pos.normalise ())
2070
2071	if (mflags & P_OUT_OF_MAP)
2072	max = maxfree[i];	2190	max = maxfree[i];
2073	else	2191	else
2074	{	2192	{
2075	mapspace &ms = mp->at (nx, ny);	2193	mapspace &ms = *pos;
2076		2194
2077	blocked = ms.move_block;
2078
2079	if ((move_type & blocked) == move_type)	2195	if ((move_type & ms.move_block) == move_type)
2080	max = maxfree[i];	2196	max = maxfree [i];
2081	else if (mflags & P_IS_ALIVE)	2197	else if (ms.flags () & P_IS_ALIVE)
2082	{	2198	{
2083	for (tmp = ms.bot; tmp; tmp = tmp->above)	2199	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2084	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2200	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2085	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2201	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2086	break;
2087
2088	if (tmp)
2089	return freedir[i];	2202	return freedir [i];
2090	}	2203	}
2091	}	2204	}
2092	}	2205	}
2093		2206
2094	return 0;	2207	return 0;
…		…
2169	* This basically means that if direction is 15, then it could either go	2282	* This basically means that if direction is 15, then it could either go
2170	* direction 4, 14, or 16 to get back to where we are.	2283	* direction 4, 14, or 16 to get back to where we are.
2171	* Moved from spell_util.c to object.c with the other related direction	2284	* Moved from spell_util.c to object.c with the other related direction
2172	* functions.	2285	* functions.
2173	*/	2286	*/
2174	int reduction_dir[SIZEOFFREE][3] = {	2287	static const int reduction_dir[SIZEOFFREE][3] = {
2175	{0, 0, 0}, /* 0 */	2288	{0, 0, 0}, /* 0 */
2176	{0, 0, 0}, /* 1 */	2289	{0, 0, 0}, /* 1 */
2177	{0, 0, 0}, /* 2 */	2290	{0, 0, 0}, /* 2 */
2178	{0, 0, 0}, /* 3 */	2291	{0, 0, 0}, /* 3 */
2179	{0, 0, 0}, /* 4 */	2292	{0, 0, 0}, /* 4 */
…		…
2273	* Add a check so we can't pick up invisible objects (0.93.8)	2386	* Add a check so we can't pick up invisible objects (0.93.8)
2274	*/	2387	*/
2275	int	2388	int
2276	can_pick (const object *who, const object *item)	2389	can_pick (const object *who, const object *item)
2277	{	2390	{
2278	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2391	return /*who->flag [FLAG_WIZ]|| */
2279	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2280	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2393	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2281	}	2394	}
2282		2395
2283	/*	2396	/*
2284	* create clone from object to another	2397	* create clone from object to another
2285	*/	2398	*/
…		…
2317	return tmp;	2430	return tmp;
2318		2431
2319	return 0;	2432	return 0;
2320	}	2433	}
2321		2434
2322	const shstr &	2435	shstr_tmp
2323	object::kv_get (const shstr &key) const	2436	object::kv_get (shstr_tmp key) const
2324	{	2437	{
2325	for (key_value *kv = key_values; kv; kv = kv->next)	2438	for (key_value *kv = key_values; kv; kv = kv->next)
2326	if (kv->key == key)	2439	if (kv->key == key)
2327	return kv->value;	2440	return kv->value;
2328		2441
2329	return shstr_null;	2442	return shstr ();
2330	}	2443	}
2331		2444
2332	void	2445	void
2333	object::kv_set (const shstr &key, const shstr &value)	2446	object::kv_set (shstr_tmp key, shstr_tmp value)
2334	{	2447	{
2335	for (key_value *kv = key_values; kv; kv = kv->next)	2448	for (key_value *kv = key_values; kv; kv = kv->next)
2336	if (kv->key == key)	2449	if (kv->key == key)
2337	{	2450	{
2338	kv->value = value;	2451	kv->value = value;
…		…
2347		2460
2348	key_values = kv;	2461	key_values = kv;
2349	}	2462	}
2350		2463
2351	void	2464	void
2352	object::kv_del (const shstr &key)	2465	object::kv_del (shstr_tmp key)
2353	{	2466	{
2354	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2467	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2355	if ((*kvp)->key == key)	2468	if ((*kvp)->key == key)
2356	{	2469	{
2357	key_value *kv = *kvp;	2470	key_value *kv = *kvp;
…		…
2450	{	2563	{
2451	return map ? map->region (x, y)	2564	return map ? map->region (x, y)
2452	: region::default_region ();	2565	: region::default_region ();
2453	}	2566	}
2454		2567
2455	const materialtype_t *
2456	object::dominant_material () const
2457	{
2458	if (materialtype_t *mt = name_to_material (materialname))
2459	return mt;
2460
2461	return name_to_material (shstr_unknown);
2462	}
2463
2464	void	2568	void
2465	object::open_container (object *new_container)	2569	object::open_container (object *new_container)
2466	{	2570	{
2467	if (container == new_container)	2571	if (container == new_container)
2468	return;	2572	return;
…		…
2488	container = 0;	2592	container = 0;
2489		2593
2490	// client needs item update to make it work, client bug requires this to be separate	2594	// client needs item update to make it work, client bug requires this to be separate
2491	esrv_update_item (UPD_FLAGS, this, old_container);	2595	esrv_update_item (UPD_FLAGS, this, old_container);
2492		2596
2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2597	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2494	play_sound (sound_find ("chest_close"));	2598	play_sound (sound_find ("chest_close"));
2495	}	2599	}
2496		2600
2497	if (new_container)	2601	if (new_container)
2498	{	2602	{
…		…
2502	// TODO: this does not seem to serve any purpose anymore?	2606	// TODO: this does not seem to serve any purpose anymore?
2503	#if 0	2607	#if 0
2504	// insert the "Close Container" object.	2608	// insert the "Close Container" object.
2505	if (archetype *closer = new_container->other_arch)	2609	if (archetype *closer = new_container->other_arch)
2506	{	2610	{
2507	object *closer = arch_to_object (new_container->other_arch);	2611	object *closer = new_container->other_arch->instance ();
2508	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2612	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2509	new_container->insert (closer);	2613	new_container->insert (closer);
2510	}	2614	}
2511	#endif	2615	#endif
2512		2616
2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2617	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2514		2618
2515	// make sure the container is available, client bug requires this to be separate	2619	// make sure the container is available, client bug requires this to be separate
2516	esrv_send_item (this, new_container);	2620	esrv_send_item (this, new_container);
2517		2621
2518	new_container->flag [FLAG_APPLIED] = true;	2622	new_container->flag [FLAG_APPLIED] = true;
…		…
2526	// else if (!old_container->env && contr && contr->ns)	2630	// else if (!old_container->env && contr && contr->ns)
2527	// contr->ns->floorbox_reset ();	2631	// contr->ns->floorbox_reset ();
2528	}	2632	}
2529		2633
2530	object *	2634	object *
2531	object::force_find (const shstr name)	2635	object::force_find (shstr_tmp name)
2532	{	2636	{
2533	/* cycle through his inventory to look for the MARK we want to	2637	/* cycle through his inventory to look for the MARK we want to
2534	* place	2638	* place
2535	*/	2639	*/
2536	for (object *tmp = inv; tmp; tmp = tmp->below)	2640	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2538	return splay (tmp);	2642	return splay (tmp);
2539		2643
2540	return 0;	2644	return 0;
2541	}	2645	}
2542		2646
		2647	//-GPL
		2648
2543	void	2649	void
		2650	object::force_set_timer (int duration)
		2651	{
		2652	this->duration = 1;
		2653	this->speed_left = -1.f;
		2654
		2655	this->set_speed (duration ? 1.f / duration : 0.f);
		2656	}
		2657
		2658	object *
2544	object::force_add (const shstr name, int duration)	2659	object::force_add (shstr_tmp name, int duration)
2545	{	2660	{
2546	if (object *force = force_find (name))	2661	if (object *force = force_find (name))
2547	force->destroy ();	2662	force->destroy ();
2548		2663
2549	object *force = get_archetype (FORCE_NAME);	2664	object *force = get_archetype (FORCE_NAME);
2550		2665
2551	force->slaying = name;	2666	force->slaying = name;
2552	force->stats.food = 1;	2667	force->force_set_timer (duration);
2553	force->speed_left = -1.f;
2554
2555	force->set_speed (duration ? 1.f / duration : 0.f);
2556	force->flag [FLAG_IS_USED_UP] = true;
2557	force->flag [FLAG_APPLIED] = true;	2668	force->flag [FLAG_APPLIED] = true;
2558		2669
2559	insert (force);	2670	return insert (force);
2560	}	2671	}
2561		2672
2562	void	2673	void
2563	object::play_sound (faceidx sound)	2674	object::play_sound (faceidx sound) const
2564	{	2675	{
2565	if (!sound)	2676	if (!sound)
2566	return;	2677	return;
2567		2678
2568	if (flag [FLAG_REMOVED])	2679	if (is_on_map ())
		2680	map->play_sound (sound, x, y);
		2681	else if (object *pl = in_player ())
		2682	pl->contr->play_sound (sound);
		2683	}
		2684
		2685	void
		2686	object::say_msg (const char *msg) const
		2687	{
		2688	if (is_on_map ())
		2689	map->say_msg (msg, x, y);
		2690	else if (object *pl = in_player ())
		2691	pl->contr->play_sound (sound);
		2692	}
		2693
		2694	void
		2695	object::make_noise ()
		2696	{
		2697	// we do not model noise in the map, so instead put
		2698	// a temporary light into the noise source
		2699	// could use the map instead, but that's less reliable for our
		2700	// goal, which is to make invisibility a bit harder to exploit
		2701
		2702	// currently only works sensibly for players
		2703	if (!is_player ())
2569	return;	2704	return;
2570		2705
2571	if (env)	2706	// find old force, or create new one
2572	{	2707	object *force = force_find (shstr_noise_force);
2573	if (object *pl = in_player ())	2708
2574	pl->contr->play_sound (sound);	2709	if (force)
2575	}	2710	force->speed_left = -1.f; // patch old speed up
2576	else	2711	else
2577	map->play_sound (sound, x, y);	2712	{
2578	}	2713	force = archetype::get (shstr_noise_force);
2579		2714
		2715	force->slaying = shstr_noise_force;
		2716	force->stats.food = 1;
		2717	force->speed_left = -1.f;
		2718
		2719	force->set_speed (1.f / 4.f);
		2720	force->flag [FLAG_IS_USED_UP] = true;
		2721	force->flag [FLAG_APPLIED] = true;
		2722
		2723	insert (force);
		2724	}
		2725	}
		2726
		2727	void object::change_move_type (MoveType mt)
		2728	{
		2729	if (move_type == mt)
		2730	return;
		2731
		2732	if (is_on_map ())
		2733	{
		2734	// we are on the map, so handle move_on/off effects
		2735	remove ();
		2736	move_type = mt;
		2737	map->insert (this, x, y, this);
		2738	}
		2739	else
		2740	move_type = mt;
		2741	}
		2742
		2743	/* object should be a player.
		2744	* we return the object the player has marked with the 'mark' command
		2745	* below. If no match is found (or object has changed), we return
		2746	* NULL. We leave it up to the calling function to print messages if
		2747	* nothing is found.
		2748	*/
		2749	object *
		2750	object::mark () const
		2751	{
		2752	if (contr && contr->mark && contr->mark->env == this)
		2753	return contr->mark;
		2754	else
		2755	return 0;
		2756	}
		2757

Diff Legend

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