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.98 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 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
374	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
375	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
376	*/	378	*/
377
378	object *	379	object *
379	get_nearest_part (object *op, const object *pl)	380	get_nearest_part (object *op, const object *pl)
380	{	381	{
381	object *tmp, *closest;	382	object *tmp, *closest;
382	int last_dist, i;	383	int last_dist, i;
…		…
390	}	391	}
391		392
392	/*	393	/*
393	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
394	*/	395	*/
395
396	object *	396	object *
397	find_object (tag_t i)	397	find_object (tag_t i)
398	{	398	{
399	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
400	if (op->count == i)	400	if (op->count == i)
401	return op;	401	return op;
402		402
403	return 0;	403	return 0;
404	}	404	}
405		405
406	/*	406	/*
407	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
410	*/	410	*/
411
412	object *	411	object *
413	find_object_name (const char *str)	412	find_object_name (const char *str)
414	{	413	{
415	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
416	object *op;	415	object *op;
417		416
418	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
419	if (op->name == str_)	418	if (op->name == str_)
420	break;	419	break;
421		420
422	return op;	421	return op;
423	}	422	}
…		…
429	}	428	}
430		429
431	/*	430	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
434	*/	434	*/
435	void	435	void
436	object::set_owner (object *owner)	436	object::set_owner (object *owner)
437	{	437	{
		438	// allow objects which own objects
438	if (!owner)	439	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)	440	while (owner->owner)
449	owner = owner->owner;	441	owner = owner->owner;
450		442
451	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
452	}	510	}
453		511
454	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	513	* refcounts and freeing the links.
456	*/	514	*/
457	static void	515	static void
458	free_key_values (object *op)	516	free_key_values (object *op)
459	{	517	{
460	for (key_value *i = op->key_values; i != 0;)	518	for (key_value *i = op->key_values; i; )
461	{	519	{
462	key_value *next = i->next;	520	key_value *next = i->next;
463	delete i;	521	delete i;
464		522
465	i = next;	523	i = next;
466	}	524	}
467		525
468	op->key_values = 0;	526	op->key_values = 0;
469	}	527	}
470		528
471	/*	529	object &
472	* copy_to first frees everything allocated by the dst object,	530	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	{	531	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	532	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	533	bool is_removed = flag [FLAG_REMOVED];
484		534
485	*(object_copy *)dst = *this;	535	*(object_copy *)this = src;
486		536
487	if (is_freed)	537	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	538	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		539
496	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
497	if (key_values)	541	if (src.key_values)
498	{	542	{
499	key_value *tail = 0;	543	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	544	key_values = 0;
503		545
504	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
505	{	547	{
506	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
507		549
508	new_link->next = 0;	550	new_link->next = 0;
509	new_link->key = i->key;	551	new_link->key = i->key;
510	new_link->value = i->value;	552	new_link->value = i->value;
511		553
512	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
513	if (!dst->key_values)	555	if (!key_values)
514	{	556	{
515	dst->key_values = new_link;	557	key_values = new_link;
516	tail = new_link;	558	tail = new_link;
517	}	559	}
518	else	560	else
519	{	561	{
520	tail->next = new_link;	562	tail->next = new_link;
521	tail = new_link;	563	tail = new_link;
522	}	564	}
523	}	565	}
524	}	566	}
		567	}
		568
		569	/*
		570	* copy_to first frees everything allocated by the dst object,
		571	* and then copies the contents of itself into the second
		572	* object, allocating what needs to be allocated. Basically, any
		573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		574	* if the first object is freed, the pointers in the new object
		575	* will point at garbage.
		576	*/
		577	void
		578	object::copy_to (object *dst)
		579	{
		580	*dst = *this;
		581
		582	if (speed < 0)
		583	dst->speed_left -= rndm ();
525		584
526	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
		586	}
		587
		588	void
		589	object::instantiate ()
		590	{
		591	if (!uuid.seq) // HACK
		592	uuid = gen_uuid ();
		593
		594	speed_left = -0.1f;
		595	/* copy the body_info to the body_used - this is only really
		596	* need for monsters, but doesn't hurt to do it for everything.
		597	* by doing so, when a monster is created, it has good starting
		598	* values for the body_used info, so when items are created
		599	* for it, they can be properly equipped.
		600	*/
		601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
		603
		604	attachable::instantiate ();
527	}	605	}
528		606
529	object *	607	object *
530	object::clone ()	608	object::clone ()
531	{	609	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
590	*/	668	*/
591	void	669	void
592	update_object (object *op, int action)	670	update_object (object *op, int action)
593	{	671	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	672	if (op == NULL)
597	{	673	{
598	/* this should never happen */	674	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	676	return;
…		…
624	return;	700	return;
625	}	701	}
626		702
627	mapspace &m = op->ms ();	703	mapspace &m = op->ms ();
628		704
629	if (m.flags_ & P_NEED_UPDATE)	705	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	706	/* nop */;
631	else if (action == UP_OBJ_INSERT)	707	else if (action == UP_OBJ_INSERT)
632	{	708	{
633	// this is likely overkill, TODO: revisit (schmorp)	709	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	710	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	719	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	720	* to have move_allow right now.
645	*/	721	*/
646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	722	|| ((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)	723	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = P_NEED_UPDATE;	724	m.flags_ = 0;
649	}	725	}
650	/* if the object is being removed, we can't make intelligent	726	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	727	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	728	* that is being removed.
653	*/	729	*/
654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	730	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	731	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	732	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	733	/* Nothing to do for that case */ ;
658	else	734	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	735	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		736
661	if (op->more)	737	if (op->more)
662	update_object (op->more, action);	738	update_object (op->more, action);
663	}	739	}
664		740
665	object *object::first;
666
667	object::object ()	741	object::object ()
668	{	742	{
669	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
670		744
671	expmul = 1.0;	745	expmul = 1.0;
672	face = blank_face;	746	face = blank_face;
673	}	747	}
674		748
675	object::~object ()	749	object::~object ()
676	{	750	{
		751	unlink ();
		752
677	free_key_values (this);	753	free_key_values (this);
678	}	754	}
679		755
		756	static int object_count;
		757
680	void object::link ()	758	void object::link ()
681	{	759	{
682	count = ++ob_count;	760	assert (!index);//D
683	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
684		763
685	prev = 0;	764	refcnt_inc ();
686	next = object::first;	765	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	766	}
693		767
694	void object::unlink ()	768	void object::unlink ()
695	{	769	{
696	if (this == object::first)	770	if (!index)
697	object::first = next;	771	return;
698		772
699	/* Remove this object from the list of used objects */	773	objects.erase (this);
700	if (prev) prev->next = next;	774	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next || active_prev || this == active_objects;
711	}	775	}
712		776
713	void	777	void
714	object::activate ()	778	object::activate ()
715	{	779	{
716	/* If already on active list, don't do anything */	780	/* If already on active list, don't do anything */
717	if (active ())	781	if (active)
718	return;	782	return;
719		783
720	if (has_active_speed ())	784	if (has_active_speed ())
721	{	785	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	786	}
732		787
733	void	788	void
734	object::activate_recursive ()	789	object::activate_recursive ()
735	{	790	{
736	activate ();	791	activate ();
737		792
738	for (object *op = inv; op; op = op->above)	793	for (object *op = inv; op; op = op->below)
739	op->activate_recursive ();	794	op->activate_recursive ();
740	}	795	}
741		796
742	/* This function removes object 'op' from the list of active	797	/* This function removes object 'op' from the list of active
743	* objects.	798	* objects.
…		…
749	*/	804	*/
750	void	805	void
751	object::deactivate ()	806	object::deactivate ()
752	{	807	{
753	/* If not on the active list, nothing needs to be done */	808	/* If not on the active list, nothing needs to be done */
754	if (!active ())	809	if (!active)
755	return;	810	return;
756		811
757	if (active_prev == 0)	812	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	813	}
773		814
774	void	815	void
775	object::deactivate_recursive ()	816	object::deactivate_recursive ()
776	{	817	{
777	for (object *op = inv; op; op = op->above)	818	for (object *op = inv; op; op = op->below)
778	op->deactivate_recursive ();	819	op->deactivate_recursive ();
779		820
780	deactivate ();	821	deactivate ();
		822	}
		823
		824	void
		825	object::set_flag_inv (int flag, int value)
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	{
		829	op->flag [flag] = value;
		830	op->set_flag_inv (flag, value);
		831	}
781	}	832	}
782		833
783	/*	834	/*
784	* Remove and free all objects in the inventory of the given object.	835	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	836	* object.c ?
…		…
800	* drop on that space.	851	* drop on that space.
801	*/	852	*/
802	if (!drop_to_ground	853	if (!drop_to_ground
803	|| !map	854	|| !map
804	|| map->in_memory != MAP_IN_MEMORY	855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
805	|| ms ().move_block == MOVE_ALL)	857	|| ms ().move_block == MOVE_ALL)
806	{	858	{
807	while (inv)	859	while (inv)
808	{	860	{
809	inv->destroy_inv (drop_to_ground);	861	inv->destroy_inv (drop_to_ground);
…		…
818		870
819	if (op->flag [FLAG_STARTEQUIP]	871	if (op->flag [FLAG_STARTEQUIP]
820	|| op->flag [FLAG_NO_DROP]	872	|| op->flag [FLAG_NO_DROP]
821	|| op->type == RUNE	873	|| op->type == RUNE
822	|| op->type == TRAP	874	|| op->type == TRAP
823	|| op->flag [FLAG_IS_A_TEMPLATE])	875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	877	op->destroy ();
825	else	878	else
826	map->insert (op, x, y);	879	map->insert (op, x, y);
827	}	880	}
828	}	881	}
…		…
836	}	889	}
837		890
838	void	891	void
839	object::do_destroy ()	892	object::do_destroy ()
840	{	893	{
		894	attachable::do_destroy ();
		895
841	if (flag [FLAG_IS_LINKED])	896	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	897	remove_button_link (this);
843		898
844	if (flag [FLAG_FRIENDLY])	899	if (flag [FLAG_FRIENDLY])
845	remove_friendly_object (this);	900	remove_friendly_object (this);
846		901
847	if (!flag [FLAG_REMOVED])	902	if (!flag [FLAG_REMOVED])
848	remove ();	903	remove ();
849		904
850	if (flag [FLAG_FREED])	905	destroy_inv (true);
851	return;
852		906
853	set_speed (0);	907	deactivate ();
		908	unlink ();
854		909
855	flag [FLAG_FREED] = 1;	910	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		911
862	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
863	{	913	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	914	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		915
…		…
870	freed_map->name = "/internal/freed_objects_map";	920	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;	921	freed_map->width = 3;
872	freed_map->height = 3;	922	freed_map->height = 3;
873		923
874	freed_map->alloc ();	924	freed_map->alloc ();
		925	freed_map->in_memory = MAP_IN_MEMORY;
875	}	926	}
876		927
877	map = freed_map;	928	map = freed_map;
878	x = 1;	929	x = 1;
879	y = 1;	930	y = 1;
880	}	931	}
881		932
882	head = 0;
883
884	if (more)	933	if (more)
885	{	934	{
886	more->destroy ();	935	more->destroy ();
887	more = 0;	936	more = 0;
888	}	937	}
889		938
		939	head = 0;
		940
890	// clear those pointers that likely might have circular references to us	941	// clear those pointers that likely might cause circular references
891	owner = 0;	942	owner = 0;
892	enemy = 0;	943	enemy = 0;
893	attacked_by = 0;	944	attacked_by = 0;
894		945	current_weapon = 0;
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	946	}
898		947
899	void	948	void
900	object::destroy (bool destroy_inventory)	949	object::destroy (bool destroy_inventory)
901	{	950	{
902	if (destroyed ())	951	if (destroyed ())
903	return;	952	return;
904		953
905	if (destroy_inventory)	954	if (destroy_inventory)
906	destroy_inv (false);	955	destroy_inv (false);
		956
		957	if (is_head ())
		958	if (sound_destroy)
		959	play_sound (sound_destroy);
		960	else if (flag [FLAG_MONSTER])
		961	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907		962
908	attachable::destroy ();	963	attachable::destroy ();
909	}	964	}
910		965
911	/*	966	/*
…		…
929	* This function removes the object op from the linked list of objects	984	* This function removes the object op from the linked list of objects
930	* which it is currently tied to. When this function is done, the	985	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	986	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	987	* environment, the x and y coordinates will be updated to
933	* the previous environment.	988	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	989	*/
936	void	990	void
937	object::remove ()	991	object::do_remove ()
938	{	992	{
939	object *tmp, *last = 0;	993	object *tmp, *last = 0;
940	object *otmp;	994	object *otmp;
941		995
942	if (QUERY_FLAG (this, FLAG_REMOVED))	996	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
985	}	1039	}
986	else if (map)	1040	else if (map)
987	{	1041	{
988	if (type == PLAYER)	1042	if (type == PLAYER)
989	{	1043	{
		1044	// leaving a spot always closes any open container on the ground
		1045	if (container && !container->env)
		1046	// this causes spurious floorbox updates, but it ensures
		1047	// that the CLOSE event is being sent.
		1048	close_container ();
		1049
990	--map->players;	1050	--map->players;
991	map->last_access = runtime;	1051	map->touch ();
992	}	1052	}
993		1053
994	map->dirty = true;	1054	map->dirty = true;
		1055	mapspace &ms = this->ms ();
995		1056
996	/* link the object above us */	1057	/* link the object above us */
997	if (above)	1058	if (above)
998	above->below = below;	1059	above->below = below;
999	else	1060	else
1000	map->at (x, y).top = below; /* we were top, set new top */	1061	ms.top = below; /* we were top, set new top */
1001		1062
1002	/* Relink the object below us, if there is one */	1063	/* Relink the object below us, if there is one */
1003	if (below)	1064	if (below)
1004	below->above = above;	1065	below->above = above;
1005	else	1066	else
…		…
1007	/* Nothing below, which means we need to relink map object for this space	1068	/* Nothing below, which means we need to relink map object for this space
1008	* use translated coordinates in case some oddness with map tiling is	1069	* use translated coordinates in case some oddness with map tiling is
1009	* evident	1070	* evident
1010	*/	1071	*/
1011	if (GET_MAP_OB (map, x, y) != this)	1072	if (GET_MAP_OB (map, x, y) != this)
1012	{
1013	char *dump = dump_object (this);
1014	LOG (llevError,
1015	"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);	1073	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 ());
1016	free (dump);
1017	dump = dump_object (GET_MAP_OB (map, x, y));
1018	LOG (llevError, "%s\n", dump);
1019	free (dump);
1020	}
1021		1074
1022	map->at (x, y).bot = above; /* goes on above it. */	1075	ms.bot = above; /* goes on above it. */
1023	}	1076	}
1024		1077
1025	above = 0;	1078	above = 0;
1026	below = 0;	1079	below = 0;
1027		1080
1028	if (map->in_memory == MAP_SAVING)	1081	if (map->in_memory == MAP_SAVING)
1029	return;	1082	return;
1030		1083
1031	int check_walk_off = !flag [FLAG_NO_APPLY];	1084	int check_walk_off = !flag [FLAG_NO_APPLY];
1032		1085
		1086	if (object *pl = ms.player ())
		1087	{
		1088	if (pl->container == this)
		1089	/* If a container that the player is currently using somehow gets
		1090	* removed (most likely destroyed), update the player view
		1091	* appropriately.
		1092	*/
		1093	pl->close_container ();
		1094
		1095	pl->contr->ns->floorbox_update ();
		1096	}
		1097
1033	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1098	for (tmp = ms.bot; tmp; tmp = tmp->above)
1034	{	1099	{
1035	/* No point updating the players look faces if he is the object	1100	/* No point updating the players look faces if he is the object
1036	* being removed.	1101	* being removed.
1037	*/	1102	*/
1038
1039	if (tmp->type == PLAYER && tmp != this)
1040	{
1041	/* If a container that the player is currently using somehow gets
1042	* removed (most likely destroyed), update the player view
1043	* appropriately.
1044	*/
1045	if (tmp->container == this)
1046	{
1047	flag [FLAG_APPLIED] = 0;
1048	tmp->container = 0;
1049	}
1050
1051	if (tmp->contr->ns)
1052	tmp->contr->ns->floorbox_update ();
1053	}
1054		1103
1055	/* See if object moving off should effect something */	1104	/* See if object moving off should effect something */
1056	if (check_walk_off	1105	if (check_walk_off
1057	&& ((move_type & tmp->move_off)	1106	&& ((move_type & tmp->move_off)
1058	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1107	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1061		1110
1062	if (destroyed ())	1111	if (destroyed ())
1063	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1112	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1064	}	1113	}
1065		1114
1066	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1067	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1068	if (tmp->above == tmp)
1069	tmp->above = 0;
1070
1071	last = tmp;	1115	last = tmp;
1072	}	1116	}
1073		1117
1074	/* last == NULL if there are no objects on this space */	1118	/* last == NULL if there are no objects on this space */
1075	//TODO: this makes little sense, why only update the topmost object?	1119	//TODO: this makes little sense, why only update the topmost object?
1076	if (!last)	1120	if (!last)
1077	map->at (x, y).flags_ = P_NEED_UPDATE;	1121	map->at (x, y).flags_ = 0;
1078	else	1122	else
1079	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1080		1124
1081	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1125	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1082	update_all_los (map, x, y);	1126	update_all_los (map, x, y);
…		…
1118	}	1162	}
1119		1163
1120	return 0;	1164	return 0;
1121	}	1165	}
1122		1166
		1167	void
		1168	object::expand_tail ()
		1169	{
		1170	if (more)
		1171	return;
		1172
		1173	object *prev = this;
		1174
		1175	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1176	{
		1177	object *op = arch_to_object (at);
		1178
		1179	op->name = name;
		1180	op->name_pl = name_pl;
		1181	op->title = title;
		1182
		1183	op->head = this;
		1184	prev->more = op;
		1185
		1186	prev = op;
		1187	}
		1188	}
		1189
1123	/*	1190	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1191	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1192	* job preparing multi-part monsters.
1126	*/	1193	*/
1127	object *	1194	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1195	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1196	{
1130	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1197	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131	{	1198	{
1132	tmp->x = x + tmp->arch->clone.x;	1199	tmp->x = x + tmp->arch->x;
1133	tmp->y = y + tmp->arch->clone.y;	1200	tmp->y = y + tmp->arch->y;
1134	}	1201	}
1135		1202
1136	return insert_ob_in_map (op, m, originator, flag);	1203	return insert_ob_in_map (op, m, originator, flag);
1137	}	1204	}
1138		1205
…		…
1157	* just 'op' otherwise	1224	* just 'op' otherwise
1158	*/	1225	*/
1159	object *	1226	object *
1160	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1227	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161	{	1228	{
		1229	assert (!op->flag [FLAG_FREED]);
		1230
1162	object *tmp, *top, *floor = NULL;	1231	object *top, *floor = NULL;
1163	sint16 x, y;
1164		1232
1165	if (QUERY_FLAG (op, FLAG_FREED))	1233	op->remove ();
1166	{
1167	LOG (llevError, "Trying to insert freed object!\n");
1168	return NULL;
1169	}
1170
1171	if (!m)
1172	{
1173	char *dump = dump_object (op);
1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175	free (dump);
1176	return op;
1177	}
1178		1234
1179	if (out_of_map (m, op->x, op->y))	1235	if (out_of_map (m, op->x, op->y))
1180	{	1236	{
1181	char *dump = dump_object (op);
1182	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1237	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1183	#ifdef MANY_CORES	1238	#ifdef MANY_CORES
1184	/* Better to catch this here, as otherwise the next use of this object	1239	/* Better to catch this here, as otherwise the next use of this object
1185	* is likely to cause a crash. Better to find out where it is getting	1240	* is likely to cause a crash. Better to find out where it is getting
1186	* improperly inserted.	1241	* improperly inserted.
1187	*/	1242	*/
1188	abort ();	1243	abort ();
1189	#endif	1244	#endif
1190	free (dump);
1191	return op;	1245	return op;
1192	}	1246	}
1193		1247
1194	if (!QUERY_FLAG (op, FLAG_REMOVED))	1248	if (object *more = op->more)
1195	{	1249	if (!insert_ob_in_map (more, m, originator, flag))
1196	char *dump = dump_object (op);
1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198	free (dump);
1199	return op;	1250	return 0;
1200	}
1201
1202	if (op->more)
1203	{
1204	/* The part may be on a different map. */
1205
1206	object *more = op->more;
1207
1208	/* We really need the caller to normalize coordinates - if
1209	* we set the map, that doesn't work if the location is within
1210	* a map and this is straddling an edge. So only if coordinate
1211	* is clear wrong do we normalize it.
1212	*/
1213	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214	more->map = get_map_from_coord (m, &more->x, &more->y);
1215	else if (!more->map)
1216	{
1217	/* For backwards compatibility - when not dealing with tiled maps,
1218	* more->map should always point to the parent.
1219	*/
1220	more->map = m;
1221	}
1222
1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1224	{
1225	if (!op->head)
1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228	return 0;
1229	}
1230	}
1231		1251
1232	CLEAR_FLAG (op, FLAG_REMOVED);	1252	CLEAR_FLAG (op, FLAG_REMOVED);
1233		1253
1234	/* Ideally, the caller figures this out. However, it complicates a lot	1254	/* Ideally, the caller figures this out. However, it complicates a lot
1235	* of areas of callers (eg, anything that uses find_free_spot would now	1255	* of areas of callers (eg, anything that uses find_free_spot would now
1236	* need extra work	1256	* need extra work
1237	*/	1257	*/
1238	op->map = get_map_from_coord (m, &op->x, &op->y);	1258	if (!xy_normalise (m, op->x, op->y))
1239	x = op->x;	1259	return 0;
1240	y = op->y;	1260
		1261	op->map = m;
		1262	mapspace &ms = op->ms ();
1241		1263
1242	/* this has to be done after we translate the coordinates.	1264	/* this has to be done after we translate the coordinates.
1243	*/	1265	*/
1244	if (op->nrof && !(flag & INS_NO_MERGE))	1266	if (op->nrof && !(flag & INS_NO_MERGE))
1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1267	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1246	if (object::can_merge (op, tmp))	1268	if (object::can_merge (op, tmp))
1247	{	1269	{
1248	op->nrof += tmp->nrof;	1270	op->nrof += tmp->nrof;
1249	tmp->destroy ();	1271	tmp->destroy ();
1250	}	1272	}
…		…
1267	op->below = originator->below;	1289	op->below = originator->below;
1268		1290
1269	if (op->below)	1291	if (op->below)
1270	op->below->above = op;	1292	op->below->above = op;
1271	else	1293	else
1272	op->ms ().bot = op;	1294	ms.bot = op;
1273		1295
1274	/* since *below* originator, no need to update top */	1296	/* since *below* originator, no need to update top */
1275	originator->below = op;	1297	originator->below = op;
1276	}	1298	}
1277	else	1299	else
1278	{	1300	{
		1301	top = ms.bot;
		1302
1279	/* If there are other objects, then */	1303	/* If there are other objects, then */
1280	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1304	if ((!(flag & INS_MAP_LOAD)) && top)
1281	{	1305	{
1282	object *last = 0;	1306	object *last = 0;
1283		1307
1284	/*	1308	/*
1285	* If there are multiple objects on this space, we do some trickier handling.	1309	* If there are multiple objects on this space, we do some trickier handling.
…		…
1291	* once we get to them. This reduces the need to traverse over all of	1315	* once we get to them. This reduces the need to traverse over all of
1292	* them when adding another one - this saves quite a bit of cpu time	1316	* them when adding another one - this saves quite a bit of cpu time
1293	* when lots of spells are cast in one area. Currently, it is presumed	1317	* when lots of spells are cast in one area. Currently, it is presumed
1294	* that flying non pickable objects are spell objects.	1318	* that flying non pickable objects are spell objects.
1295	*/	1319	*/
1296	while (top)	1320	for (top = ms.bot; top; top = top->above)
1297	{	1321	{
1298	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1322	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1299	floor = top;	1323	floor = top;
1300		1324
1301	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1325	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1304	top = top->below;	1328	top = top->below;
1305	break;	1329	break;
1306	}	1330	}
1307		1331
1308	last = top;	1332	last = top;
1309	top = top->above;
1310	}	1333	}
1311		1334
1312	/* Don't want top to be NULL, so set it to the last valid object */	1335	/* Don't want top to be NULL, so set it to the last valid object */
1313	top = last;	1336	top = last;
1314		1337
…		…
1316	* looks like instead of lots of conditions here.	1339	* looks like instead of lots of conditions here.
1317	* makes things faster, and effectively the same result.	1340	* makes things faster, and effectively the same result.
1318	*/	1341	*/
1319		1342
1320	/* Have object 'fall below' other objects that block view.	1343	/* Have object 'fall below' other objects that block view.
1321	* Unless those objects are exits, type 66	1344	* Unless those objects are exits.
1322	* If INS_ON_TOP is used, don't do this processing	1345	* If INS_ON_TOP is used, don't do this processing
1323	* Need to find the object that in fact blocks view, otherwise	1346	* Need to find the object that in fact blocks view, otherwise
1324	* stacking is a bit odd.	1347	* stacking is a bit odd.
1325	*/	1348	*/
1326	if (!(flag & INS_ON_TOP) &&	1349	if (!(flag & INS_ON_TOP)
1327	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1350	&& ms.flags () & P_BLOCKSVIEW
		1351	&& (op->face && !faces [op->face].visibility))
1328	{	1352	{
1329	for (last = top; last != floor; last = last->below)	1353	for (last = top; last != floor; last = last->below)
1330	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1354	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331	break;	1355	break;
		1356
1332	/* Check to see if we found the object that blocks view,	1357	/* Check to see if we found the object that blocks view,
1333	* and make sure we have a below pointer for it so that	1358	* and make sure we have a below pointer for it so that
1334	* we can get inserted below this one, which requires we	1359	* we can get inserted below this one, which requires we
1335	* set top to the object below us.	1360	* set top to the object below us.
1336	*/	1361	*/
1337	if (last && last->below && last != floor)	1362	if (last && last->below && last != floor)
1338	top = last->below;	1363	top = last->below;
1339	}	1364	}
1340	} /* If objects on this space */	1365	} /* If objects on this space */
1341
1342	if (flag & INS_MAP_LOAD)	1366	if (flag & INS_MAP_LOAD)
1343	top = GET_MAP_TOP (op->map, op->x, op->y);	1367	top = ms.top;
1344		1368
1345	if (flag & INS_ABOVE_FLOOR_ONLY)	1369	if (flag & INS_ABOVE_FLOOR_ONLY)
1346	top = floor;	1370	top = floor;
1347		1371
1348	/* Top is the object that our object (op) is going to get inserted above.	1372	/* Top is the object that our object (op) is going to get inserted above.
1349	*/	1373	*/
1350		1374
1351	/* First object on this space */	1375	/* First object on this space */
1352	if (!top)	1376	if (!top)
1353	{	1377	{
1354	op->above = GET_MAP_OB (op->map, op->x, op->y);	1378	op->above = ms.bot;
1355		1379
1356	if (op->above)	1380	if (op->above)
1357	op->above->below = op;	1381	op->above->below = op;
1358		1382
1359	op->below = 0;	1383	op->below = 0;
1360	op->ms ().bot = op;	1384	ms.bot = op;
1361	}	1385	}
1362	else	1386	else
1363	{ /* get inserted into the stack above top */	1387	{ /* get inserted into the stack above top */
1364	op->above = top->above;	1388	op->above = top->above;
1365		1389
…		…
1369	op->below = top;	1393	op->below = top;
1370	top->above = op;	1394	top->above = op;
1371	}	1395	}
1372		1396
1373	if (!op->above)	1397	if (!op->above)
1374	op->ms ().top = op;	1398	ms.top = op;
1375	} /* else not INS_BELOW_ORIGINATOR */	1399	} /* else not INS_BELOW_ORIGINATOR */
1376		1400
1377	if (op->type == PLAYER)	1401	if (op->type == PLAYER)
1378	{	1402	{
1379	op->contr->do_los = 1;	1403	op->contr->do_los = 1;
1380	++op->map->players;	1404	++op->map->players;
1381	op->map->last_access = runtime;	1405	op->map->touch ();
1382	}	1406	}
1383		1407
1384	op->map->dirty = true;	1408	op->map->dirty = true;
1385		1409
1386	/* If we have a floor, we know the player, if any, will be above
1387	* it, so save a few ticks and start from there.
1388	*/
1389	if (!(flag & INS_MAP_LOAD))	1410	if (!(flag & INS_MAP_LOAD))
1390	if (object *pl = op->ms ().player ())	1411	if (object *pl = ms.player ())
1391	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1412	pl->contr->ns->floorbox_update ();
1393		1413
1394	/* If this object glows, it may affect lighting conditions that are	1414	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1415	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1416	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1417	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1418	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1419	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1420	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1421	* of effect may be sufficient.
1402	*/	1422	*/
1403	if (op->map->darkness && (op->glow_radius != 0))	1423	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1424	update_all_los (op->map, op->x, op->y);
1405		1425
…		…
1416	* blocked() and wall() work properly), and these flags are updated by	1436	* blocked() and wall() work properly), and these flags are updated by
1417	* update_object().	1437	* update_object().
1418	*/	1438	*/
1419		1439
1420	/* if this is not the head or flag has been passed, don't check walk on status */	1440	/* if this is not the head or flag has been passed, don't check walk on status */
1421	if (!(flag & INS_NO_WALK_ON) && !op->head)	1441	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1422	{	1442	{
1423	if (check_move_on (op, originator))	1443	if (check_move_on (op, originator))
1424	return 0;	1444	return 0;
1425		1445
1426	/* If we are a multi part object, lets work our way through the check	1446	/* If we are a multi part object, lets work our way through the check
1427	* walk on's.	1447	* walk on's.
1428	*/	1448	*/
1429	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1449	for (object *tmp = op->more; tmp; tmp = tmp->more)
1430	if (check_move_on (tmp, originator))	1450	if (check_move_on (tmp, originator))
1431	return 0;	1451	return 0;
1432	}	1452	}
1433		1453
1434	return op;	1454	return op;
…		…
1443	{	1463	{
1444	object *tmp, *tmp1;	1464	object *tmp, *tmp1;
1445		1465
1446	/* first search for itself and remove any old instances */	1466	/* first search for itself and remove any old instances */
1447		1467
1448	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1450	tmp->destroy ();	1470	tmp->destroy ();
1451		1471
1452	tmp1 = arch_to_object (archetype::find (arch_string));	1472	tmp1 = arch_to_object (archetype::find (arch_string));
1453		1473
1454	tmp1->x = op->x;	1474	tmp1->x = op->x;
…		…
1457	}	1477	}
1458		1478
1459	object *	1479	object *
1460	object::insert_at (object *where, object *originator, int flags)	1480	object::insert_at (object *where, object *originator, int flags)
1461	{	1481	{
1462	where->map->insert (this, where->x, where->y, originator, flags);	1482	return where->map->insert (this, where->x, where->y, originator, flags);
1463	}	1483	}
1464		1484
1465	/*	1485	/*
1466	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1467	* is returned contains nr objects, and the remaining parts contains	1487	* is returned contains nr objects, and the remaining parts contains
…		…
1507	* the amount of an object. If the amount reaches 0, the object	1527	* the amount of an object. If the amount reaches 0, the object
1508	* is subsequently removed and freed.	1528	* is subsequently removed and freed.
1509	*	1529	*
1510	* Return value: 'op' if something is left, NULL if the amount reached 0	1530	* Return value: 'op' if something is left, NULL if the amount reached 0
1511	*/	1531	*/
1512
1513	object *	1532	object *
1514	decrease_ob_nr (object *op, uint32 i)	1533	decrease_ob_nr (object *op, uint32 i)
1515	{	1534	{
1516	object *tmp;	1535	object *tmp;
1517		1536
…		…
1592		1611
1593	/*	1612	/*
1594	* add_weight(object, weight) adds the specified weight to an object,	1613	* add_weight(object, weight) adds the specified weight to an object,
1595	* and also updates how much the environment(s) is/are carrying.	1614	* and also updates how much the environment(s) is/are carrying.
1596	*/	1615	*/
1597
1598	void	1616	void
1599	add_weight (object *op, signed long weight)	1617	add_weight (object *op, signed long weight)
1600	{	1618	{
1601	while (op != NULL)	1619	while (op != NULL)
1602	{	1620	{
…		…
1617	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1635	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1618	free (dump);	1636	free (dump);
1619	return op;	1637	return op;
1620	}	1638	}
1621		1639
1622	if (where->head)	1640	if (where->head_ () != where)
1623	{	1641	{
1624	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1642	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1625	where = where->head;	1643	where = where->head;
1626	}	1644	}
1627		1645
1628	return where->insert (op);	1646	return where->insert (op);
1629	}	1647	}
…		…
1634	* inside the object environment.	1652	* inside the object environment.
1635	*	1653	*
1636	* The function returns now pointer to inserted item, and return value can	1654	* The function returns now pointer to inserted item, and return value can
1637	* be != op, if items are merged. -Tero	1655	* be != op, if items are merged. -Tero
1638	*/	1656	*/
1639
1640	object *	1657	object *
1641	object::insert (object *op)	1658	object::insert (object *op)
1642	{	1659	{
1643	object *tmp, *otmp;
1644
1645	if (!QUERY_FLAG (op, FLAG_REMOVED))	1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1646	op->remove ();	1661	op->remove ();
1647		1662
1648	if (op->more)	1663	if (op->more)
1649	{	1664	{
…		…
1651	return op;	1666	return op;
1652	}	1667	}
1653		1668
1654	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1655	CLEAR_FLAG (op, FLAG_REMOVED);	1670	CLEAR_FLAG (op, FLAG_REMOVED);
		1671
1656	if (op->nrof)	1672	if (op->nrof)
1657	{	1673	{
1658	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1674	for (object *tmp = inv; tmp; tmp = tmp->below)
1659	if (object::can_merge (tmp, op))	1675	if (object::can_merge (tmp, op))
1660	{	1676	{
1661	/* return the original object and remove inserted object	1677	/* return the original object and remove inserted object
1662	(client needs the original object) */	1678	(client needs the original object) */
1663	tmp->nrof += op->nrof;	1679	tmp->nrof += op->nrof;
…		…
1682	add_weight (this, op->weight * op->nrof);	1698	add_weight (this, op->weight * op->nrof);
1683	}	1699	}
1684	else	1700	else
1685	add_weight (this, (op->weight + op->carrying));	1701	add_weight (this, (op->weight + op->carrying));
1686		1702
1687	otmp = this->in_player ();	1703	if (object *otmp = this->in_player ())
1688	if (otmp && otmp->contr)
1689	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1690	otmp->update_stats ();	1705	otmp->update_stats ();
1691		1706
		1707	op->owner = 0; // its his/hers now. period.
1692	op->map = 0;	1708	op->map = 0;
1693	op->env = this;	1709	op->env = this;
1694	op->above = 0;	1710	op->above = 0;
1695	op->below = 0;	1711	op->below = 0;
1696	op->x = 0, op->y = 0;	1712	op->x = op->y = 0;
1697		1713
1698	/* reset the light list and los of the players on the map */	1714	/* reset the light list and los of the players on the map */
1699	if ((op->glow_radius != 0) && map)	1715	if (op->glow_radius && map)
1700	{	1716	{
1701	#ifdef DEBUG_LIGHTS	1717	#ifdef DEBUG_LIGHTS
1702	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1703	#endif /* DEBUG_LIGHTS */	1719	#endif /* DEBUG_LIGHTS */
1704	if (map->darkness)	1720	if (map->darkness)
…		…
1776		1792
1777	/* The objects have to be checked from top to bottom.	1793	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1794	* Hence, we first go to the top:
1779	*/	1795	*/
1780		1796
1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1797	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782	{	1798	{
1783	/* Trim the search when we find the first other spell effect	1799	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1800	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1801	* we don't need to check all of them.
1786	*/	1802	*/
…		…
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1820	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1821	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1822	{
1807		1823
1808	float	1824	float
1809	diff = tmp->move_slow_penalty * FABS (op->speed);	1825	diff = tmp->move_slow_penalty * fabs (op->speed);
1810		1826
1811	if (op->type == PLAYER)	1827	if (op->type == PLAYER)
1812	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1828	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1829	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814	diff /= 4.0;	1830	diff /= 4.0;
…		…
1844	* The first matching object is returned, or NULL if none.	1860	* The first matching object is returned, or NULL if none.
1845	*/	1861	*/
1846	object *	1862	object *
1847	present_arch (const archetype *at, maptile *m, int x, int y)	1863	present_arch (const archetype *at, maptile *m, int x, int y)
1848	{	1864	{
1849	if (m == NULL || out_of_map (m, x, y))	1865	if (!m || out_of_map (m, x, y))
1850	{	1866	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1867	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1868	return NULL;
1853	}	1869	}
1854		1870
1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1871	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856	if (tmp->arch == at)	1872	if (tmp->arch == at)
1857	return tmp;	1873	return tmp;
1858		1874
1859	return NULL;	1875	return NULL;
1860	}	1876	}
…		…
1871	{	1887	{
1872	LOG (llevError, "Present called outside map.\n");	1888	LOG (llevError, "Present called outside map.\n");
1873	return NULL;	1889	return NULL;
1874	}	1890	}
1875		1891
1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1892	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1893	if (tmp->type == type)
1878	return tmp;	1894	return tmp;
1879		1895
1880	return NULL;	1896	return NULL;
1881	}	1897	}
…		…
1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1974	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1959	{	1975	{
1960	CLEAR_FLAG (tmp, flag);	1976	CLEAR_FLAG (tmp, flag);
1961	unflag_inv (tmp, flag);	1977	unflag_inv (tmp, flag);
1962	}	1978	}
1963	}
1964
1965	/*
1966	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967	* all it's inventory (recursively).
1968	* If checksums are used, a player will get set_cheat called for
1969	* him/her-self and all object carried by a call to this function.
1970	*/
1971	void
1972	set_cheat (object *op)
1973	{
1974	SET_FLAG (op, FLAG_WAS_WIZ);
1975	flag_inv (op, FLAG_WAS_WIZ);
1976	}	1979	}
1977		1980
1978	/*	1981	/*
1979	* find_free_spot(object, map, x, y, start, stop) will search for	1982	* find_free_spot(object, map, x, y, start, stop) will search for
1980	* a spot at the given map and coordinates which will be able to contain	1983	* a spot at the given map and coordinates which will be able to contain
…		…
2021	}	2024	}
2022		2025
2023	if (!index)	2026	if (!index)
2024	return -1;	2027	return -1;
2025		2028
2026	return altern[RANDOM () % index];	2029	return altern [rndm (index)];
2027	}	2030	}
2028		2031
2029	/*	2032	/*
2030	* find_first_free_spot(archetype, maptile, x, y) works like	2033	* find_first_free_spot(archetype, maptile, x, y) works like
2031	* find_free_spot(), but it will search max number of squares.	2034	* find_free_spot(), but it will search max number of squares.
…		…
2052	{	2055	{
2053	arr += begin;	2056	arr += begin;
2054	end -= begin;	2057	end -= begin;
2055		2058
2056	while (--end)	2059	while (--end)
2057	swap (arr [end], arr [RANDOM () % (end + 1)]);	2060	swap (arr [end], arr [rndm (end + 1)]);
2058	}	2061	}
2059		2062
2060	/* new function to make monster searching more efficient, and effective!	2063	/* new function to make monster searching more efficient, and effective!
2061	* This basically returns a randomized array (in the passed pointer) of	2064	* This basically returns a randomized array (in the passed pointer) of
2062	* the spaces to find monsters. In this way, it won't always look for	2065	* the spaces to find monsters. In this way, it won't always look for
…		…
2098	object *tmp;	2101	object *tmp;
2099	maptile *mp;	2102	maptile *mp;
2100		2103
2101	MoveType blocked, move_type;	2104	MoveType blocked, move_type;
2102		2105
2103	if (exclude && exclude->head)	2106	if (exclude && exclude->head_ () != exclude)
2104	{	2107	{
2105	exclude = exclude->head;	2108	exclude = exclude->head;
2106	move_type = exclude->move_type;	2109	move_type = exclude->move_type;
2107	}	2110	}
2108	else	2111	else
…		…
2131	max = maxfree[i];	2134	max = maxfree[i];
2132	else if (mflags & P_IS_ALIVE)	2135	else if (mflags & P_IS_ALIVE)
2133	{	2136	{
2134	for (tmp = ms.bot; tmp; tmp = tmp->above)	2137	for (tmp = ms.bot; tmp; tmp = tmp->above)
2135	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2138	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2139	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137	break;	2140	break;
2138		2141
2139	if (tmp)	2142	if (tmp)
2140	return freedir[i];	2143	return freedir[i];
2141	}	2144	}
…		…
2196		2199
2197	return 3;	2200	return 3;
2198	}	2201	}
2199		2202
2200	/*	2203	/*
2201	* absdir(int): Returns a number between 1 and 8, which represent
2202	* the "absolute" direction of a number (it actually takes care of
2203	* "overflow" in previous calculations of a direction).
2204	*/
2205
2206	int
2207	absdir (int d)
2208	{
2209	while (d < 1)
2210	d += 8;
2211
2212	while (d > 8)
2213	d -= 8;
2214
2215	return d;
2216	}
2217
2218	/*
2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2204	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220	* between two directions (which are expected to be absolute (see absdir())	2205	* between two directions (which are expected to be absolute (see absdir())
2221	*/	2206	*/
2222
2223	int	2207	int
2224	dirdiff (int dir1, int dir2)	2208	dirdiff (int dir1, int dir2)
2225	{	2209	{
2226	int d;	2210	int d;
2227		2211
…		…
2340	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2324	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341	* core dumps if they do.	2325	* core dumps if they do.
2342	*	2326	*
2343	* Add a check so we can't pick up invisible objects (0.93.8)	2327	* Add a check so we can't pick up invisible objects (0.93.8)
2344	*/	2328	*/
2345
2346	int	2329	int
2347	can_pick (const object *who, const object *item)	2330	can_pick (const object *who, const object *item)
2348	{	2331	{
2349	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2332	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2355	* create clone from object to another	2338	* create clone from object to another
2356	*/	2339	*/
2357	object *	2340	object *
2358	object_create_clone (object *asrc)	2341	object_create_clone (object *asrc)
2359	{	2342	{
2360	object *dst = 0, *tmp, *src, *part, *prev, *item;	2343	object *dst = 0, *tmp, *src, *prev, *item;
2361		2344
2362	if (!asrc)	2345	if (!asrc)
2363	return 0;	2346	return 0;
2364		2347
2365	src = asrc;
2366	if (src->head)
2367	src = src->head;	2348	src = asrc->head_ ();
2368		2349
2369	prev = 0;	2350	prev = 0;
2370	for (part = src; part; part = part->more)	2351	for (object *part = src; part; part = part->more)
2371	{	2352	{
2372	tmp = part->clone ();	2353	tmp = part->clone ();
2373	tmp->x -= src->x;	2354	tmp->x -= src->x;
2374	tmp->y -= src->y;	2355	tmp->y -= src->y;
2375		2356
…		…
2393	insert_ob_in_ob (object_create_clone (item), dst);	2374	insert_ob_in_ob (object_create_clone (item), dst);
2394		2375
2395	return dst;	2376	return dst;
2396	}	2377	}
2397		2378
2398	/* GROS - Creates an object using a string representing its content. */
2399	/* Basically, we save the content of the string to a temp file, then call */
2400	/* load_object on it. I admit it is a highly inefficient way to make things, */
2401	/* but it was simple to make and allows reusing the load_object function. */
2402	/* Remember not to use load_object_str in a time-critical situation. */
2403	/* Also remember that multiparts objects are not supported for now. */
2404	object *
2405	load_object_str (const char *obstr)
2406	{
2407	object *op;
2408	char filename[MAX_BUF];
2409
2410	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412	FILE *tempfile = fopen (filename, "w");
2413
2414	if (tempfile == NULL)
2415	{
2416	LOG (llevError, "Error - Unable to access load object temp file\n");
2417	return NULL;
2418	}
2419
2420	fprintf (tempfile, obstr);
2421	fclose (tempfile);
2422
2423	op = object::create ();
2424
2425	object_thawer thawer (filename);
2426
2427	if (thawer)
2428	load_object (thawer, op, 0);
2429
2430	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431	CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433	return op;
2434	}
2435
2436	/* This returns the first object in who's inventory that	2379	/* This returns the first object in who's inventory that
2437	* has the same type and subtype match.	2380	* has the same type and subtype match.
2438	* returns NULL if no match.	2381	* returns NULL if no match.
2439	*/	2382	*/
2440	object *	2383	object *
…		…
2493	if (link->key == canonical_key)	2436	if (link->key == canonical_key)
2494	return link->value;	2437	return link->value;
2495		2438
2496	return 0;	2439	return 0;
2497	}	2440	}
2498
2499		2441
2500	/*	2442	/*
2501	* Updates the canonical_key in op to value.	2443	* Updates the canonical_key in op to value.
2502	*	2444	*
2503	* canonical_key is a shared string (value doesn't have to be).	2445	* canonical_key is a shared string (value doesn't have to be).
…		…
2527	/* Basically, if the archetype has this key set,	2469	/* Basically, if the archetype has this key set,
2528	* we need to store the null value so when we save	2470	* we need to store the null value so when we save
2529	* it, we save the empty value so that when we load,	2471	* it, we save the empty value so that when we load,
2530	* we get this value back again.	2472	* we get this value back again.
2531	*/	2473	*/
2532	if (get_ob_key_link (&op->arch->clone, canonical_key))	2474	if (get_ob_key_link (op->arch, canonical_key))
2533	field->value = 0;	2475	field->value = 0;
2534	else	2476	else
2535	{	2477	{
2536	if (last)	2478	if (last)
2537	last->next = field->next;	2479	last->next = field->next;
…		…
2606	}	2548	}
2607	else	2549	else
2608	item = item->env;	2550	item = item->env;
2609	}	2551	}
2610		2552
2611
2612	const char *	2553	const char *
2613	object::flag_desc (char *desc, int len) const	2554	object::flag_desc (char *desc, int len) const
2614	{	2555	{
2615	char *p = desc;	2556	char *p = desc;
2616	bool first = true;	2557	bool first = true;
		2558
		2559	*p = 0;
2617		2560
2618	for (int i = 0; i < NUM_FLAGS; i++)	2561	for (int i = 0; i < NUM_FLAGS; i++)
2619	{	2562	{
2620	if (len <= 10) // magic constant!	2563	if (len <= 10) // magic constant!
2621	{	2564	{
2622	snprintf (p, len, ",...");	2565	snprintf (p, len, ",...");
2623	break;	2566	break;
2624	}	2567	}
2625		2568
2626	if (flag[i])	2569	if (flag [i])
2627	{	2570	{
2628	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2571	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2629	len -= cnt;	2572	len -= cnt;
2630	p += cnt;	2573	p += cnt;
2631	first = false;	2574	first = false;
…		…
2633	}	2576	}
2634		2577
2635	return desc;	2578	return desc;
2636	}	2579	}
2637		2580
2638	// return a suitable string describing an objetc in enough detail to find it	2581	// return a suitable string describing an object in enough detail to find it
2639	const char *	2582	const char *
2640	object::debug_desc (char *info) const	2583	object::debug_desc (char *info) const
2641	{	2584	{
2642	char flagdesc[512];	2585	char flagdesc[512];
2643	char info2[256 * 4];	2586	char info2[256 * 4];
2644	char *p = info;	2587	char *p = info;
2645		2588
2646	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2647	count, uuid.seq,	2590	count, uuid.seq,
2648	&name,	2591	&name,
2649	title ? "\",title:" : "",	2592	title ? "\",title:\"" : "",
2650	title ? (const char *)title : "",	2593	title ? (const char *)title : "",
2651	flag_desc (flagdesc, 512), type);	2594	flag_desc (flagdesc, 512), type);
2652		2595
2653	if (env)	2596	if (!this->flag[FLAG_REMOVED] && env)
2654	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2655		2598
2656	if (map)	2599	if (map)
2657	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2600	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2658		2601
…		…
2660	}	2603	}
2661		2604
2662	const char *	2605	const char *
2663	object::debug_desc () const	2606	object::debug_desc () const
2664	{	2607	{
2665	static char info[256 * 3];	2608	static char info[3][256 * 4];
		2609	static int info_idx;
		2610
2666	return debug_desc (info);	2611	return debug_desc (info [++info_idx % 3]);
2667	}	2612	}
2668		2613
		2614	struct region *
		2615	object::region () const
		2616	{
		2617	return map ? map->region (x, y)
		2618	: region::default_region ();
		2619	}
		2620
		2621	const materialtype_t *
		2622	object::dominant_material () const
		2623	{
		2624	if (materialtype_t *mt = name_to_material (materialname))
		2625	return mt;
		2626
		2627	return name_to_material (shstr_unknown);
		2628	}
		2629
		2630	void
		2631	object::open_container (object *new_container)
		2632	{
		2633	if (container == new_container)
		2634	return;
		2635
		2636	if (object *old_container = container)
		2637	{
		2638	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2639	return;
		2640
		2641	#if 0
		2642	// remove the "Close old_container" object.
		2643	if (object *closer = old_container->inv)
		2644	if (closer->type == CLOSE_CON)
		2645	closer->destroy ();
		2646	#endif
		2647
		2648	old_container->flag [FLAG_APPLIED] = 0;
		2649	container = 0;
		2650
		2651	esrv_update_item (UPD_FLAGS, this, old_container);
		2652	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2653	play_sound (sound_find ("chest_close"));
		2654	}
		2655
		2656	if (new_container)
		2657	{
		2658	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2659	return;
		2660
		2661	// TODO: this does not seem to serve any purpose anymore?
		2662	#if 0
		2663	// insert the "Close Container" object.
		2664	if (archetype *closer = new_container->other_arch)
		2665	{
		2666	object *closer = arch_to_object (new_container->other_arch);
		2667	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2668	new_container->insert (closer);
		2669	}
		2670	#endif
		2671
		2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2673
		2674	new_container->flag [FLAG_APPLIED] = 1;
		2675	container = new_container;
		2676
		2677	esrv_update_item (UPD_FLAGS, this, new_container);
		2678	esrv_send_inventory (this, new_container);
		2679	play_sound (sound_find ("chest_open"));
		2680	}
		2681	}
		2682
		2683	object *
		2684	object::force_find (const shstr name)
		2685	{
		2686	/* cycle through his inventory to look for the MARK we want to
		2687	* place
		2688	*/
		2689	for (object *tmp = inv; tmp; tmp = tmp->below)
		2690	if (tmp->type == FORCE && tmp->slaying == name)
		2691	return splay (tmp);
		2692
		2693	return 0;
		2694	}
		2695
		2696	void
		2697	object::force_add (const shstr name, int duration)
		2698	{
		2699	if (object *force = force_find (name))
		2700	force->destroy ();
		2701
		2702	object *force = get_archetype (FORCE_NAME);
		2703
		2704	force->slaying = name;
		2705	force->stats.food = 1;
		2706	force->speed_left = -1.f;
		2707
		2708	force->set_speed (duration ? 1.f / duration : 0.f);
		2709	force->flag [FLAG_IS_USED_UP] = true;
		2710	force->flag [FLAG_APPLIED] = true;
		2711
		2712	insert (force);
		2713	}
		2714
		2715	void
		2716	object::play_sound (faceidx sound) const
		2717	{
		2718	if (!sound)
		2719	return;
		2720
		2721	if (flag [FLAG_REMOVED])
		2722	return;
		2723
		2724	if (env)
		2725	{
		2726	if (object *pl = in_player ())
		2727	pl->contr->play_sound (sound);
		2728	}
		2729	else
		2730	map->play_sound (sound, x, y);
		2731	}
		2732

Diff Legend

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