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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
297	return 0;	299	return 0;
298	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	301	return 0;
300	}	302	}
301		303
302	//TODO: generate an event or call into perl for additional checks
303	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
304	{	305	{
305	ob1->optimise ();	306	ob1->optimise ();
306	ob2->optimise ();	307	ob2->optimise ();
307		308
308	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
309	return 0;	311	return 0;
310	}	312	}
311		313
312	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
313	return 1;	315	return 1;
314	}	316	}
…		…
322	sum_weight (object *op)	324	sum_weight (object *op)
323	{	325	{
324	long sum;	326	long sum;
325	object *inv;	327	object *inv;
326		328
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
328	{	330	{
329	if (inv->inv)	331	if (inv->inv)
330	sum_weight (inv);	332	sum_weight (inv);
		333
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332	}	335	}
333		336
334	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	/*	358	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	360	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
359	*/	362	*/
360
361	char *	363	char *
362	dump_object (object *op)	364	dump_object (object *op)
363	{	365	{
364	if (!op)	366	if (!op)
365	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
366		368
367	object_freezer freezer;	369	object_freezer freezer;
368	save_object (freezer, op, 1);	370	op->write (freezer);
369	return freezer.as_string ();	371	return freezer.as_string ();
370	}	372	}
371		373
372	/*	374	/*
373	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
390	}	392	}
391		393
392	/*	394	/*
393	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
394	*/	396	*/
395
396	object *	397	object *
397	find_object (tag_t i)	398	find_object (tag_t i)
398	{	399	{
399	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
400	if (op->count == i)	401	if (op->count == i)
401	return op;	402	return op;
402		403
403	return 0;	404	return 0;
404	}	405	}
405		406
406	/*	407	/*
407	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
410	*/	411	*/
411
412	object *	412	object *
413	find_object_name (const char *str)	413	find_object_name (const char *str)
414	{	414	{
415	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
416	object *op;	416	object *op;
417		417
418	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
419	if (op->name == str_)	419	if (op->name == str_)
420	break;	420	break;
421		421
422	return op;	422	return op;
423	}	423	}
…		…
449	owner = owner->owner;	449	owner = owner->owner;
450		450
451	this->owner = owner;	451	this->owner = owner;
452	}	452	}
453		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		501	"[You need to unapply some items first.]", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
454	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	521	* refcounts and freeing the links.
456	*/	522	*/
457	static void	523	static void
458	free_key_values (object *op)	524	free_key_values (object *op)
459	{	525	{
460	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
461	{	527	{
462	key_value *next = i->next;	528	key_value *next = i->next;
463	delete i;	529	delete i;
464		530
465	i = next;	531	i = next;
466	}	532	}
467		533
468	op->key_values = 0;	534	op->key_values = 0;
469	}	535	}
470		536
471	/*	537	object &
472	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	539	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
484		542
485	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
486		544
487	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	546	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		547
496	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
497	if (key_values)	549	if (src.key_values)
498	{	550	{
499	key_value *tail = 0;	551	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	552	key_values = 0;
503		553
504	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
505	{	555	{
506	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
507		557
508	new_link->next = 0;	558	new_link->next = 0;
509	new_link->key = i->key;	559	new_link->key = i->key;
510	new_link->value = i->value;	560	new_link->value = i->value;
511		561
512	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
513	if (!dst->key_values)	563	if (!key_values)
514	{	564	{
515	dst->key_values = new_link;	565	key_values = new_link;
516	tail = new_link;	566	tail = new_link;
517	}	567	}
518	else	568	else
519	{	569	{
520	tail->next = new_link;	570	tail->next = new_link;
521	tail = new_link;	571	tail = new_link;
522	}	572	}
523	}	573	}
524	}	574	}
		575	}
		576
		577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
525		592
526	dst->set_speed (dst->speed);	593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
527	}	613	}
528		614
529	object *	615	object *
530	object::clone ()	616	object::clone ()
531	{	617	{
…		…
564	}	650	}
565		651
566	this->speed = speed;	652	this->speed = speed;
567		653
568	if (has_active_speed ())	654	if (has_active_speed ())
569	activate (false);	655	activate ();
570	else	656	else
571	deactivate (false);	657	deactivate ();
572	}	658	}
573		659
574	/*	660	/*
575	* update_object() updates the the map.	661	* update_object() updates the the map.
576	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
590	*/	676	*/
591	void	677	void
592	update_object (object *op, int action)	678	update_object (object *op, int action)
593	{	679	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	680	if (op == NULL)
597	{	681	{
598	/* this should never happen */	682	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	684	return;
…		…
624	return;	708	return;
625	}	709	}
626		710
627	mapspace &m = op->ms ();	711	mapspace &m = op->ms ();
628		712
629	if (m.flags_ & P_NEED_UPDATE)	713	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	714	/* nop */;
631	else if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
632	{	716	{
633	// this is likely overkill, TODO: revisit (schmorp)	717	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	718	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
643	/* This isn't perfect, but I don't expect a lot of objects to	727	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	728	* to have move_allow right now.
645	*/	729	*/
646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
649	}	733	}
650	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	736	* that is being removed.
653	*/	737	*/
654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	739	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
658	else	742	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		744
661	if (op->more)	745	if (op->more)
662	update_object (op->more, action);	746	update_object (op->more, action);
663	}	747	}
664		748
665	object::vector object::objects; // not yet used
666	object *object::first;
667
668	object::object ()	749	object::object ()
669	{	750	{
670	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
671		752
672	expmul = 1.0;	753	expmul = 1.0;
673	face = blank_face;	754	face = blank_face;
674	}	755	}
675		756
676	object::~object ()	757	object::~object ()
677	{	758	{
		759	unlink ();
		760
678	free_key_values (this);	761	free_key_values (this);
679	}	762	}
680		763
		764	static int object_count;
		765
681	void object::link ()	766	void object::link ()
682	{	767	{
683	count = ++ob_count;	768	assert (!index);//D
684	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
685		771
686	prev = 0;	772	refcnt_inc ();
687	next = object::first;	773	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	774	}
694		775
695	void object::unlink ()	776	void object::unlink ()
696	{	777	{
697	if (this == object::first)	778	if (!index)
698	object::first = next;	779	return;
699		780
700	/* Remove this object from the list of used objects */	781	objects.erase (this);
701	if (prev) prev->next = next;	782	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}	783	}
707		784
708	void	785	void
709	object::activate (bool recursive)	786	object::activate ()
710	{	787	{
		788	/* If already on active list, don't do anything */
		789	if (active)
		790	return;
		791
711	if (has_active_speed ())	792	if (has_active_speed ())
712	{	793	actives.insert (this);
713	/* If already on active list, don't do anything */	794	}
714	if (active_next || active_prev || this == active_objects)
715	return;
716		795
717	/* process_events() expects us to insert the object at the beginning	796	void
718	* of the list. */	797	object::activate_recursive ()
719	active_next = active_objects;	798	{
		799	activate ();
720		800
721	if (active_next)
722	active_next->active_prev = this;
723
724	active_objects = this;
725	}
726
727	if (recursive)
728	for (object *op = inv; op; op = op->above)	801	for (object *op = inv; op; op = op->below)
729	op->activate (1);	802	op->activate_recursive ();
730	}	803	}
731		804
732	/* This function removes object 'op' from the list of active	805	/* This function removes object 'op' from the list of active
733	* objects.	806	* objects.
734	* This should only be used for style maps or other such	807	* This should only be used for style maps or other such
…		…
736	* in play chewing up cpu time getting processed.	809	* in play chewing up cpu time getting processed.
737	* The reverse of this is to call update_ob_speed, which	810	* The reverse of this is to call update_ob_speed, which
738	* will do the right thing based on the speed of the object.	811	* will do the right thing based on the speed of the object.
739	*/	812	*/
740	void	813	void
741	object::deactivate (bool recursive)	814	object::deactivate ()
742	{	815	{
743	/* If not on the active list, nothing needs to be done */	816	/* If not on the active list, nothing needs to be done */
744	if (!active_next && !active_prev && this != active_objects)	817	if (!active)
745	return;	818	return;
746		819
747	if (active_prev == 0)	820	actives.erase (this);
748	{	821	}
749	active_objects = active_next;
750	if (active_next)
751	active_next->active_prev = 0;
752	}
753	else
754	{
755	active_prev->active_next = active_next;
756	if (active_next)
757	active_next->active_prev = active_prev;
758	}
759		822
760	active_next = 0;	823	void
761	active_prev = 0;	824	object::deactivate_recursive ()
762		825	{
763	if (recursive)
764	for (object *op = inv; op; op = op->above)	826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
765	op->deactivate (1);	829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
		836	{
		837	op->flag [flag] = value;
		838	op->set_flag_inv (flag, value);
		839	}
766	}	840	}
767		841
768	/*	842	/*
769	* Remove and free all objects in the inventory of the given object.	843	* Remove and free all objects in the inventory of the given object.
770	* object.c ?	844	* object.c ?
…		…
785	* drop on that space.	859	* drop on that space.
786	*/	860	*/
787	if (!drop_to_ground	861	if (!drop_to_ground
788	|| !map	862	|| !map
789	|| map->in_memory != MAP_IN_MEMORY	863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
790	|| ms ().move_block == MOVE_ALL)	865	|| ms ().move_block == MOVE_ALL)
791	{	866	{
792	while (inv)	867	while (inv)
793	{	868	{
794	inv->destroy_inv (drop_to_ground);	869	inv->destroy_inv (drop_to_ground);
…		…
803		878
804	if (op->flag [FLAG_STARTEQUIP]	879	if (op->flag [FLAG_STARTEQUIP]
805	|| op->flag [FLAG_NO_DROP]	880	|| op->flag [FLAG_NO_DROP]
806	|| op->type == RUNE	881	|| op->type == RUNE
807	|| op->type == TRAP	882	|| op->type == TRAP
808	|| op->flag [FLAG_IS_A_TEMPLATE])	883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
809	op->destroy ();	885	op->destroy ();
810	else	886	else
811	map->insert (op, x, y);	887	map->insert (op, x, y);
812	}	888	}
813	}	889	}
…		…
821	}	897	}
822		898
823	void	899	void
824	object::do_destroy ()	900	object::do_destroy ()
825	{	901	{
		902	attachable::do_destroy ();
		903
826	if (flag [FLAG_IS_LINKED])	904	if (flag [FLAG_IS_LINKED])
827	remove_button_link (this);	905	remove_button_link (this);
828		906
829	if (flag [FLAG_FRIENDLY])	907	if (flag [FLAG_FRIENDLY])
830	remove_friendly_object (this);	908	remove_friendly_object (this);
831		909
832	if (!flag [FLAG_REMOVED])	910	if (!flag [FLAG_REMOVED])
833	remove ();	911	remove ();
834		912
835	if (flag [FLAG_FREED])	913	destroy_inv (true);
836	return;
837		914
838	set_speed (0);	915	deactivate ();
		916	unlink ();
839		917
840	flag [FLAG_FREED] = 1;	918	flag [FLAG_FREED] = 1;
841
842	attachable::do_destroy ();
843
844	destroy_inv (true);
845	unlink ();
846		919
847	// hack to ensure that freed objects still have a valid map	920	// hack to ensure that freed objects still have a valid map
848	{	921	{
849	static maptile *freed_map; // freed objects are moved here to avoid crashes	922	static maptile *freed_map; // freed objects are moved here to avoid crashes
850		923
…		…
855	freed_map->name = "/internal/freed_objects_map";	928	freed_map->name = "/internal/freed_objects_map";
856	freed_map->width = 3;	929	freed_map->width = 3;
857	freed_map->height = 3;	930	freed_map->height = 3;
858		931
859	freed_map->alloc ();	932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
860	}	934	}
861		935
862	map = freed_map;	936	map = freed_map;
863	x = 1;	937	x = 1;
864	y = 1;	938	y = 1;
865	}	939	}
866		940
867	head = 0;
868
869	if (more)	941	if (more)
870	{	942	{
871	more->destroy ();	943	more->destroy ();
872	more = 0;	944	more = 0;
873	}	945	}
874		946
		947	head = 0;
		948
875	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might cause circular references
876	owner = 0;	950	owner = 0;
877	enemy = 0;	951	enemy = 0;
878	attacked_by = 0;	952	attacked_by = 0;
879		953	current_weapon = 0;
880	// only relevant for players(?), but make sure of it anyways
881	contr = 0;
882	}	954	}
883		955
884	void	956	void
885	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
886	{	958	{
887	if (destroyed ())	959	if (destroyed ())
888	return;	960	return;
889		961
890	if (destroy_inventory)	962	if (destroy_inventory)
891	destroy_inv (false);	963	destroy_inv (false);
		964
		965	if (is_head ())
		966	if (sound_destroy)
		967	play_sound (sound_destroy);
		968	else if (flag [FLAG_MONSTER])
		969	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
892		970
893	attachable::destroy ();	971	attachable::destroy ();
894	}	972	}
895		973
896	/*	974	/*
…		…
914	* This function removes the object op from the linked list of objects	992	* This function removes the object op from the linked list of objects
915	* which it is currently tied to. When this function is done, the	993	* which it is currently tied to. When this function is done, the
916	* object will have no environment. If the object previously had an	994	* object will have no environment. If the object previously had an
917	* environment, the x and y coordinates will be updated to	995	* environment, the x and y coordinates will be updated to
918	* the previous environment.	996	* the previous environment.
919	* Beware: This function is called from the editor as well!
920	*/	997	*/
921	void	998	void
922	object::remove ()	999	object::do_remove ()
923	{	1000	{
924	object *tmp, *last = 0;	1001	object *tmp, *last = 0;
925	object *otmp;	1002	object *otmp;
926		1003
927	if (QUERY_FLAG (this, FLAG_REMOVED))	1004	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
970	}	1047	}
971	else if (map)	1048	else if (map)
972	{	1049	{
973	if (type == PLAYER)	1050	if (type == PLAYER)
974	{	1051	{
		1052	// leaving a spot always closes any open container on the ground
		1053	if (container && !container->env)
		1054	// this causes spurious floorbox updates, but it ensures
		1055	// that the CLOSE event is being sent.
		1056	close_container ();
		1057
975	--map->players;	1058	--map->players;
976	map->last_access = runtime;	1059	map->touch ();
977	}	1060	}
978		1061
		1062	map->dirty = true;
		1063	mapspace &ms = this->ms ();
979		1064
980	/* link the object above us */	1065	/* link the object above us */
981	if (above)	1066	if (above)
982	above->below = below;	1067	above->below = below;
983	else	1068	else
984	map->at (x, y).top = below; /* we were top, set new top */	1069	ms.top = below; /* we were top, set new top */
985		1070
986	/* Relink the object below us, if there is one */	1071	/* Relink the object below us, if there is one */
987	if (below)	1072	if (below)
988	below->above = above;	1073	below->above = above;
989	else	1074	else
…		…
991	/* Nothing below, which means we need to relink map object for this space	1076	/* Nothing below, which means we need to relink map object for this space
992	* use translated coordinates in case some oddness with map tiling is	1077	* use translated coordinates in case some oddness with map tiling is
993	* evident	1078	* evident
994	*/	1079	*/
995	if (GET_MAP_OB (map, x, y) != this)	1080	if (GET_MAP_OB (map, x, y) != this)
996	{
997	char *dump = dump_object (this);
998	LOG (llevError,
999	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1081	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1000	free (dump);
1001	dump = dump_object (GET_MAP_OB (map, x, y));
1002	LOG (llevError, "%s\n", dump);
1003	free (dump);
1004	}
1005		1082
1006	map->at (x, y).bot = above; /* goes on above it. */	1083	ms.bot = above; /* goes on above it. */
1007	}	1084	}
1008		1085
1009	above = 0;	1086	above = 0;
1010	below = 0;	1087	below = 0;
1011		1088
1012	if (map->in_memory == MAP_SAVING)	1089	if (map->in_memory == MAP_SAVING)
1013	return;	1090	return;
1014		1091
1015	int check_walk_off = !flag [FLAG_NO_APPLY];	1092	int check_walk_off = !flag [FLAG_NO_APPLY];
1016		1093
		1094	if (object *pl = ms.player ())
		1095	{
		1096	if (pl->container == this)
		1097	/* If a container that the player is currently using somehow gets
		1098	* removed (most likely destroyed), update the player view
		1099	* appropriately.
		1100	*/
		1101	pl->close_container ();
		1102
		1103	pl->contr->ns->floorbox_update ();
		1104	}
		1105
1017	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1106	for (tmp = ms.bot; tmp; tmp = tmp->above)
1018	{	1107	{
1019	/* No point updating the players look faces if he is the object	1108	/* No point updating the players look faces if he is the object
1020	* being removed.	1109	* being removed.
1021	*/	1110	*/
1022
1023	if (tmp->type == PLAYER && tmp != this)
1024	{
1025	/* If a container that the player is currently using somehow gets
1026	* removed (most likely destroyed), update the player view
1027	* appropriately.
1028	*/
1029	if (tmp->container == this)
1030	{
1031	flag [FLAG_APPLIED] = 0;
1032	tmp->container = 0;
1033	}
1034
1035	if (tmp->contr->ns)
1036	tmp->contr->ns->floorbox_update ();
1037	}
1038		1111
1039	/* See if object moving off should effect something */	1112	/* See if object moving off should effect something */
1040	if (check_walk_off	1113	if (check_walk_off
1041	&& ((move_type & tmp->move_off)	1114	&& ((move_type & tmp->move_off)
1042	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1045		1118
1046	if (destroyed ())	1119	if (destroyed ())
1047	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1048	}	1121	}
1049		1122
1050	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1051	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1052	if (tmp->above == tmp)
1053	tmp->above = 0;
1054
1055	last = tmp;	1123	last = tmp;
1056	}	1124	}
1057		1125
1058	/* last == NULL if there are no objects on this space */	1126	/* last == NULL if there are no objects on this space */
1059	//TODO: this makes little sense, why only update the topmost object?	1127	//TODO: this makes little sense, why only update the topmost object?
1060	if (!last)	1128	if (!last)
1061	map->at (x, y).flags_ = P_NEED_UPDATE;	1129	map->at (x, y).flags_ = 0;
1062	else	1130	else
1063	update_object (last, UP_OBJ_REMOVE);	1131	update_object (last, UP_OBJ_REMOVE);
1064		1132
1065	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066	update_all_los (map, x, y);	1134	update_all_los (map, x, y);
…		…
1102	}	1170	}
1103		1171
1104	return 0;	1172	return 0;
1105	}	1173	}
1106		1174
		1175	void
		1176	object::expand_tail ()
		1177	{
		1178	if (more)
		1179	return;
		1180
		1181	object *prev = this;
		1182
		1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1184	{
		1185	object *op = arch_to_object (at);
		1186
		1187	op->name = name;
		1188	op->name_pl = name_pl;
		1189	op->title = title;
		1190
		1191	op->head = this;
		1192	prev->more = op;
		1193
		1194	prev = op;
		1195	}
		1196	}
		1197
1107	/*	1198	/*
1108	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1199	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1109	* job preparing multi-part monsters	1200	* job preparing multi-part monsters.
1110	*/	1201	*/
1111	object *	1202	object *
1112	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113	{	1204	{
1114	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1115	{	1206	{
1116	tmp->x = x + tmp->arch->clone.x;	1207	tmp->x = x + tmp->arch->x;
1117	tmp->y = y + tmp->arch->clone.y;	1208	tmp->y = y + tmp->arch->y;
1118	}	1209	}
1119		1210
1120	return insert_ob_in_map (op, m, originator, flag);	1211	return insert_ob_in_map (op, m, originator, flag);
1121	}	1212	}
1122		1213
…		…
1141	* just 'op' otherwise	1232	* just 'op' otherwise
1142	*/	1233	*/
1143	object *	1234	object *
1144	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145	{	1236	{
		1237	assert (!op->flag [FLAG_FREED]);
		1238
1146	object *tmp, *top, *floor = NULL;	1239	object *top, *floor = NULL;
1147	sint16 x, y;
1148		1240
1149	if (QUERY_FLAG (op, FLAG_FREED))	1241	op->remove ();
1150	{
1151	LOG (llevError, "Trying to insert freed object!\n");
1152	return NULL;
1153	}
1154
1155	if (!m)
1156	{
1157	char *dump = dump_object (op);
1158	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1159	free (dump);
1160	return op;
1161	}
1162		1242
1163	if (out_of_map (m, op->x, op->y))	1243	if (out_of_map (m, op->x, op->y))
1164	{	1244	{
1165	char *dump = dump_object (op);
1166	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1245	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1167	#ifdef MANY_CORES	1246	#ifdef MANY_CORES
1168	/* Better to catch this here, as otherwise the next use of this object	1247	/* Better to catch this here, as otherwise the next use of this object
1169	* is likely to cause a crash. Better to find out where it is getting	1248	* is likely to cause a crash. Better to find out where it is getting
1170	* improperly inserted.	1249	* improperly inserted.
1171	*/	1250	*/
1172	abort ();	1251	abort ();
1173	#endif	1252	#endif
1174	free (dump);
1175	return op;	1253	return op;
1176	}	1254	}
1177		1255
1178	if (!QUERY_FLAG (op, FLAG_REMOVED))	1256	if (object *more = op->more)
1179	{	1257	if (!insert_ob_in_map (more, m, originator, flag))
1180	char *dump = dump_object (op);
1181	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182	free (dump);
1183	return op;	1258	return 0;
1184	}
1185
1186	if (op->more)
1187	{
1188	/* The part may be on a different map. */
1189
1190	object *more = op->more;
1191
1192	/* We really need the caller to normalize coordinates - if
1193	* we set the map, that doesn't work if the location is within
1194	* a map and this is straddling an edge. So only if coordinate
1195	* is clear wrong do we normalize it.
1196	*/
1197	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198	more->map = get_map_from_coord (m, &more->x, &more->y);
1199	else if (!more->map)
1200	{
1201	/* For backwards compatibility - when not dealing with tiled maps,
1202	* more->map should always point to the parent.
1203	*/
1204	more->map = m;
1205	}
1206
1207	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1208	{
1209	if (!op->head)
1210	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211
1212	return 0;
1213	}
1214	}
1215		1259
1216	CLEAR_FLAG (op, FLAG_REMOVED);	1260	CLEAR_FLAG (op, FLAG_REMOVED);
1217		1261
1218	/* Ideally, the caller figures this out. However, it complicates a lot	1262	/* Ideally, the caller figures this out. However, it complicates a lot
1219	* of areas of callers (eg, anything that uses find_free_spot would now	1263	* of areas of callers (eg, anything that uses find_free_spot would now
1220	* need extra work	1264	* need extra work
1221	*/	1265	*/
1222	op->map = get_map_from_coord (m, &op->x, &op->y);	1266	if (!xy_normalise (m, op->x, op->y))
1223	x = op->x;	1267	return 0;
1224	y = op->y;	1268
		1269	op->map = m;
		1270	mapspace &ms = op->ms ();
1225		1271
1226	/* this has to be done after we translate the coordinates.	1272	/* this has to be done after we translate the coordinates.
1227	*/	1273	*/
1228	if (op->nrof && !(flag & INS_NO_MERGE))	1274	if (op->nrof && !(flag & INS_NO_MERGE))
1229	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1230	if (object::can_merge (op, tmp))	1276	if (object::can_merge (op, tmp))
1231	{	1277	{
1232	op->nrof += tmp->nrof;	1278	op->nrof += tmp->nrof;
1233	tmp->destroy ();	1279	tmp->destroy ();
1234	}	1280	}
…		…
1251	op->below = originator->below;	1297	op->below = originator->below;
1252		1298
1253	if (op->below)	1299	if (op->below)
1254	op->below->above = op;	1300	op->below->above = op;
1255	else	1301	else
1256	op->ms ().bot = op;	1302	ms.bot = op;
1257		1303
1258	/* since *below* originator, no need to update top */	1304	/* since *below* originator, no need to update top */
1259	originator->below = op;	1305	originator->below = op;
1260	}	1306	}
1261	else	1307	else
1262	{	1308	{
		1309	top = ms.bot;
		1310
1263	/* If there are other objects, then */	1311	/* If there are other objects, then */
1264	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1312	if ((!(flag & INS_MAP_LOAD)) && top)
1265	{	1313	{
1266	object *last = 0;	1314	object *last = 0;
1267		1315
1268	/*	1316	/*
1269	* If there are multiple objects on this space, we do some trickier handling.	1317	* If there are multiple objects on this space, we do some trickier handling.
…		…
1275	* once we get to them. This reduces the need to traverse over all of	1323	* once we get to them. This reduces the need to traverse over all of
1276	* them when adding another one - this saves quite a bit of cpu time	1324	* them when adding another one - this saves quite a bit of cpu time
1277	* when lots of spells are cast in one area. Currently, it is presumed	1325	* when lots of spells are cast in one area. Currently, it is presumed
1278	* that flying non pickable objects are spell objects.	1326	* that flying non pickable objects are spell objects.
1279	*/	1327	*/
1280	while (top)	1328	for (top = ms.bot; top; top = top->above)
1281	{	1329	{
1282	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1330	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283	floor = top;	1331	floor = top;
1284		1332
1285	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1333	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1288	top = top->below;	1336	top = top->below;
1289	break;	1337	break;
1290	}	1338	}
1291		1339
1292	last = top;	1340	last = top;
1293	top = top->above;
1294	}	1341	}
1295		1342
1296	/* Don't want top to be NULL, so set it to the last valid object */	1343	/* Don't want top to be NULL, so set it to the last valid object */
1297	top = last;	1344	top = last;
1298		1345
…		…
1300	* looks like instead of lots of conditions here.	1347	* looks like instead of lots of conditions here.
1301	* makes things faster, and effectively the same result.	1348	* makes things faster, and effectively the same result.
1302	*/	1349	*/
1303		1350
1304	/* Have object 'fall below' other objects that block view.	1351	/* Have object 'fall below' other objects that block view.
1305	* Unless those objects are exits, type 66	1352	* Unless those objects are exits.
1306	* If INS_ON_TOP is used, don't do this processing	1353	* If INS_ON_TOP is used, don't do this processing
1307	* Need to find the object that in fact blocks view, otherwise	1354	* Need to find the object that in fact blocks view, otherwise
1308	* stacking is a bit odd.	1355	* stacking is a bit odd.
1309	*/	1356	*/
1310	if (!(flag & INS_ON_TOP) &&	1357	if (!(flag & INS_ON_TOP)
1311	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1358	&& ms.flags () & P_BLOCKSVIEW
		1359	&& (op->face && !faces [op->face].visibility))
1312	{	1360	{
1313	for (last = top; last != floor; last = last->below)	1361	for (last = top; last != floor; last = last->below)
1314	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1362	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315	break;	1363	break;
		1364
1316	/* Check to see if we found the object that blocks view,	1365	/* Check to see if we found the object that blocks view,
1317	* and make sure we have a below pointer for it so that	1366	* and make sure we have a below pointer for it so that
1318	* we can get inserted below this one, which requires we	1367	* we can get inserted below this one, which requires we
1319	* set top to the object below us.	1368	* set top to the object below us.
1320	*/	1369	*/
1321	if (last && last->below && last != floor)	1370	if (last && last->below && last != floor)
1322	top = last->below;	1371	top = last->below;
1323	}	1372	}
1324	} /* If objects on this space */	1373	} /* If objects on this space */
1325
1326	if (flag & INS_MAP_LOAD)	1374	if (flag & INS_MAP_LOAD)
1327	top = GET_MAP_TOP (op->map, op->x, op->y);	1375	top = ms.top;
1328		1376
1329	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1330	top = floor;	1378	top = floor;
1331		1379
1332	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
1333	*/	1381	*/
1334		1382
1335	/* First object on this space */	1383	/* First object on this space */
1336	if (!top)	1384	if (!top)
1337	{	1385	{
1338	op->above = GET_MAP_OB (op->map, op->x, op->y);	1386	op->above = ms.bot;
1339		1387
1340	if (op->above)	1388	if (op->above)
1341	op->above->below = op;	1389	op->above->below = op;
1342		1390
1343	op->below = 0;	1391	op->below = 0;
1344	op->ms ().bot = op;	1392	ms.bot = op;
1345	}	1393	}
1346	else	1394	else
1347	{ /* get inserted into the stack above top */	1395	{ /* get inserted into the stack above top */
1348	op->above = top->above;	1396	op->above = top->above;
1349		1397
…		…
1353	op->below = top;	1401	op->below = top;
1354	top->above = op;	1402	top->above = op;
1355	}	1403	}
1356		1404
1357	if (!op->above)	1405	if (!op->above)
1358	op->ms ().top = op;	1406	ms.top = op;
1359	} /* else not INS_BELOW_ORIGINATOR */	1407	} /* else not INS_BELOW_ORIGINATOR */
1360		1408
1361	if (op->type == PLAYER)	1409	if (op->type == PLAYER)
1362	{	1410	{
1363	op->contr->do_los = 1;	1411	op->contr->do_los = 1;
1364	++op->map->players;	1412	++op->map->players;
1365	op->map->last_access = runtime;	1413	op->map->touch ();
1366	}	1414	}
		1415
		1416	op->map->dirty = true;
1367		1417
1368	/* If we have a floor, we know the player, if any, will be above	1418	/* If we have a floor, we know the player, if any, will be above
1369	* it, so save a few ticks and start from there.	1419	* it, so save a few ticks and start from there.
1370	*/	1420	*/
1371	if (!(flag & INS_MAP_LOAD))	1421	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1422	if (object *pl = ms.player ())
1373	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1423	pl->contr->ns->floorbox_update ();
1375		1424
1376	/* If this object glows, it may affect lighting conditions that are	1425	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1426	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1427	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1428	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1429	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1430	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1431	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1432	* of effect may be sufficient.
1384	*/	1433	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1434	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1435	update_all_los (op->map, op->x, op->y);
1387		1436
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1447	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1448	* update_object().
1400	*/	1449	*/
1401		1450
1402	/* if this is not the head or flag has been passed, don't check walk on status */	1451	/* if this is not the head or flag has been passed, don't check walk on status */
1403	if (!(flag & INS_NO_WALK_ON) && !op->head)	1452	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1453	{
1405	if (check_move_on (op, originator))	1454	if (check_move_on (op, originator))
1406	return 0;	1455	return 0;
1407		1456
1408	/* If we are a multi part object, lets work our way through the check	1457	/* If we are a multi part object, lets work our way through the check
1409	* walk on's.	1458	* walk on's.
1410	*/	1459	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1460	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1461	if (check_move_on (tmp, originator))
1413	return 0;	1462	return 0;
1414	}	1463	}
1415		1464
1416	return op;	1465	return op;
…		…
1425	{	1474	{
1426	object *tmp, *tmp1;	1475	object *tmp, *tmp1;
1427		1476
1428	/* first search for itself and remove any old instances */	1477	/* first search for itself and remove any old instances */
1429		1478
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1479	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1480	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1481	tmp->destroy ();
1433		1482
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1483	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1484
1436	tmp1->x = op->x;	1485	tmp1->x = op->x;
…		…
1439	}	1488	}
1440		1489
1441	object *	1490	object *
1442	object::insert_at (object *where, object *originator, int flags)	1491	object::insert_at (object *where, object *originator, int flags)
1443	{	1492	{
1444	where->map->insert (this, where->x, where->y, originator, flags);	1493	return where->map->insert (this, where->x, where->y, originator, flags);
1445	}	1494	}
1446		1495
1447	/*	1496	/*
1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1497	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1449	* is returned contains nr objects, and the remaining parts contains	1498	* is returned contains nr objects, and the remaining parts contains
…		…
1489	* the amount of an object. If the amount reaches 0, the object	1538	* the amount of an object. If the amount reaches 0, the object
1490	* is subsequently removed and freed.	1539	* is subsequently removed and freed.
1491	*	1540	*
1492	* Return value: 'op' if something is left, NULL if the amount reached 0	1541	* Return value: 'op' if something is left, NULL if the amount reached 0
1493	*/	1542	*/
1494
1495	object *	1543	object *
1496	decrease_ob_nr (object *op, uint32 i)	1544	decrease_ob_nr (object *op, uint32 i)
1497	{	1545	{
1498	object *tmp;	1546	object *tmp;
1499		1547
…		…
1574		1622
1575	/*	1623	/*
1576	* add_weight(object, weight) adds the specified weight to an object,	1624	* add_weight(object, weight) adds the specified weight to an object,
1577	* and also updates how much the environment(s) is/are carrying.	1625	* and also updates how much the environment(s) is/are carrying.
1578	*/	1626	*/
1579
1580	void	1627	void
1581	add_weight (object *op, signed long weight)	1628	add_weight (object *op, signed long weight)
1582	{	1629	{
1583	while (op != NULL)	1630	while (op != NULL)
1584	{	1631	{
…		…
1599	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1646	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1600	free (dump);	1647	free (dump);
1601	return op;	1648	return op;
1602	}	1649	}
1603		1650
1604	if (where->head)	1651	if (where->head_ () != where)
1605	{	1652	{
1606	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1653	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1607	where = where->head;	1654	where = where->head;
1608	}	1655	}
1609		1656
1610	return where->insert (op);	1657	return where->insert (op);
1611	}	1658	}
…		…
1616	* inside the object environment.	1663	* inside the object environment.
1617	*	1664	*
1618	* The function returns now pointer to inserted item, and return value can	1665	* The function returns now pointer to inserted item, and return value can
1619	* be != op, if items are merged. -Tero	1666	* be != op, if items are merged. -Tero
1620	*/	1667	*/
1621
1622	object *	1668	object *
1623	object::insert (object *op)	1669	object::insert (object *op)
1624	{	1670	{
1625	object *tmp, *otmp;	1671	object *tmp, *otmp;
1626		1672
…		…
1758		1804
1759	/* The objects have to be checked from top to bottom.	1805	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1806	* Hence, we first go to the top:
1761	*/	1807	*/
1762		1808
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1809	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1810	{
1765	/* Trim the search when we find the first other spell effect	1811	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1812	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1813	* we don't need to check all of them.
1768	*/	1814	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1832	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1833	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1834	{
1789		1835
1790	float	1836	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1837	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1838
1793	if (op->type == PLAYER)	1839	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1840	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1841	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1842	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1827	*/	1873	*/
1828	object *	1874	object *
1829	present_arch (const archetype *at, maptile *m, int x, int y)	1875	present_arch (const archetype *at, maptile *m, int x, int y)
1830	{	1876	{
1831	if (m == NULL || out_of_map (m, x, y))	1877	if (!m || out_of_map (m, x, y))
1832	{	1878	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1879	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1880	return NULL;
1835	}	1881	}
1836		1882
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1883	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1884	if (tmp->arch == at)
1839	return tmp;	1885	return tmp;
1840		1886
1841	return NULL;	1887	return NULL;
1842	}	1888	}
…		…
1853	{	1899	{
1854	LOG (llevError, "Present called outside map.\n");	1900	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1901	return NULL;
1856	}	1902	}
1857		1903
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1904	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1905	if (tmp->type == type)
1860	return tmp;	1906	return tmp;
1861		1907
1862	return NULL;	1908	return NULL;
1863	}	1909	}
…		…
1940	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1986	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1941	{	1987	{
1942	CLEAR_FLAG (tmp, flag);	1988	CLEAR_FLAG (tmp, flag);
1943	unflag_inv (tmp, flag);	1989	unflag_inv (tmp, flag);
1944	}	1990	}
1945	}
1946
1947	/*
1948	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949	* all it's inventory (recursively).
1950	* If checksums are used, a player will get set_cheat called for
1951	* him/her-self and all object carried by a call to this function.
1952	*/
1953	void
1954	set_cheat (object *op)
1955	{
1956	SET_FLAG (op, FLAG_WAS_WIZ);
1957	flag_inv (op, FLAG_WAS_WIZ);
1958	}	1991	}
1959		1992
1960	/*	1993	/*
1961	* find_free_spot(object, map, x, y, start, stop) will search for	1994	* find_free_spot(object, map, x, y, start, stop) will search for
1962	* a spot at the given map and coordinates which will be able to contain	1995	* a spot at the given map and coordinates which will be able to contain
…		…
2003	}	2036	}
2004		2037
2005	if (!index)	2038	if (!index)
2006	return -1;	2039	return -1;
2007		2040
2008	return altern[RANDOM () % index];	2041	return altern [rndm (index)];
2009	}	2042	}
2010		2043
2011	/*	2044	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2045	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2046	* find_free_spot(), but it will search max number of squares.
…		…
2034	{	2067	{
2035	arr += begin;	2068	arr += begin;
2036	end -= begin;	2069	end -= begin;
2037		2070
2038	while (--end)	2071	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2072	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2073	}
2041		2074
2042	/* new function to make monster searching more efficient, and effective!	2075	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2076	* This basically returns a randomized array (in the passed pointer) of
2044	* the spaces to find monsters. In this way, it won't always look for	2077	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2113	object *tmp;
2081	maptile *mp;	2114	maptile *mp;
2082		2115
2083	MoveType blocked, move_type;	2116	MoveType blocked, move_type;
2084		2117
2085	if (exclude && exclude->head)	2118	if (exclude && exclude->head_ () != exclude)
2086	{	2119	{
2087	exclude = exclude->head;	2120	exclude = exclude->head;
2088	move_type = exclude->move_type;	2121	move_type = exclude->move_type;
2089	}	2122	}
2090	else	2123	else
…		…
2113	max = maxfree[i];	2146	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2147	else if (mflags & P_IS_ALIVE)
2115	{	2148	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2149	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2152	break;
2120		2153
2121	if (tmp)	2154	if (tmp)
2122	return freedir[i];	2155	return freedir[i];
2123	}	2156	}
…		…
2178		2211
2179	return 3;	2212	return 3;
2180	}	2213	}
2181		2214
2182	/*	2215	/*
2183	* absdir(int): Returns a number between 1 and 8, which represent
2184	* the "absolute" direction of a number (it actually takes care of
2185	* "overflow" in previous calculations of a direction).
2186	*/
2187
2188	int
2189	absdir (int d)
2190	{
2191	while (d < 1)
2192	d += 8;
2193
2194	while (d > 8)
2195	d -= 8;
2196
2197	return d;
2198	}
2199
2200	/*
2201	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2216	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2217	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2218	*/
2204
2205	int	2219	int
2206	dirdiff (int dir1, int dir2)	2220	dirdiff (int dir1, int dir2)
2207	{	2221	{
2208	int d;	2222	int d;
2209		2223
…		…
2322	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2336	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323	* core dumps if they do.	2337	* core dumps if they do.
2324	*	2338	*
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2339	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2340	*/
2327
2328	int	2341	int
2329	can_pick (const object *who, const object *item)	2342	can_pick (const object *who, const object *item)
2330	{	2343	{
2331	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2337	* create clone from object to another	2350	* create clone from object to another
2338	*/	2351	*/
2339	object *	2352	object *
2340	object_create_clone (object *asrc)	2353	object_create_clone (object *asrc)
2341	{	2354	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2355	object *dst = 0, *tmp, *src, *prev, *item;
2343		2356
2344	if (!asrc)	2357	if (!asrc)
2345	return 0;	2358	return 0;
2346		2359
2347	src = asrc;
2348	if (src->head)
2349	src = src->head;	2360	src = asrc->head_ ();
2350		2361
2351	prev = 0;	2362	prev = 0;
2352	for (part = src; part; part = part->more)	2363	for (object *part = src; part; part = part->more)
2353	{	2364	{
2354	tmp = part->clone ();	2365	tmp = part->clone ();
2355	tmp->x -= src->x;	2366	tmp->x -= src->x;
2356	tmp->y -= src->y;	2367	tmp->y -= src->y;
2357		2368
…		…
2375	insert_ob_in_ob (object_create_clone (item), dst);	2386	insert_ob_in_ob (object_create_clone (item), dst);
2376		2387
2377	return dst;	2388	return dst;
2378	}	2389	}
2379		2390
2380	/* GROS - Creates an object using a string representing its content. */
2381	/* Basically, we save the content of the string to a temp file, then call */
2382	/* load_object on it. I admit it is a highly inefficient way to make things, */
2383	/* but it was simple to make and allows reusing the load_object function. */
2384	/* Remember not to use load_object_str in a time-critical situation. */
2385	/* Also remember that multiparts objects are not supported for now. */
2386	object *
2387	load_object_str (const char *obstr)
2388	{
2389	object *op;
2390	char filename[MAX_BUF];
2391
2392	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394	FILE *tempfile = fopen (filename, "w");
2395
2396	if (tempfile == NULL)
2397	{
2398	LOG (llevError, "Error - Unable to access load object temp file\n");
2399	return NULL;
2400	}
2401
2402	fprintf (tempfile, obstr);
2403	fclose (tempfile);
2404
2405	op = object::create ();
2406
2407	object_thawer thawer (filename);
2408
2409	if (thawer)
2410	load_object (thawer, op, 0);
2411
2412	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413	CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415	return op;
2416	}
2417
2418	/* This returns the first object in who's inventory that	2391	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2392	* has the same type and subtype match.
2420	* returns NULL if no match.	2393	* returns NULL if no match.
2421	*/	2394	*/
2422	object *	2395	object *
…		…
2475	if (link->key == canonical_key)	2448	if (link->key == canonical_key)
2476	return link->value;	2449	return link->value;
2477		2450
2478	return 0;	2451	return 0;
2479	}	2452	}
2480
2481		2453
2482	/*	2454	/*
2483	* Updates the canonical_key in op to value.	2455	* Updates the canonical_key in op to value.
2484	*	2456	*
2485	* canonical_key is a shared string (value doesn't have to be).	2457	* canonical_key is a shared string (value doesn't have to be).
…		…
2509	/* Basically, if the archetype has this key set,	2481	/* Basically, if the archetype has this key set,
2510	* we need to store the null value so when we save	2482	* we need to store the null value so when we save
2511	* it, we save the empty value so that when we load,	2483	* it, we save the empty value so that when we load,
2512	* we get this value back again.	2484	* we get this value back again.
2513	*/	2485	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))	2486	if (get_ob_key_link (op->arch, canonical_key))
2515	field->value = 0;	2487	field->value = 0;
2516	else	2488	else
2517	{	2489	{
2518	if (last)	2490	if (last)
2519	last->next = field->next;	2491	last->next = field->next;
…		…
2588	}	2560	}
2589	else	2561	else
2590	item = item->env;	2562	item = item->env;
2591	}	2563	}
2592		2564
2593
2594	const char *	2565	const char *
2595	object::flag_desc (char *desc, int len) const	2566	object::flag_desc (char *desc, int len) const
2596	{	2567	{
2597	char *p = desc;	2568	char *p = desc;
2598	bool first = true;	2569	bool first = true;
		2570
		2571	*p = 0;
2599		2572
2600	for (int i = 0; i < NUM_FLAGS; i++)	2573	for (int i = 0; i < NUM_FLAGS; i++)
2601	{	2574	{
2602	if (len <= 10) // magic constant!	2575	if (len <= 10) // magic constant!
2603	{	2576	{
2604	snprintf (p, len, ",...");	2577	snprintf (p, len, ",...");
2605	break;	2578	break;
2606	}	2579	}
2607		2580
2608	if (flag[i])	2581	if (flag [i])
2609	{	2582	{
2610	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2583	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611	len -= cnt;	2584	len -= cnt;
2612	p += cnt;	2585	p += cnt;
2613	first = false;	2586	first = false;
…		…
2615	}	2588	}
2616		2589
2617	return desc;	2590	return desc;
2618	}	2591	}
2619		2592
2620	// return a suitable string describing an objetc in enough detail to find it	2593	// return a suitable string describing an object in enough detail to find it
2621	const char *	2594	const char *
2622	object::debug_desc (char *info) const	2595	object::debug_desc (char *info) const
2623	{	2596	{
2624	char flagdesc[512];	2597	char flagdesc[512];
2625	char info2[256 * 4];	2598	char info2[256 * 4];
2626	char *p = info;	2599	char *p = info;
2627		2600
2628	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2601	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629	count, uuid.seq,	2602	count, uuid.seq,
2630	&name,	2603	&name,
2631	title ? "\",title:" : "",	2604	title ? "\",title:\"" : "",
2632	title ? (const char *)title : "",	2605	title ? (const char *)title : "",
2633	flag_desc (flagdesc, 512), type);	2606	flag_desc (flagdesc, 512), type);
2634		2607
2635	if (env)	2608	if (env)
2636	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2609	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2642	}	2615	}
2643		2616
2644	const char *	2617	const char *
2645	object::debug_desc () const	2618	object::debug_desc () const
2646	{	2619	{
2647	static char info[256 * 3];	2620	static char info[3][256 * 4];
		2621	static int info_idx;
		2622
2648	return debug_desc (info);	2623	return debug_desc (info [++info_idx % 3]);
2649	}	2624	}
2650		2625
		2626	struct region *
		2627	object::region () const
		2628	{
		2629	return map ? map->region (x, y)
		2630	: region::default_region ();
		2631	}
		2632
		2633	const materialtype_t *
		2634	object::dominant_material () const
		2635	{
		2636	if (materialtype_t *mt = name_to_material (materialname))
		2637	return mt;
		2638
		2639	return name_to_material (shstr_unknown);
		2640	}
		2641
		2642	void
		2643	object::open_container (object *new_container)
		2644	{
		2645	if (container == new_container)
		2646	return;
		2647
		2648	if (object *old_container = container)
		2649	{
		2650	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2651	return;
		2652
		2653	#if 0
		2654	// remove the "Close old_container" object.
		2655	if (object *closer = old_container->inv)
		2656	if (closer->type == CLOSE_CON)
		2657	closer->destroy ();
		2658	#endif
		2659
		2660	old_container->flag [FLAG_APPLIED] = 0;
		2661	container = 0;
		2662
		2663	esrv_update_item (UPD_FLAGS, this, old_container);
		2664	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2665	play_sound (sound_find ("chest_close"));
		2666	}
		2667
		2668	if (new_container)
		2669	{
		2670	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2671	return;
		2672
		2673	// TODO: this does not seem to serve any purpose anymore?
		2674	#if 0
		2675	// insert the "Close Container" object.
		2676	if (archetype *closer = new_container->other_arch)
		2677	{
		2678	object *closer = arch_to_object (new_container->other_arch);
		2679	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2680	new_container->insert (closer);
		2681	}
		2682	#endif
		2683
		2684	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2685
		2686	new_container->flag [FLAG_APPLIED] = 1;
		2687	container = new_container;
		2688
		2689	esrv_update_item (UPD_FLAGS, this, new_container);
		2690	esrv_send_inventory (this, new_container);
		2691	play_sound (sound_find ("chest_open"));
		2692	}
		2693	}
		2694
		2695	object *
		2696	object::force_find (const shstr name)
		2697	{
		2698	/* cycle through his inventory to look for the MARK we want to
		2699	* place
		2700	*/
		2701	for (object *tmp = inv; tmp; tmp = tmp->below)
		2702	if (tmp->type == FORCE && tmp->slaying == name)
		2703	return splay (tmp);
		2704
		2705	return 0;
		2706	}
		2707
		2708	void
		2709	object::force_add (const shstr name, int duration)
		2710	{
		2711	if (object *force = force_find (name))
		2712	force->destroy ();
		2713
		2714	object *force = get_archetype (FORCE_NAME);
		2715
		2716	force->slaying = name;
		2717	force->stats.food = 1;
		2718	force->speed_left = -1.f;
		2719
		2720	force->set_speed (duration ? 1.f / duration : 0.f);
		2721	force->flag [FLAG_IS_USED_UP] = true;
		2722	force->flag [FLAG_APPLIED] = true;
		2723
		2724	insert (force);
		2725	}
		2726
		2727	void
		2728	object::play_sound (faceidx sound) const
		2729	{
		2730	if (!sound)
		2731	return;
		2732
		2733	if (flag [FLAG_REMOVED])
		2734	return;
		2735
		2736	if (env)
		2737	{
		2738	if (object *pl = in_player ())
		2739	pl->contr->play_sound (sound);
		2740	}
		2741	else
		2742	map->play_sound (sound, x, y);
		2743	}
		2744

Diff Legend

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