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.237 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	//+GPL
40		43
41	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
42	0,	45	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	46	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	51	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	52	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	55	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	56	int freedir[SIZEOFFREE] = {
60	0,	57	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	58	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	59	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	61	};
65		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
66	static void	70	static void
67	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
68	{	72	{
69	CALL_BEGIN (2);	73	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	77	CALL_END;
74	}	78	}
75		79
76	static void	80	static void
77	read_uuid (void)	81	read_uuid ()
78	{	82	{
79	char filename[MAX_BUF];	83	char filename[MAX_BUF];
80		84
81	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
82		86
…		…
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	106	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
104		108
105	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
106	{	110	{
…		…
133		137
134	void	138	void
135	UUID::init ()	139	UUID::init ()
136	{	140	{
137	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) | digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz |= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
138	}	207	}
139		208
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	210	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	211	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
179	* check weight	248	* check weight
180	*/	249	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	250	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	251	{
183	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
184	if (ob1 == ob2	253	if (ob1 == ob2
185	|| ob1->type != ob2->type	254	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	255	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	256	|| ob1->name != ob2->name
		257	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	258	return 0;
190		259
191	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	261	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	263	return 0;
198		264
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	266	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	267	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		273
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		276
211	if (ob1->arch->name != ob2->arch->name	277	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	278	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	279	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	280	|| ob1->msg != ob2->msg
215	|| ob1->weight != ob2->weight	281	|| ob1->weight != ob2->weight
216	|| ob1->attacktype != ob2->attacktype	282	|| ob1->attacktype != ob2->attacktype
217	|| ob1->magic != ob2->magic	283	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	284	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	285	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	286	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	287	|| ob1->animation_id != ob2->animation_id
		288	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	|| ob1->client_type != ob2->client_type	289	|| ob1->client_type != ob2->client_type
223	|| ob1->materialname != ob2->materialname	290	|| ob1->material != ob2->material
224	|| ob1->lore != ob2->lore	291	|| ob1->lore != ob2->lore
225	|| ob1->subtype != ob2->subtype	292	|| ob1->subtype != ob2->subtype
226	|| ob1->move_type != ob2->move_type	293	|| ob1->move_type != ob2->move_type
227	|| ob1->move_block != ob2->move_block	294	|| ob1->move_block != ob2->move_block
228	|| ob1->move_allow != ob2->move_allow	295	|| ob1->move_allow != ob2->move_allow
229	|| ob1->move_on != ob2->move_on	296	|| ob1->move_on != ob2->move_on
230	|| ob1->move_off != ob2->move_off	297	|| ob1->move_off != ob2->move_off
231	|| ob1->move_slow != ob2->move_slow	298	|| ob1->move_slow != ob2->move_slow
232	|| ob1->move_slow_penalty != ob2->move_slow_penalty	299	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	302	return 0;
236		303
237	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	305	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	306	.reset (FLAG_REMOVED)
241	.any ())	307	.any ())
242	return 0;	308	return 0;
243		309
244	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
…		…
326	{	392	{
327	// see if we are in a container of sorts	393	// see if we are in a container of sorts
328	if (env)	394	if (env)
329	{	395	{
330	// the player inventory itself is always visible	396	// the player inventory itself is always visible
331	if (env->type == PLAYER)	397	if (env->is_player ())
332	return env;	398	return env;
333		399
334	// else a player could have our env open	400	// else a player could have our env open
335	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
336		402
337	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	404	// even if our inv is in a player.
339	if (envest->is_on_map ())	405	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	407	if (pl->container_ () == env)
342	return pl;	408	return pl;
343	}	409	}
344	else	410	else
345	{	411	{
346	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
349	if (!pl->container || this == pl->container)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	|| pl->container_ () == this)
350	return pl;	417	return pl;
351	}	418	}
352	}	419	}
353		420
354	return 0;	421	return 0;
…		…
432	object_freezer freezer;	499	object_freezer freezer;
433	op->write (freezer);	500	op->write (freezer);
434	return freezer.as_string ();	501	return freezer.as_string ();
435	}	502	}
436		503
437	/*	504	char *
438	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
439	* multi-object 1 which is closest to the second object.
440	* If it's not a multi-object, it is returned.
441	*/
442	object *
443	get_nearest_part (object *op, const object *pl)
444	{	506	{
445	object *tmp, *closest;	507	return dump_object (this);
446	int last_dist, i;
447
448	if (!op->more)
449	return op;
450
451	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
452	tmp;
453	tmp = tmp->more)
454	if ((i = distance (tmp, pl)) < last_dist)
455	closest = tmp, last_dist = i;
456
457	return closest;
458	}	508	}
459		509
460	/*	510	/*
461	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
462	* VERRRY slow.	512	* VERRRY slow.
…		…
470		520
471	return 0;	521	return 0;
472	}	522	}
473		523
474	/*	524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
		534	return op;
		535
		536	return 0;
		537	}
		538
		539	/*
475	* Returns the first object which has a name equal to the argument.	540	* Returns the first object which has a name equal to the argument.
476	* Used only by the patch command, but not all that useful.	541	* Used only by the patch command, but not all that useful.
477	* Enables features like "patch <name-of-other-player> food 999"	542	* Enables features like "patch <name-of-other-player> food 999"
478	*/	543	*/
479	object *	544	object *
480	find_object_name (const char *str)	545	find_object_name (const char *str)
481	{	546	{
482	shstr_cmp str_ (str);	547	shstr_cmp str_ (str);
483	object *op;
484		548
		549	if (str_)
485	for_all_objects (op)	550	for_all_objects (op)
486	if (op->name == str_)	551	if (op->name == str_)
487	break;	552	return op;
488		553
489	return op;	554	return 0;
490	}	555	}
491		556
492	/*	557	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	558	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	559	* skill and experience objects.
…		…
507	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	572	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
508	return;	573	return;
509	}	574	}
510		575
511	this->owner = owner;	576	this->owner = owner;
512	}
513
514	int
515	object::slottype () const
516	{
517	if (type == SKILL)
518	{
519	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
520	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
521	}
522	else
523	{
524	if (slot [body_combat].info) return slot_combat;
525	if (slot [body_range ].info) return slot_ranged;
526	}
527
528	return slot_none;
529	}
530
531	bool
532	object::change_weapon (object *ob)
533	{
534	if (current_weapon == ob)
535	return true;
536
537	if (chosen_skill)
538	chosen_skill->flag [FLAG_APPLIED] = false;
539
540	current_weapon = ob;
541	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
542
543	if (chosen_skill)
544	chosen_skill->flag [FLAG_APPLIED] = true;
545
546	update_stats ();
547
548	if (ob)
549	{
550	// now check wether any body locations became invalid, in which case
551	// we cannot apply the weapon at the moment.
552	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
553	if (slot[i].used < 0)
554	{
555	current_weapon = chosen_skill = 0;
556	update_stats ();
557
558	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "
561	"[You need to unapply some items first.]", &ob->name);
562	return false;
563	}
564
565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566	}
567	else
568	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
569
570	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
571	{
572	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
573	&name, ob->debug_desc ());
574	return false;
575	}
576
577	return true;
578	}	577	}
579		578
580	/* Zero the key_values on op, decrementing the shared-string	579	/* Zero the key_values on op, decrementing the shared-string
581	* refcounts and freeing the links.	580	* refcounts and freeing the links.
582	*/	581	*/
…		…
635	tail = new_link;	634	tail = new_link;
636	}	635	}
637	}	636	}
638	}	637	}
639		638
640	if (speed < 0)	639	dst->activate ();
641	dst->speed_left -= rndm ();
642
643	dst->set_speed (dst->speed);
644	}	640	}
645		641
646	void	642	void
647	object::instantiate ()	643	object::instantiate ()
648	{	644	{
649	if (!uuid.seq) // HACK	645	if (!uuid.seq) // HACK
650	uuid = UUID::gen ();	646	uuid = UUID::gen ();
651		647
		648	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		649	if (flag [FLAG_RANDOM_SPEED] && speed)
		650	speed_left = - speed - rndm (); // TODO animation
		651	else
652	speed_left = -0.1f;	652	speed_left = -1.;
		653
653	/* copy the body_info to the body_used - this is only really	654	/* copy the body_info to the body_used - this is only really
654	* need for monsters, but doesn't hurt to do it for everything.	655	* need for monsters, but doesn't hurt to do it for everything.
655	* by doing so, when a monster is created, it has good starting	656	* by doing so, when a monster is created, it has good starting
656	* values for the body_used info, so when items are created	657	* values for the body_used info, so when items are created
657	* for it, they can be properly equipped.	658	* for it, they can be properly equipped.
…		…
665	object *	666	object *
666	object::clone ()	667	object::clone ()
667	{	668	{
668	object *neu = create ();	669	object *neu = create ();
669	copy_to (neu);	670	copy_to (neu);
		671
		672	// TODO: unclean state changes, should not be done in clone AND instantiate
		673	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		674	neu->speed_left = - neu->speed - rndm (); // TODO animation
		675
670	neu->map = map; // not copied by copy_to	676	neu->map = map; // not copied by copy_to
671	return neu;	677	return neu;
672	}	678	}
673		679
674	/*	680	/*
…		…
692	* This function needs to be called whenever the speed of an object changes.	698	* This function needs to be called whenever the speed of an object changes.
693	*/	699	*/
694	void	700	void
695	object::set_speed (float speed)	701	object::set_speed (float speed)
696	{	702	{
697	if (flag [FLAG_FREED] && speed)
698	{
699	LOG (llevError, "Object %s is freed but has speed.\n", &name);
700	speed = 0;
701	}
702
703	this->speed = speed;	703	this->speed = speed;
704		704
705	if (has_active_speed ())	705	if (has_active_speed ())
706	activate ();	706	activate ();
707	else	707	else
…		…
757		757
758	if (!(m.flags_ & P_UPTODATE))	758	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	759	/* nop */;
760	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
761	{	761	{
		762	#if 0
762	// this is likely overkill, TODO: revisit (schmorp)	763	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	765	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	766	|| (op->is_player () && !(m.flags_ & P_PLAYER))
766	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	768	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	769	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	|| (m.move_on | op->move_on ) != m.move_on	770	|| (m.move_on | op->move_on ) != m.move_on
770	|| (m.move_off | op->move_off ) != m.move_off	771	|| (m.move_off | op->move_off ) != m.move_off
771	|| (m.move_slow | op->move_slow) != m.move_slow	772	|| (m.move_slow | op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	774	* have move_allow right now.
774	*/	775	*/
775	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	776	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		777	m.invalidate ();
		778	#else
776	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	779	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
777	m.flags_ = 0;	780	m.invalidate ();
		781	#endif
778	}	782	}
779	/* if the object is being removed, we can't make intelligent	783	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	784	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	785	* that is being removed.
782	*/	786	*/
783	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	787	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	788	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	789	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	790	/* Nothing to do for that case */ ;
787	else	791	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	792	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		793
…		…
793		797
794	object::object ()	798	object::object ()
795	{	799	{
796	SET_FLAG (this, FLAG_REMOVED);	800	SET_FLAG (this, FLAG_REMOVED);
797		801
798	expmul = 1.0;	802	//expmul = 1.0; declared const for the time being
799	face = blank_face;	803	face = blank_face;
		804	material = MATERIAL_NULL;
800	}	805	}
801		806
802	object::~object ()	807	object::~object ()
803	{	808	{
804	unlink ();	809	unlink ();
…		…
833	/* If already on active list, don't do anything */	838	/* If already on active list, don't do anything */
834	if (active)	839	if (active)
835	return;	840	return;
836		841
837	if (has_active_speed ())	842	if (has_active_speed ())
		843	{
		844	if (flag [FLAG_FREED])
		845	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		846
838	actives.insert (this);	847	actives.insert (this);
		848	}
839	}	849	}
840		850
841	void	851	void
842	object::activate_recursive ()	852	object::activate_recursive ()
843	{	853	{
…		…
904	* drop on that space.	914	* drop on that space.
905	*/	915	*/
906	if (!drop_to_ground	916	if (!drop_to_ground
907	|| !map	917	|| !map
908	|| map->in_memory != MAP_ACTIVE	918	|| map->in_memory != MAP_ACTIVE
909	|| map->nodrop	919	|| map->no_drop
910	|| ms ().move_block == MOVE_ALL)	920	|| ms ().move_block == MOVE_ALL)
911	{	921	{
912	while (inv)	922	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	923	inv->destroy ();
916	}
917	}	924	}
918	else	925	else
919	{ /* Put objects in inventory onto this space */	926	{ /* Put objects in inventory onto this space */
920	while (inv)	927	while (inv)
921	{	928	{
…		…
925	|| op->flag [FLAG_NO_DROP]	932	|| op->flag [FLAG_NO_DROP]
926	|| op->type == RUNE	933	|| op->type == RUNE
927	|| op->type == TRAP	934	|| op->type == TRAP
928	|| op->flag [FLAG_IS_A_TEMPLATE]	935	|| op->flag [FLAG_IS_A_TEMPLATE]
929	|| op->flag [FLAG_DESTROY_ON_DEATH])	936	|| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	937	op->destroy ();
931	else	938	else
932	map->insert (op, x, y);	939	map->insert (op, x, y);
933	}	940	}
934	}	941	}
935	}	942	}
…		…
943		950
944	static struct freed_map : maptile	951	static struct freed_map : maptile
945	{	952	{
946	freed_map ()	953	freed_map ()
947	{	954	{
948	path = "<freed objects map>";	955	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	956	name = "/internal/freed_objects_map";
950	width = 3;	957	width = 3;
951	height = 3;	958	height = 3;
952	nodrop = 1;	959	no_drop = 1;
		960	no_reset = 1;
953		961
954	alloc ();	962	alloc ();
955	in_memory = MAP_ACTIVE;	963	in_memory = MAP_ACTIVE;
956	}	964	}
957		965
…		…
963		971
964	void	972	void
965	object::do_destroy ()	973	object::do_destroy ()
966	{	974	{
967	if (flag [FLAG_IS_LINKED])	975	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	976	remove_link ();
969		977
970	if (flag [FLAG_FRIENDLY])	978	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	979	remove_friendly_object (this);
972		980
973	remove ();	981	remove ();
…		…
998	attacked_by = 0;	1006	attacked_by = 0;
999	current_weapon = 0;	1007	current_weapon = 0;
1000	}	1008	}
1001		1009
1002	void	1010	void
1003	object::destroy (bool destroy_inventory)	1011	object::destroy ()
1004	{	1012	{
1005	if (destroyed ())	1013	if (destroyed ())
1006	return;	1014	return;
1007		1015
1008	if (!is_head () && !head->destroyed ())	1016	if (!is_head () && !head->destroyed ())
1009	{	1017	{
1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1018	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1019	head->destroy ();
1012	return;	1020	return;
1013	}	1021	}
1014		1022
1015	destroy_inv (!destroy_inventory);	1023	destroy_inv (false);
1016		1024
1017	if (is_head ())	1025	if (is_head ())
1018	if (sound_destroy)	1026	if (sound_destroy)
1019	play_sound (sound_destroy);	1027	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1028	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1039	* the previous environment.
1032	*/	1040	*/
1033	void	1041	void
1034	object::do_remove ()	1042	object::do_remove ()
1035	{	1043	{
1036	object *tmp, *last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1044	if (flag [FLAG_REMOVED])
1040	return;	1045	return;
1041		1046
1042	INVOKE_OBJECT (REMOVE, this);	1047	INVOKE_OBJECT (REMOVE, this);
1043		1048
…		…
1056	if (object *pl = visible_to ())	1061	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1062	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1063	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1064
1060	adjust_weight (env, -total_weight ());	1065	adjust_weight (env, -total_weight ());
		1066
		1067	object *pl = in_player ();
1061		1068
1062	/* we set up values so that it could be inserted into	1069	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1070	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1071	* to the caller to decide what we want to do.
1065	*/	1072	*/
…		…
1073		1080
1074	above = 0;	1081	above = 0;
1075	below = 0;	1082	below = 0;
1076	env = 0;	1083	env = 0;
1077		1084
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1085	if (pl && pl->is_player ())
1079	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.
1081	*/	1086	{
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1087	if (expect_false (pl->contr->combat_ob == this))
1083	otmp->update_stats ();	1088	{
		1089	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1090	pl->contr->combat_ob = 0;
		1091	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1092	}
		1093
		1094	if (expect_false (pl->contr->ranged_ob == this))
		1095	{
		1096	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1097	pl->contr->ranged_ob = 0;
		1098	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1099	}
		1100
		1101	pl->contr->queue_stats_update ();
		1102
		1103	if (expect_false (glow_radius) && pl->is_on_map ())
		1104	update_all_los (pl->map, pl->x, pl->y);
		1105	}
1084	}	1106	}
1085	else if (map)	1107	else if (map)
1086	{	1108	{
1087	map->dirty = true;	1109	map->dirty = true;
1088	mapspace &ms = this->ms ();	1110	mapspace &ms = this->ms ();
1089		1111
1090	if (object *pl = ms.player ())	1112	if (object *pl = ms.player ())
1091	{	1113	{
1092	if (type == PLAYER) // this == pl(!)	1114	if (is_player ())
1093	{	1115	{
		1116	if (!flag [FLAG_WIZPASS])
		1117	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1118
1094	// leaving a spot always closes any open container on the ground	1119	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1120	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1121	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1122	// that the CLOSE event is being sent.
1098	close_container ();	1123	close_container ();
1099		1124
1100	--map->players;	1125	--map->players;
1101	map->touch ();	1126	map->touch ();
1102	}	1127	}
1103	else if (pl->container == this)	1128	else if (pl->container_ () == this)
1104	{	1129	{
1105	// removing a container should close it	1130	// removing a container should close it
1106	close_container ();	1131	close_container ();
1107	}	1132	}
1108		1133
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1140	*(below ? &below->above : &ms.bot) = above;
1116		1141
1117	above = 0;	1142	above = 0;
1118	below = 0;	1143	below = 0;
1119		1144
		1145	ms.invalidate ();
		1146
1120	if (map->in_memory == MAP_SAVING)	1147	if (map->in_memory == MAP_SAVING)
1121	return;	1148	return;
1122		1149
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1150	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1151
1125	if (object *pl = ms.player ())	1152	if (object *pl = ms.player ())
1126	{	1153	{
1127	if (pl->container == this)	1154	if (pl->container_ () == this)
1128	/* If a container that the player is currently using somehow gets	1155	/* If a container that the player is currently using somehow gets
1129	* removed (most likely destroyed), update the player view	1156	* removed (most likely destroyed), update the player view
1130	* appropriately.	1157	* appropriately.
1131	*/	1158	*/
1132	pl->close_container ();	1159	pl->close_container ();
…		…
1136	//TODO: update floorbox to preserve ordering	1163	//TODO: update floorbox to preserve ordering
1137	if (pl->contr->ns)	1164	if (pl->contr->ns)
1138	pl->contr->ns->floorbox_update ();	1165	pl->contr->ns->floorbox_update ();
1139	}	1166	}
1140		1167
		1168	if (check_walk_off)
1141	for (tmp = ms.bot; tmp; tmp = tmp->above)	1169	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1142	{	1170	{
		1171	above = tmp->above;
		1172
1143	/* No point updating the players look faces if he is the object	1173	/* No point updating the players look faces if he is the object
1144	* being removed.	1174	* being removed.
1145	*/	1175	*/
1146		1176
1147	/* See if object moving off should effect something */	1177	/* See if object moving off should effect something */
1148	if (check_walk_off
1149	&& ((move_type & tmp->move_off)	1178	if ((move_type & tmp->move_off)
1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1179	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1151	{
1152	move_apply (tmp, this, 0);	1180	move_apply (tmp, this, 0);
1153
1154	if (destroyed ())
1155	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1156	}	1181	}
1157		1182
1158	last = tmp;	1183	if (affects_los ())
1159	}
1160
1161	/* last == NULL if there are no objects on this space */
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1169	update_all_los (map, x, y);	1184	update_all_los (map, x, y);
1170	}	1185	}
1171	}	1186	}
1172		1187
1173	/*	1188	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1212	esrv_update_item (UPD_NROF, pl, top);
1198		1213
1199	op->weight = 0; // cancel the addition above	1214	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1215	op->carrying = 0; // must be 0 already
1201		1216
1202	op->destroy (1);	1217	op->destroy ();
1203		1218
1204	return top;	1219	return top;
1205	}	1220	}
1206		1221
1207	return 0;	1222	return 0;
…		…
1215		1230
1216	object *prev = this;	1231	object *prev = this;
1217		1232
1218	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1233	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1219	{	1234	{
1220	object *op = arch_to_object (at);	1235	object *op = at->instance ();
1221		1236
1222	op->name = name;	1237	op->name = name;
1223	op->name_pl = name_pl;	1238	op->name_pl = name_pl;
1224	op->title = title;	1239	op->title = title;
1225		1240
…		…
1235	* job preparing multi-part monsters.	1250	* job preparing multi-part monsters.
1236	*/	1251	*/
1237	object *	1252	object *
1238	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1253	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1239	{	1254	{
		1255	op->remove ();
		1256
1240	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241	{	1258	{
1242	tmp->x = x + tmp->arch->x;	1259	tmp->x = x + tmp->arch->x;
1243	tmp->y = y + tmp->arch->y;	1260	tmp->y = y + tmp->arch->y;
1244	}	1261	}
…		…
1261	* Passing 0 for flag gives proper default values, so flag really only needs	1278	* Passing 0 for flag gives proper default values, so flag really only needs
1262	* to be set if special handling is needed.	1279	* to be set if special handling is needed.
1263	*	1280	*
1264	* Return value:	1281	* Return value:
1265	* new object if 'op' was merged with other object	1282	* new object if 'op' was merged with other object
1266	* NULL if 'op' was destroyed	1283	* NULL if there was an error (destroyed, blocked etc.)
1267	* just 'op' otherwise	1284	* just 'op' otherwise
1268	*/	1285	*/
1269	object *	1286	object *
1270	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1287	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271	{	1288	{
1272	op->remove ();	1289	op->remove ();
		1290
		1291	if (m == &freed_map)//D TODO: remove soon
		1292	{//D
		1293	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1294	}//D
1273		1295
1274	/* Ideally, the caller figures this out. However, it complicates a lot	1296	/* Ideally, the caller figures this out. However, it complicates a lot
1275	* of areas of callers (eg, anything that uses find_free_spot would now	1297	* of areas of callers (eg, anything that uses find_free_spot would now
1276	* need extra work	1298	* need extra work
1277	*/	1299	*/
		1300	maptile *newmap = m;
1278	if (!xy_normalise (m, op->x, op->y))	1301	if (!xy_normalise (newmap, op->x, op->y))
1279	{	1302	{
1280	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1303	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1281	return 0;	1304	return 0;
1282	}	1305	}
1283		1306
1284	if (object *more = op->more)	1307	if (object *more = op->more)
1285	if (!insert_ob_in_map (more, m, originator, flag))	1308	if (!insert_ob_in_map (more, m, originator, flag))
1286	return 0;	1309	return 0;
1287		1310
1288	CLEAR_FLAG (op, FLAG_REMOVED);	1311	op->flag [FLAG_REMOVED] = false;
1289		1312	op->env = 0;
1290	op->map = m;	1313	op->map = newmap;
		1314
1291	mapspace &ms = op->ms ();	1315	mapspace &ms = op->ms ();
1292		1316
1293	/* this has to be done after we translate the coordinates.	1317	/* this has to be done after we translate the coordinates.
1294	*/	1318	*/
1295	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1298	{	1322	{
1299	// TODO: we actually want to update tmp, not op,	1323	// TODO: we actually want to update tmp, not op,
1300	// but some caller surely breaks when we return tmp	1324	// but some caller surely breaks when we return tmp
1301	// from here :/	1325	// from here :/
1302	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1303	tmp->destroy (1);	1327	tmp->destroy ();
1304	}	1328	}
1305		1329
1306	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1307	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1308		1332
1309	if (!QUERY_FLAG (op, FLAG_ALIVE))	1333	if (!QUERY_FLAG (op, FLAG_ALIVE))
1310	CLEAR_FLAG (op, FLAG_NO_STEAL);	1334	CLEAR_FLAG (op, FLAG_NO_STEAL);
1311		1335
1312	if (flag & INS_BELOW_ORIGINATOR)	1336	if (flag & INS_BELOW_ORIGINATOR)
1313	{	1337	{
1314	if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ())	1338	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1315	{	1339	{
1316	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
		1341	abort ();
		1342	}
		1343
		1344	if (!originator->is_on_map ())
		1345	{
		1346	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1347	op->debug_desc (), originator->debug_desc ());
1317	abort ();	1348	abort ();
1318	}	1349	}
1319		1350
1320	op->above = originator;	1351	op->above = originator;
1321	op->below = originator->below;	1352	op->below = originator->below;
…		…
1390	} /* If objects on this space */	1421	} /* If objects on this space */
1391		1422
1392	if (flag & INS_ABOVE_FLOOR_ONLY)	1423	if (flag & INS_ABOVE_FLOOR_ONLY)
1393	top = floor;	1424	top = floor;
1394		1425
1395	/* Top is the object that our object (op) is going to get inserted above.	1426	// insert object above top, or bottom-most if top = 0
1396	*/
1397
1398	/* no top found, insert on top */
1399	if (!top)	1427	if (!top)
1400	{	1428	{
1401	op->above = 0;	1429	op->below = 0;
1402	op->below = ms.top;	1430	op->above = ms.bot;
1403	ms.top = op;	1431	ms.bot = op;
1404		1432
1405	*(op->below ? &op->below->above : &ms.bot) = op;	1433	*(op->above ? &op->above->below : &ms.top) = op;
1406	}	1434	}
1407	else	1435	else
1408	{ /* get inserted into the stack above top */	1436	{
1409	op->above = top->above;	1437	op->above = top->above;
1410	top->above = op;	1438	top->above = op;
1411		1439
1412	op->below = top;	1440	op->below = top;
1413	*(op->above ? &op->above->below : &ms.top) = op;	1441	*(op->above ? &op->above->below : &ms.top) = op;
1414	}	1442	}
1415	} /* else not INS_BELOW_ORIGINATOR */	1443	}
1416		1444
1417	if (op->type == PLAYER)	1445	if (op->is_player ())
1418	{	1446	{
1419	op->contr->do_los = 1;	1447	op->contr->do_los = 1;
1420	++op->map->players;	1448	++op->map->players;
1421	op->map->touch ();	1449	op->map->touch ();
1422	}	1450	}
…		…
1437	* be far away from this change and not affected in any way -	1465	* be far away from this change and not affected in any way -
1438	* this should get redone to only look for players within range,	1466	* this should get redone to only look for players within range,
1439	* or just updating the P_UPTODATE for spaces within this area	1467	* or just updating the P_UPTODATE for spaces within this area
1440	* of effect may be sufficient.	1468	* of effect may be sufficient.
1441	*/	1469	*/
1442	if (op->map->darkness && (op->glow_radius != 0))	1470	if (op->affects_los ())
		1471	{
		1472	op->ms ().invalidate ();
1443	update_all_los (op->map, op->x, op->y);	1473	update_all_los (op->map, op->x, op->y);
		1474	}
1444		1475
1445	/* updates flags (blocked, alive, no magic, etc) for this map space */	1476	/* updates flags (blocked, alive, no magic, etc) for this map space */
1446	update_object (op, UP_OBJ_INSERT);	1477	update_object (op, UP_OBJ_INSERT);
1447		1478
1448	INVOKE_OBJECT (INSERT, op);	1479	INVOKE_OBJECT (INSERT, op);
…		…
1455	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1456	* update_object().	1487	* update_object().
1457	*/	1488	*/
1458		1489
1459	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1460	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1461	{	1492	{
1462	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1463	return 0;	1494	return 0;
1464		1495
1465	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
…		…
1476	/* this function inserts an object in the map, but if it	1507	/* this function inserts an object in the map, but if it
1477	* finds an object of its own type, it'll remove that one first.	1508	* finds an object of its own type, it'll remove that one first.
1478	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1479	*/	1510	*/
1480	void	1511	void
1481	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1482	{	1513	{
1483	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1484		1515
1485	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1517	if (tmp->arch->archname == archname) /* same archetype */
1487	tmp->destroy (1);	1518	tmp->destroy ();
1488		1519
1489	object *tmp = arch_to_object (archetype::find (arch_string));	1520	object *tmp = archetype::find (archname)->instance ();
1490		1521
1491	tmp->x = op->x;	1522	tmp->x = op->x;
1492	tmp->y = op->y;	1523	tmp->y = op->y;
1493		1524
1494	insert_ob_in_map (tmp, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1499	{	1530	{
1500	if (where->env)	1531	if (where->env)
1501	return where->env->insert (this);	1532	return where->env->insert (this);
1502	else	1533	else
1503	return where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
		1535	}
		1536
		1537	// check whether we can put this into the map, respect max_volume, max_items
		1538	bool
		1539	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1540	{
		1541	mapspace &ms = m->at (x, y);
		1542
		1543	int items = ms.items ();
		1544
		1545	if (!items // testing !items ensures we can drop at least one item
		1546	|| (items < m->max_items
		1547	&& ms.volume () < m->max_volume))
		1548	return true;
		1549
		1550	if (originator && originator->is_player ())
		1551	originator->contr->failmsg (format (
		1552	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1553	query_name ()
		1554	));
		1555
		1556	return false;
1504	}	1557	}
1505		1558
1506	/*	1559	/*
1507	* decrease(object, number) decreases a specified number from	1560	* decrease(object, number) decreases a specified number from
1508	* the amount of an object. If the amount reaches 0, the object	1561	* the amount of an object. If the amount reaches 0, the object
…		…
1516	if (!nr)	1569	if (!nr)
1517	return true;	1570	return true;
1518		1571
1519	nr = min (nr, nrof);	1572	nr = min (nr, nrof);
1520		1573
		1574	if (nrof > nr)
		1575	{
1521	nrof -= nr;	1576	nrof -= nr;
1522
1523	if (nrof)
1524	{
1525	adjust_weight (env, -weight * nr); // carrying == 0	1577	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1526		1578
1527	if (object *pl = visible_to ())	1579	if (object *pl = visible_to ())
1528	esrv_update_item (UPD_NROF, pl, this);	1580	esrv_update_item (UPD_NROF, pl, this);
1529		1581
1530	return true;	1582	return true;
1531	}	1583	}
1532	else	1584	else
1533	{	1585	{
1534	destroy (1);	1586	destroy ();
1535	return false;	1587	return false;
1536	}	1588	}
1537	}	1589	}
1538		1590
1539	/*	1591	/*
…		…
1616	if (object *pl = tmp->visible_to ())	1668	if (object *pl = tmp->visible_to ())
1617	esrv_update_item (UPD_NROF, pl, tmp);	1669	esrv_update_item (UPD_NROF, pl, tmp);
1618		1670
1619	adjust_weight (this, op->total_weight ());	1671	adjust_weight (this, op->total_weight ());
1620		1672
1621	op->destroy (1);	1673	op->destroy ();
1622	op = tmp;	1674	op = tmp;
1623	goto inserted;	1675	goto inserted;
1624	}	1676	}
1625		1677
1626	op->owner = 0; // it's his/hers now. period.	1678	op->owner = 0; // it's his/hers now. period.
…		…
1644		1696
1645	adjust_weight (this, op->total_weight ());	1697	adjust_weight (this, op->total_weight ());
1646		1698
1647	inserted:	1699	inserted:
1648	/* reset the light list and los of the players on the map */	1700	/* reset the light list and los of the players on the map */
1649	if (op->glow_radius && map && map->darkness)	1701	if (op->glow_radius && is_on_map ())
		1702	{
		1703	update_stats ();
1650	update_all_los (map, x, y);	1704	update_all_los (map, x, y);
1651		1705	}
		1706	else if (is_player ())
1652	// if this is a player's inventory, update stats	1707	// if this is a player's inventory, update stats
1653	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1708	contr->queue_stats_update ();
1654	update_stats ();
1655		1709
1656	INVOKE_OBJECT (INSERT, this);	1710	INVOKE_OBJECT (INSERT, this);
1657		1711
1658	return op;	1712	return op;
1659	}	1713	}
…		…
1679	* on top.	1733	* on top.
1680	*/	1734	*/
1681	int	1735	int
1682	check_move_on (object *op, object *originator)	1736	check_move_on (object *op, object *originator)
1683	{	1737	{
		1738	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1739	return 0;
		1740
1684	object *tmp;	1741	object *tmp;
1685	maptile *m = op->map;	1742	maptile *m = op->map;
1686	int x = op->x, y = op->y;	1743	int x = op->x, y = op->y;
1687		1744
1688	MoveType move_on, move_slow, move_block;	1745	mapspace &ms = m->at (x, y);
1689		1746
1690	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1747	ms.update ();
1691	return 0;
1692		1748
1693	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1749	MoveType move_on = ms.move_on;
1694	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1750	MoveType move_slow = ms.move_slow;
1695	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1751	MoveType move_block = ms.move_block;
1696		1752
1697	/* if nothing on this space will slow op down or be applied,	1753	/* if nothing on this space will slow op down or be applied,
1698	* no need to do checking below. have to make sure move_type	1754	* no need to do checking below. have to make sure move_type
1699	* is set, as lots of objects don't have it set - we treat that	1755	* is set, as lots of objects don't have it set - we treat that
1700	* as walking.	1756	* as walking.
…		…
1711	return 0;	1767	return 0;
1712		1768
1713	/* The objects have to be checked from top to bottom.	1769	/* The objects have to be checked from top to bottom.
1714	* Hence, we first go to the top:	1770	* Hence, we first go to the top:
1715	*/	1771	*/
1716		1772	for (object *next, *tmp = ms.top; tmp; tmp = next)
1717	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1718	{
1719	/* Trim the search when we find the first other spell effect
1720	* this helps performance so that if a space has 50 spell objects,
1721	* we don't need to check all of them.
1722	*/
1723	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1724	break;
1725	}	1773	{
		1774	next = tmp->below;
1726		1775
1727	for (; tmp; tmp = tmp->below)
1728	{
1729	if (tmp == op)	1776	if (tmp == op)
1730	continue; /* Can't apply yourself */	1777	continue; /* Can't apply yourself */
1731		1778
1732	/* Check to see if one of the movement types should be slowed down.	1779	/* Check to see if one of the movement types should be slowed down.
1733	* Second check makes sure that the movement types not being slowed	1780	* Second check makes sure that the movement types not being slowed
…		…
1738	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1785	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1739	{	1786	{
1740	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1787	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1741	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1788	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1742	{	1789	{
1743
1744	float
1745	diff = tmp->move_slow_penalty * fabs (op->speed);	1790	float diff = tmp->move_slow_penalty * fabs (op->speed);
1746		1791
1747	if (op->type == PLAYER)	1792	if (op->is_player ())
1748	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1793	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1749	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1794	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1750	diff /= 4.0;	1795	diff /= 4.0;
1751		1796
1752	op->speed_left -= diff;	1797	op->speed_left -= diff;
1753	}	1798	}
1754	}	1799	}
…		…
1960	* head of the object should correspond for the entire object.	2005	* head of the object should correspond for the entire object.
1961	*/	2006	*/
1962	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2007	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1963	continue;	2008	continue;
1964		2009
1965	if (ob->blocked (m, pos.x, pos.y))	2010	if (ob->blocked (pos.m, pos.x, pos.y))
1966	continue;	2011	continue;
1967		2012
1968	altern [index++] = i;	2013	altern [index++] = i;
1969	}	2014	}
1970		2015
…		…
2038	* there is capable of.	2083	* there is capable of.
2039	*/	2084	*/
2040	int	2085	int
2041	find_dir (maptile *m, int x, int y, object *exclude)	2086	find_dir (maptile *m, int x, int y, object *exclude)
2042	{	2087	{
2043	int i, max = SIZEOFFREE, mflags;	2088	int max = SIZEOFFREE, mflags;
2044
2045	sint16 nx, ny;
2046	object *tmp;
2047	maptile *mp;
2048
2049	MoveType blocked, move_type;	2089	MoveType move_type;
2050		2090
2051	if (exclude && exclude->head_ () != exclude)	2091	if (exclude && exclude->head_ () != exclude)
2052	{	2092	{
2053	exclude = exclude->head;	2093	exclude = exclude->head;
2054	move_type = exclude->move_type;	2094	move_type = exclude->move_type;
…		…
2057	{	2097	{
2058	/* If we don't have anything, presume it can use all movement types. */	2098	/* If we don't have anything, presume it can use all movement types. */
2059	move_type = MOVE_ALL;	2099	move_type = MOVE_ALL;
2060	}	2100	}
2061		2101
2062	for (i = 1; i < max; i++)	2102	for (int i = 1; i < max; i++)
2063	{	2103	{
2064	mp = m;	2104	mapxy pos (m, x, y);
2065	nx = x + freearr_x[i];	2105	pos.move (i);
2066	ny = y + freearr_y[i];
2067		2106
2068	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2107	if (!pos.normalise ())
2069
2070	if (mflags & P_OUT_OF_MAP)
2071	max = maxfree[i];	2108	max = maxfree[i];
2072	else	2109	else
2073	{	2110	{
2074	mapspace &ms = mp->at (nx, ny);	2111	mapspace &ms = *pos;
2075		2112
2076	blocked = ms.move_block;
2077
2078	if ((move_type & blocked) == move_type)	2113	if ((move_type & ms.move_block) == move_type)
2079	max = maxfree[i];	2114	max = maxfree [i];
2080	else if (mflags & P_IS_ALIVE)	2115	else if (ms.flags () & P_IS_ALIVE)
2081	{	2116	{
2082	for (tmp = ms.bot; tmp; tmp = tmp->above)	2117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2083	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2118	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2084	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2119	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2085	break;
2086
2087	if (tmp)
2088	return freedir[i];	2120	return freedir [i];
2089	}	2121	}
2090	}	2122	}
2091	}	2123	}
2092		2124
2093	return 0;	2125	return 0;
…		…
2168	* This basically means that if direction is 15, then it could either go	2200	* This basically means that if direction is 15, then it could either go
2169	* direction 4, 14, or 16 to get back to where we are.	2201	* direction 4, 14, or 16 to get back to where we are.
2170	* Moved from spell_util.c to object.c with the other related direction	2202	* Moved from spell_util.c to object.c with the other related direction
2171	* functions.	2203	* functions.
2172	*/	2204	*/
2173	int reduction_dir[SIZEOFFREE][3] = {	2205	static const int reduction_dir[SIZEOFFREE][3] = {
2174	{0, 0, 0}, /* 0 */	2206	{0, 0, 0}, /* 0 */
2175	{0, 0, 0}, /* 1 */	2207	{0, 0, 0}, /* 1 */
2176	{0, 0, 0}, /* 2 */	2208	{0, 0, 0}, /* 2 */
2177	{0, 0, 0}, /* 3 */	2209	{0, 0, 0}, /* 3 */
2178	{0, 0, 0}, /* 4 */	2210	{0, 0, 0}, /* 4 */
…		…
2274	int	2306	int
2275	can_pick (const object *who, const object *item)	2307	can_pick (const object *who, const object *item)
2276	{	2308	{
2277	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2309	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2278	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2279	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2311	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2280	}	2312	}
2281		2313
2282	/*	2314	/*
2283	* create clone from object to another	2315	* create clone from object to another
2284	*/	2316	*/
…		…
2316	return tmp;	2348	return tmp;
2317		2349
2318	return 0;	2350	return 0;
2319	}	2351	}
2320		2352
2321	const shstr &	2353	shstr_tmp
2322	object::kv_get (const shstr &key) const	2354	object::kv_get (shstr_tmp key) const
2323	{	2355	{
2324	for (key_value *kv = key_values; kv; kv = kv->next)	2356	for (key_value *kv = key_values; kv; kv = kv->next)
2325	if (kv->key == key)	2357	if (kv->key == key)
2326	return kv->value;	2358	return kv->value;
2327		2359
2328	return shstr_null;	2360	return shstr ();
2329	}	2361	}
2330		2362
2331	void	2363	void
2332	object::kv_set (const shstr &key, const shstr &value)	2364	object::kv_set (shstr_tmp key, shstr_tmp value)
2333	{	2365	{
2334	for (key_value *kv = key_values; kv; kv = kv->next)	2366	for (key_value *kv = key_values; kv; kv = kv->next)
2335	if (kv->key == key)	2367	if (kv->key == key)
2336	{	2368	{
2337	kv->value = value;	2369	kv->value = value;
…		…
2346		2378
2347	key_values = kv;	2379	key_values = kv;
2348	}	2380	}
2349		2381
2350	void	2382	void
2351	object::kv_del (const shstr &key)	2383	object::kv_del (shstr_tmp key)
2352	{	2384	{
2353	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2385	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2354	if ((*kvp)->key == key)	2386	if ((*kvp)->key == key)
2355	{	2387	{
2356	key_value *kv = *kvp;	2388	key_value *kv = *kvp;
…		…
2415	{	2447	{
2416	char flagdesc[512];	2448	char flagdesc[512];
2417	char info2[256 * 4];	2449	char info2[256 * 4];
2418	char *p = info;	2450	char *p = info;
2419		2451
2420	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2452	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2421	count,	2453	count,
2422	uuid.c_str (),	2454	uuid.c_str (),
2423	&name,	2455	&name,
2424	title ? "\",title:\"" : "",	2456	title ? ",title:\"" : "",
2425	title ? (const char *)title : "",	2457	title ? (const char *)title : "",
		2458	title ? "\"" : "",
2426	flag_desc (flagdesc, 512), type);	2459	flag_desc (flagdesc, 512), type);
2427		2460
2428	if (!flag[FLAG_REMOVED] && env)	2461	if (!flag[FLAG_REMOVED] && env)
2429	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2462	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2430		2463
…		…
2446	struct region *	2479	struct region *
2447	object::region () const	2480	object::region () const
2448	{	2481	{
2449	return map ? map->region (x, y)	2482	return map ? map->region (x, y)
2450	: region::default_region ();	2483	: region::default_region ();
2451	}
2452
2453	const materialtype_t *
2454	object::dominant_material () const
2455	{
2456	if (materialtype_t *mt = name_to_material (materialname))
2457	return mt;
2458
2459	return name_to_material (shstr_unknown);
2460	}	2484	}
2461		2485
2462	void	2486	void
2463	object::open_container (object *new_container)	2487	object::open_container (object *new_container)
2464	{	2488	{
…		…
2486	container = 0;	2510	container = 0;
2487		2511
2488	// client needs item update to make it work, client bug requires this to be separate	2512	// client needs item update to make it work, client bug requires this to be separate
2489	esrv_update_item (UPD_FLAGS, this, old_container);	2513	esrv_update_item (UPD_FLAGS, this, old_container);
2490		2514
2491	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2515	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2492	play_sound (sound_find ("chest_close"));	2516	play_sound (sound_find ("chest_close"));
2493	}	2517	}
2494		2518
2495	if (new_container)	2519	if (new_container)
2496	{	2520	{
…		…
2500	// TODO: this does not seem to serve any purpose anymore?	2524	// TODO: this does not seem to serve any purpose anymore?
2501	#if 0	2525	#if 0
2502	// insert the "Close Container" object.	2526	// insert the "Close Container" object.
2503	if (archetype *closer = new_container->other_arch)	2527	if (archetype *closer = new_container->other_arch)
2504	{	2528	{
2505	object *closer = arch_to_object (new_container->other_arch);	2529	object *closer = new_container->other_arch->instance ();
2506	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2530	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2507	new_container->insert (closer);	2531	new_container->insert (closer);
2508	}	2532	}
2509	#endif	2533	#endif
2510		2534
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2512		2536
2513	// make sure the container is available, client bug requires this to be separate	2537	// make sure the container is available, client bug requires this to be separate
2514	esrv_send_item (this, new_container);	2538	esrv_send_item (this, new_container);
2515		2539
2516	new_container->flag [FLAG_APPLIED] = true;	2540	new_container->flag [FLAG_APPLIED] = true;
…		…
2524	// else if (!old_container->env && contr && contr->ns)	2548	// else if (!old_container->env && contr && contr->ns)
2525	// contr->ns->floorbox_reset ();	2549	// contr->ns->floorbox_reset ();
2526	}	2550	}
2527		2551
2528	object *	2552	object *
2529	object::force_find (const shstr name)	2553	object::force_find (shstr_tmp name)
2530	{	2554	{
2531	/* cycle through his inventory to look for the MARK we want to	2555	/* cycle through his inventory to look for the MARK we want to
2532	* place	2556	* place
2533	*/	2557	*/
2534	for (object *tmp = inv; tmp; tmp = tmp->below)	2558	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2536	return splay (tmp);	2560	return splay (tmp);
2537		2561
2538	return 0;	2562	return 0;
2539	}	2563	}
2540		2564
		2565	//-GPL
		2566
2541	void	2567	void
		2568	object::force_set_timer (int duration)
		2569	{
		2570	this->duration = 1;
		2571	this->speed_left = -1.f;
		2572
		2573	this->set_speed (duration ? 1.f / duration : 0.f);
		2574	}
		2575
		2576	object *
2542	object::force_add (const shstr name, int duration)	2577	object::force_add (shstr_tmp name, int duration)
2543	{	2578	{
2544	if (object *force = force_find (name))	2579	if (object *force = force_find (name))
2545	force->destroy ();	2580	force->destroy ();
2546		2581
2547	object *force = get_archetype (FORCE_NAME);	2582	object *force = get_archetype (FORCE_NAME);
2548		2583
2549	force->slaying = name;	2584	force->slaying = name;
2550	force->stats.food = 1;	2585	force->force_set_timer (duration);
2551	force->speed_left = -1.f;
2552
2553	force->set_speed (duration ? 1.f / duration : 0.f);
2554	force->flag [FLAG_IS_USED_UP] = true;
2555	force->flag [FLAG_APPLIED] = true;	2586	force->flag [FLAG_APPLIED] = true;
2556		2587
2557	insert (force);	2588	return insert (force);
2558	}	2589	}
2559		2590
2560	void	2591	void
2561	object::play_sound (faceidx sound)	2592	object::play_sound (faceidx sound) const
2562	{	2593	{
2563	if (!sound)	2594	if (!sound)
2564	return;	2595	return;
2565		2596
2566	if (flag [FLAG_REMOVED])	2597	if (is_on_map ())
		2598	map->play_sound (sound, x, y);
		2599	else if (object *pl = in_player ())
		2600	pl->contr->play_sound (sound);
		2601	}
		2602
		2603	void
		2604	object::say_msg (const char *msg) const
		2605	{
		2606	if (is_on_map ())
		2607	map->say_msg (msg, x, y);
		2608	else if (object *pl = in_player ())
		2609	pl->contr->play_sound (sound);
		2610	}
		2611
		2612	void
		2613	object::make_noise ()
		2614	{
		2615	// we do not model noise in the map, so instead put
		2616	// a temporary light into the noise source
		2617	// could use the map instead, but that's less reliable for our
		2618	// goal, which is to make invisibility a bit harder to exploit
		2619
		2620	// currently only works sensibly for players
		2621	if (!is_player ())
2567	return;	2622	return;
2568		2623
2569	if (env)	2624	// find old force, or create new one
2570	{	2625	object *force = force_find (shstr_noise_force);
2571	if (object *pl = in_player ())	2626
2572	pl->contr->play_sound (sound);	2627	if (force)
2573	}	2628	force->speed_left = -1.f; // patch old speed up
2574	else	2629	else
2575	map->play_sound (sound, x, y);	2630	{
2576	}	2631	force = archetype::get (shstr_noise_force);
2577		2632
		2633	force->slaying = shstr_noise_force;
		2634	force->stats.food = 1;
		2635	force->speed_left = -1.f;
		2636
		2637	force->set_speed (1.f / 4.f);
		2638	force->flag [FLAG_IS_USED_UP] = true;
		2639	force->flag [FLAG_APPLIED] = true;
		2640
		2641	insert (force);
		2642	}
		2643	}
		2644
		2645	void object::change_move_type (MoveType mt)
		2646	{
		2647	if (move_type == mt)
		2648	return;
		2649
		2650	if (is_on_map ())
		2651	{
		2652	// we are on the map, so handle move_on/off effects
		2653	remove ();
		2654	move_type = mt;
		2655	map->insert (this, x, y, this);
		2656	}
		2657	else
		2658	move_type = mt;
		2659	}
		2660

Diff Legend

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