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.78 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.140 by root, Tue Apr 24 12:32:14 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>
…		…
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,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* 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	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
356	/*	357	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	359	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
360	*/	361	*/
361
362	char *	362	char *
363	dump_object (object *op)	363	dump_object (object *op)
364	{	364	{
365	if (!op)	365	if (!op)
366	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
367		367
368	object_freezer freezer;	368	object_freezer freezer;
369	save_object (freezer, op, 3);	369	op->write (freezer);
370	return freezer.as_string ();	370	return freezer.as_string ();
371	}	371	}
372		372
373	/*	373	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	391	}
392		392
393	/*	393	/*
394	* 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.
395	*/	395	*/
396
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
401	if (op->count == i)	400	if (op->count == i)
402	return op;	401	return op;
403		402
404	return 0;	403	return 0;
405	}	404	}
406		405
407	/*	406	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
411	*/	410	*/
412
413	object *	411	object *
414	find_object_name (const char *str)	412	find_object_name (const char *str)
415	{	413	{
416	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
417	object *op;	415	object *op;
418		416
419	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
420	if (op->name == str_)	418	if (op->name == str_)
421	break;	419	break;
422		420
423	return op;	421	return op;
424	}	422	}
…		…
456	* refcounts and freeing the links.	454	* refcounts and freeing the links.
457	*/	455	*/
458	static void	456	static void
459	free_key_values (object *op)	457	free_key_values (object *op)
460	{	458	{
461	for (key_value *i = op->key_values; i != 0;)	459	for (key_value *i = op->key_values; i; )
462	{	460	{
463	key_value *next = i->next;	461	key_value *next = i->next;
464	delete i;	462	delete i;
465		463
466	i = next;	464	i = next;
467	}	465	}
468		466
469	op->key_values = 0;	467	op->key_values = 0;
470	}	468	}
471		469
472	/*	470	object &
473	* copy_to first frees everything allocated by the dst object,	471	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	{	472	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	473	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	474	bool is_removed = flag [FLAG_REMOVED];
485		475
486	*(object_copy *)dst = *this;	476	*(object_copy *)this = src;
487	*(object_pod *)dst = *this;
488		477
489	if (self || cb)	478	flag [FLAG_FREED] = is_freed;
490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	479	flag [FLAG_REMOVED] = is_removed;
491
492	if (is_freed)
493	SET_FLAG (dst, FLAG_FREED);
494
495	if (is_removed)
496	SET_FLAG (dst, FLAG_REMOVED);
497
498	if (speed < 0)
499	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
500		480
501	/* Copy over key_values, if any. */	481	/* Copy over key_values, if any. */
502	if (key_values)	482	if (src.key_values)
503	{	483	{
504	key_value *tail = 0;	484	key_value *tail = 0;
505	key_value *i;
506
507	dst->key_values = 0;	485	key_values = 0;
508		486
509	for (i = key_values; i; i = i->next)	487	for (key_value *i = src.key_values; i; i = i->next)
510	{	488	{
511	key_value *new_link = new key_value;	489	key_value *new_link = new key_value;
512		490
513	new_link->next = 0;	491	new_link->next = 0;
514	new_link->key = i->key;	492	new_link->key = i->key;
515	new_link->value = i->value;	493	new_link->value = i->value;
516		494
517	/* Try and be clever here, too. */	495	/* Try and be clever here, too. */
518	if (!dst->key_values)	496	if (!key_values)
519	{	497	{
520	dst->key_values = new_link;	498	key_values = new_link;
521	tail = new_link;	499	tail = new_link;
522	}	500	}
523	else	501	else
524	{	502	{
525	tail->next = new_link;	503	tail->next = new_link;
526	tail = new_link;	504	tail = new_link;
527	}	505	}
528	}	506	}
529	}	507	}
		508	}
530		509
531	update_ob_speed (dst);	510	/*
		511	* copy_to first frees everything allocated by the dst object,
		512	* and then copies the contents of itself into the second
		513	* object, allocating what needs to be allocated. Basically, any
		514	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		515	* if the first object is freed, the pointers in the new object
		516	* will point at garbage.
		517	*/
		518	void
		519	object::copy_to (object *dst)
		520	{
		521	*dst = *this;
		522
		523	if (speed < 0)
		524	dst->speed_left = speed_left - rndm ();
		525
		526	dst->set_speed (dst->speed);
		527	}
		528
		529	void
		530	object::instantiate ()
		531	{
		532	if (!uuid.seq) // HACK
		533	uuid = gen_uuid ();
		534
		535	speed_left = -0.1f;
		536	/* copy the body_info to the body_used - this is only really
		537	* need for monsters, but doesn't hurt to do it for everything.
		538	* by doing so, when a monster is created, it has good starting
		539	* values for the body_used info, so when items are created
		540	* for it, they can be properly equipped.
		541	*/
		542	memcpy (body_used, body_info, sizeof (body_used));
		543
		544	attachable::instantiate ();
532	}	545	}
533		546
534	object *	547	object *
535	object::clone ()	548	object::clone ()
536	{	549	{
…		…
542	/*	555	/*
543	* If an object with the IS_TURNABLE() flag needs to be turned due	556	* If an object with the IS_TURNABLE() flag needs to be turned due
544	* to the closest player being on the other side, this function can	557	* to the closest player being on the other side, this function can
545	* be called to update the face variable, _and_ how it looks on the map.	558	* be called to update the face variable, _and_ how it looks on the map.
546	*/	559	*/
547
548	void	560	void
549	update_turn_face (object *op)	561	update_turn_face (object *op)
550	{	562	{
551	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	563	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
552	return;	564	return;
		565
553	SET_ANIMATION (op, op->direction);	566	SET_ANIMATION (op, op->direction);
554	update_object (op, UP_OBJ_FACE);	567	update_object (op, UP_OBJ_FACE);
555	}	568	}
556		569
557	/*	570	/*
558	* Updates the speed of an object. If the speed changes from 0 to another	571	* Updates the speed of an object. If the speed changes from 0 to another
559	* value, or vice versa, then add/remove the object from the active list.	572	* value, or vice versa, then add/remove the object from the active list.
560	* This function needs to be called whenever the speed of an object changes.	573	* This function needs to be called whenever the speed of an object changes.
561	*/	574	*/
562	void	575	void
563	update_ob_speed (object *op)	576	object::set_speed (float speed)
564	{	577	{
565	extern int arch_init;	578	if (flag [FLAG_FREED] && speed)
566
567	/* No reason putting the archetypes objects on the speed list,
568	* since they never really need to be updated.
569	*/
570
571	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
572	{	579	{
573	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	580	LOG (llevError, "Object %s is freed but has speed.\n", &name);
574	#ifdef MANY_CORES
575	abort ();
576	#else
577	op->speed = 0;	581	speed = 0;
578	#endif
579	}
580
581	if (arch_init)
582	return;
583
584	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
585	{	582	}
586	/* If already on active list, don't do anything */
587	if (op->active_next || op->active_prev || op == active_objects)
588	return;
589		583
590	/* process_events() expects us to insert the object at the beginning	584	this->speed = speed;
591	* of the list. */
592	op->active_next = active_objects;
593		585
594	if (op->active_next != NULL)	586	if (has_active_speed ())
595	op->active_next->active_prev = op;	587	activate ();
596
597	active_objects = op;
598	}
599	else	588	else
600	{	589	deactivate ();
601	/* If not on the active list, nothing needs to be done */
602	if (!op->active_next && !op->active_prev && op != active_objects)
603	return;
604
605	if (op->active_prev == NULL)
606	{
607	active_objects = op->active_next;
608
609	if (op->active_next != NULL)
610	op->active_next->active_prev = NULL;
611	}
612	else
613	{
614	op->active_prev->active_next = op->active_next;
615
616	if (op->active_next)
617	op->active_next->active_prev = op->active_prev;
618	}
619
620	op->active_next = NULL;
621	op->active_prev = NULL;
622	}
623	}
624
625	/* This function removes object 'op' from the list of active
626	* objects.
627	* This should only be used for style maps or other such
628	* reference maps where you don't want an object that isn't
629	* in play chewing up cpu time getting processed.
630	* The reverse of this is to call update_ob_speed, which
631	* will do the right thing based on the speed of the object.
632	*/
633	void
634	remove_from_active_list (object *op)
635	{
636	/* If not on the active list, nothing needs to be done */
637	if (!op->active_next && !op->active_prev && op != active_objects)
638	return;
639
640	if (op->active_prev == NULL)
641	{
642	active_objects = op->active_next;
643	if (op->active_next != NULL)
644	op->active_next->active_prev = NULL;
645	}
646	else
647	{
648	op->active_prev->active_next = op->active_next;
649	if (op->active_next)
650	op->active_next->active_prev = op->active_prev;
651	}
652	op->active_next = NULL;
653	op->active_prev = NULL;
654	}	590	}
655		591
656	/*	592	/*
657	* update_object() updates the the map.	593	* update_object() updates the the map.
658	* It takes into account invisible objects (and represent squares covered	594	* It takes into account invisible objects (and represent squares covered
…		…
671	* UP_OBJ_FACE: only the objects face has changed.	607	* UP_OBJ_FACE: only the objects face has changed.
672	*/	608	*/
673	void	609	void
674	update_object (object *op, int action)	610	update_object (object *op, int action)
675	{	611	{
676	MoveType move_on, move_off, move_block, move_slow;
677
678	if (op == NULL)	612	if (op == NULL)
679	{	613	{
680	/* this should never happen */	614	/* this should never happen */
681	LOG (llevDebug, "update_object() called for NULL object.\n");	615	LOG (llevDebug, "update_object() called for NULL object.\n");
682	return;	616	return;
…		…
695	*/	629	*/
696	if (!op->map || op->map->in_memory == MAP_SAVING)	630	if (!op->map || op->map->in_memory == MAP_SAVING)
697	return;	631	return;
698		632
699	/* make sure the object is within map boundaries */	633	/* make sure the object is within map boundaries */
700	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	634	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
701	{	635	{
702	LOG (llevError, "update_object() called for object out of map!\n");	636	LOG (llevError, "update_object() called for object out of map!\n");
703	#ifdef MANY_CORES	637	#ifdef MANY_CORES
704	abort ();	638	abort ();
705	#endif	639	#endif
706	return;	640	return;
707	}	641	}
708		642
709	mapspace &m = op->ms ();	643	mapspace &m = op->ms ();
710		644
711	if (m.flags_ & P_NEED_UPDATE)	645	if (!(m.flags_ & P_UPTODATE))
712	/* nop */;	646	/* nop */;
713	else if (action == UP_OBJ_INSERT)	647	else if (action == UP_OBJ_INSERT)
714	{	648	{
715	// this is likely overkill, TODO: revisit (schmorp)	649	// this is likely overkill, TODO: revisit (schmorp)
716	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	650	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
725	/* This isn't perfect, but I don't expect a lot of objects to	659	/* This isn't perfect, but I don't expect a lot of objects to
726	* to have move_allow right now.	660	* to have move_allow right now.
727	*/	661	*/
728	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	662	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
729	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	663	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
730	m.flags_ = P_NEED_UPDATE;	664	m.flags_ = 0;
731	}	665	}
732	/* if the object is being removed, we can't make intelligent	666	/* if the object is being removed, we can't make intelligent
733	* decisions, because remove_ob can't really pass the object	667	* decisions, because remove_ob can't really pass the object
734	* that is being removed.	668	* that is being removed.
735	*/	669	*/
736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	670	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
737	m.flags_ = P_NEED_UPDATE;	671	m.flags_ = 0;
738	else if (action == UP_OBJ_FACE)	672	else if (action == UP_OBJ_FACE)
739	/* Nothing to do for that case */ ;	673	/* Nothing to do for that case */ ;
740	else	674	else
741	LOG (llevError, "update_object called with invalid action: %d\n", action);	675	LOG (llevError, "update_object called with invalid action: %d\n", action);
742		676
743	if (op->more)	677	if (op->more)
744	update_object (op->more, action);	678	update_object (op->more, action);
745	}	679	}
746		680
747	object::vector object::mortals;
748	object::vector object::objects; // not yet used
749	object *object::first;
750
751	void object::free_mortals ()
752	{
753	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
754	if ((*i)->refcnt)
755	++i; // further delay freeing
756	else
757	{
758	delete *i;
759	mortals.erase (i);
760	}
761	}
762
763	object::object ()	681	object::object ()
764	{	682	{
765	SET_FLAG (this, FLAG_REMOVED);	683	SET_FLAG (this, FLAG_REMOVED);
766		684
767	expmul = 1.0;	685	expmul = 1.0;
768	face = blank_face;	686	face = blank_face;
769	}	687	}
770		688
771	object::~object ()	689	object::~object ()
772	{	690	{
		691	unlink ();
		692
773	free_key_values (this);	693	free_key_values (this);
774	}	694	}
775		695
		696	static int object_count;
		697
776	void object::link ()	698	void object::link ()
777	{	699	{
778	count = ++ob_count;	700	assert (!index);//D
779	uuid = gen_uuid ();	701	uuid = gen_uuid ();
		702	count = ++object_count;
780		703
781	prev = 0;	704	refcnt_inc ();
782	next = object::first;	705	objects.insert (this);
783
784	if (object::first)
785	object::first->prev = this;
786
787	object::first = this;
788	}	706	}
789		707
790	void object::unlink ()	708	void object::unlink ()
791	{	709	{
792	if (this == object::first)	710	if (!index)
793	object::first = next;	711	return;
794		712
795	/* Remove this object from the list of used objects */	713	objects.erase (this);
796	if (prev) prev->next = next;	714	refcnt_dec ();
797	if (next) next->prev = prev;	715	}
798		716
799	prev = 0;	717	void
800	next = 0;	718	object::activate ()
		719	{
		720	/* If already on active list, don't do anything */
		721	if (active)
		722	return;
		723
		724	if (has_active_speed ())
		725	actives.insert (this);
		726	}
		727
		728	void
		729	object::activate_recursive ()
		730	{
		731	activate ();
		732
		733	for (object *op = inv; op; op = op->below)
		734	op->activate_recursive ();
		735	}
		736
		737	/* This function removes object 'op' from the list of active
		738	* objects.
		739	* This should only be used for style maps or other such
		740	* reference maps where you don't want an object that isn't
		741	* in play chewing up cpu time getting processed.
		742	* The reverse of this is to call update_ob_speed, which
		743	* will do the right thing based on the speed of the object.
		744	*/
		745	void
		746	object::deactivate ()
		747	{
		748	/* If not on the active list, nothing needs to be done */
		749	if (!active)
		750	return;
		751
		752	actives.erase (this);
		753	}
		754
		755	void
		756	object::deactivate_recursive ()
		757	{
		758	for (object *op = inv; op; op = op->below)
		759	op->deactivate_recursive ();
		760
		761	deactivate ();
		762	}
		763
		764	void
		765	object::set_flag_inv (int flag, int value)
		766	{
		767	for (object *op = inv; op; op = op->below)
		768	{
		769	op->flag [flag] = value;
		770	op->set_flag_inv (flag, value);
		771	}
		772	}
		773
		774	/*
		775	* Remove and free all objects in the inventory of the given object.
		776	* object.c ?
		777	*/
		778	void
		779	object::destroy_inv (bool drop_to_ground)
		780	{
		781	// need to check first, because the checks below might segfault
		782	// as we might be on an invalid mapspace and crossfire code
		783	// is too buggy to ensure that the inventory is empty.
		784	// corollary: if you create arrows etc. with stuff in tis inventory,
		785	// cf will crash below with off-map x and y
		786	if (!inv)
		787	return;
		788
		789	/* Only if the space blocks everything do we not process -
		790	* if some form of movement is allowed, let objects
		791	* drop on that space.
		792	*/
		793	if (!drop_to_ground
		794	|| !map
		795	|| map->in_memory != MAP_IN_MEMORY
		796	|| map->nodrop
		797	|| ms ().move_block == MOVE_ALL)
		798	{
		799	while (inv)
		800	{
		801	inv->destroy_inv (drop_to_ground);
		802	inv->destroy ();
		803	}
		804	}
		805	else
		806	{ /* Put objects in inventory onto this space */
		807	while (inv)
		808	{
		809	object *op = inv;
		810
		811	if (op->flag [FLAG_STARTEQUIP]
		812	|| op->flag [FLAG_NO_DROP]
		813	|| op->type == RUNE
		814	|| op->type == TRAP
		815	|| op->flag [FLAG_IS_A_TEMPLATE]
		816	|| op->flag [FLAG_DESTROY_ON_DEATH])
		817	op->destroy ();
		818	else
		819	map->insert (op, x, y);
		820	}
		821	}
801	}	822	}
802		823
803	object *object::create ()	824	object *object::create ()
804	{	825	{
805	object *op = new object;	826	object *op = new object;
806	op->link ();	827	op->link ();
807	return op;	828	return op;
808	}	829	}
809		830
810	/*	831	void
811	* free_object() frees everything allocated by an object, removes	832	object::do_destroy ()
812	* it from the list of used objects, and puts it on the list of
813	* free objects. The IS_FREED() flag is set in the object.
814	* The object must have been removed by remove_ob() first for
815	* this function to succeed.
816	*
817	* If destroy_inventory is set, free inventory as well. Else drop items in
818	* inventory to the ground.
819	*/
820	void object::destroy (bool destroy_inventory)
821	{	833	{
822	if (QUERY_FLAG (this, FLAG_FREED))	834	attachable::do_destroy ();
823	return;
824		835
825	if (QUERY_FLAG (this, FLAG_FRIENDLY))	836	if (flag [FLAG_IS_LINKED])
		837	remove_button_link (this);
		838
		839	if (flag [FLAG_FRIENDLY])
826	remove_friendly_object (this);	840	remove_friendly_object (this);
827		841
828	if (!QUERY_FLAG (this, FLAG_REMOVED))	842	if (!flag [FLAG_REMOVED])
829	remove ();	843	remove ();
830		844
831	SET_FLAG (this, FLAG_FREED);	845	destroy_inv (true);
832		846
833	if (more)	847	deactivate ();
834	{	848	unlink ();
835	more->destroy (destroy_inventory);
836	more = 0;
837	}
838		849
839	if (inv)	850	flag [FLAG_FREED] = 1;
840	{
841	/* Only if the space blocks everything do we not process -
842	* if some form of movement is allowed, let objects
843	* drop on that space.
844	*/
845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
846	{
847	object *op = inv;
848
849	while (op)
850	{
851	object *tmp = op->below;
852	op->destroy (destroy_inventory);
853	op = tmp;
854	}
855	}
856	else
857	{ /* Put objects in inventory onto this space */
858	object *op = inv;
859
860	while (op)
861	{
862	object *tmp = op->below;
863
864	op->remove ();
865
866	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
868	op->destroy ();
869	else
870	{
871	op->x = x;
872	op->y = y;
873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
874	}
875
876	op = tmp;
877	}
878	}
879	}
880		851
881	// hack to ensure that freed objects still have a valid map	852	// hack to ensure that freed objects still have a valid map
882	{	853	{
883	static maptile *freed_map; // freed objects are moved here to avoid crashes	854	static maptile *freed_map; // freed objects are moved here to avoid crashes
884		855
…		…
888		859
889	freed_map->name = "/internal/freed_objects_map";	860	freed_map->name = "/internal/freed_objects_map";
890	freed_map->width = 3;	861	freed_map->width = 3;
891	freed_map->height = 3;	862	freed_map->height = 3;
892		863
893	freed_map->allocate ();	864	freed_map->alloc ();
		865	freed_map->in_memory = MAP_IN_MEMORY;
894	}	866	}
895		867
896	map = freed_map;	868	map = freed_map;
897	x = 1;	869	x = 1;
898	y = 1;	870	y = 1;
899	}	871	}
900		872
		873	head = 0;
		874
		875	if (more)
		876	{
		877	more->destroy ();
		878	more = 0;
		879	}
		880
901	// clear those pointers that likely might have circular references to us	881	// clear those pointers that likely might have circular references to us
902	owner = 0;	882	owner = 0;
903	enemy = 0;	883	enemy = 0;
904	attacked_by = 0;	884	attacked_by = 0;
		885	}
905		886
906	// only relevant for players(?), but make sure of it anyways	887	void
907	contr = 0;	888	object::destroy (bool destroy_inventory)
		889	{
		890	if (destroyed ())
		891	return;
908		892
909	/* Remove object from the active list */	893	if (destroy_inventory)
910	speed = 0;	894	destroy_inv (false);
911	update_ob_speed (this);
912		895
913	unlink ();	896	attachable::destroy ();
914
915	mortals.push_back (this);
916	}	897	}
917		898
918	/*	899	/*
919	* sub_weight() recursively (outwards) subtracts a number from the	900	* sub_weight() recursively (outwards) subtracts a number from the
920	* weight of an object (and what is carried by it's environment(s)).	901	* weight of an object (and what is carried by it's environment(s)).
…		…
936	* This function removes the object op from the linked list of objects	917	* This function removes the object op from the linked list of objects
937	* which it is currently tied to. When this function is done, the	918	* which it is currently tied to. When this function is done, the
938	* object will have no environment. If the object previously had an	919	* object will have no environment. If the object previously had an
939	* environment, the x and y coordinates will be updated to	920	* environment, the x and y coordinates will be updated to
940	* the previous environment.	921	* the previous environment.
941	* Beware: This function is called from the editor as well!
942	*/	922	*/
943	void	923	void
944	object::remove ()	924	object::do_remove ()
945	{	925	{
946	object *tmp, *last = 0;	926	object *tmp, *last = 0;
947	object *otmp;	927	object *otmp;
948		928
949	int check_walk_off;
950
951	if (QUERY_FLAG (this, FLAG_REMOVED))	929	if (QUERY_FLAG (this, FLAG_REMOVED))
952	return;	930	return;
953		931
954	SET_FLAG (this, FLAG_REMOVED);	932	SET_FLAG (this, FLAG_REMOVED);
		933	INVOKE_OBJECT (REMOVE, this);
955		934
956	if (more)	935	if (more)
957	more->remove ();	936	more->remove ();
958		937
959	/*	938	/*
…		…
972	* to save cpu time.	951	* to save cpu time.
973	*/	952	*/
974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	953	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
975	otmp->update_stats ();	954	otmp->update_stats ();
976		955
977	if (above != NULL)	956	if (above)
978	above->below = below;	957	above->below = below;
979	else	958	else
980	env->inv = below;	959	env->inv = below;
981		960
982	if (below != NULL)	961	if (below)
983	below->above = above;	962	below->above = above;
984		963
985	/* we set up values so that it could be inserted into	964	/* we set up values so that it could be inserted into
986	* the map, but we don't actually do that - it is up	965	* the map, but we don't actually do that - it is up
987	* to the caller to decide what we want to do.	966	* to the caller to decide what we want to do.
…		…
991	above = 0, below = 0;	970	above = 0, below = 0;
992	env = 0;	971	env = 0;
993	}	972	}
994	else if (map)	973	else if (map)
995	{	974	{
996	/* Re did the following section of code - it looks like it had	975	if (type == PLAYER)
997	* lots of logic for things we no longer care about
998	*/	976	{
		977	// leaving a spot always closes any open container on the ground
		978	if (container && !container->env)
		979	// this causes spurious floorbox updates, but it ensures
		980	// that the CLOSE event is being sent.
		981	close_container ();
		982
		983	--map->players;
		984	map->touch ();
		985	}
		986
		987	map->dirty = true;
		988	mapspace &ms = this->ms ();
999		989
1000	/* link the object above us */	990	/* link the object above us */
1001	if (above)	991	if (above)
1002	above->below = below;	992	above->below = below;
1003	else	993	else
1004	map->at (x, y).top = below; /* we were top, set new top */	994	ms.top = below; /* we were top, set new top */
1005		995
1006	/* Relink the object below us, if there is one */	996	/* Relink the object below us, if there is one */
1007	if (below)	997	if (below)
1008	below->above = above;	998	below->above = above;
1009	else	999	else
…		…
1011	/* Nothing below, which means we need to relink map object for this space	1001	/* Nothing below, which means we need to relink map object for this space
1012	* use translated coordinates in case some oddness with map tiling is	1002	* use translated coordinates in case some oddness with map tiling is
1013	* evident	1003	* evident
1014	*/	1004	*/
1015	if (GET_MAP_OB (map, x, y) != this)	1005	if (GET_MAP_OB (map, x, y) != this)
1016	{
1017	char *dump = dump_object (this);
1018	LOG (llevError,
1019	"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);	1006	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 ());
1020	free (dump);
1021	dump = dump_object (GET_MAP_OB (map, x, y));
1022	LOG (llevError, "%s\n", dump);
1023	free (dump);
1024	}
1025		1007
1026	map->at (x, y).bottom = above; /* goes on above it. */	1008	ms.bot = above; /* goes on above it. */
1027	}	1009	}
1028		1010
1029	above = 0;	1011	above = 0;
1030	below = 0;	1012	below = 0;
1031		1013
1032	if (map->in_memory == MAP_SAVING)	1014	if (map->in_memory == MAP_SAVING)
1033	return;	1015	return;
1034		1016
1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1017	int check_walk_off = !flag [FLAG_NO_APPLY];
1036		1018
1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1019	for (tmp = ms.bot; tmp; tmp = tmp->above)
1038	{	1020	{
1039	/* No point updating the players look faces if he is the object	1021	/* No point updating the players look faces if he is the object
1040	* being removed.	1022	* being removed.
1041	*/	1023	*/
1042		1024
…		…
1046	* removed (most likely destroyed), update the player view	1028	* removed (most likely destroyed), update the player view
1047	* appropriately.	1029	* appropriately.
1048	*/	1030	*/
1049	if (tmp->container == this)	1031	if (tmp->container == this)
1050	{	1032	{
1051	CLEAR_FLAG (this, FLAG_APPLIED);	1033	flag [FLAG_APPLIED] = 0;
1052	tmp->container = 0;	1034	tmp->container = 0;
1053	}	1035	}
1054		1036
		1037	if (tmp->contr->ns)
1055	tmp->contr->ns->floorbox_update ();	1038	tmp->contr->ns->floorbox_update ();
1056	}	1039	}
1057		1040
1058	/* See if player moving off should effect something */	1041	/* See if object moving off should effect something */
1059	if (check_walk_off	1042	if (check_walk_off
1060	&& ((move_type & tmp->move_off)	1043	&& ((move_type & tmp->move_off)
1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1062	{	1045	{
1063	move_apply (tmp, this, 0);	1046	move_apply (tmp, this, 0);
…		…
1065	if (destroyed ())	1048	if (destroyed ())
1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1067	}	1050	}
1068		1051
1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1070		1053	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1071	if (tmp->above == tmp)	1054	if (tmp->above == tmp)
1072	tmp->above = 0;	1055	tmp->above = 0;
1073		1056
1074	last = tmp;	1057	last = tmp;
1075	}	1058	}
1076		1059
1077	/* last == NULL of there are no objects on this space */	1060	/* last == NULL if there are no objects on this space */
		1061	//TODO: this makes little sense, why only update the topmost object?
1078	if (!last)	1062	if (!last)
1079	map->at (x, y).flags_ = P_NEED_UPDATE;	1063	map->at (x, y).flags_ = 0;
1080	else	1064	else
1081	update_object (last, UP_OBJ_REMOVE);	1065	update_object (last, UP_OBJ_REMOVE);
1082		1066
1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1067	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1084	update_all_los (map, x, y);	1068	update_all_los (map, x, y);
1085	}	1069	}
1086	}	1070	}
1087		1071
1088	/*	1072	/*
…		…
1097	merge_ob (object *op, object *top)	1081	merge_ob (object *op, object *top)
1098	{	1082	{
1099	if (!op->nrof)	1083	if (!op->nrof)
1100	return 0;	1084	return 0;
1101		1085
1102	if (top == NULL)	1086	if (top)
1103	for (top = op; top != NULL && top->above != NULL; top = top->above);	1087	for (top = op; top && top->above; top = top->above)
		1088	;
1104		1089
1105	for (; top != NULL; top = top->below)	1090	for (; top; top = top->below)
1106	{	1091	{
1107	if (top == op)	1092	if (top == op)
1108	continue;	1093	continue;
1109		1094
1110	if (object::can_merge (op, top))	1095	if (object::can_merge (op, top))
…		…
1119	}	1104	}
1120		1105
1121	return 0;	1106	return 0;
1122	}	1107	}
1123		1108
		1109	void
		1110	object::expand_tail ()
		1111	{
		1112	if (more)
		1113	return;
		1114
		1115	object *prev = this;
		1116
		1117	for (archetype *at = arch->more; at; at = at->more)
		1118	{
		1119	object *op = arch_to_object (at);
		1120
		1121	op->name = name;
		1122	op->name_pl = name_pl;
		1123	op->title = title;
		1124
		1125	op->head = this;
		1126	prev->more = op;
		1127
		1128	prev = op;
		1129	}
		1130	}
		1131
1124	/*	1132	/*
1125	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1133	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1126	* job preparing multi-part monsters	1134	* job preparing multi-part monsters.
1127	*/	1135	*/
1128	object *	1136	object *
1129	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1130	{	1138	{
1131	object *tmp;
1132
1133	if (op->head)
1134	op = op->head;
1135
1136	for (tmp = op; tmp; tmp = tmp->more)	1139	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1137	{	1140	{
1138	tmp->x = x + tmp->arch->clone.x;	1141	tmp->x = x + tmp->arch->clone.x;
1139	tmp->y = y + tmp->arch->clone.y;	1142	tmp->y = y + tmp->arch->clone.y;
1140	}	1143	}
1141		1144
…		…
1160	* Return value:	1163	* Return value:
1161	* new object if 'op' was merged with other object	1164	* new object if 'op' was merged with other object
1162	* NULL if 'op' was destroyed	1165	* NULL if 'op' was destroyed
1163	* just 'op' otherwise	1166	* just 'op' otherwise
1164	*/	1167	*/
1165
1166	object *	1168	object *
1167	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1169	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1168	{	1170	{
		1171	assert (!op->flag [FLAG_FREED]);
		1172
1169	object *tmp, *top, *floor = NULL;	1173	object *tmp, *top, *floor = NULL;
1170	sint16 x, y;
1171		1174
1172	if (QUERY_FLAG (op, FLAG_FREED))	1175	op->remove ();
1173	{
1174	LOG (llevError, "Trying to insert freed object!\n");
1175	return NULL;
1176	}
1177		1176
1178	if (m == NULL)	1177	#if 0
1179	{	1178	if (!m->active != !op->active)
1180	char *dump = dump_object (op);	1179	if (m->active)
1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1180	op->activate_recursive ();
1182	free (dump);	1181	else
1183	return op;	1182	op->deactivate_recursive ();
1184	}	1183	#endif
1185		1184
1186	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1187	{	1186	{
1188	char *dump = dump_object (op);
1189	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1187	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1190	#ifdef MANY_CORES	1188	#ifdef MANY_CORES
1191	/* Better to catch this here, as otherwise the next use of this object	1189	/* Better to catch this here, as otherwise the next use of this object
1192	* is likely to cause a crash. Better to find out where it is getting	1190	* is likely to cause a crash. Better to find out where it is getting
1193	* improperly inserted.	1191	* improperly inserted.
1194	*/	1192	*/
1195	abort ();	1193	abort ();
1196	#endif	1194	#endif
1197	free (dump);
1198	return op;	1195	return op;
1199	}	1196	}
1200		1197
1201	if (!QUERY_FLAG (op, FLAG_REMOVED))
1202	{
1203	char *dump = dump_object (op);
1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1205	free (dump);
1206	return op;
1207	}
1208
1209	if (op->more != NULL)
1210	{
1211	/* The part may be on a different map. */
1212
1213	object *more = op->more;	1198	if (object *more = op->more)
1214		1199	{
1215	/* We really need the caller to normalize coordinates - if
1216	* we set the map, that doesn't work if the location is within
1217	* a map and this is straddling an edge. So only if coordinate
1218	* is clear wrong do we normalize it.
1219	*/
1220	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1221	more->map = get_map_from_coord (m, &more->x, &more->y);
1222	else if (!more->map)
1223	{
1224	/* For backwards compatibility - when not dealing with tiled maps,
1225	* more->map should always point to the parent.
1226	*/
1227	more->map = m;
1228	}
1229
1230	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1200	if (!insert_ob_in_map (more, m, originator, flag))
1231	{	1201	{
1232	if (!op->head)	1202	if (!op->head)
1233	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1203	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1234		1204
1235	return NULL;	1205	return 0;
1236	}	1206	}
1237	}	1207	}
1238		1208
1239	CLEAR_FLAG (op, FLAG_REMOVED);	1209	CLEAR_FLAG (op, FLAG_REMOVED);
1240		1210
1241	/* Ideally, the caller figures this out. However, it complicates a lot	1211	/* Ideally, the caller figures this out. However, it complicates a lot
1242	* of areas of callers (eg, anything that uses find_free_spot would now	1212	* of areas of callers (eg, anything that uses find_free_spot would now
1243	* need extra work	1213	* need extra work
1244	*/	1214	*/
1245	op->map = get_map_from_coord (m, &op->x, &op->y);	1215	if (!xy_normalise (m, op->x, op->y))
1246	x = op->x;	1216	return 0;
1247	y = op->y;	1217
		1218	op->map = m;
		1219	mapspace &ms = op->ms ();
1248		1220
1249	/* this has to be done after we translate the coordinates.	1221	/* this has to be done after we translate the coordinates.
1250	*/	1222	*/
1251	if (op->nrof && !(flag & INS_NO_MERGE))	1223	if (op->nrof && !(flag & INS_NO_MERGE))
1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1224	for (tmp = ms.bot; tmp; tmp = tmp->above)
1253	if (object::can_merge (op, tmp))	1225	if (object::can_merge (op, tmp))
1254	{	1226	{
1255	op->nrof += tmp->nrof;	1227	op->nrof += tmp->nrof;
1256	tmp->destroy ();	1228	tmp->destroy ();
1257	}	1229	}
…		…
1274	op->below = originator->below;	1246	op->below = originator->below;
1275		1247
1276	if (op->below)	1248	if (op->below)
1277	op->below->above = op;	1249	op->below->above = op;
1278	else	1250	else
1279	op->ms ().bottom = op;	1251	ms.bot = op;
1280		1252
1281	/* since *below* originator, no need to update top */	1253	/* since *below* originator, no need to update top */
1282	originator->below = op;	1254	originator->below = op;
1283	}	1255	}
1284	else	1256	else
1285	{	1257	{
		1258	top = ms.bot;
		1259
1286	/* If there are other objects, then */	1260	/* If there are other objects, then */
1287	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1261	if ((!(flag & INS_MAP_LOAD)) && top)
1288	{	1262	{
1289	object *last = NULL;	1263	object *last = 0;
1290		1264
1291	/*	1265	/*
1292	* If there are multiple objects on this space, we do some trickier handling.	1266	* If there are multiple objects on this space, we do some trickier handling.
1293	* We've already dealt with merging if appropriate.	1267	* We've already dealt with merging if appropriate.
1294	* Generally, we want to put the new object on top. But if	1268	* Generally, we want to put the new object on top. But if
…		…
1298	* once we get to them. This reduces the need to traverse over all of	1272	* once we get to them. This reduces the need to traverse over all of
1299	* them when adding another one - this saves quite a bit of cpu time	1273	* them when adding another one - this saves quite a bit of cpu time
1300	* when lots of spells are cast in one area. Currently, it is presumed	1274	* when lots of spells are cast in one area. Currently, it is presumed
1301	* that flying non pickable objects are spell objects.	1275	* that flying non pickable objects are spell objects.
1302	*/	1276	*/
1303		1277	for (top = ms.bot; top; top = top->above)
1304	while (top != NULL)
1305	{	1278	{
1306	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1279	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1307	floor = top;	1280	floor = top;
1308		1281
1309	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1282	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1312	top = top->below;	1285	top = top->below;
1313	break;	1286	break;
1314	}	1287	}
1315		1288
1316	last = top;	1289	last = top;
1317	top = top->above;
1318	}	1290	}
1319		1291
1320	/* Don't want top to be NULL, so set it to the last valid object */	1292	/* Don't want top to be NULL, so set it to the last valid object */
1321	top = last;	1293	top = last;
1322		1294
…		…
1324	* looks like instead of lots of conditions here.	1296	* looks like instead of lots of conditions here.
1325	* makes things faster, and effectively the same result.	1297	* makes things faster, and effectively the same result.
1326	*/	1298	*/
1327		1299
1328	/* Have object 'fall below' other objects that block view.	1300	/* Have object 'fall below' other objects that block view.
1329	* Unless those objects are exits, type 66	1301	* Unless those objects are exits.
1330	* If INS_ON_TOP is used, don't do this processing	1302	* If INS_ON_TOP is used, don't do this processing
1331	* Need to find the object that in fact blocks view, otherwise	1303	* Need to find the object that in fact blocks view, otherwise
1332	* stacking is a bit odd.	1304	* stacking is a bit odd.
1333	*/	1305	*/
1334	if (!(flag & INS_ON_TOP) &&	1306	if (!(flag & INS_ON_TOP)
1335	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1307	&& ms.flags () & P_BLOCKSVIEW
		1308	&& (op->face && !faces [op->face].visibility))
1336	{	1309	{
1337	for (last = top; last != floor; last = last->below)	1310	for (last = top; last != floor; last = last->below)
1338	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1311	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1339	break;	1312	break;
		1313
1340	/* Check to see if we found the object that blocks view,	1314	/* Check to see if we found the object that blocks view,
1341	* and make sure we have a below pointer for it so that	1315	* and make sure we have a below pointer for it so that
1342	* we can get inserted below this one, which requires we	1316	* we can get inserted below this one, which requires we
1343	* set top to the object below us.	1317	* set top to the object below us.
1344	*/	1318	*/
…		…
1346	top = last->below;	1320	top = last->below;
1347	}	1321	}
1348	} /* If objects on this space */	1322	} /* If objects on this space */
1349		1323
1350	if (flag & INS_MAP_LOAD)	1324	if (flag & INS_MAP_LOAD)
1351	top = GET_MAP_TOP (op->map, op->x, op->y);	1325	top = ms.top;
1352		1326
1353	if (flag & INS_ABOVE_FLOOR_ONLY)	1327	if (flag & INS_ABOVE_FLOOR_ONLY)
1354	top = floor;	1328	top = floor;
1355		1329
1356	/* Top is the object that our object (op) is going to get inserted above.	1330	/* Top is the object that our object (op) is going to get inserted above.
1357	*/	1331	*/
1358		1332
1359	/* First object on this space */	1333	/* First object on this space */
1360	if (!top)	1334	if (!top)
1361	{	1335	{
1362	op->above = GET_MAP_OB (op->map, op->x, op->y);	1336	op->above = ms.bot;
1363		1337
1364	if (op->above)	1338	if (op->above)
1365	op->above->below = op;	1339	op->above->below = op;
1366		1340
1367	op->below = NULL;	1341	op->below = 0;
1368	op->ms ().bottom = op;	1342	ms.bot = op;
1369	}	1343	}
1370	else	1344	else
1371	{ /* get inserted into the stack above top */	1345	{ /* get inserted into the stack above top */
1372	op->above = top->above;	1346	op->above = top->above;
1373		1347
…		…
1376		1350
1377	op->below = top;	1351	op->below = top;
1378	top->above = op;	1352	top->above = op;
1379	}	1353	}
1380		1354
1381	if (op->above == NULL)	1355	if (!op->above)
1382	op->ms ().top = op;	1356	ms.top = op;
1383	} /* else not INS_BELOW_ORIGINATOR */	1357	} /* else not INS_BELOW_ORIGINATOR */
1384		1358
1385	if (op->type == PLAYER)	1359	if (op->type == PLAYER)
		1360	{
1386	op->contr->do_los = 1;	1361	op->contr->do_los = 1;
		1362	++op->map->players;
		1363	op->map->touch ();
		1364	}
		1365
		1366	op->map->dirty = true;
1387		1367
1388	/* If we have a floor, we know the player, if any, will be above	1368	/* If we have a floor, we know the player, if any, will be above
1389	* it, so save a few ticks and start from there.	1369	* it, so save a few ticks and start from there.
1390	*/	1370	*/
1391	if (!(flag & INS_MAP_LOAD))	1371	if (!(flag & INS_MAP_LOAD))
1392	if (object *pl = op->ms ().player ())	1372	if (object *pl = ms.player ())
		1373	if (pl->contr->ns)
1393	pl->contr->ns->floorbox_update ();	1374	pl->contr->ns->floorbox_update ();
1394		1375
1395	/* If this object glows, it may affect lighting conditions that are	1376	/* If this object glows, it may affect lighting conditions that are
1396	* visible to others on this map. But update_all_los is really	1377	* visible to others on this map. But update_all_los is really
1397	* an inefficient way to do this, as it means los for all players	1378	* an inefficient way to do this, as it means los for all players
1398	* on the map will get recalculated. The players could very well	1379	* on the map will get recalculated. The players could very well
1399	* be far away from this change and not affected in any way -	1380	* be far away from this change and not affected in any way -
1400	* this should get redone to only look for players within range,	1381	* this should get redone to only look for players within range,
1401	* or just updating the P_NEED_UPDATE for spaces within this area	1382	* or just updating the P_UPTODATE for spaces within this area
1402	* of effect may be sufficient.	1383	* of effect may be sufficient.
1403	*/	1384	*/
1404	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1385	if (op->map->darkness && (op->glow_radius != 0))
1405	update_all_los (op->map, op->x, op->y);	1386	update_all_los (op->map, op->x, op->y);
1406		1387
1407	/* updates flags (blocked, alive, no magic, etc) for this map space */	1388	/* updates flags (blocked, alive, no magic, etc) for this map space */
1408	update_object (op, UP_OBJ_INSERT);	1389	update_object (op, UP_OBJ_INSERT);
		1390
		1391	INVOKE_OBJECT (INSERT, op);
1409		1392
1410	/* Don't know if moving this to the end will break anything. However,	1393	/* Don't know if moving this to the end will break anything. However,
1411	* we want to have floorbox_update called before calling this.	1394	* we want to have floorbox_update called before calling this.
1412	*	1395	*
1413	* check_move_on() must be after this because code called from	1396	* check_move_on() must be after this because code called from
…		…
1418		1401
1419	/* if this is not the head or flag has been passed, don't check walk on status */	1402	/* if this is not the head or flag has been passed, don't check walk on status */
1420	if (!(flag & INS_NO_WALK_ON) && !op->head)	1403	if (!(flag & INS_NO_WALK_ON) && !op->head)
1421	{	1404	{
1422	if (check_move_on (op, originator))	1405	if (check_move_on (op, originator))
1423	return NULL;	1406	return 0;
1424		1407
1425	/* If we are a multi part object, lets work our way through the check	1408	/* If we are a multi part object, lets work our way through the check
1426	* walk on's.	1409	* walk on's.
1427	*/	1410	*/
1428	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1429	if (check_move_on (tmp, originator))	1412	if (check_move_on (tmp, originator))
1430	return NULL;	1413	return 0;
1431	}	1414	}
1432		1415
1433	return op;	1416	return op;
1434	}	1417	}
1435		1418
…		…
1442	{	1425	{
1443	object *tmp, *tmp1;	1426	object *tmp, *tmp1;
1444		1427
1445	/* first search for itself and remove any old instances */	1428	/* first search for itself and remove any old instances */
1446		1429
1447	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1430	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1448	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1449	tmp->destroy ();	1432	tmp->destroy ();
1450		1433
1451	tmp1 = arch_to_object (archetype::find (arch_string));	1434	tmp1 = arch_to_object (archetype::find (arch_string));
1452		1435
1453	tmp1->x = op->x;	1436	tmp1->x = op->x;
1454	tmp1->y = op->y;	1437	tmp1->y = op->y;
1455	insert_ob_in_map (tmp1, op->map, op, 0);	1438	insert_ob_in_map (tmp1, op->map, op, 0);
		1439	}
		1440
		1441	object *
		1442	object::insert_at (object *where, object *originator, int flags)
		1443	{
		1444	return where->map->insert (this, where->x, where->y, originator, flags);
1456	}	1445	}
1457		1446
1458	/*	1447	/*
1459	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1460	* is returned contains nr objects, and the remaining parts contains	1449	* is returned contains nr objects, and the remaining parts contains
1461	* the rest (or is removed and freed if that number is 0).	1450	* the rest (or is removed and freed if that number is 0).
1462	* On failure, NULL is returned, and the reason put into the	1451	* On failure, NULL is returned, and the reason put into the
1463	* global static errmsg array.	1452	* global static errmsg array.
1464	*/	1453	*/
1465
1466	object *	1454	object *
1467	get_split_ob (object *orig_ob, uint32 nr)	1455	get_split_ob (object *orig_ob, uint32 nr)
1468	{	1456	{
1469	object *newob;	1457	object *newob;
1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1501	* the amount of an object. If the amount reaches 0, the object	1489	* the amount of an object. If the amount reaches 0, the object
1502	* is subsequently removed and freed.	1490	* is subsequently removed and freed.
1503	*	1491	*
1504	* Return value: 'op' if something is left, NULL if the amount reached 0	1492	* Return value: 'op' if something is left, NULL if the amount reached 0
1505	*/	1493	*/
1506
1507	object *	1494	object *
1508	decrease_ob_nr (object *op, uint32 i)	1495	decrease_ob_nr (object *op, uint32 i)
1509	{	1496	{
1510	object *tmp;	1497	object *tmp;
1511	player *pl;
1512		1498
1513	if (i == 0) /* objects with op->nrof require this check */	1499	if (i == 0) /* objects with op->nrof require this check */
1514	return op;	1500	return op;
1515		1501
1516	if (i > op->nrof)	1502	if (i > op->nrof)
…		…
1529	* IMO, searching through all the players will mostly	1515	* IMO, searching through all the players will mostly
1530	* likely be quicker than following op->env to the map,	1516	* likely be quicker than following op->env to the map,
1531	* and then searching the map for a player.	1517	* and then searching the map for a player.
1532	*/	1518	*/
1533	if (!tmp)	1519	if (!tmp)
1534	{	1520	for_all_players (pl)
1535	for (pl = first_player; pl; pl = pl->next)
1536	if (pl->ob->container == op->env)	1521	if (pl->ob->container == op->env)
1537	{	1522	{
1538	tmp = pl->ob;	1523	tmp = pl->ob;
1539	break;	1524	break;
1540	}	1525	}
1541	}
1542		1526
1543	if (i < op->nrof)	1527	if (i < op->nrof)
1544	{	1528	{
1545	sub_weight (op->env, op->weight * i);	1529	sub_weight (op->env, op->weight * i);
1546	op->nrof -= i;	1530	op->nrof -= i;
…		…
1589		1573
1590	/*	1574	/*
1591	* add_weight(object, weight) adds the specified weight to an object,	1575	* add_weight(object, weight) adds the specified weight to an object,
1592	* and also updates how much the environment(s) is/are carrying.	1576	* and also updates how much the environment(s) is/are carrying.
1593	*/	1577	*/
1594
1595	void	1578	void
1596	add_weight (object *op, signed long weight)	1579	add_weight (object *op, signed long weight)
1597	{	1580	{
1598	while (op != NULL)	1581	while (op != NULL)
1599	{	1582	{
…		…
1631	* inside the object environment.	1614	* inside the object environment.
1632	*	1615	*
1633	* The function returns now pointer to inserted item, and return value can	1616	* The function returns now pointer to inserted item, and return value can
1634	* be != op, if items are merged. -Tero	1617	* be != op, if items are merged. -Tero
1635	*/	1618	*/
1636
1637	object *	1619	object *
1638	object::insert (object *op)	1620	object::insert (object *op)
1639	{	1621	{
1640	object *tmp, *otmp;	1622	object *tmp, *otmp;
1641		1623
…		…
1696	if ((op->glow_radius != 0) && map)	1678	if ((op->glow_radius != 0) && map)
1697	{	1679	{
1698	#ifdef DEBUG_LIGHTS	1680	#ifdef DEBUG_LIGHTS
1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1681	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1700	#endif /* DEBUG_LIGHTS */	1682	#endif /* DEBUG_LIGHTS */
1701	if (MAP_DARKNESS (map))	1683	if (map->darkness)
1702	update_all_los (map, x, y);	1684	update_all_los (map, x, y);
1703	}	1685	}
1704		1686
1705	/* Client has no idea of ordering so lets not bother ordering it here.	1687	/* Client has no idea of ordering so lets not bother ordering it here.
1706	* It sure simplifies this function...	1688	* It sure simplifies this function...
…		…
1711	{	1693	{
1712	op->below = inv;	1694	op->below = inv;
1713	op->below->above = op;	1695	op->below->above = op;
1714	inv = op;	1696	inv = op;
1715	}	1697	}
		1698
		1699	INVOKE_OBJECT (INSERT, this);
1716		1700
1717	return op;	1701	return op;
1718	}	1702	}
1719		1703
1720	/*	1704	/*
…		…
1735	*	1719	*
1736	* MSW 2001-07-08: Check all objects on space, not just those below	1720	* MSW 2001-07-08: Check all objects on space, not just those below
1737	* object being inserted. insert_ob_in_map may not put new objects	1721	* object being inserted. insert_ob_in_map may not put new objects
1738	* on top.	1722	* on top.
1739	*/	1723	*/
1740
1741	int	1724	int
1742	check_move_on (object *op, object *originator)	1725	check_move_on (object *op, object *originator)
1743	{	1726	{
1744	object *tmp;	1727	object *tmp;
1745	maptile *m = op->map;	1728	maptile *m = op->map;
…		…
1772		1755
1773	/* The objects have to be checked from top to bottom.	1756	/* The objects have to be checked from top to bottom.
1774	* Hence, we first go to the top:	1757	* Hence, we first go to the top:
1775	*/	1758	*/
1776		1759
1777	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1778	{	1761	{
1779	/* Trim the search when we find the first other spell effect	1762	/* Trim the search when we find the first other spell effect
1780	* this helps performance so that if a space has 50 spell objects,	1763	* this helps performance so that if a space has 50 spell objects,
1781	* we don't need to check all of them.	1764	* we don't need to check all of them.
1782	*/	1765	*/
…		…
1800	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1801	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1802	{	1785	{
1803		1786
1804	float	1787	float
1805	diff = tmp->move_slow_penalty * FABS (op->speed);	1788	diff = tmp->move_slow_penalty * fabs (op->speed);
1806		1789
1807	if (op->type == PLAYER)	1790	if (op->type == PLAYER)
1808	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1809	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1810	diff /= 4.0;	1793	diff /= 4.0;
…		…
1837	/*	1820	/*
1838	* present_arch(arch, map, x, y) searches for any objects with	1821	* present_arch(arch, map, x, y) searches for any objects with
1839	* a matching archetype at the given map and coordinates.	1822	* a matching archetype at the given map and coordinates.
1840	* The first matching object is returned, or NULL if none.	1823	* The first matching object is returned, or NULL if none.
1841	*/	1824	*/
1842
1843	object *	1825	object *
1844	present_arch (const archetype *at, maptile *m, int x, int y)	1826	present_arch (const archetype *at, maptile *m, int x, int y)
1845	{	1827	{
1846	object *
1847	tmp;
1848
1849	if (m == NULL || out_of_map (m, x, y))	1828	if (!m || out_of_map (m, x, y))
1850	{	1829	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1830	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1831	return NULL;
1853	}	1832	}
1854	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1833
		1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1855	if (tmp->arch == at)	1835	if (tmp->arch == at)
1856	return tmp;	1836	return tmp;
		1837
1857	return NULL;	1838	return NULL;
1858	}	1839	}
1859		1840
1860	/*	1841	/*
1861	* present(type, map, x, y) searches for any objects with	1842	* present(type, map, x, y) searches for any objects with
1862	* a matching type variable at the given map and coordinates.	1843	* a matching type variable at the given map and coordinates.
1863	* The first matching object is returned, or NULL if none.	1844	* The first matching object is returned, or NULL if none.
1864	*/	1845	*/
1865
1866	object *	1846	object *
1867	present (unsigned char type, maptile *m, int x, int y)	1847	present (unsigned char type, maptile *m, int x, int y)
1868	{	1848	{
1869	object *
1870	tmp;
1871
1872	if (out_of_map (m, x, y))	1849	if (out_of_map (m, x, y))
1873	{	1850	{
1874	LOG (llevError, "Present called outside map.\n");	1851	LOG (llevError, "Present called outside map.\n");
1875	return NULL;	1852	return NULL;
1876	}	1853	}
1877	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1854
		1855	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1878	if (tmp->type == type)	1856	if (tmp->type == type)
1879	return tmp;	1857	return tmp;
		1858
1880	return NULL;	1859	return NULL;
1881	}	1860	}
1882		1861
1883	/*	1862	/*
1884	* present_in_ob(type, object) searches for any objects with	1863	* present_in_ob(type, object) searches for any objects with
1885	* a matching type variable in the inventory of the given object.	1864	* a matching type variable in the inventory of the given object.
1886	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
1887	*/	1866	*/
1888
1889	object *	1867	object *
1890	present_in_ob (unsigned char type, const object *op)	1868	present_in_ob (unsigned char type, const object *op)
1891	{	1869	{
1892	object *
1893	tmp;
1894
1895	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1870	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1896	if (tmp->type == type)	1871	if (tmp->type == type)
1897	return tmp;	1872	return tmp;
		1873
1898	return NULL;	1874	return NULL;
1899	}	1875	}
1900		1876
1901	/*	1877	/*
1902	* present_in_ob (type, str, object) searches for any objects with	1878	* present_in_ob (type, str, object) searches for any objects with
…		…
1910	* str is the string to match against. Note that we match against	1886	* str is the string to match against. Note that we match against
1911	* the object name, not the archetype name. this is so that the	1887	* the object name, not the archetype name. this is so that the
1912	* spell code can use one object type (force), but change it's name	1888	* spell code can use one object type (force), but change it's name
1913	* to be unique.	1889	* to be unique.
1914	*/	1890	*/
1915
1916	object *	1891	object *
1917	present_in_ob_by_name (int type, const char *str, const object *op)	1892	present_in_ob_by_name (int type, const char *str, const object *op)
1918	{	1893	{
1919	object *
1920	tmp;
1921
1922	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1894	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923	{
1924	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1895	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1925	return tmp;	1896	return tmp;
1926	}	1897
1927	return NULL;	1898	return 0;
1928	}	1899	}
1929		1900
1930	/*	1901	/*
1931	* present_arch_in_ob(archetype, object) searches for any objects with	1902	* present_arch_in_ob(archetype, object) searches for any objects with
1932	* a matching archetype in the inventory of the given object.	1903	* a matching archetype in the inventory of the given object.
1933	* The first matching object is returned, or NULL if none.	1904	* The first matching object is returned, or NULL if none.
1934	*/	1905	*/
1935
1936	object *	1906	object *
1937	present_arch_in_ob (const archetype *at, const object *op)	1907	present_arch_in_ob (const archetype *at, const object *op)
1938	{	1908	{
1939	object *
1940	tmp;
1941
1942	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1943	if (tmp->arch == at)	1910	if (tmp->arch == at)
1944	return tmp;	1911	return tmp;
		1912
1945	return NULL;	1913	return NULL;
1946	}	1914	}
1947		1915
1948	/*	1916	/*
1949	* activate recursively a flag on an object inventory	1917	* activate recursively a flag on an object inventory
1950	*/	1918	*/
1951	void	1919	void
1952	flag_inv (object *op, int flag)	1920	flag_inv (object *op, int flag)
1953	{	1921	{
1954	object *
1955	tmp;
1956
1957	if (op->inv)	1922	if (op->inv)
1958	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1959	{	1924	{
1960	SET_FLAG (tmp, flag);	1925	SET_FLAG (tmp, flag);
1961	flag_inv (tmp, flag);	1926	flag_inv (tmp, flag);
1962	}	1927	}
1963	} /*	1928	}
		1929
		1930	/*
1964	* desactivate recursively a flag on an object inventory	1931	* deactivate recursively a flag on an object inventory
1965	*/	1932	*/
1966	void	1933	void
1967	unflag_inv (object *op, int flag)	1934	unflag_inv (object *op, int flag)
1968	{	1935	{
1969	object *
1970	tmp;
1971
1972	if (op->inv)	1936	if (op->inv)
1973	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1974	{	1938	{
1975	CLEAR_FLAG (tmp, flag);	1939	CLEAR_FLAG (tmp, flag);
1976	unflag_inv (tmp, flag);	1940	unflag_inv (tmp, flag);
1977	}	1941	}
1978	}	1942	}
…		…
1981	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1945	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1982	* all it's inventory (recursively).	1946	* all it's inventory (recursively).
1983	* If checksums are used, a player will get set_cheat called for	1947	* If checksums are used, a player will get set_cheat called for
1984	* him/her-self and all object carried by a call to this function.	1948	* him/her-self and all object carried by a call to this function.
1985	*/	1949	*/
1986
1987	void	1950	void
1988	set_cheat (object *op)	1951	set_cheat (object *op)
1989	{	1952	{
1990	SET_FLAG (op, FLAG_WAS_WIZ);	1953	SET_FLAG (op, FLAG_WAS_WIZ);
1991	flag_inv (op, FLAG_WAS_WIZ);	1954	flag_inv (op, FLAG_WAS_WIZ);
…		…
2010	* because arch_blocked (now ob_blocked) needs to know the movement type	1973	* because arch_blocked (now ob_blocked) needs to know the movement type
2011	* to know if the space in question will block the object. We can't use	1974	* to know if the space in question will block the object. We can't use
2012	* the archetype because that isn't correct if the monster has been	1975	* the archetype because that isn't correct if the monster has been
2013	* customized, changed states, etc.	1976	* customized, changed states, etc.
2014	*/	1977	*/
2015
2016	int	1978	int
2017	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1979	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2018	{	1980	{
2019	int
2020	i,
2021	index = 0, flag;	1981	int index = 0, flag;
2022	static int
2023	altern[SIZEOFFREE];	1982	int altern[SIZEOFFREE];
2024		1983
2025	for (i = start; i < stop; i++)	1984	for (int i = start; i < stop; i++)
2026	{	1985	{
2027	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1986	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2028	if (!flag)	1987	if (!flag)
2029	altern[index++] = i;	1988	altern [index++] = i;
2030		1989
2031	/* Basically, if we find a wall on a space, we cut down the search size.	1990	/* Basically, if we find a wall on a space, we cut down the search size.
2032	* In this way, we won't return spaces that are on another side of a wall.	1991	* In this way, we won't return spaces that are on another side of a wall.
2033	* This mostly work, but it cuts down the search size in all directions -	1992	* This mostly work, but it cuts down the search size in all directions -
2034	* if the space being examined only has a wall to the north and empty	1993	* if the space being examined only has a wall to the north and empty
…		…
2041	}	2000	}
2042		2001
2043	if (!index)	2002	if (!index)
2044	return -1;	2003	return -1;
2045		2004
2046	return altern[RANDOM () % index];	2005	return altern [rndm (index)];
2047	}	2006	}
2048		2007
2049	/*	2008	/*
2050	* find_first_free_spot(archetype, maptile, x, y) works like	2009	* find_first_free_spot(archetype, maptile, x, y) works like
2051	* find_free_spot(), but it will search max number of squares.	2010	* find_free_spot(), but it will search max number of squares.
2052	* But it will return the first available spot, not a random choice.	2011	* But it will return the first available spot, not a random choice.
2053	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2012	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2054	*/	2013	*/
2055
2056	int	2014	int
2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2015	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2058	{	2016	{
2059	int
2060	i;
2061
2062	for (i = 0; i < SIZEOFFREE; i++)	2017	for (int i = 0; i < SIZEOFFREE; i++)
2063	{
2064	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2018	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2065	return i;	2019	return i;
2066	}	2020
2067	return -1;	2021	return -1;
2068	}	2022	}
2069		2023
2070	/*	2024	/*
2071	* The function permute(arr, begin, end) randomly reorders the array	2025	* The function permute(arr, begin, end) randomly reorders the array
2072	* arr[begin..end-1].	2026	* arr[begin..end-1].
		2027	* now uses a fisher-yates shuffle, old permute was broken
2073	*/	2028	*/
2074	static void	2029	static void
2075	permute (int *arr, int begin, int end)	2030	permute (int *arr, int begin, int end)
2076	{	2031	{
2077	int	2032	arr += begin;
2078	i,
2079	j,
2080	tmp,
2081	len;
2082
2083	len = end - begin;	2033	end -= begin;
2084	for (i = begin; i < end; i++)
2085	{
2086	j = begin + RANDOM () % len;
2087		2034
2088	tmp = arr[i];	2035	while (--end)
2089	arr[i] = arr[j];	2036	swap (arr [end], arr [rndm (end + 1)]);
2090	arr[j] = tmp;
2091	}
2092	}	2037	}
2093		2038
2094	/* new function to make monster searching more efficient, and effective!	2039	/* new function to make monster searching more efficient, and effective!
2095	* This basically returns a randomized array (in the passed pointer) of	2040	* This basically returns a randomized array (in the passed pointer) of
2096	* the spaces to find monsters. In this way, it won't always look for	2041	* the spaces to find monsters. In this way, it won't always look for
…		…
2099	* the 3x3 area will be searched, just not in a predictable order.	2044	* the 3x3 area will be searched, just not in a predictable order.
2100	*/	2045	*/
2101	void	2046	void
2102	get_search_arr (int *search_arr)	2047	get_search_arr (int *search_arr)
2103	{	2048	{
2104	int	2049	int i;
2105	i;
2106		2050
2107	for (i = 0; i < SIZEOFFREE; i++)	2051	for (i = 0; i < SIZEOFFREE; i++)
2108	{
2109	search_arr[i] = i;	2052	search_arr[i] = i;
2110	}
2111		2053
2112	permute (search_arr, 1, SIZEOFFREE1 + 1);	2054	permute (search_arr, 1, SIZEOFFREE1 + 1);
2113	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2055	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2114	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2056	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2115	}	2057	}
…		…
2124	* Perhaps incorrectly, but I'm making the assumption that exclude	2066	* Perhaps incorrectly, but I'm making the assumption that exclude
2125	* is actually want is going to try and move there. We need this info	2067	* is actually want is going to try and move there. We need this info
2126	* because we have to know what movement the thing looking to move	2068	* because we have to know what movement the thing looking to move
2127	* there is capable of.	2069	* there is capable of.
2128	*/	2070	*/
2129
2130	int	2071	int
2131	find_dir (maptile *m, int x, int y, object *exclude)	2072	find_dir (maptile *m, int x, int y, object *exclude)
2132	{	2073	{
2133	int
2134	i,
2135	max = SIZEOFFREE, mflags;	2074	int i, max = SIZEOFFREE, mflags;
2136		2075
2137	sint16 nx, ny;	2076	sint16 nx, ny;
2138	object *	2077	object *tmp;
2139	tmp;
2140	maptile *	2078	maptile *mp;
2141	mp;
2142		2079
2143	MoveType blocked, move_type;	2080	MoveType blocked, move_type;
2144		2081
2145	if (exclude && exclude->head)	2082	if (exclude && exclude->head)
2146	{	2083	{
…		…
2163		2100
2164	if (mflags & P_OUT_OF_MAP)	2101	if (mflags & P_OUT_OF_MAP)
2165	max = maxfree[i];	2102	max = maxfree[i];
2166	else	2103	else
2167	{	2104	{
2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2105	mapspace &ms = mp->at (nx, ny);
		2106
		2107	blocked = ms.move_block;
2169		2108
2170	if ((move_type & blocked) == move_type)	2109	if ((move_type & blocked) == move_type)
2171	max = maxfree[i];	2110	max = maxfree[i];
2172	else if (mflags & P_IS_ALIVE)	2111	else if (mflags & P_IS_ALIVE)
2173	{	2112	{
2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2113	for (tmp = ms.bot; tmp; tmp = tmp->above)
2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2115	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2176	break;	2116	break;
2177		2117
2178	if (tmp)	2118	if (tmp)
2179	return freedir[i];	2119	return freedir[i];
2180	}	2120	}
…		…
2186		2126
2187	/*	2127	/*
2188	* distance(object 1, object 2) will return the square of the	2128	* distance(object 1, object 2) will return the square of the
2189	* distance between the two given objects.	2129	* distance between the two given objects.
2190	*/	2130	*/
2191
2192	int	2131	int
2193	distance (const object *ob1, const object *ob2)	2132	distance (const object *ob1, const object *ob2)
2194	{	2133	{
2195	int i;
2196
2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2134	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2198	return i;
2199	}	2135	}
2200		2136
2201	/*	2137	/*
2202	* find_dir_2(delta-x,delta-y) will return a direction in which	2138	* find_dir_2(delta-x,delta-y) will return a direction in which
2203	* an object which has subtracted the x and y coordinates of another	2139	* an object which has subtracted the x and y coordinates of another
2204	* object, needs to travel toward it.	2140	* object, needs to travel toward it.
2205	*/	2141	*/
2206
2207	int	2142	int
2208	find_dir_2 (int x, int y)	2143	find_dir_2 (int x, int y)
2209	{	2144	{
2210	int q;	2145	int q;
2211		2146
…		…
2240		2175
2241	return 3;	2176	return 3;
2242	}	2177	}
2243		2178
2244	/*	2179	/*
2245	* absdir(int): Returns a number between 1 and 8, which represent
2246	* the "absolute" direction of a number (it actually takes care of
2247	* "overflow" in previous calculations of a direction).
2248	*/
2249
2250	int
2251	absdir (int d)
2252	{
2253	while (d < 1)
2254	d += 8;
2255	while (d > 8)
2256	d -= 8;
2257	return d;
2258	}
2259
2260	/*
2261	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2180	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2262	* between two directions (which are expected to be absolute (see absdir())	2181	* between two directions (which are expected to be absolute (see absdir())
2263	*/	2182	*/
2264
2265	int	2183	int
2266	dirdiff (int dir1, int dir2)	2184	dirdiff (int dir1, int dir2)
2267	{	2185	{
2268	int	2186	int d;
2269	d;
2270		2187
2271	d = abs (dir1 - dir2);	2188	d = abs (dir1 - dir2);
2272	if (d > 4)	2189	if (d > 4)
2273	d = 8 - d;	2190	d = 8 - d;
		2191
2274	return d;	2192	return d;
2275	}	2193	}
2276		2194
2277	/* peterm:	2195	/* peterm:
2278	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2196	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2281	* This basically means that if direction is 15, then it could either go	2199	* This basically means that if direction is 15, then it could either go
2282	* direction 4, 14, or 16 to get back to where we are.	2200	* direction 4, 14, or 16 to get back to where we are.
2283	* Moved from spell_util.c to object.c with the other related direction	2201	* Moved from spell_util.c to object.c with the other related direction
2284	* functions.	2202	* functions.
2285	*/	2203	*/
2286
2287	int
2288	reduction_dir[SIZEOFFREE][3] = {	2204	int reduction_dir[SIZEOFFREE][3] = {
2289	{0, 0, 0}, /* 0 */	2205	{0, 0, 0}, /* 0 */
2290	{0, 0, 0}, /* 1 */	2206	{0, 0, 0}, /* 1 */
2291	{0, 0, 0}, /* 2 */	2207	{0, 0, 0}, /* 2 */
2292	{0, 0, 0}, /* 3 */	2208	{0, 0, 0}, /* 3 */
2293	{0, 0, 0}, /* 4 */	2209	{0, 0, 0}, /* 4 */
…		…
2437	insert_ob_in_ob (object_create_clone (item), dst);	2353	insert_ob_in_ob (object_create_clone (item), dst);
2438		2354
2439	return dst;	2355	return dst;
2440	}	2356	}
2441		2357
2442	/* GROS - Creates an object using a string representing its content. */
2443	/* Basically, we save the content of the string to a temp file, then call */
2444	/* load_object on it. I admit it is a highly inefficient way to make things, */
2445	/* but it was simple to make and allows reusing the load_object function. */
2446	/* Remember not to use load_object_str in a time-critical situation. */
2447	/* Also remember that multiparts objects are not supported for now. */
2448
2449	object *
2450	load_object_str (const char *obstr)
2451	{
2452	object *op;
2453	char filename[MAX_BUF];
2454
2455	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2456
2457	FILE *tempfile = fopen (filename, "w");
2458
2459	if (tempfile == NULL)
2460	{
2461	LOG (llevError, "Error - Unable to access load object temp file\n");
2462	return NULL;
2463	}
2464
2465	fprintf (tempfile, obstr);
2466	fclose (tempfile);
2467
2468	op = object::create ();
2469
2470	object_thawer thawer (filename);
2471
2472	if (thawer)
2473	load_object (thawer, op, 0);
2474
2475	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2476	CLEAR_FLAG (op, FLAG_REMOVED);
2477
2478	return op;
2479	}
2480
2481	/* This returns the first object in who's inventory that	2358	/* This returns the first object in who's inventory that
2482	* has the same type and subtype match.	2359	* has the same type and subtype match.
2483	* returns NULL if no match.	2360	* returns NULL if no match.
2484	*/	2361	*/
2485	object *	2362	object *
2486	find_obj_by_type_subtype (const object *who, int type, int subtype)	2363	find_obj_by_type_subtype (const object *who, int type, int subtype)
2487	{	2364	{
2488	object *tmp;
2489
2490	for (tmp = who->inv; tmp; tmp = tmp->below)	2365	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2491	if (tmp->type == type && tmp->subtype == subtype)	2366	if (tmp->type == type && tmp->subtype == subtype)
2492	return tmp;	2367	return tmp;
2493		2368
2494	return NULL;	2369	return 0;
2495	}	2370	}
2496		2371
2497	/* If ob has a field named key, return the link from the list,	2372	/* If ob has a field named key, return the link from the list,
2498	* otherwise return NULL.	2373	* otherwise return NULL.
2499	*	2374	*
…		…
2501	* do the desired thing.	2376	* do the desired thing.
2502	*/	2377	*/
2503	key_value *	2378	key_value *
2504	get_ob_key_link (const object *ob, const char *key)	2379	get_ob_key_link (const object *ob, const char *key)
2505	{	2380	{
2506	key_value *link;
2507
2508	for (link = ob->key_values; link != NULL; link = link->next)	2381	for (key_value *link = ob->key_values; link; link = link->next)
2509	if (link->key == key)	2382	if (link->key == key)
2510	return link;	2383	return link;
2511		2384
2512	return NULL;	2385	return 0;
2513	}	2386	}
2514		2387
2515	/*	2388	/*
2516	* Returns the value of op has an extra_field for key, or NULL.	2389	* Returns the value of op has an extra_field for key, or NULL.
2517	*	2390	*
…		…
2542	if (link->key == canonical_key)	2415	if (link->key == canonical_key)
2543	return link->value;	2416	return link->value;
2544		2417
2545	return 0;	2418	return 0;
2546	}	2419	}
2547
2548		2420
2549	/*	2421	/*
2550	* Updates the canonical_key in op to value.	2422	* Updates the canonical_key in op to value.
2551	*	2423	*
2552	* canonical_key is a shared string (value doesn't have to be).	2424	* canonical_key is a shared string (value doesn't have to be).
…		…
2557	* Returns TRUE on success.	2429	* Returns TRUE on success.
2558	*/	2430	*/
2559	int	2431	int
2560	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2432	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2561	{	2433	{
2562	key_value *
2563	field = NULL, *last = NULL;	2434	key_value *field = NULL, *last = NULL;
2564		2435
2565	for (field = op->key_values; field != NULL; field = field->next)	2436	for (field = op->key_values; field != NULL; field = field->next)
2566	{	2437	{
2567	if (field->key != canonical_key)	2438	if (field->key != canonical_key)
2568	{	2439	{
…		…
2596	/* IF we get here, key doesn't exist */	2467	/* IF we get here, key doesn't exist */
2597		2468
2598	/* No field, we'll have to add it. */	2469	/* No field, we'll have to add it. */
2599		2470
2600	if (!add_key)	2471	if (!add_key)
2601	{
2602	return FALSE;	2472	return FALSE;
2603	}	2473
2604	/* There isn't any good reason to store a null	2474	/* There isn't any good reason to store a null
2605	* value in the key/value list. If the archetype has	2475	* value in the key/value list. If the archetype has
2606	* this key, then we should also have it, so shouldn't	2476	* this key, then we should also have it, so shouldn't
2607	* be here. If user wants to store empty strings,	2477	* be here. If user wants to store empty strings,
2608	* should pass in ""	2478	* should pass in ""
…		…
2657	}	2527	}
2658	else	2528	else
2659	item = item->env;	2529	item = item->env;
2660	}	2530	}
2661		2531
		2532
		2533	const char *
		2534	object::flag_desc (char *desc, int len) const
		2535	{
		2536	char *p = desc;
		2537	bool first = true;
		2538
		2539	*p = 0;
		2540
		2541	for (int i = 0; i < NUM_FLAGS; i++)
		2542	{
		2543	if (len <= 10) // magic constant!
		2544	{
		2545	snprintf (p, len, ",...");
		2546	break;
		2547	}
		2548
		2549	if (flag [i])
		2550	{
		2551	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2552	len -= cnt;
		2553	p += cnt;
		2554	first = false;
		2555	}
		2556	}
		2557
		2558	return desc;
		2559	}
		2560
2662	// return a suitable string describing an objetc in enough detail to find it	2561	// return a suitable string describing an object in enough detail to find it
2663	const char *	2562	const char *
2664	object::debug_desc (char *info) const	2563	object::debug_desc (char *info) const
2665	{	2564	{
		2565	char flagdesc[512];
2666	char info2[256 * 3];	2566	char info2[256 * 4];
2667	char *p = info;	2567	char *p = info;
2668		2568
2669	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2569	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2670	count,	2570	count, uuid.seq,
2671	&name,	2571	&name,
2672	title ? " " : "",	2572	title ? "\",title:\"" : "",
2673	title ? (const char *)title : "");	2573	title ? (const char *)title : "",
		2574	flag_desc (flagdesc, 512), type);
2674		2575
2675	if (env)	2576	if (env)
2676	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2577	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2677		2578
2678	if (map)	2579	if (map)
2679	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2580	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2680		2581
2681	return info;	2582	return info;
2682	}	2583	}
2683		2584
2684	const char *	2585	const char *
2685	object::debug_desc () const	2586	object::debug_desc () const
2686	{	2587	{
2687	static char info[256 * 3];	2588	static char info[256 * 4];
2688	return debug_desc (info);	2589	return debug_desc (info);
2689	}	2590	}
2690		2591
		2592	const char *
		2593	object::debug_desc2 () const
		2594	{
		2595	static char info[256 * 4];
		2596	return debug_desc (info);
		2597	}
		2598
		2599	struct region *
		2600	object::region () const
		2601	{
		2602	return map ? map->region (x, y)
		2603	: region::default_region ();
		2604	}
		2605
		2606	const materialtype_t *
		2607	object::dominant_material () const
		2608	{
		2609	if (materialtype_t *mat = name_to_material (materialname))
		2610	return mat;
		2611
		2612	// omfg this is slow, this has to be temporary :)
		2613	shstr unknown ("unknown");
		2614
		2615	return name_to_material (unknown);
		2616	}
		2617
		2618	void
		2619	object::open_container (object *new_container)
		2620	{
		2621	if (container == new_container)
		2622	return;
		2623
		2624	if (object *old_container = container)
		2625	{
		2626	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2627	return;
		2628
		2629	#if 0
		2630	// remove the "Close old_container" object.
		2631	if (object *closer = old_container->inv)
		2632	if (closer->type == CLOSE_CON)
		2633	closer->destroy ();
		2634	#endif
		2635
		2636	old_container->flag [FLAG_APPLIED] = 0;
		2637	container = 0;
		2638
		2639	esrv_update_item (UPD_FLAGS, this, old_container);
		2640	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2641	}
		2642
		2643	if (new_container)
		2644	{
		2645	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2646	return;
		2647
		2648	// TODO: this does not seem to serve any purpose anymore?
		2649	#if 0
		2650	// insert the "Close Container" object.
		2651	if (archetype *closer = new_container->other_arch)
		2652	{
		2653	object *closer = arch_to_object (new_container->other_arch);
		2654	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2655	new_container->insert (closer);
		2656	}
		2657	#endif
		2658
		2659	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2660
		2661	new_container->flag [FLAG_APPLIED] = 1;
		2662	container = new_container;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, new_container);
		2665	esrv_send_inventory (this, new_container);
		2666	}
		2667	}
		2668
		2669

Diff Legend

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