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.183 by root, Mon Aug 20 19:13:10 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	}
…		…
429	}	429	}
430		430
431	/*	431	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	432	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	433	* skill and experience objects.
		434	* ACTUALLY NO! investigate! TODO
434	*/	435	*/
435	void	436	void
436	object::set_owner (object *owner)	437	object::set_owner (object *owner)
437	{	438	{
		439	// allow objects which own objects
438	if (!owner)	440	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	441	while (owner->owner)
449	owner = owner->owner;	442	owner = owner->owner;
450		443
451	this->owner = owner;	444	this->owner = owner;
		445	}
		446
		447	int
		448	object::slottype () const
		449	{
		450	if (type == SKILL)
		451	{
		452	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		453	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		454	}
		455	else
		456	{
		457	if (slot [body_combat].info) return slot_combat;
		458	if (slot [body_range ].info) return slot_ranged;
		459	}
		460
		461	return slot_none;
		462	}
		463
		464	bool
		465	object::change_weapon (object *ob)
		466	{
		467	if (current_weapon == ob)
		468	return true;
		469
		470	if (chosen_skill)
		471	chosen_skill->flag [FLAG_APPLIED] = false;
		472
		473	current_weapon = ob;
		474	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		475
		476	if (chosen_skill)
		477	chosen_skill->flag [FLAG_APPLIED] = true;
		478
		479	update_stats ();
		480
		481	if (ob)
		482	{
		483	// now check wether any body locations became invalid, in which case
		484	// we cannot apply the weapon at the moment.
		485	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		486	if (slot[i].used < 0)
		487	{
		488	current_weapon = chosen_skill = 0;
		489	update_stats ();
		490
		491	new_draw_info_format (NDI_UNIQUE, 0, this,
		492	"You try to balance all your items at once, "
		493	"but the %s is just too much for your body. "
		494	"[You need to unapply some items first.]", &ob->name);
		495	return false;
		496	}
		497
		498	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		499	}
		500	else
		501	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		502
		503	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		504	{
		505	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		506	&name, ob->debug_desc ());
		507	return false;
		508	}
		509
		510	return true;
452	}	511	}
453		512
454	/* Zero the key_values on op, decrementing the shared-string	513	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	514	* refcounts and freeing the links.
456	*/	515	*/
457	static void	516	static void
458	free_key_values (object *op)	517	free_key_values (object *op)
459	{	518	{
460	for (key_value *i = op->key_values; i != 0;)	519	for (key_value *i = op->key_values; i; )
461	{	520	{
462	key_value *next = i->next;	521	key_value *next = i->next;
463	delete i;	522	delete i;
464		523
465	i = next;	524	i = next;
466	}	525	}
467		526
468	op->key_values = 0;	527	op->key_values = 0;
469	}	528	}
470		529
471	/*	530	object &
472	* copy_to first frees everything allocated by the dst object,	531	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	{	532	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	533	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	534	bool is_removed = flag [FLAG_REMOVED];
484		535
485	*(object_copy *)dst = *this;	536	*(object_copy *)this = src;
486		537
487	if (is_freed)	538	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	539	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		540
496	/* Copy over key_values, if any. */	541	/* Copy over key_values, if any. */
497	if (key_values)	542	if (src.key_values)
498	{	543	{
499	key_value *tail = 0;	544	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	545	key_values = 0;
503		546
504	for (i = key_values; i; i = i->next)	547	for (key_value *i = src.key_values; i; i = i->next)
505	{	548	{
506	key_value *new_link = new key_value;	549	key_value *new_link = new key_value;
507		550
508	new_link->next = 0;	551	new_link->next = 0;
509	new_link->key = i->key;	552	new_link->key = i->key;
510	new_link->value = i->value;	553	new_link->value = i->value;
511		554
512	/* Try and be clever here, too. */	555	/* Try and be clever here, too. */
513	if (!dst->key_values)	556	if (!key_values)
514	{	557	{
515	dst->key_values = new_link;	558	key_values = new_link;
516	tail = new_link;	559	tail = new_link;
517	}	560	}
518	else	561	else
519	{	562	{
520	tail->next = new_link;	563	tail->next = new_link;
521	tail = new_link;	564	tail = new_link;
522	}	565	}
523	}	566	}
524	}	567	}
		568	}
		569
		570	/*
		571	* copy_to first frees everything allocated by the dst object,
		572	* and then copies the contents of itself into the second
		573	* object, allocating what needs to be allocated. Basically, any
		574	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		575	* if the first object is freed, the pointers in the new object
		576	* will point at garbage.
		577	*/
		578	void
		579	object::copy_to (object *dst)
		580	{
		581	*dst = *this;
		582
		583	if (speed < 0)
		584	dst->speed_left = speed_left - rndm ();
525		585
526	dst->set_speed (dst->speed);	586	dst->set_speed (dst->speed);
		587	}
		588
		589	void
		590	object::instantiate ()
		591	{
		592	if (!uuid.seq) // HACK
		593	uuid = gen_uuid ();
		594
		595	speed_left = -0.1f;
		596	/* copy the body_info to the body_used - this is only really
		597	* need for monsters, but doesn't hurt to do it for everything.
		598	* by doing so, when a monster is created, it has good starting
		599	* values for the body_used info, so when items are created
		600	* for it, they can be properly equipped.
		601	*/
		602	for (int i = NUM_BODY_LOCATIONS; i--; )
		603	slot[i].used = slot[i].info;
		604
		605	attachable::instantiate ();
527	}	606	}
528		607
529	object *	608	object *
530	object::clone ()	609	object::clone ()
531	{	610	{
…		…
564	}	643	}
565		644
566	this->speed = speed;	645	this->speed = speed;
567		646
568	if (has_active_speed ())	647	if (has_active_speed ())
569	activate (false);	648	activate ();
570	else	649	else
571	deactivate (false);	650	deactivate ();
572	}	651	}
573		652
574	/*	653	/*
575	* update_object() updates the the map.	654	* update_object() updates the the map.
576	* It takes into account invisible objects (and represent squares covered	655	* It takes into account invisible objects (and represent squares covered
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	668	* UP_OBJ_FACE: only the objects face has changed.
590	*/	669	*/
591	void	670	void
592	update_object (object *op, int action)	671	update_object (object *op, int action)
593	{	672	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	673	if (op == NULL)
597	{	674	{
598	/* this should never happen */	675	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	676	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	677	return;
…		…
624	return;	701	return;
625	}	702	}
626		703
627	mapspace &m = op->ms ();	704	mapspace &m = op->ms ();
628		705
629	if (m.flags_ & P_NEED_UPDATE)	706	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	707	/* nop */;
631	else if (action == UP_OBJ_INSERT)	708	else if (action == UP_OBJ_INSERT)
632	{	709	{
633	// this is likely overkill, TODO: revisit (schmorp)	710	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	711	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	720	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	721	* to have move_allow right now.
645	*/	722	*/
646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	723	|| ((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)	724	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = P_NEED_UPDATE;	725	m.flags_ = 0;
649	}	726	}
650	/* if the object is being removed, we can't make intelligent	727	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	728	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	729	* that is being removed.
653	*/	730	*/
654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	731	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	733	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	734	/* Nothing to do for that case */ ;
658	else	735	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	736	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		737
661	if (op->more)	738	if (op->more)
662	update_object (op->more, action);	739	update_object (op->more, action);
663	}	740	}
664		741
665	object::vector object::objects; // not yet used
666	object *object::first;
667
668	object::object ()	742	object::object ()
669	{	743	{
670	SET_FLAG (this, FLAG_REMOVED);	744	SET_FLAG (this, FLAG_REMOVED);
671		745
672	expmul = 1.0;	746	expmul = 1.0;
673	face = blank_face;	747	face = blank_face;
674	}	748	}
675		749
676	object::~object ()	750	object::~object ()
677	{	751	{
		752	unlink ();
		753
678	free_key_values (this);	754	free_key_values (this);
679	}	755	}
680		756
		757	static int object_count;
		758
681	void object::link ()	759	void object::link ()
682	{	760	{
683	count = ++ob_count;	761	assert (!index);//D
684	uuid = gen_uuid ();	762	uuid = gen_uuid ();
		763	count = ++object_count;
685		764
686	prev = 0;	765	refcnt_inc ();
687	next = object::first;	766	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	767	}
694		768
695	void object::unlink ()	769	void object::unlink ()
696	{	770	{
697	if (this == object::first)	771	if (!index)
698	object::first = next;	772	return;
699		773
700	/* Remove this object from the list of used objects */	774	objects.erase (this);
701	if (prev) prev->next = next;	775	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}	776	}
707		777
708	void	778	void
709	object::activate (bool recursive)	779	object::activate ()
710	{	780	{
		781	/* If already on active list, don't do anything */
		782	if (active)
		783	return;
		784
711	if (has_active_speed ())	785	if (has_active_speed ())
712	{	786	actives.insert (this);
713	/* If already on active list, don't do anything */	787	}
714	if (active_next || active_prev || this == active_objects)
715	return;
716		788
717	/* process_events() expects us to insert the object at the beginning	789	void
718	* of the list. */	790	object::activate_recursive ()
719	active_next = active_objects;	791	{
		792	activate ();
720		793
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)	794	for (object *op = inv; op; op = op->below)
729	op->activate (1);	795	op->activate_recursive ();
730	}	796	}
731		797
732	/* This function removes object 'op' from the list of active	798	/* This function removes object 'op' from the list of active
733	* objects.	799	* objects.
734	* This should only be used for style maps or other such	800	* This should only be used for style maps or other such
…		…
736	* in play chewing up cpu time getting processed.	802	* in play chewing up cpu time getting processed.
737	* The reverse of this is to call update_ob_speed, which	803	* The reverse of this is to call update_ob_speed, which
738	* will do the right thing based on the speed of the object.	804	* will do the right thing based on the speed of the object.
739	*/	805	*/
740	void	806	void
741	object::deactivate (bool recursive)	807	object::deactivate ()
742	{	808	{
743	/* If not on the active list, nothing needs to be done */	809	/* If not on the active list, nothing needs to be done */
744	if (!active_next && !active_prev && this != active_objects)	810	if (!active)
745	return;	811	return;
746		812
747	if (active_prev == 0)	813	actives.erase (this);
748	{	814	}
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		815
760	active_next = 0;	816	void
761	active_prev = 0;	817	object::deactivate_recursive ()
762		818	{
763	if (recursive)
764	for (object *op = inv; op; op = op->above)	819	for (object *op = inv; op; op = op->below)
		820	op->deactivate_recursive ();
		821
765	op->deactivate (1);	822	deactivate ();
		823	}
		824
		825	void
		826	object::set_flag_inv (int flag, int value)
		827	{
		828	for (object *op = inv; op; op = op->below)
		829	{
		830	op->flag [flag] = value;
		831	op->set_flag_inv (flag, value);
		832	}
766	}	833	}
767		834
768	/*	835	/*
769	* Remove and free all objects in the inventory of the given object.	836	* Remove and free all objects in the inventory of the given object.
770	* object.c ?	837	* object.c ?
…		…
785	* drop on that space.	852	* drop on that space.
786	*/	853	*/
787	if (!drop_to_ground	854	if (!drop_to_ground
788	|| !map	855	|| !map
789	|| map->in_memory != MAP_IN_MEMORY	856	|| map->in_memory != MAP_IN_MEMORY
		857	|| map->nodrop
790	|| ms ().move_block == MOVE_ALL)	858	|| ms ().move_block == MOVE_ALL)
791	{	859	{
792	while (inv)	860	while (inv)
793	{	861	{
794	inv->destroy_inv (drop_to_ground);	862	inv->destroy_inv (drop_to_ground);
…		…
803		871
804	if (op->flag [FLAG_STARTEQUIP]	872	if (op->flag [FLAG_STARTEQUIP]
805	|| op->flag [FLAG_NO_DROP]	873	|| op->flag [FLAG_NO_DROP]
806	|| op->type == RUNE	874	|| op->type == RUNE
807	|| op->type == TRAP	875	|| op->type == TRAP
808	|| op->flag [FLAG_IS_A_TEMPLATE])	876	|| op->flag [FLAG_IS_A_TEMPLATE]
		877	|| op->flag [FLAG_DESTROY_ON_DEATH])
809	op->destroy ();	878	op->destroy ();
810	else	879	else
811	map->insert (op, x, y);	880	map->insert (op, x, y);
812	}	881	}
813	}	882	}
…		…
821	}	890	}
822		891
823	void	892	void
824	object::do_destroy ()	893	object::do_destroy ()
825	{	894	{
		895	attachable::do_destroy ();
		896
826	if (flag [FLAG_IS_LINKED])	897	if (flag [FLAG_IS_LINKED])
827	remove_button_link (this);	898	remove_button_link (this);
828		899
829	if (flag [FLAG_FRIENDLY])	900	if (flag [FLAG_FRIENDLY])
830	remove_friendly_object (this);	901	remove_friendly_object (this);
831		902
832	if (!flag [FLAG_REMOVED])	903	if (!flag [FLAG_REMOVED])
833	remove ();	904	remove ();
834		905
835	if (flag [FLAG_FREED])	906	destroy_inv (true);
836	return;
837		907
838	set_speed (0);	908	deactivate ();
		909	unlink ();
839		910
840	flag [FLAG_FREED] = 1;	911	flag [FLAG_FREED] = 1;
841
842	attachable::do_destroy ();
843
844	destroy_inv (true);
845	unlink ();
846		912
847	// hack to ensure that freed objects still have a valid map	913	// hack to ensure that freed objects still have a valid map
848	{	914	{
849	static maptile *freed_map; // freed objects are moved here to avoid crashes	915	static maptile *freed_map; // freed objects are moved here to avoid crashes
850		916
…		…
855	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
856	freed_map->width = 3;	922	freed_map->width = 3;
857	freed_map->height = 3;	923	freed_map->height = 3;
858		924
859	freed_map->alloc ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
860	}	927	}
861		928
862	map = freed_map;	929	map = freed_map;
863	x = 1;	930	x = 1;
864	y = 1;	931	y = 1;
865	}	932	}
866		933
867	head = 0;
868
869	if (more)	934	if (more)
870	{	935	{
871	more->destroy ();	936	more->destroy ();
872	more = 0;	937	more = 0;
873	}	938	}
874		939
		940	head = 0;
		941
875	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
876	owner = 0;	943	owner = 0;
877	enemy = 0;	944	enemy = 0;
878	attacked_by = 0;	945	attacked_by = 0;
879		946	current_weapon = 0;
880	// only relevant for players(?), but make sure of it anyways
881	contr = 0;
882	}	947	}
883		948
884	void	949	void
885	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
886	{	951	{
887	if (destroyed ())	952	if (destroyed ())
888	return;	953	return;
889		954
890	if (destroy_inventory)	955	if (destroy_inventory)
891	destroy_inv (false);	956	destroy_inv (false);
		957
		958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
892		963
893	attachable::destroy ();	964	attachable::destroy ();
894	}	965	}
895		966
896	/*	967	/*
…		…
914	* This function removes the object op from the linked list of objects	985	* 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	986	* which it is currently tied to. When this function is done, the
916	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
917	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
918	* the previous environment.	989	* the previous environment.
919	* Beware: This function is called from the editor as well!
920	*/	990	*/
921	void	991	void
922	object::remove ()	992	object::do_remove ()
923	{	993	{
924	object *tmp, *last = 0;	994	object *tmp, *last = 0;
925	object *otmp;	995	object *otmp;
926		996
927	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
970	}	1040	}
971	else if (map)	1041	else if (map)
972	{	1042	{
973	if (type == PLAYER)	1043	if (type == PLAYER)
974	{	1044	{
		1045	// leaving a spot always closes any open container on the ground
		1046	if (container && !container->env)
		1047	// this causes spurious floorbox updates, but it ensures
		1048	// that the CLOSE event is being sent.
		1049	close_container ();
		1050
975	--map->players;	1051	--map->players;
976	map->last_access = runtime;	1052	map->touch ();
977	}	1053	}
978		1054
		1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
979		1057
980	/* link the object above us */	1058	/* link the object above us */
981	if (above)	1059	if (above)
982	above->below = below;	1060	above->below = below;
983	else	1061	else
984	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
985		1063
986	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
987	if (below)	1065	if (below)
988	below->above = above;	1066	below->above = above;
989	else	1067	else
…		…
991	/* Nothing below, which means we need to relink map object for this space	1069	/* 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	1070	* use translated coordinates in case some oddness with map tiling is
993	* evident	1071	* evident
994	*/	1072	*/
995	if (GET_MAP_OB (map, x, y) != this)	1073	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);	1074	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		1075
1006	map->at (x, y).bot = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1007	}	1077	}
1008		1078
1009	above = 0;	1079	above = 0;
1010	below = 0;	1080	below = 0;
1011		1081
1012	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1013	return;	1083	return;
1014		1084
1015	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1016		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1017	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1018	{	1100	{
1019	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1020	* being removed.	1102	* being removed.
1021	*/	1103	*/
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		1104
1039	/* See if object moving off should effect something */	1105	/* See if object moving off should effect something */
1040	if (check_walk_off	1106	if (check_walk_off
1041	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1042	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1045		1111
1046	if (destroyed ())	1112	if (destroyed ())
1047	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1113	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1048	}	1114	}
1049		1115
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;	1116	last = tmp;
1056	}	1117	}
1057		1118
1058	/* last == NULL if there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
1059	//TODO: this makes little sense, why only update the topmost object?	1120	//TODO: this makes little sense, why only update the topmost object?
1060	if (!last)	1121	if (!last)
1061	map->at (x, y).flags_ = P_NEED_UPDATE;	1122	map->at (x, y).flags_ = 0;
1062	else	1123	else
1063	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1064		1125
1065	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
…		…
1102	}	1163	}
1103		1164
1104	return 0;	1165	return 0;
1105	}	1166	}
1106		1167
		1168	void
		1169	object::expand_tail ()
		1170	{
		1171	if (more)
		1172	return;
		1173
		1174	object *prev = this;
		1175
		1176	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1177	{
		1178	object *op = arch_to_object (at);
		1179
		1180	op->name = name;
		1181	op->name_pl = name_pl;
		1182	op->title = title;
		1183
		1184	op->head = this;
		1185	prev->more = op;
		1186
		1187	prev = op;
		1188	}
		1189	}
		1190
1107	/*	1191	/*
1108	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1192	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1109	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1110	*/	1194	*/
1111	object *	1195	object *
1112	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1196	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113	{	1197	{
1114	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1115	{	1199	{
1116	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1117	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1118	}	1202	}
1119		1203
1120	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1121	}	1205	}
1122		1206
…		…
1141	* just 'op' otherwise	1225	* just 'op' otherwise
1142	*/	1226	*/
1143	object *	1227	object *
1144	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1146	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1147	sint16 x, y;
1148		1233
1149	if (QUERY_FLAG (op, FLAG_FREED))	1234	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		1235
1163	if (out_of_map (m, op->x, op->y))	1236	if (out_of_map (m, op->x, op->y))
1164	{	1237	{
1165	char *dump = dump_object (op);
1166	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1238	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1167	#ifdef MANY_CORES	1239	#ifdef MANY_CORES
1168	/* Better to catch this here, as otherwise the next use of this object	1240	/* 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	1241	* is likely to cause a crash. Better to find out where it is getting
1170	* improperly inserted.	1242	* improperly inserted.
1171	*/	1243	*/
1172	abort ();	1244	abort ();
1173	#endif	1245	#endif
1174	free (dump);
1175	return op;	1246	return op;
1176	}	1247	}
1177		1248
1178	if (!QUERY_FLAG (op, FLAG_REMOVED))	1249	if (object *more = op->more)
1179	{	1250	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;	1251	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		1252
1216	CLEAR_FLAG (op, FLAG_REMOVED);	1253	CLEAR_FLAG (op, FLAG_REMOVED);
1217		1254
1218	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* 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	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1220	* need extra work	1257	* need extra work
1221	*/	1258	*/
1222	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1223	x = op->x;	1260	return 0;
1224	y = op->y;	1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1225		1264
1226	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1227	*/	1266	*/
1228	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1229	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1230	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1231	{	1270	{
1232	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1233	tmp->destroy ();	1272	tmp->destroy ();
1234	}	1273	}
…		…
1251	op->below = originator->below;	1290	op->below = originator->below;
1252		1291
1253	if (op->below)	1292	if (op->below)
1254	op->below->above = op;	1293	op->below->above = op;
1255	else	1294	else
1256	op->ms ().bot = op;	1295	ms.bot = op;
1257		1296
1258	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1259	originator->below = op;	1298	originator->below = op;
1260	}	1299	}
1261	else	1300	else
1262	{	1301	{
		1302	top = ms.bot;
		1303
1263	/* If there are other objects, then */	1304	/* If there are other objects, then */
1264	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if ((!(flag & INS_MAP_LOAD)) && top)
1265	{	1306	{
1266	object *last = 0;	1307	object *last = 0;
1267		1308
1268	/*	1309	/*
1269	* If there are multiple objects on this space, we do some trickier handling.	1310	* 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	1316	* 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	1317	* 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	1318	* when lots of spells are cast in one area. Currently, it is presumed
1278	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1279	*/	1320	*/
1280	while (top)	1321	for (top = ms.bot; top; top = top->above)
1281	{	1322	{
1282	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283	floor = top;	1324	floor = top;
1284		1325
1285	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	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;	1329	top = top->below;
1289	break;	1330	break;
1290	}	1331	}
1291		1332
1292	last = top;	1333	last = top;
1293	top = top->above;
1294	}	1334	}
1295		1335
1296	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1297	top = last;	1337	top = last;
1298		1338
…		…
1300	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1301	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1302	*/	1342	*/
1303		1343
1304	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1305	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1306	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1307	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1308	* stacking is a bit odd.	1348	* stacking is a bit odd.
1309	*/	1349	*/
1310	if (!(flag & INS_ON_TOP) &&	1350	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))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1312	{	1353	{
1313	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1314	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315	break;	1356	break;
		1357
1316	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1317	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1318	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1319	* set top to the object below us.	1361	* set top to the object below us.
1320	*/	1362	*/
1321	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1322	top = last->below;	1364	top = last->below;
1323	}	1365	}
1324	} /* If objects on this space */	1366	} /* If objects on this space */
1325
1326	if (flag & INS_MAP_LOAD)	1367	if (flag & INS_MAP_LOAD)
1327	top = GET_MAP_TOP (op->map, op->x, op->y);	1368	top = ms.top;
1328		1369
1329	if (flag & INS_ABOVE_FLOOR_ONLY)	1370	if (flag & INS_ABOVE_FLOOR_ONLY)
1330	top = floor;	1371	top = floor;
1331		1372
1332	/* Top is the object that our object (op) is going to get inserted above.	1373	/* Top is the object that our object (op) is going to get inserted above.
1333	*/	1374	*/
1334		1375
1335	/* First object on this space */	1376	/* First object on this space */
1336	if (!top)	1377	if (!top)
1337	{	1378	{
1338	op->above = GET_MAP_OB (op->map, op->x, op->y);	1379	op->above = ms.bot;
1339		1380
1340	if (op->above)	1381	if (op->above)
1341	op->above->below = op;	1382	op->above->below = op;
1342		1383
1343	op->below = 0;	1384	op->below = 0;
1344	op->ms ().bot = op;	1385	ms.bot = op;
1345	}	1386	}
1346	else	1387	else
1347	{ /* get inserted into the stack above top */	1388	{ /* get inserted into the stack above top */
1348	op->above = top->above;	1389	op->above = top->above;
1349		1390
…		…
1353	op->below = top;	1394	op->below = top;
1354	top->above = op;	1395	top->above = op;
1355	}	1396	}
1356		1397
1357	if (!op->above)	1398	if (!op->above)
1358	op->ms ().top = op;	1399	ms.top = op;
1359	} /* else not INS_BELOW_ORIGINATOR */	1400	} /* else not INS_BELOW_ORIGINATOR */
1360		1401
1361	if (op->type == PLAYER)	1402	if (op->type == PLAYER)
1362	{	1403	{
1363	op->contr->do_los = 1;	1404	op->contr->do_los = 1;
1364	++op->map->players;	1405	++op->map->players;
1365	op->map->last_access = runtime;	1406	op->map->touch ();
1366	}	1407	}
1367		1408
1368	/* If we have a floor, we know the player, if any, will be above	1409	op->map->dirty = true;
1369	* it, so save a few ticks and start from there.	1410
1370	*/
1371	if (!(flag & INS_MAP_LOAD))	1411	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1412	if (object *pl = ms.player ())
1373	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1413	pl->contr->ns->floorbox_update ();
1375		1414
1376	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1416	* 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	1417	* 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	1418	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1419	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1420	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1421	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1422	* of effect may be sufficient.
1384	*/	1423	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1424	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1425	update_all_los (op->map, op->x, op->y);
1387		1426
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1437	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1438	* update_object().
1400	*/	1439	*/
1401		1440
1402	/* if this is not the head or flag has been passed, don't check walk on status */	1441	/* 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)	1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1443	{
1405	if (check_move_on (op, originator))	1444	if (check_move_on (op, originator))
1406	return 0;	1445	return 0;
1407		1446
1408	/* If we are a multi part object, lets work our way through the check	1447	/* If we are a multi part object, lets work our way through the check
1409	* walk on's.	1448	* walk on's.
1410	*/	1449	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1450	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1451	if (check_move_on (tmp, originator))
1413	return 0;	1452	return 0;
1414	}	1453	}
1415		1454
1416	return op;	1455	return op;
…		…
1425	{	1464	{
1426	object *tmp, *tmp1;	1465	object *tmp, *tmp1;
1427		1466
1428	/* first search for itself and remove any old instances */	1467	/* first search for itself and remove any old instances */
1429		1468
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1471	tmp->destroy ();
1433		1472
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1473	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1474
1436	tmp1->x = op->x;	1475	tmp1->x = op->x;
…		…
1439	}	1478	}
1440		1479
1441	object *	1480	object *
1442	object::insert_at (object *where, object *originator, int flags)	1481	object::insert_at (object *where, object *originator, int flags)
1443	{	1482	{
1444	where->map->insert (this, where->x, where->y, originator, flags);	1483	return where->map->insert (this, where->x, where->y, originator, flags);
1445	}	1484	}
1446		1485
1447	/*	1486	/*
1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1487	* 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	1488	* is returned contains nr objects, and the remaining parts contains
…		…
1489	* the amount of an object. If the amount reaches 0, the object	1528	* the amount of an object. If the amount reaches 0, the object
1490	* is subsequently removed and freed.	1529	* is subsequently removed and freed.
1491	*	1530	*
1492	* Return value: 'op' if something is left, NULL if the amount reached 0	1531	* Return value: 'op' if something is left, NULL if the amount reached 0
1493	*/	1532	*/
1494
1495	object *	1533	object *
1496	decrease_ob_nr (object *op, uint32 i)	1534	decrease_ob_nr (object *op, uint32 i)
1497	{	1535	{
1498	object *tmp;	1536	object *tmp;
1499		1537
…		…
1574		1612
1575	/*	1613	/*
1576	* add_weight(object, weight) adds the specified weight to an object,	1614	* add_weight(object, weight) adds the specified weight to an object,
1577	* and also updates how much the environment(s) is/are carrying.	1615	* and also updates how much the environment(s) is/are carrying.
1578	*/	1616	*/
1579
1580	void	1617	void
1581	add_weight (object *op, signed long weight)	1618	add_weight (object *op, signed long weight)
1582	{	1619	{
1583	while (op != NULL)	1620	while (op != NULL)
1584	{	1621	{
…		…
1599	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1636	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1600	free (dump);	1637	free (dump);
1601	return op;	1638	return op;
1602	}	1639	}
1603		1640
1604	if (where->head)	1641	if (where->head_ () != where)
1605	{	1642	{
1606	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1643	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1607	where = where->head;	1644	where = where->head;
1608	}	1645	}
1609		1646
1610	return where->insert (op);	1647	return where->insert (op);
1611	}	1648	}
…		…
1616	* inside the object environment.	1653	* inside the object environment.
1617	*	1654	*
1618	* The function returns now pointer to inserted item, and return value can	1655	* The function returns now pointer to inserted item, and return value can
1619	* be != op, if items are merged. -Tero	1656	* be != op, if items are merged. -Tero
1620	*/	1657	*/
1621
1622	object *	1658	object *
1623	object::insert (object *op)	1659	object::insert (object *op)
1624	{	1660	{
1625	object *tmp, *otmp;
1626
1627	if (!QUERY_FLAG (op, FLAG_REMOVED))	1661	if (!QUERY_FLAG (op, FLAG_REMOVED))
1628	op->remove ();	1662	op->remove ();
1629		1663
1630	if (op->more)	1664	if (op->more)
1631	{	1665	{
…		…
1633	return op;	1667	return op;
1634	}	1668	}
1635		1669
1636	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1670	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1637	CLEAR_FLAG (op, FLAG_REMOVED);	1671	CLEAR_FLAG (op, FLAG_REMOVED);
		1672
1638	if (op->nrof)	1673	if (op->nrof)
1639	{	1674	{
1640	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1675	for (object *tmp = inv; tmp; tmp = tmp->below)
1641	if (object::can_merge (tmp, op))	1676	if (object::can_merge (tmp, op))
1642	{	1677	{
1643	/* return the original object and remove inserted object	1678	/* return the original object and remove inserted object
1644	(client needs the original object) */	1679	(client needs the original object) */
1645	tmp->nrof += op->nrof;	1680	tmp->nrof += op->nrof;
…		…
1664	add_weight (this, op->weight * op->nrof);	1699	add_weight (this, op->weight * op->nrof);
1665	}	1700	}
1666	else	1701	else
1667	add_weight (this, (op->weight + op->carrying));	1702	add_weight (this, (op->weight + op->carrying));
1668		1703
1669	otmp = this->in_player ();	1704	if (object *otmp = this->in_player ())
1670	if (otmp && otmp->contr)
1671	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1705	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1672	otmp->update_stats ();	1706	otmp->update_stats ();
1673		1707
		1708	op->owner = 0; // its his/hers now. period.
1674	op->map = 0;	1709	op->map = 0;
1675	op->env = this;	1710	op->env = this;
1676	op->above = 0;	1711	op->above = 0;
1677	op->below = 0;	1712	op->below = 0;
1678	op->x = 0, op->y = 0;	1713	op->x = op->y = 0;
1679		1714
1680	/* reset the light list and los of the players on the map */	1715	/* reset the light list and los of the players on the map */
1681	if ((op->glow_radius != 0) && map)	1716	if (op->glow_radius && map)
1682	{	1717	{
1683	#ifdef DEBUG_LIGHTS	1718	#ifdef DEBUG_LIGHTS
1684	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1719	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1685	#endif /* DEBUG_LIGHTS */	1720	#endif /* DEBUG_LIGHTS */
1686	if (map->darkness)	1721	if (map->darkness)
…		…
1758		1793
1759	/* The objects have to be checked from top to bottom.	1794	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1795	* Hence, we first go to the top:
1761	*/	1796	*/
1762		1797
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1798	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1799	{
1765	/* Trim the search when we find the first other spell effect	1800	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1801	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1802	* we don't need to check all of them.
1768	*/	1803	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1821	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))	1822	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1823	{
1789		1824
1790	float	1825	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1826	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1827
1793	if (op->type == PLAYER)	1828	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1829	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)))	1830	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1831	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1861	* The first matching object is returned, or NULL if none.
1827	*/	1862	*/
1828	object *	1863	object *
1829	present_arch (const archetype *at, maptile *m, int x, int y)	1864	present_arch (const archetype *at, maptile *m, int x, int y)
1830	{	1865	{
1831	if (m == NULL || out_of_map (m, x, y))	1866	if (!m || out_of_map (m, x, y))
1832	{	1867	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1868	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1869	return NULL;
1835	}	1870	}
1836		1871
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1872	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1873	if (tmp->arch == at)
1839	return tmp;	1874	return tmp;
1840		1875
1841	return NULL;	1876	return NULL;
1842	}	1877	}
…		…
1853	{	1888	{
1854	LOG (llevError, "Present called outside map.\n");	1889	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1890	return NULL;
1856	}	1891	}
1857		1892
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1893	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1894	if (tmp->type == type)
1860	return tmp;	1895	return tmp;
1861		1896
1862	return NULL;	1897	return NULL;
1863	}	1898	}
…		…
1940	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1975	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1941	{	1976	{
1942	CLEAR_FLAG (tmp, flag);	1977	CLEAR_FLAG (tmp, flag);
1943	unflag_inv (tmp, flag);	1978	unflag_inv (tmp, flag);
1944	}	1979	}
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	}	1980	}
1959		1981
1960	/*	1982	/*
1961	* find_free_spot(object, map, x, y, start, stop) will search for	1983	* 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	1984	* a spot at the given map and coordinates which will be able to contain
…		…
2003	}	2025	}
2004		2026
2005	if (!index)	2027	if (!index)
2006	return -1;	2028	return -1;
2007		2029
2008	return altern[RANDOM () % index];	2030	return altern [rndm (index)];
2009	}	2031	}
2010		2032
2011	/*	2033	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2034	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2035	* find_free_spot(), but it will search max number of squares.
…		…
2034	{	2056	{
2035	arr += begin;	2057	arr += begin;
2036	end -= begin;	2058	end -= begin;
2037		2059
2038	while (--end)	2060	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2061	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2062	}
2041		2063
2042	/* new function to make monster searching more efficient, and effective!	2064	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2065	* 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	2066	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2102	object *tmp;
2081	maptile *mp;	2103	maptile *mp;
2082		2104
2083	MoveType blocked, move_type;	2105	MoveType blocked, move_type;
2084		2106
2085	if (exclude && exclude->head)	2107	if (exclude && exclude->head_ () != exclude)
2086	{	2108	{
2087	exclude = exclude->head;	2109	exclude = exclude->head;
2088	move_type = exclude->move_type;	2110	move_type = exclude->move_type;
2089	}	2111	}
2090	else	2112	else
…		…
2113	max = maxfree[i];	2135	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2136	else if (mflags & P_IS_ALIVE)
2115	{	2137	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2138	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2139	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2140	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2141	break;
2120		2142
2121	if (tmp)	2143	if (tmp)
2122	return freedir[i];	2144	return freedir[i];
2123	}	2145	}
…		…
2178		2200
2179	return 3;	2201	return 3;
2180	}	2202	}
2181		2203
2182	/*	2204	/*
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	2205	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2206	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2207	*/
2204
2205	int	2208	int
2206	dirdiff (int dir1, int dir2)	2209	dirdiff (int dir1, int dir2)
2207	{	2210	{
2208	int d;	2211	int d;
2209		2212
…		…
2322	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2325	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323	* core dumps if they do.	2326	* core dumps if they do.
2324	*	2327	*
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2328	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2329	*/
2327
2328	int	2330	int
2329	can_pick (const object *who, const object *item)	2331	can_pick (const object *who, const object *item)
2330	{	2332	{
2331	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2333	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2334	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2337	* create clone from object to another	2339	* create clone from object to another
2338	*/	2340	*/
2339	object *	2341	object *
2340	object_create_clone (object *asrc)	2342	object_create_clone (object *asrc)
2341	{	2343	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2344	object *dst = 0, *tmp, *src, *prev, *item;
2343		2345
2344	if (!asrc)	2346	if (!asrc)
2345	return 0;	2347	return 0;
2346		2348
2347	src = asrc;
2348	if (src->head)
2349	src = src->head;	2349	src = asrc->head_ ();
2350		2350
2351	prev = 0;	2351	prev = 0;
2352	for (part = src; part; part = part->more)	2352	for (object *part = src; part; part = part->more)
2353	{	2353	{
2354	tmp = part->clone ();	2354	tmp = part->clone ();
2355	tmp->x -= src->x;	2355	tmp->x -= src->x;
2356	tmp->y -= src->y;	2356	tmp->y -= src->y;
2357		2357
…		…
2375	insert_ob_in_ob (object_create_clone (item), dst);	2375	insert_ob_in_ob (object_create_clone (item), dst);
2376		2376
2377	return dst;	2377	return dst;
2378	}	2378	}
2379		2379
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	2380	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2381	* has the same type and subtype match.
2420	* returns NULL if no match.	2382	* returns NULL if no match.
2421	*/	2383	*/
2422	object *	2384	object *
…		…
2475	if (link->key == canonical_key)	2437	if (link->key == canonical_key)
2476	return link->value;	2438	return link->value;
2477		2439
2478	return 0;	2440	return 0;
2479	}	2441	}
2480
2481		2442
2482	/*	2443	/*
2483	* Updates the canonical_key in op to value.	2444	* Updates the canonical_key in op to value.
2484	*	2445	*
2485	* canonical_key is a shared string (value doesn't have to be).	2446	* canonical_key is a shared string (value doesn't have to be).
…		…
2509	/* Basically, if the archetype has this key set,	2470	/* Basically, if the archetype has this key set,
2510	* we need to store the null value so when we save	2471	* we need to store the null value so when we save
2511	* it, we save the empty value so that when we load,	2472	* it, we save the empty value so that when we load,
2512	* we get this value back again.	2473	* we get this value back again.
2513	*/	2474	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))	2475	if (get_ob_key_link (op->arch, canonical_key))
2515	field->value = 0;	2476	field->value = 0;
2516	else	2477	else
2517	{	2478	{
2518	if (last)	2479	if (last)
2519	last->next = field->next;	2480	last->next = field->next;
…		…
2588	}	2549	}
2589	else	2550	else
2590	item = item->env;	2551	item = item->env;
2591	}	2552	}
2592		2553
2593
2594	const char *	2554	const char *
2595	object::flag_desc (char *desc, int len) const	2555	object::flag_desc (char *desc, int len) const
2596	{	2556	{
2597	char *p = desc;	2557	char *p = desc;
2598	bool first = true;	2558	bool first = true;
		2559
		2560	*p = 0;
2599		2561
2600	for (int i = 0; i < NUM_FLAGS; i++)	2562	for (int i = 0; i < NUM_FLAGS; i++)
2601	{	2563	{
2602	if (len <= 10) // magic constant!	2564	if (len <= 10) // magic constant!
2603	{	2565	{
2604	snprintf (p, len, ",...");	2566	snprintf (p, len, ",...");
2605	break;	2567	break;
2606	}	2568	}
2607		2569
2608	if (flag[i])	2570	if (flag [i])
2609	{	2571	{
2610	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2572	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611	len -= cnt;	2573	len -= cnt;
2612	p += cnt;	2574	p += cnt;
2613	first = false;	2575	first = false;
…		…
2615	}	2577	}
2616		2578
2617	return desc;	2579	return desc;
2618	}	2580	}
2619		2581
2620	// return a suitable string describing an objetc in enough detail to find it	2582	// return a suitable string describing an object in enough detail to find it
2621	const char *	2583	const char *
2622	object::debug_desc (char *info) const	2584	object::debug_desc (char *info) const
2623	{	2585	{
2624	char flagdesc[512];	2586	char flagdesc[512];
2625	char info2[256 * 4];	2587	char info2[256 * 4];
2626	char *p = info;	2588	char *p = info;
2627		2589
2628	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2590	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629	count, uuid.seq,	2591	count, uuid.seq,
2630	&name,	2592	&name,
2631	title ? "\",title:" : "",	2593	title ? "\",title:\"" : "",
2632	title ? (const char *)title : "",	2594	title ? (const char *)title : "",
2633	flag_desc (flagdesc, 512), type);	2595	flag_desc (flagdesc, 512), type);
2634		2596
2635	if (env)	2597	if (!this->flag[FLAG_REMOVED] && env)
2636	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2598	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2637		2599
2638	if (map)	2600	if (map)
2639	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2601	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2640		2602
…		…
2642	}	2604	}
2643		2605
2644	const char *	2606	const char *
2645	object::debug_desc () const	2607	object::debug_desc () const
2646	{	2608	{
2647	static char info[256 * 3];	2609	static char info[3][256 * 4];
		2610	static int info_idx;
		2611
2648	return debug_desc (info);	2612	return debug_desc (info [++info_idx % 3]);
2649	}	2613	}
2650		2614
		2615	struct region *
		2616	object::region () const
		2617	{
		2618	return map ? map->region (x, y)
		2619	: region::default_region ();
		2620	}
		2621
		2622	const materialtype_t *
		2623	object::dominant_material () const
		2624	{
		2625	if (materialtype_t *mt = name_to_material (materialname))
		2626	return mt;
		2627
		2628	return name_to_material (shstr_unknown);
		2629	}
		2630
		2631	void
		2632	object::open_container (object *new_container)
		2633	{
		2634	if (container == new_container)
		2635	return;
		2636
		2637	if (object *old_container = container)
		2638	{
		2639	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2640	return;
		2641
		2642	#if 0
		2643	// remove the "Close old_container" object.
		2644	if (object *closer = old_container->inv)
		2645	if (closer->type == CLOSE_CON)
		2646	closer->destroy ();
		2647	#endif
		2648
		2649	old_container->flag [FLAG_APPLIED] = 0;
		2650	container = 0;
		2651
		2652	esrv_update_item (UPD_FLAGS, this, old_container);
		2653	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2654	play_sound (sound_find ("chest_close"));
		2655	}
		2656
		2657	if (new_container)
		2658	{
		2659	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2660	return;
		2661
		2662	// TODO: this does not seem to serve any purpose anymore?
		2663	#if 0
		2664	// insert the "Close Container" object.
		2665	if (archetype *closer = new_container->other_arch)
		2666	{
		2667	object *closer = arch_to_object (new_container->other_arch);
		2668	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2669	new_container->insert (closer);
		2670	}
		2671	#endif
		2672
		2673	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2674
		2675	new_container->flag [FLAG_APPLIED] = 1;
		2676	container = new_container;
		2677
		2678	esrv_update_item (UPD_FLAGS, this, new_container);
		2679	esrv_send_inventory (this, new_container);
		2680	play_sound (sound_find ("chest_open"));
		2681	}
		2682	}
		2683
		2684	object *
		2685	object::force_find (const shstr name)
		2686	{
		2687	/* cycle through his inventory to look for the MARK we want to
		2688	* place
		2689	*/
		2690	for (object *tmp = inv; tmp; tmp = tmp->below)
		2691	if (tmp->type == FORCE && tmp->slaying == name)
		2692	return splay (tmp);
		2693
		2694	return 0;
		2695	}
		2696
		2697	void
		2698	object::force_add (const shstr name, int duration)
		2699	{
		2700	if (object *force = force_find (name))
		2701	force->destroy ();
		2702
		2703	object *force = get_archetype (FORCE_NAME);
		2704
		2705	force->slaying = name;
		2706	force->stats.food = 1;
		2707	force->speed_left = -1.f;
		2708
		2709	force->set_speed (duration ? 1.f / duration : 0.f);
		2710	force->flag [FLAG_IS_USED_UP] = true;
		2711	force->flag [FLAG_APPLIED] = true;
		2712
		2713	insert (force);
		2714	}
		2715
		2716	void
		2717	object::play_sound (faceidx sound) const
		2718	{
		2719	if (!sound)
		2720	return;
		2721
		2722	if (flag [FLAG_REMOVED])
		2723	return;
		2724
		2725	if (env)
		2726	{
		2727	if (object *pl = in_player ())
		2728	pl->contr->play_sound (sound);
		2729	}
		2730	else
		2731	map->play_sound (sound, x, y);
		2732	}
		2733

Diff Legend

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