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.91 by elmex, Tue Dec 26 10:51:52 2006 UTC vs.
Revision 1.155 by root, Thu May 17 21:32:08 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
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,	46	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	47	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	};	48	};
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,	49	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,
…		…
190	* Check nrof variable *before* calling can_merge()	193	* Check nrof variable *before* calling can_merge()
191	*	194	*
192	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
193	* check weight	196	* check weight
194	*/	197	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	199	{
198	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
199	if (ob1 == ob2	201	if (ob1 == ob2
200	|| ob1->type != ob2->type	202	|| ob1->type != ob2->type
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	359	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	361	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
360	*/	363	*/
361
362	char *	364	char *
363	dump_object (object *op)	365	dump_object (object *op)
364	{	366	{
365	if (!op)	367	if (!op)
366	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
367		369
368	object_freezer freezer;	370	object_freezer freezer;
369	save_object (freezer, op, 1);	371	op->write (freezer);
370	return freezer.as_string ();	372	return freezer.as_string ();
371	}	373	}
372		374
373	/*	375	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	393	}
392		394
393	/*	395	/*
394	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
395	*/	397	*/
396
397	object *	398	object *
398	find_object (tag_t i)	399	find_object (tag_t i)
399	{	400	{
400	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
401	if (op->count == i)	402	if (op->count == i)
402	return op;	403	return op;
403		404
404	return 0;	405	return 0;
405	}	406	}
406		407
407	/*	408	/*
408	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
411	*/	412	*/
412
413	object *	413	object *
414	find_object_name (const char *str)	414	find_object_name (const char *str)
415	{	415	{
416	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
417	object *op;	417	object *op;
418		418
419	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
420	if (op->name == str_)	420	if (op->name == str_)
421	break;	421	break;
422		422
423	return op;	423	return op;
424	}	424	}
…		…
450	owner = owner->owner;	450	owner = owner->owner;
451		451
452	this->owner = owner;	452	this->owner = owner;
453	}	453	}
454		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance your applied items all at once, but the %s is too much. "
		501	"You need to unapply some items first.", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
455	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	521	* refcounts and freeing the links.
457	*/	522	*/
458	static void	523	static void
459	free_key_values (object *op)	524	free_key_values (object *op)
460	{	525	{
461	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
462	{	527	{
463	key_value *next = i->next;	528	key_value *next = i->next;
464	delete i;	529	delete i;
465		530
466	i = next;	531	i = next;
467	}	532	}
468		533
469	op->key_values = 0;	534	op->key_values = 0;
470	}	535	}
471		536
472	/*	537	object &
473	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	539	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
485		542
486	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
487		544
488	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	546	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		547
497	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
498	if (key_values)	549	if (src.key_values)
499	{	550	{
500	key_value *tail = 0;	551	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	552	key_values = 0;
504		553
505	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
506	{	555	{
507	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
508		557
509	new_link->next = 0;	558	new_link->next = 0;
510	new_link->key = i->key;	559	new_link->key = i->key;
511	new_link->value = i->value;	560	new_link->value = i->value;
512		561
513	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
514	if (!dst->key_values)	563	if (!key_values)
515	{	564	{
516	dst->key_values = new_link;	565	key_values = new_link;
517	tail = new_link;	566	tail = new_link;
518	}	567	}
519	else	568	else
520	{	569	{
521	tail->next = new_link;	570	tail->next = new_link;
522	tail = new_link;	571	tail = new_link;
523	}	572	}
524	}	573	}
525	}	574	}
		575	}
		576
		577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
526		592
527	dst->set_speed (dst->speed);	593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
528	}	613	}
529		614
530	object *	615	object *
531	object::clone ()	616	object::clone ()
532	{	617	{
…		…
538	/*	623	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	624	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	625	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	626	* be called to update the face variable, _and_ how it looks on the map.
542	*/	627	*/
543
544	void	628	void
545	update_turn_face (object *op)	629	update_turn_face (object *op)
546	{	630	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	631	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	632	return;
		633
549	SET_ANIMATION (op, op->direction);	634	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	635	update_object (op, UP_OBJ_FACE);
551	}	636	}
552		637
553	/*	638	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	641	* This function needs to be called whenever the speed of an object changes.
557	*/	642	*/
558	void	643	void
559	object::set_speed (float speed)	644	object::set_speed (float speed)
560	{	645	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	646	if (flag [FLAG_FREED] && speed)
567	{	647	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	648	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	649	speed = 0;
570	}	650	}
571		651
572	this->speed = speed;	652	this->speed = speed;
573		653
574	if (arch_init)	654	if (has_active_speed ())
575	return;	655	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	656	else
593	{	657	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	658	}
648		659
649	/*	660	/*
650	* update_object() updates the the map.	661	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
665	*/	676	*/
666	void	677	void
667	update_object (object *op, int action)	678	update_object (object *op, int action)
668	{	679	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	680	if (op == NULL)
672	{	681	{
673	/* this should never happen */	682	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	684	return;
…		…
699	return;	708	return;
700	}	709	}
701		710
702	mapspace &m = op->ms ();	711	mapspace &m = op->ms ();
703		712
704	if (m.flags_ & P_NEED_UPDATE)	713	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	714	/* nop */;
706	else if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
707	{	716	{
708	// this is likely overkill, TODO: revisit (schmorp)	717	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	718	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	727	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	728	* to have move_allow right now.
720	*/	729	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
724	}	733	}
725	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	736	* that is being removed.
728	*/	737	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	739	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
733	else	742	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		744
736	if (op->more)	745	if (op->more)
737	update_object (op->more, action);	746	update_object (op->more, action);
738	}	747	}
739		748
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	749	object::object ()
744	{	750	{
745	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
746		752
747	expmul = 1.0;	753	expmul = 1.0;
748	face = blank_face;	754	face = blank_face;
749	}	755	}
750		756
751	object::~object ()	757	object::~object ()
752	{	758	{
		759	unlink ();
		760
753	free_key_values (this);	761	free_key_values (this);
754	}	762	}
755		763
		764	static int object_count;
		765
756	void object::link ()	766	void object::link ()
757	{	767	{
758	count = ++ob_count;	768	assert (!index);//D
759	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
760		771
761	prev = 0;	772	refcnt_inc ();
762	next = object::first;	773	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	774	}
769		775
770	void object::unlink ()	776	void object::unlink ()
771	{	777	{
772	if (this == object::first)	778	if (!index)
773	object::first = next;	779	return;
774		780
775	/* Remove this object from the list of used objects */	781	objects.erase (this);
776	if (prev) prev->next = next;	782	refcnt_dec ();
777	if (next) next->prev = prev;	783	}
778		784
779	prev = 0;	785	void
780	next = 0;	786	object::activate ()
		787	{
		788	/* If already on active list, don't do anything */
		789	if (active)
		790	return;
		791
		792	if (has_active_speed ())
		793	actives.insert (this);
		794	}
		795
		796	void
		797	object::activate_recursive ()
		798	{
		799	activate ();
		800
		801	for (object *op = inv; op; op = op->below)
		802	op->activate_recursive ();
		803	}
		804
		805	/* This function removes object 'op' from the list of active
		806	* objects.
		807	* This should only be used for style maps or other such
		808	* reference maps where you don't want an object that isn't
		809	* in play chewing up cpu time getting processed.
		810	* The reverse of this is to call update_ob_speed, which
		811	* will do the right thing based on the speed of the object.
		812	*/
		813	void
		814	object::deactivate ()
		815	{
		816	/* If not on the active list, nothing needs to be done */
		817	if (!active)
		818	return;
		819
		820	actives.erase (this);
		821	}
		822
		823	void
		824	object::deactivate_recursive ()
		825	{
		826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
		829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
		836	{
		837	op->flag [flag] = value;
		838	op->set_flag_inv (flag, value);
		839	}
781	}	840	}
782		841
783	/*	842	/*
784	* Remove and free all objects in the inventory of the given object.	843	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	844	* object.c ?
786	*/	845	*/
787	void	846	void
788	object::destroy_inv (bool drop_to_ground)	847	object::destroy_inv (bool drop_to_ground)
789	{	848	{
		849	// need to check first, because the checks below might segfault
		850	// as we might be on an invalid mapspace and crossfire code
		851	// is too buggy to ensure that the inventory is empty.
		852	// corollary: if you create arrows etc. with stuff in tis inventory,
		853	// cf will crash below with off-map x and y
		854	if (!inv)
		855	return;
		856
790	/* Only if the space blocks everything do we not process -	857	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	858	* if some form of movement is allowed, let objects
792	* drop on that space.	859	* drop on that space.
793	*/	860	*/
794	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	861	if (!drop_to_ground
		862	|| !map
		863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
		865	|| ms ().move_block == MOVE_ALL)
795	{	866	{
796	while (inv)	867	while (inv)
		868	{
		869	inv->destroy_inv (drop_to_ground);
797	inv->destroy ();	870	inv->destroy ();
		871	}
798	}	872	}
799	else	873	else
800	{ /* Put objects in inventory onto this space */	874	{ /* Put objects in inventory onto this space */
801	while (inv)	875	while (inv)
802	{	876	{
…		…
804		878
805	if (op->flag [FLAG_STARTEQUIP]	879	if (op->flag [FLAG_STARTEQUIP]
806	|| op->flag [FLAG_NO_DROP]	880	|| op->flag [FLAG_NO_DROP]
807	|| op->type == RUNE	881	|| op->type == RUNE
808	|| op->type == TRAP	882	|| op->type == TRAP
809	|| op->flag [FLAG_IS_A_TEMPLATE])	883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
810	op->destroy ();	885	op->destroy ();
811	else	886	else
812	{	887	map->insert (op, x, y);
813	op->remove ();
814	op->x = x;
815	op->y = y;
816	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817	}
818	}	888	}
819	}	889	}
820	}	890	}
821		891
822	object *object::create ()	892	object *object::create ()
…		…
827	}	897	}
828		898
829	void	899	void
830	object::do_destroy ()	900	object::do_destroy ()
831	{	901	{
		902	attachable::do_destroy ();
		903
832	if (flag [FLAG_IS_LINKED])	904	if (flag [FLAG_IS_LINKED])
833	remove_button_link (this);	905	remove_button_link (this);
834		906
835	if (flag [FLAG_FRIENDLY])	907	if (flag [FLAG_FRIENDLY])
836	remove_friendly_object (this);	908	remove_friendly_object (this);
837		909
838	if (!flag [FLAG_REMOVED])	910	if (!flag [FLAG_REMOVED])
839	remove ();	911	remove ();
840		912
841	if (flag [FLAG_FREED])	913	destroy_inv (true);
842	return;	914
		915	deactivate ();
		916	unlink ();
843		917
844	flag [FLAG_FREED] = 1;	918	flag [FLAG_FREED] = 1;
845
846	attachable::do_destroy ();
847
848	destroy_inv (true);
849	set_speed (0);
850	unlink ();
851		919
852	// hack to ensure that freed objects still have a valid map	920	// hack to ensure that freed objects still have a valid map
853	{	921	{
854	static maptile *freed_map; // freed objects are moved here to avoid crashes	922	static maptile *freed_map; // freed objects are moved here to avoid crashes
855		923
…		…
859		927
860	freed_map->name = "/internal/freed_objects_map";	928	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	929	freed_map->width = 3;
862	freed_map->height = 3;	930	freed_map->height = 3;
863		931
864	freed_map->allocate ();	932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
865	}	934	}
866		935
867	map = freed_map;	936	map = freed_map;
868	x = 1;	937	x = 1;
869	y = 1;	938	y = 1;
…		…
879		948
880	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might have circular references to us
881	owner = 0;	950	owner = 0;
882	enemy = 0;	951	enemy = 0;
883	attacked_by = 0;	952	attacked_by = 0;
884
885	// only relevant for players(?), but make sure of it anyways
886	contr = 0;
887	}	953	}
888		954
889	void	955	void
890	object::destroy (bool destroy_inventory)	956	object::destroy (bool destroy_inventory)
891	{	957	{
…		…
919	* 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
920	* 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
921	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
922	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
923	* the previous environment.	989	* the previous environment.
924	* Beware: This function is called from the editor as well!
925	*/	990	*/
926	void	991	void
927	object::remove ()	992	object::do_remove ()
928	{	993	{
929	object *tmp, *last = 0;	994	object *tmp, *last = 0;
930	object *otmp;	995	object *otmp;
931		996
932	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
954	* to save cpu time.	1019	* to save cpu time.
955	*/	1020	*/
956	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
957	otmp->update_stats ();	1022	otmp->update_stats ();
958		1023
959	if (above != NULL)	1024	if (above)
960	above->below = below;	1025	above->below = below;
961	else	1026	else
962	env->inv = below;	1027	env->inv = below;
963		1028
964	if (below != NULL)	1029	if (below)
965	below->above = above;	1030	below->above = above;
966		1031
967	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
968	* the map, but we don't actually do that - it is up	1033	* the map, but we don't actually do that - it is up
969	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
973	above = 0, below = 0;	1038	above = 0, below = 0;
974	env = 0;	1039	env = 0;
975	}	1040	}
976	else if (map)	1041	else if (map)
977	{	1042	{
978	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
979	* lots of logic for things we no longer care about
980	*/	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
		1051	--map->players;
		1052	map->touch ();
		1053	}
		1054
		1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
981		1057
982	/* link the object above us */	1058	/* link the object above us */
983	if (above)	1059	if (above)
984	above->below = below;	1060	above->below = below;
985	else	1061	else
986	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
987		1063
988	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
989	if (below)	1065	if (below)
990	below->above = above;	1066	below->above = above;
991	else	1067	else
…		…
993	/* 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
994	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
995	* evident	1071	* evident
996	*/	1072	*/
997	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
998	{
999	char *dump = dump_object (this);
1000	LOG (llevError,
1001	"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 ());
1002	free (dump);
1003	dump = dump_object (GET_MAP_OB (map, x, y));
1004	LOG (llevError, "%s\n", dump);
1005	free (dump);
1006	}
1007		1075
1008	map->at (x, y).bot = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1009	}	1077	}
1010		1078
1011	above = 0;	1079	above = 0;
1012	below = 0;	1080	below = 0;
1013		1081
1014	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1015	return;	1083	return;
1016		1084
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		1086
1019	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1087	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1088	{
1021	/* No point updating the players look faces if he is the object	1089	/* No point updating the players look faces if he is the object
1022	* being removed.	1090	* being removed.
1023	*/	1091	*/
1024		1092
…		…
1036		1104
1037	if (tmp->contr->ns)	1105	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();	1106	tmp->contr->ns->floorbox_update ();
1039	}	1107	}
1040		1108
1041	/* See if player moving off should effect something */	1109	/* See if object moving off should effect something */
1042	if (check_walk_off	1110	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1111	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1112	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045	{	1113	{
1046	move_apply (tmp, this, 0);	1114	move_apply (tmp, this, 0);
…		…
1048	if (destroyed ())	1116	if (destroyed ())
1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1117	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050	}	1118	}
1051		1119
1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1120	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053		1121	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1054	if (tmp->above == tmp)	1122	if (tmp->above == tmp)
1055	tmp->above = 0;	1123	tmp->above = 0;
1056		1124
1057	last = tmp;	1125	last = tmp;
1058	}	1126	}
1059		1127
1060	/* last == NULL of there are no objects on this space */	1128	/* last == NULL if there are no objects on this space */
		1129	//TODO: this makes little sense, why only update the topmost object?
1061	if (!last)	1130	if (!last)
1062	map->at (x, y).flags_ = P_NEED_UPDATE;	1131	map->at (x, y).flags_ = 0;
1063	else	1132	else
1064	update_object (last, UP_OBJ_REMOVE);	1133	update_object (last, UP_OBJ_REMOVE);
1065		1134
1066	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1135	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1067	update_all_los (map, x, y);	1136	update_all_los (map, x, y);
…		…
1103	}	1172	}
1104		1173
1105	return 0;	1174	return 0;
1106	}	1175	}
1107		1176
		1177	void
		1178	object::expand_tail ()
		1179	{
		1180	if (more)
		1181	return;
		1182
		1183	object *prev = this;
		1184
		1185	for (archetype *at = arch->more; at; at = at->more)
		1186	{
		1187	object *op = arch_to_object (at);
		1188
		1189	op->name = name;
		1190	op->name_pl = name_pl;
		1191	op->title = title;
		1192
		1193	op->head = this;
		1194	prev->more = op;
		1195
		1196	prev = op;
		1197	}
		1198	}
		1199
1108	/*	1200	/*
1109	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1201	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1110	* job preparing multi-part monsters	1202	* job preparing multi-part monsters.
1111	*/	1203	*/
1112	object *	1204	object *
1113	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1205	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1114	{	1206	{
1115	object *tmp;
1116
1117	if (op->head)
1118	op = op->head;
1119
1120	for (tmp = op; tmp; tmp = tmp->more)	1207	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1121	{	1208	{
1122	tmp->x = x + tmp->arch->clone.x;	1209	tmp->x = x + tmp->arch->clone.x;
1123	tmp->y = y + tmp->arch->clone.y;	1210	tmp->y = y + tmp->arch->clone.y;
1124	}	1211	}
1125		1212
…		…
1147	* just 'op' otherwise	1234	* just 'op' otherwise
1148	*/	1235	*/
1149	object *	1236	object *
1150	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1237	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1151	{	1238	{
		1239	assert (!op->flag [FLAG_FREED]);
		1240
1152	object *tmp, *top, *floor = NULL;	1241	object *top, *floor = NULL;
1153	sint16 x, y;
1154		1242
1155	if (QUERY_FLAG (op, FLAG_FREED))	1243	op->remove ();
1156	{
1157	LOG (llevError, "Trying to insert freed object!\n");
1158	return NULL;
1159	}
1160		1244
1161	if (m == NULL)	1245	#if 0
1162	{	1246	if (!m->active != !op->active)
1163	char *dump = dump_object (op);	1247	if (m->active)
1164	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1248	op->activate_recursive ();
1165	free (dump);	1249	else
1166	return op;	1250	op->deactivate_recursive ();
1167	}	1251	#endif
1168		1252
1169	if (out_of_map (m, op->x, op->y))	1253	if (out_of_map (m, op->x, op->y))
1170	{	1254	{
1171	char *dump = dump_object (op);
1172	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1255	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1173	#ifdef MANY_CORES	1256	#ifdef MANY_CORES
1174	/* Better to catch this here, as otherwise the next use of this object	1257	/* Better to catch this here, as otherwise the next use of this object
1175	* is likely to cause a crash. Better to find out where it is getting	1258	* is likely to cause a crash. Better to find out where it is getting
1176	* improperly inserted.	1259	* improperly inserted.
1177	*/	1260	*/
1178	abort ();	1261	abort ();
1179	#endif	1262	#endif
1180	free (dump);
1181	return op;	1263	return op;
1182	}	1264	}
1183		1265
1184	if (!QUERY_FLAG (op, FLAG_REMOVED))	1266	if (object *more = op->more)
1185	{	1267	if (!insert_ob_in_map (more, m, originator, flag))
1186	char *dump = dump_object (op);
1187	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1188	free (dump);
1189	return op;	1268	return 0;
1190	}
1191
1192	if (op->more)
1193	{
1194	/* The part may be on a different map. */
1195
1196	object *more = op->more;
1197
1198	/* We really need the caller to normalize coordinates - if
1199	* we set the map, that doesn't work if the location is within
1200	* a map and this is straddling an edge. So only if coordinate
1201	* is clear wrong do we normalize it.
1202	*/
1203	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1204	more->map = get_map_from_coord (m, &more->x, &more->y);
1205	else if (!more->map)
1206	{
1207	/* For backwards compatibility - when not dealing with tiled maps,
1208	* more->map should always point to the parent.
1209	*/
1210	more->map = m;
1211	}
1212
1213	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1214	{
1215	if (!op->head)
1216	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218	return 0;
1219	}
1220	}
1221		1269
1222	CLEAR_FLAG (op, FLAG_REMOVED);	1270	CLEAR_FLAG (op, FLAG_REMOVED);
1223		1271
1224	/* Ideally, the caller figures this out. However, it complicates a lot	1272	/* Ideally, the caller figures this out. However, it complicates a lot
1225	* of areas of callers (eg, anything that uses find_free_spot would now	1273	* of areas of callers (eg, anything that uses find_free_spot would now
1226	* need extra work	1274	* need extra work
1227	*/	1275	*/
1228	op->map = get_map_from_coord (m, &op->x, &op->y);	1276	if (!xy_normalise (m, op->x, op->y))
1229	x = op->x;	1277	return 0;
1230	y = op->y;	1278
		1279	op->map = m;
		1280	mapspace &ms = op->ms ();
1231		1281
1232	/* this has to be done after we translate the coordinates.	1282	/* this has to be done after we translate the coordinates.
1233	*/	1283	*/
1234	if (op->nrof && !(flag & INS_NO_MERGE))	1284	if (op->nrof && !(flag & INS_NO_MERGE))
1235	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1285	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1236	if (object::can_merge (op, tmp))	1286	if (object::can_merge (op, tmp))
1237	{	1287	{
1238	op->nrof += tmp->nrof;	1288	op->nrof += tmp->nrof;
1239	tmp->destroy ();	1289	tmp->destroy ();
1240	}	1290	}
…		…
1257	op->below = originator->below;	1307	op->below = originator->below;
1258		1308
1259	if (op->below)	1309	if (op->below)
1260	op->below->above = op;	1310	op->below->above = op;
1261	else	1311	else
1262	op->ms ().bot = op;	1312	ms.bot = op;
1263		1313
1264	/* since *below* originator, no need to update top */	1314	/* since *below* originator, no need to update top */
1265	originator->below = op;	1315	originator->below = op;
1266	}	1316	}
1267	else	1317	else
1268	{	1318	{
		1319	top = ms.bot;
		1320
1269	/* If there are other objects, then */	1321	/* If there are other objects, then */
1270	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1322	if ((!(flag & INS_MAP_LOAD)) && top)
1271	{	1323	{
1272	object *last = NULL;	1324	object *last = 0;
1273		1325
1274	/*	1326	/*
1275	* If there are multiple objects on this space, we do some trickier handling.	1327	* If there are multiple objects on this space, we do some trickier handling.
1276	* We've already dealt with merging if appropriate.	1328	* We've already dealt with merging if appropriate.
1277	* Generally, we want to put the new object on top. But if	1329	* Generally, we want to put the new object on top. But if
…		…
1281	* once we get to them. This reduces the need to traverse over all of	1333	* once we get to them. This reduces the need to traverse over all of
1282	* them when adding another one - this saves quite a bit of cpu time	1334	* them when adding another one - this saves quite a bit of cpu time
1283	* when lots of spells are cast in one area. Currently, it is presumed	1335	* when lots of spells are cast in one area. Currently, it is presumed
1284	* that flying non pickable objects are spell objects.	1336	* that flying non pickable objects are spell objects.
1285	*/	1337	*/
1286		1338	for (top = ms.bot; top; top = top->above)
1287	while (top != NULL)
1288	{	1339	{
1289	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1340	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1290	floor = top;	1341	floor = top;
1291		1342
1292	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1343	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1295	top = top->below;	1346	top = top->below;
1296	break;	1347	break;
1297	}	1348	}
1298		1349
1299	last = top;	1350	last = top;
1300	top = top->above;
1301	}	1351	}
1302		1352
1303	/* Don't want top to be NULL, so set it to the last valid object */	1353	/* Don't want top to be NULL, so set it to the last valid object */
1304	top = last;	1354	top = last;
1305		1355
…		…
1307	* looks like instead of lots of conditions here.	1357	* looks like instead of lots of conditions here.
1308	* makes things faster, and effectively the same result.	1358	* makes things faster, and effectively the same result.
1309	*/	1359	*/
1310		1360
1311	/* Have object 'fall below' other objects that block view.	1361	/* Have object 'fall below' other objects that block view.
1312	* Unless those objects are exits, type 66	1362	* Unless those objects are exits.
1313	* If INS_ON_TOP is used, don't do this processing	1363	* If INS_ON_TOP is used, don't do this processing
1314	* Need to find the object that in fact blocks view, otherwise	1364	* Need to find the object that in fact blocks view, otherwise
1315	* stacking is a bit odd.	1365	* stacking is a bit odd.
1316	*/	1366	*/
1317	if (!(flag & INS_ON_TOP) &&	1367	if (!(flag & INS_ON_TOP)
1318	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1368	&& ms.flags () & P_BLOCKSVIEW
		1369	&& (op->face && !faces [op->face].visibility))
1319	{	1370	{
1320	for (last = top; last != floor; last = last->below)	1371	for (last = top; last != floor; last = last->below)
1321	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1372	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1322	break;	1373	break;
		1374
1323	/* Check to see if we found the object that blocks view,	1375	/* Check to see if we found the object that blocks view,
1324	* and make sure we have a below pointer for it so that	1376	* and make sure we have a below pointer for it so that
1325	* we can get inserted below this one, which requires we	1377	* we can get inserted below this one, which requires we
1326	* set top to the object below us.	1378	* set top to the object below us.
1327	*/	1379	*/
…		…
1329	top = last->below;	1381	top = last->below;
1330	}	1382	}
1331	} /* If objects on this space */	1383	} /* If objects on this space */
1332		1384
1333	if (flag & INS_MAP_LOAD)	1385	if (flag & INS_MAP_LOAD)
1334	top = GET_MAP_TOP (op->map, op->x, op->y);	1386	top = ms.top;
1335		1387
1336	if (flag & INS_ABOVE_FLOOR_ONLY)	1388	if (flag & INS_ABOVE_FLOOR_ONLY)
1337	top = floor;	1389	top = floor;
1338		1390
1339	/* Top is the object that our object (op) is going to get inserted above.	1391	/* Top is the object that our object (op) is going to get inserted above.
1340	*/	1392	*/
1341		1393
1342	/* First object on this space */	1394	/* First object on this space */
1343	if (!top)	1395	if (!top)
1344	{	1396	{
1345	op->above = GET_MAP_OB (op->map, op->x, op->y);	1397	op->above = ms.bot;
1346		1398
1347	if (op->above)	1399	if (op->above)
1348	op->above->below = op;	1400	op->above->below = op;
1349		1401
1350	op->below = NULL;	1402	op->below = 0;
1351	op->ms ().bot = op;	1403	ms.bot = op;
1352	}	1404	}
1353	else	1405	else
1354	{ /* get inserted into the stack above top */	1406	{ /* get inserted into the stack above top */
1355	op->above = top->above;	1407	op->above = top->above;
1356		1408
…		…
1359		1411
1360	op->below = top;	1412	op->below = top;
1361	top->above = op;	1413	top->above = op;
1362	}	1414	}
1363		1415
1364	if (op->above == NULL)	1416	if (!op->above)
1365	op->ms ().top = op;	1417	ms.top = op;
1366	} /* else not INS_BELOW_ORIGINATOR */	1418	} /* else not INS_BELOW_ORIGINATOR */
1367		1419
1368	if (op->type == PLAYER)	1420	if (op->type == PLAYER)
		1421	{
1369	op->contr->do_los = 1;	1422	op->contr->do_los = 1;
		1423	++op->map->players;
		1424	op->map->touch ();
		1425	}
		1426
		1427	op->map->dirty = true;
1370		1428
1371	/* If we have a floor, we know the player, if any, will be above	1429	/* If we have a floor, we know the player, if any, will be above
1372	* it, so save a few ticks and start from there.	1430	* it, so save a few ticks and start from there.
1373	*/	1431	*/
1374	if (!(flag & INS_MAP_LOAD))	1432	if (!(flag & INS_MAP_LOAD))
1375	if (object *pl = op->ms ().player ())	1433	if (object *pl = ms.player ())
1376	if (pl->contr->ns)	1434	if (pl->contr->ns)
1377	pl->contr->ns->floorbox_update ();	1435	pl->contr->ns->floorbox_update ();
1378		1436
1379	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1380	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1381	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1382	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
1383	* be far away from this change and not affected in any way -	1441	* be far away from this change and not affected in any way -
1384	* this should get redone to only look for players within range,	1442	* this should get redone to only look for players within range,
1385	* or just updating the P_NEED_UPDATE for spaces within this area	1443	* or just updating the P_UPTODATE for spaces within this area
1386	* of effect may be sufficient.	1444	* of effect may be sufficient.
1387	*/	1445	*/
1388	if (op->map->darkness && (op->glow_radius != 0))	1446	if (op->map->darkness && (op->glow_radius != 0))
1389	update_all_los (op->map, op->x, op->y);	1447	update_all_los (op->map, op->x, op->y);
1390		1448
…		…
1401	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1402	* update_object().	1460	* update_object().
1403	*/	1461	*/
1404		1462
1405	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1406	if (!(flag & INS_NO_WALK_ON) && !op->head)	1464	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1407	{	1465	{
1408	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1409	return 0;	1467	return 0;
1410		1468
1411	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
1412	* walk on's.	1470	* walk on's.
1413	*/	1471	*/
1414	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1472	for (object *tmp = op->more; tmp; tmp = tmp->more)
1415	if (check_move_on (tmp, originator))	1473	if (check_move_on (tmp, originator))
1416	return 0;	1474	return 0;
1417	}	1475	}
1418		1476
1419	return op;	1477	return op;
…		…
1428	{	1486	{
1429	object *tmp, *tmp1;	1487	object *tmp, *tmp1;
1430		1488
1431	/* first search for itself and remove any old instances */	1489	/* first search for itself and remove any old instances */
1432		1490
1433	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1491	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1434	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1492	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1435	tmp->destroy ();	1493	tmp->destroy ();
1436		1494
1437	tmp1 = arch_to_object (archetype::find (arch_string));	1495	tmp1 = arch_to_object (archetype::find (arch_string));
1438		1496
1439	tmp1->x = op->x;	1497	tmp1->x = op->x;
1440	tmp1->y = op->y;	1498	tmp1->y = op->y;
1441	insert_ob_in_map (tmp1, op->map, op, 0);	1499	insert_ob_in_map (tmp1, op->map, op, 0);
		1500	}
		1501
		1502	object *
		1503	object::insert_at (object *where, object *originator, int flags)
		1504	{
		1505	return where->map->insert (this, where->x, where->y, originator, flags);
1442	}	1506	}
1443		1507
1444	/*	1508	/*
1445	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1509	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1446	* is returned contains nr objects, and the remaining parts contains	1510	* is returned contains nr objects, and the remaining parts contains
1447	* the rest (or is removed and freed if that number is 0).	1511	* the rest (or is removed and freed if that number is 0).
1448	* On failure, NULL is returned, and the reason put into the	1512	* On failure, NULL is returned, and the reason put into the
1449	* global static errmsg array.	1513	* global static errmsg array.
1450	*/	1514	*/
1451
1452	object *	1515	object *
1453	get_split_ob (object *orig_ob, uint32 nr)	1516	get_split_ob (object *orig_ob, uint32 nr)
1454	{	1517	{
1455	object *newob;	1518	object *newob;
1456	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1519	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1487	* the amount of an object. If the amount reaches 0, the object	1550	* the amount of an object. If the amount reaches 0, the object
1488	* is subsequently removed and freed.	1551	* is subsequently removed and freed.
1489	*	1552	*
1490	* Return value: 'op' if something is left, NULL if the amount reached 0	1553	* Return value: 'op' if something is left, NULL if the amount reached 0
1491	*/	1554	*/
1492
1493	object *	1555	object *
1494	decrease_ob_nr (object *op, uint32 i)	1556	decrease_ob_nr (object *op, uint32 i)
1495	{	1557	{
1496	object *tmp;	1558	object *tmp;
1497		1559
…		…
1572		1634
1573	/*	1635	/*
1574	* add_weight(object, weight) adds the specified weight to an object,	1636	* add_weight(object, weight) adds the specified weight to an object,
1575	* and also updates how much the environment(s) is/are carrying.	1637	* and also updates how much the environment(s) is/are carrying.
1576	*/	1638	*/
1577
1578	void	1639	void
1579	add_weight (object *op, signed long weight)	1640	add_weight (object *op, signed long weight)
1580	{	1641	{
1581	while (op != NULL)	1642	while (op != NULL)
1582	{	1643	{
…		…
1597	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1658	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598	free (dump);	1659	free (dump);
1599	return op;	1660	return op;
1600	}	1661	}
1601		1662
1602	if (where->head)	1663	if (where->head_ () != where)
1603	{	1664	{
1604	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1665	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605	where = where->head;	1666	where = where->head;
1606	}	1667	}
1607		1668
1608	return where->insert (op);	1669	return where->insert (op);
1609	}	1670	}
…		…
1614	* inside the object environment.	1675	* inside the object environment.
1615	*	1676	*
1616	* The function returns now pointer to inserted item, and return value can	1677	* The function returns now pointer to inserted item, and return value can
1617	* be != op, if items are merged. -Tero	1678	* be != op, if items are merged. -Tero
1618	*/	1679	*/
1619
1620	object *	1680	object *
1621	object::insert (object *op)	1681	object::insert (object *op)
1622	{	1682	{
1623	object *tmp, *otmp;	1683	object *tmp, *otmp;
1624		1684
…		…
1720	*	1780	*
1721	* MSW 2001-07-08: Check all objects on space, not just those below	1781	* MSW 2001-07-08: Check all objects on space, not just those below
1722	* object being inserted. insert_ob_in_map may not put new objects	1782	* object being inserted. insert_ob_in_map may not put new objects
1723	* on top.	1783	* on top.
1724	*/	1784	*/
1725
1726	int	1785	int
1727	check_move_on (object *op, object *originator)	1786	check_move_on (object *op, object *originator)
1728	{	1787	{
1729	object *tmp;	1788	object *tmp;
1730	maptile *m = op->map;	1789	maptile *m = op->map;
…		…
1757		1816
1758	/* The objects have to be checked from top to bottom.	1817	/* The objects have to be checked from top to bottom.
1759	* Hence, we first go to the top:	1818	* Hence, we first go to the top:
1760	*/	1819	*/
1761		1820
1762	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1821	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1763	{	1822	{
1764	/* Trim the search when we find the first other spell effect	1823	/* Trim the search when we find the first other spell effect
1765	* this helps performance so that if a space has 50 spell objects,	1824	* this helps performance so that if a space has 50 spell objects,
1766	* we don't need to check all of them.	1825	* we don't need to check all of them.
1767	*/	1826	*/
…		…
1785	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1844	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1786	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1845	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1787	{	1846	{
1788		1847
1789	float	1848	float
1790	diff = tmp->move_slow_penalty * FABS (op->speed);	1849	diff = tmp->move_slow_penalty * fabs (op->speed);
1791		1850
1792	if (op->type == PLAYER)	1851	if (op->type == PLAYER)
1793	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1852	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1794	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1853	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1795	diff /= 4.0;	1854	diff /= 4.0;
…		…
1825	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1826	*/	1885	*/
1827	object *	1886	object *
1828	present_arch (const archetype *at, maptile *m, int x, int y)	1887	present_arch (const archetype *at, maptile *m, int x, int y)
1829	{	1888	{
1830	if (m == NULL || out_of_map (m, x, y))	1889	if (!m || out_of_map (m, x, y))
1831	{	1890	{
1832	LOG (llevError, "Present_arch called outside map.\n");	1891	LOG (llevError, "Present_arch called outside map.\n");
1833	return NULL;	1892	return NULL;
1834	}	1893	}
1835		1894
1836	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1895	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837	if (tmp->arch == at)	1896	if (tmp->arch == at)
1838	return tmp;	1897	return tmp;
1839		1898
1840	return NULL;	1899	return NULL;
1841	}	1900	}
…		…
1852	{	1911	{
1853	LOG (llevError, "Present called outside map.\n");	1912	LOG (llevError, "Present called outside map.\n");
1854	return NULL;	1913	return NULL;
1855	}	1914	}
1856		1915
1857	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1916	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1858	if (tmp->type == type)	1917	if (tmp->type == type)
1859	return tmp;	1918	return tmp;
1860		1919
1861	return NULL;	1920	return NULL;
1862	}	1921	}
…		…
1939	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1998	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1940	{	1999	{
1941	CLEAR_FLAG (tmp, flag);	2000	CLEAR_FLAG (tmp, flag);
1942	unflag_inv (tmp, flag);	2001	unflag_inv (tmp, flag);
1943	}	2002	}
1944	}
1945
1946	/*
1947	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1948	* all it's inventory (recursively).
1949	* If checksums are used, a player will get set_cheat called for
1950	* him/her-self and all object carried by a call to this function.
1951	*/
1952	void
1953	set_cheat (object *op)
1954	{
1955	SET_FLAG (op, FLAG_WAS_WIZ);
1956	flag_inv (op, FLAG_WAS_WIZ);
1957	}	2003	}
1958		2004
1959	/*	2005	/*
1960	* find_free_spot(object, map, x, y, start, stop) will search for	2006	* find_free_spot(object, map, x, y, start, stop) will search for
1961	* a spot at the given map and coordinates which will be able to contain	2007	* a spot at the given map and coordinates which will be able to contain
…		…
2002	}	2048	}
2003		2049
2004	if (!index)	2050	if (!index)
2005	return -1;	2051	return -1;
2006		2052
2007	return altern[RANDOM () % index];	2053	return altern [rndm (index)];
2008	}	2054	}
2009		2055
2010	/*	2056	/*
2011	* find_first_free_spot(archetype, maptile, x, y) works like	2057	* find_first_free_spot(archetype, maptile, x, y) works like
2012	* find_free_spot(), but it will search max number of squares.	2058	* find_free_spot(), but it will search max number of squares.
…		…
2033	{	2079	{
2034	arr += begin;	2080	arr += begin;
2035	end -= begin;	2081	end -= begin;
2036		2082
2037	while (--end)	2083	while (--end)
2038	swap (arr [end], arr [RANDOM () % (end + 1)]);	2084	swap (arr [end], arr [rndm (end + 1)]);
2039	}	2085	}
2040		2086
2041	/* new function to make monster searching more efficient, and effective!	2087	/* new function to make monster searching more efficient, and effective!
2042	* This basically returns a randomized array (in the passed pointer) of	2088	* This basically returns a randomized array (in the passed pointer) of
2043	* the spaces to find monsters. In this way, it won't always look for	2089	* the spaces to find monsters. In this way, it won't always look for
…		…
2079	object *tmp;	2125	object *tmp;
2080	maptile *mp;	2126	maptile *mp;
2081		2127
2082	MoveType blocked, move_type;	2128	MoveType blocked, move_type;
2083		2129
2084	if (exclude && exclude->head)	2130	if (exclude && exclude->head_ () != exclude)
2085	{	2131	{
2086	exclude = exclude->head;	2132	exclude = exclude->head;
2087	move_type = exclude->move_type;	2133	move_type = exclude->move_type;
2088	}	2134	}
2089	else	2135	else
…		…
2112	max = maxfree[i];	2158	max = maxfree[i];
2113	else if (mflags & P_IS_ALIVE)	2159	else if (mflags & P_IS_ALIVE)
2114	{	2160	{
2115	for (tmp = ms.bot; tmp; tmp = tmp->above)	2161	for (tmp = ms.bot; tmp; tmp = tmp->above)
2116	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2162	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2117	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2163	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2118	break;	2164	break;
2119		2165
2120	if (tmp)	2166	if (tmp)
2121	return freedir[i];	2167	return freedir[i];
2122	}	2168	}
…		…
2177		2223
2178	return 3;	2224	return 3;
2179	}	2225	}
2180		2226
2181	/*	2227	/*
2182	* absdir(int): Returns a number between 1 and 8, which represent
2183	* the "absolute" direction of a number (it actually takes care of
2184	* "overflow" in previous calculations of a direction).
2185	*/
2186
2187	int
2188	absdir (int d)
2189	{
2190	while (d < 1)
2191	d += 8;
2192
2193	while (d > 8)
2194	d -= 8;
2195
2196	return d;
2197	}
2198
2199	/*
2200	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2228	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2201	* between two directions (which are expected to be absolute (see absdir())	2229	* between two directions (which are expected to be absolute (see absdir())
2202	*/	2230	*/
2203
2204	int	2231	int
2205	dirdiff (int dir1, int dir2)	2232	dirdiff (int dir1, int dir2)
2206	{	2233	{
2207	int d;	2234	int d;
2208		2235
…		…
2336	* create clone from object to another	2363	* create clone from object to another
2337	*/	2364	*/
2338	object *	2365	object *
2339	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2340	{	2367	{
2341	object *dst = 0, *tmp, *src, *part, *prev, *item;	2368	object *dst = 0, *tmp, *src, *prev, *item;
2342		2369
2343	if (!asrc)	2370	if (!asrc)
2344	return 0;	2371	return 0;
2345		2372
2346	src = asrc;
2347	if (src->head)
2348	src = src->head;	2373	src = asrc->head_ ();
2349		2374
2350	prev = 0;	2375	prev = 0;
2351	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2352	{	2377	{
2353	tmp = part->clone ();	2378	tmp = part->clone ();
2354	tmp->x -= src->x;	2379	tmp->x -= src->x;
2355	tmp->y -= src->y;	2380	tmp->y -= src->y;
2356		2381
…		…
2374	insert_ob_in_ob (object_create_clone (item), dst);	2399	insert_ob_in_ob (object_create_clone (item), dst);
2375		2400
2376	return dst;	2401	return dst;
2377	}	2402	}
2378		2403
2379	/* GROS - Creates an object using a string representing its content. */
2380	/* Basically, we save the content of the string to a temp file, then call */
2381	/* load_object on it. I admit it is a highly inefficient way to make things, */
2382	/* but it was simple to make and allows reusing the load_object function. */
2383	/* Remember not to use load_object_str in a time-critical situation. */
2384	/* Also remember that multiparts objects are not supported for now. */
2385	object *
2386	load_object_str (const char *obstr)
2387	{
2388	object *op;
2389	char filename[MAX_BUF];
2390
2391	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2392
2393	FILE *tempfile = fopen (filename, "w");
2394
2395	if (tempfile == NULL)
2396	{
2397	LOG (llevError, "Error - Unable to access load object temp file\n");
2398	return NULL;
2399	}
2400
2401	fprintf (tempfile, obstr);
2402	fclose (tempfile);
2403
2404	op = object::create ();
2405
2406	object_thawer thawer (filename);
2407
2408	if (thawer)
2409	load_object (thawer, op, 0);
2410
2411	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2412	CLEAR_FLAG (op, FLAG_REMOVED);
2413
2414	return op;
2415	}
2416
2417	/* This returns the first object in who's inventory that	2404	/* This returns the first object in who's inventory that
2418	* has the same type and subtype match.	2405	* has the same type and subtype match.
2419	* returns NULL if no match.	2406	* returns NULL if no match.
2420	*/	2407	*/
2421	object *	2408	object *
…		…
2474	if (link->key == canonical_key)	2461	if (link->key == canonical_key)
2475	return link->value;	2462	return link->value;
2476		2463
2477	return 0;	2464	return 0;
2478	}	2465	}
2479
2480		2466
2481	/*	2467	/*
2482	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
2483	*	2469	*
2484	* canonical_key is a shared string (value doesn't have to be).	2470	* canonical_key is a shared string (value doesn't have to be).
…		…
2587	}	2573	}
2588	else	2574	else
2589	item = item->env;	2575	item = item->env;
2590	}	2576	}
2591		2577
		2578
		2579	const char *
		2580	object::flag_desc (char *desc, int len) const
		2581	{
		2582	char *p = desc;
		2583	bool first = true;
		2584
		2585	*p = 0;
		2586
		2587	for (int i = 0; i < NUM_FLAGS; i++)
		2588	{
		2589	if (len <= 10) // magic constant!
		2590	{
		2591	snprintf (p, len, ",...");
		2592	break;
		2593	}
		2594
		2595	if (flag [i])
		2596	{
		2597	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2598	len -= cnt;
		2599	p += cnt;
		2600	first = false;
		2601	}
		2602	}
		2603
		2604	return desc;
		2605	}
		2606
2592	// return a suitable string describing an objetc in enough detail to find it	2607	// return a suitable string describing an object in enough detail to find it
2593	const char *	2608	const char *
2594	object::debug_desc (char *info) const	2609	object::debug_desc (char *info) const
2595	{	2610	{
		2611	char flagdesc[512];
2596	char info2[256 * 3];	2612	char info2[256 * 4];
2597	char *p = info;	2613	char *p = info;
2598		2614
2599	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2600	count,	2616	count, uuid.seq,
2601	&name,	2617	&name,
2602	title ? " " : "",	2618	title ? "\",title:\"" : "",
2603	title ? (const char *)title : "");	2619	title ? (const char *)title : "",
		2620	flag_desc (flagdesc, 512), type);
2604		2621
2605	if (env)	2622	if (env)
2606	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2607		2624
2608	if (map)	2625	if (map)
2609	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2610		2627
2611	return info;	2628	return info;
2612	}	2629	}
2613		2630
2614	const char *	2631	const char *
2615	object::debug_desc () const	2632	object::debug_desc () const
2616	{	2633	{
2617	static char info[256 * 3];	2634	static char info[3][256 * 4];
		2635	static int info_idx;
		2636
2618	return debug_desc (info);	2637	return debug_desc (info [++info_idx % 3]);
2619	}	2638	}
2620		2639
		2640	struct region *
		2641	object::region () const
		2642	{
		2643	return map ? map->region (x, y)
		2644	: region::default_region ();
		2645	}
		2646
		2647	const materialtype_t *
		2648	object::dominant_material () const
		2649	{
		2650	if (materialtype_t *mat = name_to_material (materialname))
		2651	return mat;
		2652
		2653	// omfg this is slow, this has to be temporary :)
		2654	shstr unknown ("unknown");
		2655
		2656	return name_to_material (unknown);
		2657	}
		2658
		2659	void
		2660	object::open_container (object *new_container)
		2661	{
		2662	if (container == new_container)
		2663	return;
		2664
		2665	if (object *old_container = container)
		2666	{
		2667	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2668	return;
		2669
		2670	#if 0
		2671	// remove the "Close old_container" object.
		2672	if (object *closer = old_container->inv)
		2673	if (closer->type == CLOSE_CON)
		2674	closer->destroy ();
		2675	#endif
		2676
		2677	old_container->flag [FLAG_APPLIED] = 0;
		2678	container = 0;
		2679
		2680	esrv_update_item (UPD_FLAGS, this, old_container);
		2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2682	}
		2683
		2684	if (new_container)
		2685	{
		2686	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2687	return;
		2688
		2689	// TODO: this does not seem to serve any purpose anymore?
		2690	#if 0
		2691	// insert the "Close Container" object.
		2692	if (archetype *closer = new_container->other_arch)
		2693	{
		2694	object *closer = arch_to_object (new_container->other_arch);
		2695	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2696	new_container->insert (closer);
		2697	}
		2698	#endif
		2699
		2700	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2701
		2702	new_container->flag [FLAG_APPLIED] = 1;
		2703	container = new_container;
		2704
		2705	esrv_update_item (UPD_FLAGS, this, new_container);
		2706	esrv_send_inventory (this, new_container);
		2707	}
		2708	}
		2709
		2710

Diff Legend

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