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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.84 by root, Mon Dec 25 14:54:44 2006 UTC

…		…
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
34		36
35	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
36	static UUID uuid;	38	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
38		40
…		…
104	_exit (1);	106	_exit (1);
105	}	107	}
106		108
107	uuid.seq = uid;	109	uuid.seq = uid;
108	write_uuid ();	110	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	112	fclose (fp);
111	}	113	}
112		114
113	UUID	115	UUID
114	gen_uuid ()	116	gen_uuid ()
…		…
183	*	185	*
184	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
187	*	189	*
188	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
189	*	191	*
190	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
191	* check weight	193	* check weight
192	*/	194	*/
193		195
194	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	197	{
196	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
198	return 0;	204	return 0;
199		205
200	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	209	* used to store nrof).
206	*/	210	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		222
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		225
222		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	251	return 0;
254		252
255	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	254	* check all objects in the inventory.
257	*/	255	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	260	return 0;
263		261
264	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	264	return 0;
267		265
268	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	267	* if it is valid.
270	*/	268	*/
…		…
350	object *	348	object *
351	object_get_env_recursive (object *op)	349	object_get_env_recursive (object *op)
352	{	350	{
353	while (op->env != NULL)	351	while (op->env != NULL)
354	op = op->env;	352	op = op->env;
355	return op;
356	}
357
358	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;	353	return op;
371	}	354	}
372		355
373	/*	356	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
…		…
484	}	467	}
485		468
486	op->key_values = 0;	469	op->key_values = 0;
487	}	470	}
488		471
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*	472	/*
541	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
542	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
543	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
545	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
546	* will point at garbage.	478	* will point at garbage.
547	*/	479	*/
548	void	480	void
549	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
550	{	482	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553		485
554	op2->clone (op);	486	*(object_copy *)dst = *this;
555		487
556	if (is_freed)	488	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
558	if (is_removed)	491	if (is_removed)
559	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
560		493
561	if (op2->speed < 0)	494	if (speed < 0)
562	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563		496
564	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
565	if (op2->key_values)	498	if (key_values)
566	{	499	{
567	key_value *tail = 0;	500	key_value *tail = 0;
568	key_value *i;	501	key_value *i;
569		502
570	op->key_values = 0;	503	dst->key_values = 0;
571		504
572	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
573	{	506	{
574	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
575		508
576	new_link->next = 0;	509	new_link->next = 0;
577	new_link->key = i->key;	510	new_link->key = i->key;
578	new_link->value = i->value;	511	new_link->value = i->value;
579		512
580	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
581	if (!op->key_values)	514	if (!dst->key_values)
582	{	515	{
583	op->key_values = new_link;	516	dst->key_values = new_link;
584	tail = new_link;	517	tail = new_link;
585	}	518	}
586	else	519	else
587	{	520	{
588	tail->next = new_link;	521	tail->next = new_link;
589	tail = new_link;	522	tail = new_link;
590	}	523	}
591	}	524	}
592	}	525	}
593		526
594	update_ob_speed (op);	527	update_ob_speed (dst);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
595	}	536	}
596		537
597	/*	538	/*
598	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
599	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
…		…
707	op->active_next = NULL;	648	op->active_next = NULL;
708	op->active_prev = NULL;	649	op->active_prev = NULL;
709	}	650	}
710		651
711	/*	652	/*
712	* update_object() updates the array which represents the map.	653	* update_object() updates the the map.
713	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
714	* by invisible objects by whatever is below them (unless it's another	655	* by invisible objects by whatever is below them (unless it's another
715	* invisible object, etc...)	656	* invisible object, etc...)
716	* If the object being updated is beneath a player, the look-window	657	* If the object being updated is beneath a player, the look-window
717	* of that player is updated (this might be a suboptimal way of	658	* of that player is updated (this might be a suboptimal way of
718	* updating that window, though, since update_object() is called _often_)	659	* updating that window, though, since update_object() is called _often_)
719	*	660	*
720	* action is a hint of what the caller believes need to be done.	661	* action is a hint of what the caller believes need to be done.
721	* For example, if the only thing that has changed is the face (due to
722	* an animation), we don't need to call update_position until that actually
723	* comes into view of a player. OTOH, many other things, like addition/removal
724	* of walls or living creatures may need us to update the flags now.
725	* current action are:	662	* current action are:
726	* UP_OBJ_INSERT: op was inserted	663	* UP_OBJ_INSERT: op was inserted
727	* UP_OBJ_REMOVE: op was removed	664	* UP_OBJ_REMOVE: op was removed
728	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	665	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729	* as that is easier than trying to look at what may have changed.	666	* as that is easier than trying to look at what may have changed.
730	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
731	*/	668	*/
732
733	void	669	void
734	update_object (object *op, int action)	670	update_object (object *op, int action)
735	{	671	{
736	int update_now = 0, flags;
737	MoveType move_on, move_off, move_block, move_slow;	672	MoveType move_on, move_off, move_block, move_slow;
738		673
739	if (op == NULL)	674	if (op == NULL)
740	{	675	{
741	/* this should never happen */	676	/* this should never happen */
742	LOG (llevDebug, "update_object() called for NULL object.\n");	677	LOG (llevDebug, "update_object() called for NULL object.\n");
743	return;	678	return;
744	}	679	}
745		680
746	if (op->env != NULL)	681	if (op->env)
747	{	682	{
748	/* Animation is currently handled by client, so nothing	683	/* Animation is currently handled by client, so nothing
749	* to do in this case.	684	* to do in this case.
750	*/	685	*/
751	return;	686	return;
…		…
756	*/	691	*/
757	if (!op->map || op->map->in_memory == MAP_SAVING)	692	if (!op->map || op->map->in_memory == MAP_SAVING)
758	return;	693	return;
759		694
760	/* make sure the object is within map boundaries */	695	/* make sure the object is within map boundaries */
761	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	696	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762	{	697	{
763	LOG (llevError, "update_object() called for object out of map!\n");	698	LOG (llevError, "update_object() called for object out of map!\n");
764	#ifdef MANY_CORES	699	#ifdef MANY_CORES
765	abort ();	700	abort ();
766	#endif	701	#endif
767	return;	702	return;
768	}	703	}
769		704
770	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	705	mapspace &m = op->ms ();
771	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776		706
		707	if (m.flags_ & P_NEED_UPDATE)
		708	/* nop */;
777	if (action == UP_OBJ_INSERT)	709	else if (action == UP_OBJ_INSERT)
778	{	710	{
		711	// this is likely overkill, TODO: revisit (schmorp)
779	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780	update_now = 1;
781
782	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	713	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783	update_now = 1;	714	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784		715	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		716	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	717	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786	update_now = 1;
787
788	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789	update_now = 1;
790
791	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792	update_now = 1;
793
794	if ((move_on | op->move_on) != move_on)	718	|| (m.move_on | op->move_on ) != m.move_on
795	update_now = 1;
796
797	if ((move_off | op->move_off) != move_off)	719	|| (m.move_off | op->move_off ) != m.move_off
798	update_now = 1;	720	|| (m.move_slow | op->move_slow) != m.move_slow
799
800	/* This isn't perfect, but I don't expect a lot of objects to	721	/* This isn't perfect, but I don't expect a lot of objects to
801	* to have move_allow right now.	722	* to have move_allow right now.
802	*/	723	*/
803	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804	update_now = 1;	725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805		726	m.flags_ = P_NEED_UPDATE;
806	if ((move_slow | op->move_slow) != move_slow)
807	update_now = 1;
808	}	727	}
809	/* if the object is being removed, we can't make intelligent	728	/* if the object is being removed, we can't make intelligent
810	* decisions, because remove_ob can't really pass the object	729	* decisions, because remove_ob can't really pass the object
811	* that is being removed.	730	* that is being removed.
812	*/	731	*/
813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814	update_now = 1;	733	m.flags_ = P_NEED_UPDATE;
815	else if (action == UP_OBJ_FACE)	734	else if (action == UP_OBJ_FACE)
816	/* Nothing to do for that case */ ;	735	/* Nothing to do for that case */ ;
817	else	736	else
818	LOG (llevError, "update_object called with invalid action: %d\n", action);	737	LOG (llevError, "update_object called with invalid action: %d\n", action);
819		738
820	if (update_now)
821	{
822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823	update_position (op->map, op->x, op->y);
824	}
825
826	if (op->more != NULL)	739	if (op->more)
827	update_object (op->more, action);	740	update_object (op->more, action);
828	}	741	}
829		742
830	object::vector object::mortals;
831	object::vector object::objects; // not yet used	743	object::vector object::objects; // not yet used
832	object *object::first;	744	object *object::first;
833
834	void object::free_mortals ()
835	{
836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837	if ((*i)->refcnt)
838	++i; // further delay freeing
839	else
840	{
841	delete *i;
842	mortals.erase (i);
843	}
844
845	static int lastmortals = 0;//D
846
847	if (mortals.size() != lastmortals && lastmortals > 100)//D
848	{
849	lastmortals = mortals.size ();//D
850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851	}
852	}
853		745
854	object::object ()	746	object::object ()
855	{	747	{
856	SET_FLAG (this, FLAG_REMOVED);	748	SET_FLAG (this, FLAG_REMOVED);
857		749
…		…
906	* this function to succeed.	798	* this function to succeed.
907	*	799	*
908	* If destroy_inventory is set, free inventory as well. Else drop items in	800	* If destroy_inventory is set, free inventory as well. Else drop items in
909	* inventory to the ground.	801	* inventory to the ground.
910	*/	802	*/
911	void object::destroy (bool destroy_inventory)	803	void
		804	object::do_destroy ()
912	{	805	{
913	if (QUERY_FLAG (this, FLAG_FREED))	806	attachable::do_destroy ();
		807
		808	if (flag [FLAG_IS_LINKED])
		809	remove_button_link (this);
		810
		811	if (flag [FLAG_FRIENDLY])
		812	remove_friendly_object (this);
		813
		814	if (!flag [FLAG_REMOVED])
		815	remove ();
		816
		817	if (flag [FLAG_FREED])
914	return;	818	return;
915		819
916	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	flag [FLAG_FREED] = 1;
917	remove_friendly_object (this);
918
919	if (!QUERY_FLAG (this, FLAG_REMOVED))
920	remove_ob (this);
921
922	SET_FLAG (this, FLAG_FREED);
923		821
924	// hack to ensure that freed objects still have a valid map	822	// hack to ensure that freed objects still have a valid map
925	{	823	{
926	static maptile *freed_map; // freed objects are moved here to avoid crashes	824	static maptile *freed_map; // freed objects are moved here to avoid crashes
927		825
928	if (!freed_map)	826	if (!freed_map)
929	{	827	{
930	freed_map = get_empty_map (3, 3);	828	freed_map = new maptile;
		829
931	freed_map->name = "freed objects map";	830	freed_map->name = "/internal/freed_objects_map";
932	allocate_map (freed_map);	831	freed_map->width = 3;
		832	freed_map->height = 3;
		833
		834	freed_map->allocate ();
933	}	835	}
934		836
935	map = freed_map;	837	map = freed_map;
936	x = 1;	838	x = 1;
937	y = 1;	839	y = 1;
938	}	840	}
939		841
940	if (more)
941	{
942	more->destroy (destroy_inventory);
943	more = 0;	842	more = 0;
944	}	843	head = 0;
945		844	inv = 0;
946	if (inv)
947	{
948	/* Only if the space blocks everything do we not process -
949	* if some form of movement is allowed, let objects
950	* drop on that space.
951	*/
952	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
953	{
954	object *op = inv;
955
956	while (op)
957	{
958	object *tmp = op->below;
959	op->destroy (destroy_inventory);
960	op = tmp;
961	}
962	}
963	else
964	{ /* Put objects in inventory onto this space */
965	object *op = inv;
966
967	while (op)
968	{
969	object *tmp = op->below;
970
971	remove_ob (op);
972
973	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
974	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
975	free_object (op);
976	else
977	{
978	op->x = x;
979	op->y = y;
980	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
981	}
982
983	op = tmp;
984	}
985	}
986	}
987		845
988	// clear those pointers that likely might have circular references to us	846	// clear those pointers that likely might have circular references to us
989	owner = 0;	847	owner = 0;
990	enemy = 0;	848	enemy = 0;
991	attacked_by = 0;	849	attacked_by = 0;
…		…
996	/* Remove object from the active list */	854	/* Remove object from the active list */
997	speed = 0;	855	speed = 0;
998	update_ob_speed (this);	856	update_ob_speed (this);
999		857
1000	unlink ();	858	unlink ();
		859	}
1001		860
1002	mortals.push_back (this);	861	/*
		862	* Remove and free all objects in the inventory of the given object.
		863	* object.c ?
		864	*/
		865	void
		866	object::destroy_inv (bool drop_to_ground)
		867	{
		868	if (!inv)
		869	return;
		870
		871	/* Only if the space blocks everything do we not process -
		872	* if some form of movement is allowed, let objects
		873	* drop on that space.
		874	*/
		875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		876	{
		877	while (inv)
		878	{
		879	inv->destroy_inv (drop_to_ground);
		880	inv->destroy ();
		881	}
		882	}
		883	else
		884	{ /* Put objects in inventory onto this space */
		885	while (inv)
		886	{
		887	object *op = inv;
		888
		889	if (op->flag [FLAG_STARTEQUIP]
		890	|| op->flag [FLAG_NO_DROP]
		891	|| op->type == RUNE
		892	|| op->type == TRAP
		893	|| op->flag [FLAG_IS_A_TEMPLATE])
		894	op->destroy ();
		895	else
		896	{
		897	op->remove ();
		898	op->x = x;
		899	op->y = y;
		900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		901	}
		902	}
		903	}
		904	}
		905
		906	void
		907	object::destroy (bool destroy_inventory)
		908	{
		909	if (destroyed ())
		910	return;
		911
		912	if (more)
		913	{
		914	//TODO: non-head objects must not have inventory
		915	more->destroy (destroy_inventory);
		916	more = 0;
		917	}
		918
		919	if (destroy_inventory)
		920	destroy_inv (true);
		921
		922	attachable::destroy ();
1003	}	923	}
1004		924
1005	/*	925	/*
1006	* sub_weight() recursively (outwards) subtracts a number from the	926	* sub_weight() recursively (outwards) subtracts a number from the
1007	* weight of an object (and what is carried by it's environment(s)).	927	* weight of an object (and what is carried by it's environment(s)).
1008	*/	928	*/
1009
1010	void	929	void
1011	sub_weight (object *op, signed long weight)	930	sub_weight (object *op, signed long weight)
1012	{	931	{
1013	while (op != NULL)	932	while (op != NULL)
1014	{	933	{
…		…
1018	op->carrying -= weight;	937	op->carrying -= weight;
1019	op = op->env;	938	op = op->env;
1020	}	939	}
1021	}	940	}
1022		941
1023	/* remove_ob(op):	942	/* op->remove ():
1024	* This function removes the object op from the linked list of objects	943	* This function removes the object op from the linked list of objects
1025	* which it is currently tied to. When this function is done, the	944	* which it is currently tied to. When this function is done, the
1026	* object will have no environment. If the object previously had an	945	* object will have no environment. If the object previously had an
1027	* environment, the x and y coordinates will be updated to	946	* environment, the x and y coordinates will be updated to
1028	* the previous environment.	947	* the previous environment.
1029	* Beware: This function is called from the editor as well!	948	* Beware: This function is called from the editor as well!
1030	*/	949	*/
1031
1032	void	950	void
1033	remove_ob (object *op)	951	object::remove ()
1034	{	952	{
1035	object *tmp, *last = 0;	953	object *tmp, *last = 0;
1036	object *otmp;	954	object *otmp;
1037		955
1038	int check_walk_off;
1039	maptile *m;
1040
1041	sint16 x, y;
1042
1043	if (QUERY_FLAG (op, FLAG_REMOVED))	956	if (QUERY_FLAG (this, FLAG_REMOVED))
1044	return;	957	return;
1045		958
1046	SET_FLAG (op, FLAG_REMOVED);	959	SET_FLAG (this, FLAG_REMOVED);
		960	INVOKE_OBJECT (REMOVE, this);
1047		961
1048	if (op->more != NULL)	962	if (more)
1049	remove_ob (op->more);	963	more->remove ();
1050		964
1051	/*	965	/*
1052	* In this case, the object to be removed is in someones	966	* In this case, the object to be removed is in someones
1053	* inventory.	967	* inventory.
1054	*/	968	*/
1055	if (op->env != NULL)	969	if (env)
1056	{	970	{
1057	if (op->nrof)	971	if (nrof)
1058	sub_weight (op->env, op->weight * op->nrof);	972	sub_weight (env, weight * nrof);
1059	else	973	else
1060	sub_weight (op->env, op->weight + op->carrying);	974	sub_weight (env, weight + carrying);
1061		975
1062	/* NO_FIX_PLAYER is set when a great many changes are being	976	/* NO_FIX_PLAYER is set when a great many changes are being
1063	* made to players inventory. If set, avoiding the call	977	* made to players inventory. If set, avoiding the call
1064	* to save cpu time.	978	* to save cpu time.
1065	*/	979	*/
1066	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1067	fix_player (otmp);	981	otmp->update_stats ();
1068		982
1069	if (op->above != NULL)	983	if (above != NULL)
1070	op->above->below = op->below;	984	above->below = below;
1071	else	985	else
1072	op->env->inv = op->below;	986	env->inv = below;
1073		987
1074	if (op->below != NULL)	988	if (below != NULL)
1075	op->below->above = op->above;	989	below->above = above;
1076		990
1077	/* we set up values so that it could be inserted into	991	/* we set up values so that it could be inserted into
1078	* the map, but we don't actually do that - it is up	992	* the map, but we don't actually do that - it is up
1079	* to the caller to decide what we want to do.	993	* to the caller to decide what we want to do.
1080	*/	994	*/
1081	op->x = op->env->x, op->y = op->env->y;	995	x = env->x, y = env->y;
1082	op->map = op->env->map;	996	map = env->map;
1083	op->above = NULL, op->below = NULL;	997	above = 0, below = 0;
1084	op->env = NULL;	998	env = 0;
1085	}	999	}
1086	else if (op->map)	1000	else if (map)
1087	{	1001	{
1088	x = op->x;
1089	y = op->y;
1090	m = get_map_from_coord (op->map, &x, &y);
1091
1092	if (!m)
1093	{
1094	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1095	op->map->path, op->x, op->y);
1096	/* in old days, we used to set x and y to 0 and continue.
1097	* it seems if we get into this case, something is probablye
1098	* screwed up and should be fixed.
1099	*/
1100	abort ();
1101	}
1102
1103	if (op->map != m)
1104	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1105	op->map->path, m->path, op->x, op->y, x, y);
1106
1107	/* Re did the following section of code - it looks like it had	1002	/* Re did the following section of code - it looks like it had
1108	* lots of logic for things we no longer care about	1003	* lots of logic for things we no longer care about
1109	*/	1004	*/
1110		1005
1111	/* link the object above us */	1006	/* link the object above us */
1112	if (op->above)	1007	if (above)
1113	op->above->below = op->below;	1008	above->below = below;
1114	else	1009	else
1115	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1010	map->at (x, y).top = below; /* we were top, set new top */
1116		1011
1117	/* Relink the object below us, if there is one */	1012	/* Relink the object below us, if there is one */
1118	if (op->below)	1013	if (below)
1119	op->below->above = op->above;	1014	below->above = above;
1120	else	1015	else
1121	{	1016	{
1122	/* Nothing below, which means we need to relink map object for this space	1017	/* Nothing below, which means we need to relink map object for this space
1123	* use translated coordinates in case some oddness with map tiling is	1018	* use translated coordinates in case some oddness with map tiling is
1124	* evident	1019	* evident
1125	*/	1020	*/
1126	if (GET_MAP_OB (m, x, y) != op)	1021	if (GET_MAP_OB (map, x, y) != this)
1127	{	1022	{
1128	char *dump = dump_object (op);	1023	char *dump = dump_object (this);
1129	LOG (llevError,	1024	LOG (llevError,
1130	"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);	1025	"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);
1131	free (dump);	1026	free (dump);
1132	dump = dump_object (GET_MAP_OB (m, x, y));	1027	dump = dump_object (GET_MAP_OB (map, x, y));
1133	LOG (llevError, "%s\n", dump);	1028	LOG (llevError, "%s\n", dump);
1134	free (dump);	1029	free (dump);
1135	}	1030	}
1136		1031
1137	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1032	map->at (x, y).bot = above; /* goes on above it. */
1138	}	1033	}
1139		1034
1140	op->above = 0;	1035	above = 0;
1141	op->below = 0;	1036	below = 0;
1142		1037
1143	if (op->map->in_memory == MAP_SAVING)	1038	if (map->in_memory == MAP_SAVING)
1144	return;	1039	return;
1145		1040
1146	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1041	int check_walk_off = !flag [FLAG_NO_APPLY];
1147		1042
1148	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1149	{	1044	{
1150	/* No point updating the players look faces if he is the object	1045	/* No point updating the players look faces if he is the object
1151	* being removed.	1046	* being removed.
1152	*/	1047	*/
1153		1048
1154	if (tmp->type == PLAYER && tmp != op)	1049	if (tmp->type == PLAYER && tmp != this)
1155	{	1050	{
1156	/* If a container that the player is currently using somehow gets	1051	/* If a container that the player is currently using somehow gets
1157	* removed (most likely destroyed), update the player view	1052	* removed (most likely destroyed), update the player view
1158	* appropriately.	1053	* appropriately.
1159	*/	1054	*/
1160	if (tmp->container == op)	1055	if (tmp->container == this)
1161	{	1056	{
1162	CLEAR_FLAG (op, FLAG_APPLIED);	1057	flag [FLAG_APPLIED] = 0;
1163	tmp->container = NULL;	1058	tmp->container = 0;
1164	}	1059	}
1165		1060
1166	tmp->contr->socket.update_look = 1;	1061	if (tmp->contr->ns)
		1062	tmp->contr->ns->floorbox_update ();
1167	}	1063	}
1168		1064
1169	/* See if player moving off should effect something */	1065	/* See if player moving off should effect something */
1170	if (check_walk_off	1066	if (check_walk_off
1171	&& ((op->move_type & tmp->move_off)	1067	&& ((move_type & tmp->move_off)
1172	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1173	{	1069	{
1174	move_apply (tmp, op, NULL);	1070	move_apply (tmp, this, 0);
1175		1071
1176	if (op->destroyed ())	1072	if (destroyed ())
1177	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1178	}	1074	}
1179		1075
1180	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1181		1077
1182	if (tmp->above == tmp)	1078	if (tmp->above == tmp)
1183	tmp->above = NULL;	1079	tmp->above = 0;
1184		1080
1185	last = tmp;	1081	last = tmp;
1186	}	1082	}
1187		1083
1188	/* last == NULL of there are no objects on this space */	1084	/* last == NULL of there are no objects on this space */
1189	if (last == NULL)	1085	if (!last)
1190	{	1086	map->at (x, y).flags_ = P_NEED_UPDATE;
1191	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1192	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1193	* those out anyways, and if there are any flags set right now, they won't
1194	* be correct anyways.
1195	*/
1196	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1197	update_position (op->map, op->x, op->y);
1198	}
1199	else	1087	else
1200	update_object (last, UP_OBJ_REMOVE);	1088	update_object (last, UP_OBJ_REMOVE);
1201		1089
1202	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1203	update_all_los (op->map, op->x, op->y);	1091	update_all_los (map, x, y);
1204	}	1092	}
1205	}	1093	}
1206		1094
1207	/*	1095	/*
1208	* merge_ob(op,top):	1096	* merge_ob(op,top):
…		…
1216	merge_ob (object *op, object *top)	1104	merge_ob (object *op, object *top)
1217	{	1105	{
1218	if (!op->nrof)	1106	if (!op->nrof)
1219	return 0;	1107	return 0;
1220		1108
1221	if (top == NULL)	1109	if (top)
1222	for (top = op; top != NULL && top->above != NULL; top = top->above);	1110	for (top = op; top && top->above; top = top->above)
		1111	;
1223		1112
1224	for (; top != NULL; top = top->below)	1113	for (; top; top = top->below)
1225	{	1114	{
1226	if (top == op)	1115	if (top == op)
1227	continue;	1116	continue;
1228	if (CAN_MERGE (op, top))	1117
		1118	if (object::can_merge (op, top))
1229	{	1119	{
1230	top->nrof += op->nrof;	1120	top->nrof += op->nrof;
1231		1121
1232	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1122	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1233	op->weight = 0; /* Don't want any adjustements now */	1123	op->weight = 0; /* Don't want any adjustements now */
1234	remove_ob (op);	1124	op->destroy ();
1235	free_object (op);
1236	return top;	1125	return top;
1237	}	1126	}
1238	}	1127	}
1239		1128
1240	return 0;	1129	return 0;
…		…
1279	* Return value:	1168	* Return value:
1280	* new object if 'op' was merged with other object	1169	* new object if 'op' was merged with other object
1281	* NULL if 'op' was destroyed	1170	* NULL if 'op' was destroyed
1282	* just 'op' otherwise	1171	* just 'op' otherwise
1283	*/	1172	*/
1284
1285	object *	1173	object *
1286	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1287	{	1175	{
1288	object *tmp, *top, *floor = NULL;	1176	object *tmp, *top, *floor = NULL;
1289	sint16 x, y;	1177	sint16 x, y;
…		…
1323	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1324	free (dump);	1212	free (dump);
1325	return op;	1213	return op;
1326	}	1214	}
1327		1215
1328	if (op->more != NULL)	1216	if (op->more)
1329	{	1217	{
1330	/* The part may be on a different map. */	1218	/* The part may be on a different map. */
1331		1219
1332	object *more = op->more;	1220	object *more = op->more;
1333		1221
…		…
1349	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1350	{	1238	{
1351	if (!op->head)	1239	if (!op->head)
1352	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1353		1241
1354	return NULL;	1242	return 0;
1355	}	1243	}
1356	}	1244	}
1357		1245
1358	CLEAR_FLAG (op, FLAG_REMOVED);	1246	CLEAR_FLAG (op, FLAG_REMOVED);
1359		1247
…		…
1367		1255
1368	/* this has to be done after we translate the coordinates.	1256	/* this has to be done after we translate the coordinates.
1369	*/	1257	*/
1370	if (op->nrof && !(flag & INS_NO_MERGE))	1258	if (op->nrof && !(flag & INS_NO_MERGE))
1371	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1372	if (CAN_MERGE (op, tmp))	1260	if (object::can_merge (op, tmp))
1373	{	1261	{
1374	op->nrof += tmp->nrof;	1262	op->nrof += tmp->nrof;
1375	remove_ob (tmp);	1263	tmp->destroy ();
1376	free_object (tmp);
1377	}	1264	}
1378		1265
1379	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1266	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1380	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1267	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1381		1268
…		…
1394	op->below = originator->below;	1281	op->below = originator->below;
1395		1282
1396	if (op->below)	1283	if (op->below)
1397	op->below->above = op;	1284	op->below->above = op;
1398	else	1285	else
1399	SET_MAP_OB (op->map, op->x, op->y, op);	1286	op->ms ().bot = op;
1400		1287
1401	/* since *below* originator, no need to update top */	1288	/* since *below* originator, no need to update top */
1402	originator->below = op;	1289	originator->below = op;
1403	}	1290	}
1404	else	1291	else
…		…
1450	* If INS_ON_TOP is used, don't do this processing	1337	* If INS_ON_TOP is used, don't do this processing
1451	* Need to find the object that in fact blocks view, otherwise	1338	* Need to find the object that in fact blocks view, otherwise
1452	* stacking is a bit odd.	1339	* stacking is a bit odd.
1453	*/	1340	*/
1454	if (!(flag & INS_ON_TOP) &&	1341	if (!(flag & INS_ON_TOP) &&
1455	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1456	{	1343	{
1457	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1458	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1459	break;	1346	break;
1460	/* Check to see if we found the object that blocks view,	1347	/* Check to see if we found the object that blocks view,
…		…
1483		1370
1484	if (op->above)	1371	if (op->above)
1485	op->above->below = op;	1372	op->above->below = op;
1486		1373
1487	op->below = NULL;	1374	op->below = NULL;
1488	SET_MAP_OB (op->map, op->x, op->y, op);	1375	op->ms ().bot = op;
1489	}	1376	}
1490	else	1377	else
1491	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1492	op->above = top->above;	1379	op->above = top->above;
1493		1380
…		…
1497	op->below = top;	1384	op->below = top;
1498	top->above = op;	1385	top->above = op;
1499	}	1386	}
1500		1387
1501	if (op->above == NULL)	1388	if (op->above == NULL)
1502	SET_MAP_TOP (op->map, op->x, op->y, op);	1389	op->ms ().top = op;
1503	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1504		1391
1505	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
1506	op->contr->do_los = 1;	1393	op->contr->do_los = 1;
1507		1394
1508	/* If we have a floor, we know the player, if any, will be above	1395	/* If we have a floor, we know the player, if any, will be above
1509	* it, so save a few ticks and start from there.	1396	* it, so save a few ticks and start from there.
1510	*/	1397	*/
1511	if (!(flag & INS_MAP_LOAD))	1398	if (!(flag & INS_MAP_LOAD))
1512	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1399	if (object *pl = op->ms ().player ())
1513	if (tmp->type == PLAYER)	1400	if (pl->contr->ns)
1514	tmp->contr->socket.update_look = 1;	1401	pl->contr->ns->floorbox_update ();
1515		1402
1516	/* If this object glows, it may affect lighting conditions that are	1403	/* If this object glows, it may affect lighting conditions that are
1517	* visible to others on this map. But update_all_los is really	1404	* visible to others on this map. But update_all_los is really
1518	* an inefficient way to do this, as it means los for all players	1405	* an inefficient way to do this, as it means los for all players
1519	* on the map will get recalculated. The players could very well	1406	* on the map will get recalculated. The players could very well
1520	* be far away from this change and not affected in any way -	1407	* be far away from this change and not affected in any way -
1521	* this should get redone to only look for players within range,	1408	* this should get redone to only look for players within range,
1522	* or just updating the P_NEED_UPDATE for spaces within this area	1409	* or just updating the P_NEED_UPDATE for spaces within this area
1523	* of effect may be sufficient.	1410	* of effect may be sufficient.
1524	*/	1411	*/
1525	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1412	if (op->map->darkness && (op->glow_radius != 0))
1526	update_all_los (op->map, op->x, op->y);	1413	update_all_los (op->map, op->x, op->y);
1527		1414
1528	/* updates flags (blocked, alive, no magic, etc) for this map space */	1415	/* updates flags (blocked, alive, no magic, etc) for this map space */
1529	update_object (op, UP_OBJ_INSERT);	1416	update_object (op, UP_OBJ_INSERT);
1530		1417
		1418	INVOKE_OBJECT (INSERT, op);
		1419
1531	/* Don't know if moving this to the end will break anything. However,	1420	/* Don't know if moving this to the end will break anything. However,
1532	* we want to have update_look set above before calling this.	1421	* we want to have floorbox_update called before calling this.
1533	*	1422	*
1534	* check_move_on() must be after this because code called from	1423	* check_move_on() must be after this because code called from
1535	* check_move_on() depends on correct map flags (so functions like	1424	* check_move_on() depends on correct map flags (so functions like
1536	* blocked() and wall() work properly), and these flags are updated by	1425	* blocked() and wall() work properly), and these flags are updated by
1537	* update_object().	1426	* update_object().
…		…
1539		1428
1540	/* if this is not the head or flag has been passed, don't check walk on status */	1429	/* if this is not the head or flag has been passed, don't check walk on status */
1541	if (!(flag & INS_NO_WALK_ON) && !op->head)	1430	if (!(flag & INS_NO_WALK_ON) && !op->head)
1542	{	1431	{
1543	if (check_move_on (op, originator))	1432	if (check_move_on (op, originator))
1544	return NULL;	1433	return 0;
1545		1434
1546	/* If we are a multi part object, lets work our way through the check	1435	/* If we are a multi part object, lets work our way through the check
1547	* walk on's.	1436	* walk on's.
1548	*/	1437	*/
1549	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1550	if (check_move_on (tmp, originator))	1439	if (check_move_on (tmp, originator))
1551	return NULL;	1440	return 0;
1552	}	1441	}
1553		1442
1554	return op;	1443	return op;
1555	}	1444	}
1556		1445
1557	/* this function inserts an object in the map, but if it	1446	/* this function inserts an object in the map, but if it
1558	* finds an object of its own type, it'll remove that one first.	1447	* finds an object of its own type, it'll remove that one first.
1559	* op is the object to insert it under: supplies x and the map.	1448	* op is the object to insert it under: supplies x and the map.
1560	*/	1449	*/
1561	void	1450	void
1562	replace_insert_ob_in_map (const char *arch_string, object *op)	1451	replace_insert_ob_in_map (const char *arch_string, object *op)
1563	{	1452	{
1564	object *	1453	object *tmp, *tmp1;
1565	tmp;
1566	object *
1567	tmp1;
1568		1454
1569	/* first search for itself and remove any old instances */	1455	/* first search for itself and remove any old instances */
1570		1456
1571	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1572	{
1573	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1574	{	1459	tmp->destroy ();
1575	remove_ob (tmp);
1576	free_object (tmp);
1577	}
1578	}
1579		1460
1580	tmp1 = arch_to_object (archetype::find (arch_string));	1461	tmp1 = arch_to_object (archetype::find (arch_string));
1581		1462
1582	tmp1->x = op->x;	1463	tmp1->x = op->x;
1583	tmp1->y = op->y;	1464	tmp1->y = op->y;
…		…
1593	*/	1474	*/
1594		1475
1595	object *	1476	object *
1596	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1597	{	1478	{
1598	object *	1479	object *newob;
1599	newob;
1600	int
1601	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1602		1481
1603	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1604	{	1483	{
1605	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1484	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1606	return NULL;	1485	return NULL;
1607	}	1486	}
1608		1487
1609	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
1610		1489
1611	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1612	{	1491	orig_ob->destroy (1);
1613	if (!is_removed)
1614	remove_ob (orig_ob);
1615	free_object2 (orig_ob, 1);
1616	}
1617	else if (!is_removed)	1492	else if (!is_removed)
1618	{	1493	{
1619	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1620	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1621	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1496	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1641		1516
1642	object *	1517	object *
1643	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1644	{	1519	{
1645	object *tmp;	1520	object *tmp;
1646	player *pl;
1647		1521
1648	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1649	return op;	1523	return op;
1650		1524
1651	if (i > op->nrof)	1525	if (i > op->nrof)
1652	i = op->nrof;	1526	i = op->nrof;
1653		1527
1654	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1655	op->nrof -= i;	1529	op->nrof -= i;
1656	else if (op->env != NULL)	1530	else if (op->env)
1657	{	1531	{
1658	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1659	* therein?	1533	* therein?
1660	*/	1534	*/
1661	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1662	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1663	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1664	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1665	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1666	* and then searching the map for a player.	1540	* and then searching the map for a player.
1667	*/	1541	*/
1668	if (!tmp)	1542	if (!tmp)
1669	{	1543	for_all_players (pl)
1670	for (pl = first_player; pl; pl = pl->next)
1671	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1672	break;	1547	break;
1673	if (pl)
1674	tmp = pl->ob;
1675	else
1676	tmp = NULL;
1677	}	1548	}
1678		1549
1679	if (i < op->nrof)	1550	if (i < op->nrof)
1680	{	1551	{
1681	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1682	op->nrof -= i;	1553	op->nrof -= i;
1683	if (tmp)	1554	if (tmp)
1684	{
1685	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1686	}
1687	}	1556	}
1688	else	1557	else
1689	{	1558	{
1690	remove_ob (op);	1559	op->remove ();
1691	op->nrof = 0;	1560	op->nrof = 0;
1692	if (tmp)	1561	if (tmp)
1693	{
1694	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1695	}
1696	}	1563	}
1697	}	1564	}
1698	else	1565	else
1699	{	1566	{
1700	object *above = op->above;	1567	object *above = op->above;
1701		1568
1702	if (i < op->nrof)	1569	if (i < op->nrof)
1703	op->nrof -= i;	1570	op->nrof -= i;
1704	else	1571	else
1705	{	1572	{
1706	remove_ob (op);	1573	op->remove ();
1707	op->nrof = 0;	1574	op->nrof = 0;
1708	}	1575	}
1709		1576
1710	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1711	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1712	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1713	{	1580	{
1714	if (op->nrof)	1581	if (op->nrof)
1715	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1716	else	1583	else
…		…
1720		1587
1721	if (op->nrof)	1588	if (op->nrof)
1722	return op;	1589	return op;
1723	else	1590	else
1724	{	1591	{
1725	free_object (op);	1592	op->destroy ();
1726	return NULL;	1593	return 0;
1727	}	1594	}
1728	}	1595	}
1729		1596
1730	/*	1597	/*
1731	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1743	op->carrying += weight;	1610	op->carrying += weight;
1744	op = op->env;	1611	op = op->env;
1745	}	1612	}
1746	}	1613	}
1747		1614
1748	/*
1749	* insert_ob_in_ob(op,environment):
1750	* This function inserts the object op in the linked list
1751	* inside the object environment.
1752	*
1753	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1754	* the inventory at the last position or next to other objects of the same
1755	* type.
1756	* Frank: Now sorted by type, archetype and magic!
1757	*
1758	* The function returns now pointer to inserted item, and return value can
1759	* be != op, if items are merged. -Tero
1760	*/
1761
1762	object *	1615	object *
1763	insert_ob_in_ob (object *op, object *where)	1616	insert_ob_in_ob (object *op, object *where)
1764	{	1617	{
1765	object *	1618	if (!where)
1766	tmp, *
1767	otmp;
1768
1769	if (!QUERY_FLAG (op, FLAG_REMOVED))
1770	{
1771	char *dump = dump_object (op);
1772	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773	free (dump);
1774	return op;
1775	}
1776
1777	if (where == NULL)
1778	{	1619	{
1779	char *dump = dump_object (op);	1620	char *dump = dump_object (op);
1780	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1781	free (dump);	1622	free (dump);
1782	return op;	1623	return op;
1783	}	1624	}
1784		1625
1785	if (where->head)	1626	if (where->head)
1786	{	1627	{
1787	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1788	where = where->head;	1629	where = where->head;
1789	}	1630	}
		1631
		1632	return where->insert (op);
		1633	}
		1634
		1635	/*
		1636	* env->insert (op)
		1637	* This function inserts the object op in the linked list
		1638	* inside the object environment.
		1639	*
		1640	* The function returns now pointer to inserted item, and return value can
		1641	* be != op, if items are merged. -Tero
		1642	*/
		1643
		1644	object *
		1645	object::insert (object *op)
		1646	{
		1647	object *tmp, *otmp;
		1648
		1649	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1650	op->remove ();
1790		1651
1791	if (op->more)	1652	if (op->more)
1792	{	1653	{
1793	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1654	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1794	return op;	1655	return op;
…		…
1796		1657
1797	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1798	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1799	if (op->nrof)	1660	if (op->nrof)
1800	{	1661	{
1801	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1802	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1803	{	1664	{
1804	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1805	(client needs the original object) */	1666	(client needs the original object) */
1806	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1807	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
1808	* tmp->nrof, we need to increase the weight.	1669	* tmp->nrof, we need to increase the weight.
1809	*/	1670	*/
1810	add_weight (where, op->weight * op->nrof);	1671	add_weight (this, op->weight * op->nrof);
1811	SET_FLAG (op, FLAG_REMOVED);	1672	SET_FLAG (op, FLAG_REMOVED);
1812	free_object (op); /* free the inserted object */	1673	op->destroy (); /* free the inserted object */
1813	op = tmp;	1674	op = tmp;
1814	remove_ob (op); /* and fix old object's links */	1675	op->remove (); /* and fix old object's links */
1815	CLEAR_FLAG (op, FLAG_REMOVED);	1676	CLEAR_FLAG (op, FLAG_REMOVED);
1816	break;	1677	break;
1817	}	1678	}
1818		1679
1819	/* I assume combined objects have no inventory	1680	/* I assume combined objects have no inventory
1820	* We add the weight - this object could have just been removed	1681	* We add the weight - this object could have just been removed
1821	* (if it was possible to merge). calling remove_ob will subtract	1682	* (if it was possible to merge). calling remove_ob will subtract
1822	* the weight, so we need to add it in again, since we actually do	1683	* the weight, so we need to add it in again, since we actually do
1823	* the linking below	1684	* the linking below
1824	*/	1685	*/
1825	add_weight (where, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1826	}	1687	}
1827	else	1688	else
1828	add_weight (where, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1829		1690
1830	otmp = is_player_inv (where);	1691	otmp = this->in_player ();
1831	if (otmp && otmp->contr != NULL)	1692	if (otmp && otmp->contr)
1832	{
1833	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1834	fix_player (otmp);	1694	otmp->update_stats ();
1835	}
1836		1695
1837	op->map = NULL;	1696	op->map = 0;
1838	op->env = where;	1697	op->env = this;
1839	op->above = NULL;	1698	op->above = 0;
1840	op->below = NULL;	1699	op->below = 0;
1841	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1842		1701
1843	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1844	if ((op->glow_radius != 0) && where->map)	1703	if ((op->glow_radius != 0) && map)
1845	{	1704	{
1846	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1847	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1848	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1849	if (MAP_DARKNESS (where->map))	1708	if (map->darkness)
1850	update_all_los (where->map, where->x, where->y);	1709	update_all_los (map, x, y);
1851	}	1710	}
1852		1711
1853	/* Client has no idea of ordering so lets not bother ordering it here.	1712	/* Client has no idea of ordering so lets not bother ordering it here.
1854	* It sure simplifies this function...	1713	* It sure simplifies this function...
1855	*/	1714	*/
1856	if (where->inv == NULL)	1715	if (!inv)
1857	where->inv = op;	1716	inv = op;
1858	else	1717	else
1859	{	1718	{
1860	op->below = where->inv;	1719	op->below = inv;
1861	op->below->above = op;	1720	op->below->above = op;
1862	where->inv = op;	1721	inv = op;
1863	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
		1725
1864	return op;	1726	return op;
1865	}	1727	}
1866		1728
1867	/*	1729	/*
1868	* Checks if any objects has a move_type that matches objects	1730	* Checks if any objects has a move_type that matches objects
…		…
1919		1781
1920	/* The objects have to be checked from top to bottom.	1782	/* The objects have to be checked from top to bottom.
1921	* Hence, we first go to the top:	1783	* Hence, we first go to the top:
1922	*/	1784	*/
1923		1785
1924	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1925	{	1787	{
1926	/* Trim the search when we find the first other spell effect	1788	/* Trim the search when we find the first other spell effect
1927	* this helps performance so that if a space has 50 spell objects,	1789	* this helps performance so that if a space has 50 spell objects,
1928	* we don't need to check all of them.	1790	* we don't need to check all of them.
1929	*/	1791	*/
…		…
1984	/*	1846	/*
1985	* present_arch(arch, map, x, y) searches for any objects with	1847	* present_arch(arch, map, x, y) searches for any objects with
1986	* a matching archetype at the given map and coordinates.	1848	* a matching archetype at the given map and coordinates.
1987	* The first matching object is returned, or NULL if none.	1849	* The first matching object is returned, or NULL if none.
1988	*/	1850	*/
1989
1990	object *	1851	object *
1991	present_arch (const archetype *at, maptile *m, int x, int y)	1852	present_arch (const archetype *at, maptile *m, int x, int y)
1992	{	1853	{
1993	object *
1994	tmp;
1995
1996	if (m == NULL || out_of_map (m, x, y))	1854	if (m == NULL || out_of_map (m, x, y))
1997	{	1855	{
1998	LOG (llevError, "Present_arch called outside map.\n");	1856	LOG (llevError, "Present_arch called outside map.\n");
1999	return NULL;	1857	return NULL;
2000	}	1858	}
		1859
2001	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1860	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2002	if (tmp->arch == at)	1861	if (tmp->arch == at)
2003	return tmp;	1862	return tmp;
		1863
2004	return NULL;	1864	return NULL;
2005	}	1865	}
2006		1866
2007	/*	1867	/*
2008	* present(type, map, x, y) searches for any objects with	1868	* present(type, map, x, y) searches for any objects with
2009	* a matching type variable at the given map and coordinates.	1869	* a matching type variable at the given map and coordinates.
2010	* The first matching object is returned, or NULL if none.	1870	* The first matching object is returned, or NULL if none.
2011	*/	1871	*/
2012
2013	object *	1872	object *
2014	present (unsigned char type, maptile *m, int x, int y)	1873	present (unsigned char type, maptile *m, int x, int y)
2015	{	1874	{
2016	object *
2017	tmp;
2018
2019	if (out_of_map (m, x, y))	1875	if (out_of_map (m, x, y))
2020	{	1876	{
2021	LOG (llevError, "Present called outside map.\n");	1877	LOG (llevError, "Present called outside map.\n");
2022	return NULL;	1878	return NULL;
2023	}	1879	}
		1880
2024	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1881	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2025	if (tmp->type == type)	1882	if (tmp->type == type)
2026	return tmp;	1883	return tmp;
		1884
2027	return NULL;	1885	return NULL;
2028	}	1886	}
2029		1887
2030	/*	1888	/*
2031	* present_in_ob(type, object) searches for any objects with	1889	* present_in_ob(type, object) searches for any objects with
2032	* a matching type variable in the inventory of the given object.	1890	* a matching type variable in the inventory of the given object.
2033	* The first matching object is returned, or NULL if none.	1891	* The first matching object is returned, or NULL if none.
2034	*/	1892	*/
2035
2036	object *	1893	object *
2037	present_in_ob (unsigned char type, const object *op)	1894	present_in_ob (unsigned char type, const object *op)
2038	{	1895	{
2039	object *
2040	tmp;
2041
2042	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1896	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2043	if (tmp->type == type)	1897	if (tmp->type == type)
2044	return tmp;	1898	return tmp;
		1899
2045	return NULL;	1900	return NULL;
2046	}	1901	}
2047		1902
2048	/*	1903	/*
2049	* present_in_ob (type, str, object) searches for any objects with	1904	* present_in_ob (type, str, object) searches for any objects with
…		…
2057	* str is the string to match against. Note that we match against	1912	* str is the string to match against. Note that we match against
2058	* the object name, not the archetype name. this is so that the	1913	* the object name, not the archetype name. this is so that the
2059	* spell code can use one object type (force), but change it's name	1914	* spell code can use one object type (force), but change it's name
2060	* to be unique.	1915	* to be unique.
2061	*/	1916	*/
2062
2063	object *	1917	object *
2064	present_in_ob_by_name (int type, const char *str, const object *op)	1918	present_in_ob_by_name (int type, const char *str, const object *op)
2065	{	1919	{
2066	object *
2067	tmp;
2068
2069	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2070	{
2071	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1921	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2072	return tmp;	1922	return tmp;
2073	}	1923
2074	return NULL;	1924	return 0;
2075	}	1925	}
2076		1926
2077	/*	1927	/*
2078	* present_arch_in_ob(archetype, object) searches for any objects with	1928	* present_arch_in_ob(archetype, object) searches for any objects with
2079	* a matching archetype in the inventory of the given object.	1929	* a matching archetype in the inventory of the given object.
2080	* The first matching object is returned, or NULL if none.	1930	* The first matching object is returned, or NULL if none.
2081	*/	1931	*/
2082
2083	object *	1932	object *
2084	present_arch_in_ob (const archetype *at, const object *op)	1933	present_arch_in_ob (const archetype *at, const object *op)
2085	{	1934	{
2086	object *
2087	tmp;
2088
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2090	if (tmp->arch == at)	1936	if (tmp->arch == at)
2091	return tmp;	1937	return tmp;
		1938
2092	return NULL;	1939	return NULL;
2093	}	1940	}
2094		1941
2095	/*	1942	/*
2096	* activate recursively a flag on an object inventory	1943	* activate recursively a flag on an object inventory
2097	*/	1944	*/
2098	void	1945	void
2099	flag_inv (object *op, int flag)	1946	flag_inv (object *op, int flag)
2100	{	1947	{
2101	object *
2102	tmp;
2103
2104	if (op->inv)	1948	if (op->inv)
2105	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1949	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2106	{	1950	{
2107	SET_FLAG (tmp, flag);	1951	SET_FLAG (tmp, flag);
2108	flag_inv (tmp, flag);	1952	flag_inv (tmp, flag);
2109	}	1953	}
2110	} /*	1954	}
		1955
		1956	/*
2111	* desactivate recursively a flag on an object inventory	1957	* deactivate recursively a flag on an object inventory
2112	*/	1958	*/
2113	void	1959	void
2114	unflag_inv (object *op, int flag)	1960	unflag_inv (object *op, int flag)
2115	{	1961	{
2116	object *
2117	tmp;
2118
2119	if (op->inv)	1962	if (op->inv)
2120	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1963	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2121	{	1964	{
2122	CLEAR_FLAG (tmp, flag);	1965	CLEAR_FLAG (tmp, flag);
2123	unflag_inv (tmp, flag);	1966	unflag_inv (tmp, flag);
2124	}	1967	}
2125	}	1968	}
…		…
2128	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1971	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2129	* all it's inventory (recursively).	1972	* all it's inventory (recursively).
2130	* If checksums are used, a player will get set_cheat called for	1973	* If checksums are used, a player will get set_cheat called for
2131	* him/her-self and all object carried by a call to this function.	1974	* him/her-self and all object carried by a call to this function.
2132	*/	1975	*/
2133
2134	void	1976	void
2135	set_cheat (object *op)	1977	set_cheat (object *op)
2136	{	1978	{
2137	SET_FLAG (op, FLAG_WAS_WIZ);	1979	SET_FLAG (op, FLAG_WAS_WIZ);
2138	flag_inv (op, FLAG_WAS_WIZ);	1980	flag_inv (op, FLAG_WAS_WIZ);
…		…
2157	* because arch_blocked (now ob_blocked) needs to know the movement type	1999	* because arch_blocked (now ob_blocked) needs to know the movement type
2158	* to know if the space in question will block the object. We can't use	2000	* to know if the space in question will block the object. We can't use
2159	* the archetype because that isn't correct if the monster has been	2001	* the archetype because that isn't correct if the monster has been
2160	* customized, changed states, etc.	2002	* customized, changed states, etc.
2161	*/	2003	*/
2162
2163	int	2004	int
2164	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2005	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2165	{	2006	{
2166	int
2167	i,
2168	index = 0, flag;	2007	int index = 0, flag;
2169	static int
2170	altern[SIZEOFFREE];	2008	int altern[SIZEOFFREE];
2171		2009
2172	for (i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
2173	{	2011	{
2174	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2012	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2175	if (!flag)	2013	if (!flag)
2176	altern[index++] = i;	2014	altern [index++] = i;
2177		2015
2178	/* Basically, if we find a wall on a space, we cut down the search size.	2016	/* Basically, if we find a wall on a space, we cut down the search size.
2179	* In this way, we won't return spaces that are on another side of a wall.	2017	* In this way, we won't return spaces that are on another side of a wall.
2180	* This mostly work, but it cuts down the search size in all directions -	2018	* This mostly work, but it cuts down the search size in all directions -
2181	* if the space being examined only has a wall to the north and empty	2019	* if the space being examined only has a wall to the north and empty
2182	* spaces in all the other directions, this will reduce the search space	2020	* spaces in all the other directions, this will reduce the search space
2183	* to only the spaces immediately surrounding the target area, and	2021	* to only the spaces immediately surrounding the target area, and
2184	* won't look 2 spaces south of the target space.	2022	* won't look 2 spaces south of the target space.
2185	*/	2023	*/
2186	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2024	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2187	stop = maxfree[i];	2025	stop = maxfree[i];
2188	}	2026	}
		2027
2189	if (!index)	2028	if (!index)
2190	return -1;	2029	return -1;
		2030
2191	return altern[RANDOM () % index];	2031	return altern[RANDOM () % index];
2192	}	2032	}
2193		2033
2194	/*	2034	/*
2195	* find_first_free_spot(archetype, maptile, x, y) works like	2035	* find_first_free_spot(archetype, maptile, x, y) works like
2196	* find_free_spot(), but it will search max number of squares.	2036	* find_free_spot(), but it will search max number of squares.
2197	* But it will return the first available spot, not a random choice.	2037	* But it will return the first available spot, not a random choice.
2198	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2038	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2199	*/	2039	*/
2200
2201	int	2040	int
2202	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2041	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2203	{	2042	{
2204	int
2205	i;
2206
2207	for (i = 0; i < SIZEOFFREE; i++)	2043	for (int i = 0; i < SIZEOFFREE; i++)
2208	{
2209	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2044	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2210	return i;	2045	return i;
2211	}	2046
2212	return -1;	2047	return -1;
2213	}	2048	}
2214		2049
2215	/*	2050	/*
2216	* The function permute(arr, begin, end) randomly reorders the array	2051	* The function permute(arr, begin, end) randomly reorders the array
2217	* arr[begin..end-1].	2052	* arr[begin..end-1].
		2053	* now uses a fisher-yates shuffle, old permute was broken
2218	*/	2054	*/
2219	static void	2055	static void
2220	permute (int *arr, int begin, int end)	2056	permute (int *arr, int begin, int end)
2221	{	2057	{
2222	int	2058	arr += begin;
2223	i,
2224	j,
2225	tmp,
2226	len;
2227
2228	len = end - begin;	2059	end -= begin;
2229	for (i = begin; i < end; i++)
2230	{
2231	j = begin + RANDOM () % len;
2232		2060
2233	tmp = arr[i];	2061	while (--end)
2234	arr[i] = arr[j];	2062	swap (arr [end], arr [RANDOM () % (end + 1)]);
2235	arr[j] = tmp;
2236	}
2237	}	2063	}
2238		2064
2239	/* new function to make monster searching more efficient, and effective!	2065	/* new function to make monster searching more efficient, and effective!
2240	* This basically returns a randomized array (in the passed pointer) of	2066	* This basically returns a randomized array (in the passed pointer) of
2241	* the spaces to find monsters. In this way, it won't always look for	2067	* the spaces to find monsters. In this way, it won't always look for
…		…
2244	* the 3x3 area will be searched, just not in a predictable order.	2070	* the 3x3 area will be searched, just not in a predictable order.
2245	*/	2071	*/
2246	void	2072	void
2247	get_search_arr (int *search_arr)	2073	get_search_arr (int *search_arr)
2248	{	2074	{
2249	int	2075	int i;
2250	i;
2251		2076
2252	for (i = 0; i < SIZEOFFREE; i++)	2077	for (i = 0; i < SIZEOFFREE; i++)
2253	{
2254	search_arr[i] = i;	2078	search_arr[i] = i;
2255	}
2256		2079
2257	permute (search_arr, 1, SIZEOFFREE1 + 1);	2080	permute (search_arr, 1, SIZEOFFREE1 + 1);
2258	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2081	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2259	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2082	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2260	}	2083	}
…		…
2269	* Perhaps incorrectly, but I'm making the assumption that exclude	2092	* Perhaps incorrectly, but I'm making the assumption that exclude
2270	* is actually want is going to try and move there. We need this info	2093	* is actually want is going to try and move there. We need this info
2271	* because we have to know what movement the thing looking to move	2094	* because we have to know what movement the thing looking to move
2272	* there is capable of.	2095	* there is capable of.
2273	*/	2096	*/
2274
2275	int	2097	int
2276	find_dir (maptile *m, int x, int y, object *exclude)	2098	find_dir (maptile *m, int x, int y, object *exclude)
2277	{	2099	{
2278	int
2279	i,
2280	max = SIZEOFFREE, mflags;	2100	int i, max = SIZEOFFREE, mflags;
2281		2101
2282	sint16 nx, ny;	2102	sint16 nx, ny;
2283	object *	2103	object *tmp;
2284	tmp;
2285	maptile *	2104	maptile *mp;
2286	mp;
2287		2105
2288	MoveType blocked, move_type;	2106	MoveType blocked, move_type;
2289		2107
2290	if (exclude && exclude->head)	2108	if (exclude && exclude->head)
2291	{	2109	{
…		…
2303	mp = m;	2121	mp = m;
2304	nx = x + freearr_x[i];	2122	nx = x + freearr_x[i];
2305	ny = y + freearr_y[i];	2123	ny = y + freearr_y[i];
2306		2124
2307	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2125	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2126
2308	if (mflags & P_OUT_OF_MAP)	2127	if (mflags & P_OUT_OF_MAP)
2309	{
2310	max = maxfree[i];	2128	max = maxfree[i];
2311	}
2312	else	2129	else
2313	{	2130	{
2314	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2131	mapspace &ms = mp->at (nx, ny);
		2132
		2133	blocked = ms.move_block;
2315		2134
2316	if ((move_type & blocked) == move_type)	2135	if ((move_type & blocked) == move_type)
2317	{
2318	max = maxfree[i];	2136	max = maxfree[i];
2319	}
2320	else if (mflags & P_IS_ALIVE)	2137	else if (mflags & P_IS_ALIVE)
2321	{	2138	{
2322	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2139	for (tmp = ms.bot; tmp; tmp = tmp->above)
2323	{	2140	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2324	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2141	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2325	{
2326	break;	2142	break;
2327	}	2143
2328	}
2329	if (tmp)	2144	if (tmp)
2330	{
2331	return freedir[i];	2145	return freedir[i];
2332	}
2333	}	2146	}
2334	}	2147	}
2335	}	2148	}
		2149
2336	return 0;	2150	return 0;
2337	}	2151	}
2338		2152
2339	/*	2153	/*
2340	* distance(object 1, object 2) will return the square of the	2154	* distance(object 1, object 2) will return the square of the
2341	* distance between the two given objects.	2155	* distance between the two given objects.
2342	*/	2156	*/
2343
2344	int	2157	int
2345	distance (const object *ob1, const object *ob2)	2158	distance (const object *ob1, const object *ob2)
2346	{	2159	{
2347	int
2348	i;
2349
2350	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2160	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2351	return i;
2352	}	2161	}
2353		2162
2354	/*	2163	/*
2355	* find_dir_2(delta-x,delta-y) will return a direction in which	2164	* find_dir_2(delta-x,delta-y) will return a direction in which
2356	* an object which has subtracted the x and y coordinates of another	2165	* an object which has subtracted the x and y coordinates of another
2357	* object, needs to travel toward it.	2166	* object, needs to travel toward it.
2358	*/	2167	*/
2359
2360	int	2168	int
2361	find_dir_2 (int x, int y)	2169	find_dir_2 (int x, int y)
2362	{	2170	{
2363	int	2171	int q;
2364	q;
2365		2172
2366	if (y)	2173	if (y)
2367	q = x * 100 / y;	2174	q = x * 100 / y;
2368	else if (x)	2175	else if (x)
2369	q = -300 * x;	2176	q = -300 * x;
…		…
2404	int	2211	int
2405	absdir (int d)	2212	absdir (int d)
2406	{	2213	{
2407	while (d < 1)	2214	while (d < 1)
2408	d += 8;	2215	d += 8;
		2216
2409	while (d > 8)	2217	while (d > 8)
2410	d -= 8;	2218	d -= 8;
		2219
2411	return d;	2220	return d;
2412	}	2221	}
2413		2222
2414	/*	2223	/*
2415	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2224	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2417	*/	2226	*/
2418		2227
2419	int	2228	int
2420	dirdiff (int dir1, int dir2)	2229	dirdiff (int dir1, int dir2)
2421	{	2230	{
2422	int	2231	int d;
2423	d;
2424		2232
2425	d = abs (dir1 - dir2);	2233	d = abs (dir1 - dir2);
2426	if (d > 4)	2234	if (d > 4)
2427	d = 8 - d;	2235	d = 8 - d;
		2236
2428	return d;	2237	return d;
2429	}	2238	}
2430		2239
2431	/* peterm:	2240	/* peterm:
2432	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2241	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2435	* This basically means that if direction is 15, then it could either go	2244	* This basically means that if direction is 15, then it could either go
2436	* direction 4, 14, or 16 to get back to where we are.	2245	* direction 4, 14, or 16 to get back to where we are.
2437	* Moved from spell_util.c to object.c with the other related direction	2246	* Moved from spell_util.c to object.c with the other related direction
2438	* functions.	2247	* functions.
2439	*/	2248	*/
2440
2441	int
2442	reduction_dir[SIZEOFFREE][3] = {	2249	int reduction_dir[SIZEOFFREE][3] = {
2443	{0, 0, 0}, /* 0 */	2250	{0, 0, 0}, /* 0 */
2444	{0, 0, 0}, /* 1 */	2251	{0, 0, 0}, /* 1 */
2445	{0, 0, 0}, /* 2 */	2252	{0, 0, 0}, /* 2 */
2446	{0, 0, 0}, /* 3 */	2253	{0, 0, 0}, /* 3 */
2447	{0, 0, 0}, /* 4 */	2254	{0, 0, 0}, /* 4 */
…		…
2495	* find a path to that monster that we found. If not,	2302	* find a path to that monster that we found. If not,
2496	* we don't bother going toward it. Returns 1 if we	2303	* we don't bother going toward it. Returns 1 if we
2497	* can see a direct way to get it	2304	* can see a direct way to get it
2498	* Modified to be map tile aware -.MSW	2305	* Modified to be map tile aware -.MSW
2499	*/	2306	*/
2500
2501
2502	int	2307	int
2503	can_see_monsterP (maptile *m, int x, int y, int dir)	2308	can_see_monsterP (maptile *m, int x, int y, int dir)
2504	{	2309	{
2505	sint16 dx, dy;	2310	sint16 dx, dy;
2506	int
2507	mflags;	2311	int mflags;
2508		2312
2509	if (dir < 0)	2313	if (dir < 0)
2510	return 0; /* exit condition: invalid direction */	2314	return 0; /* exit condition: invalid direction */
2511		2315
2512	dx = x + freearr_x[dir];	2316	dx = x + freearr_x[dir];
…		…
2525	return 0;	2329	return 0;
2526		2330
2527	/* yes, can see. */	2331	/* yes, can see. */
2528	if (dir < 9)	2332	if (dir < 9)
2529	return 1;	2333	return 1;
		2334
2530	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2335	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2531	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2336	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2337	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2532	}	2338	}
2533
2534
2535		2339
2536	/*	2340	/*
2537	* can_pick(picker, item): finds out if an object is possible to be	2341	* can_pick(picker, item): finds out if an object is possible to be
2538	* picked up by the picker. Returnes 1 if it can be	2342	* picked up by the picker. Returnes 1 if it can be
2539	* picked up, otherwise 0.	2343	* picked up, otherwise 0.
…		…
2550	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2354	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2551	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2355	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2552	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2356	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2553	}	2357	}
2554		2358
2555
2556	/*	2359	/*
2557	* create clone from object to another	2360	* create clone from object to another
2558	*/	2361	*/
2559	object *	2362	object *
2560	object_create_clone (object *asrc)	2363	object_create_clone (object *asrc)
2561	{	2364	{
2562	object *
2563	dst = NULL, *tmp, *src, *part, *prev, *item;	2365	object *dst = 0, *tmp, *src, *part, *prev, *item;
2564		2366
2565	if (!asrc)	2367	if (!asrc)
2566	return NULL;	2368	return 0;
		2369
2567	src = asrc;	2370	src = asrc;
2568	if (src->head)	2371	if (src->head)
2569	src = src->head;	2372	src = src->head;
2570		2373
2571	prev = NULL;	2374	prev = 0;
2572	for (part = src; part; part = part->more)	2375	for (part = src; part; part = part->more)
2573	{	2376	{
2574	tmp = get_object ();	2377	tmp = part->clone ();
2575	copy_object (part, tmp);
2576	tmp->x -= src->x;	2378	tmp->x -= src->x;
2577	tmp->y -= src->y;	2379	tmp->y -= src->y;
		2380
2578	if (!part->head)	2381	if (!part->head)
2579	{	2382	{
2580	dst = tmp;	2383	dst = tmp;
2581	tmp->head = NULL;	2384	tmp->head = 0;
2582	}	2385	}
2583	else	2386	else
2584	{
2585	tmp->head = dst;	2387	tmp->head = dst;
2586	}	2388
2587	tmp->more = NULL;	2389	tmp->more = 0;
		2390
2588	if (prev)	2391	if (prev)
2589	prev->more = tmp;	2392	prev->more = tmp;
		2393
2590	prev = tmp;	2394	prev = tmp;
2591	}	2395	}
2592		2396
2593	for (item = src->inv; item; item = item->below)	2397	for (item = src->inv; item; item = item->below)
2594	insert_ob_in_ob (object_create_clone (item), dst);	2398	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2600	/* Basically, we save the content of the string to a temp file, then call */	2404	/* Basically, we save the content of the string to a temp file, then call */
2601	/* load_object on it. I admit it is a highly inefficient way to make things, */	2405	/* load_object on it. I admit it is a highly inefficient way to make things, */
2602	/* but it was simple to make and allows reusing the load_object function. */	2406	/* but it was simple to make and allows reusing the load_object function. */
2603	/* Remember not to use load_object_str in a time-critical situation. */	2407	/* Remember not to use load_object_str in a time-critical situation. */
2604	/* Also remember that multiparts objects are not supported for now. */	2408	/* Also remember that multiparts objects are not supported for now. */
2605
2606	object *	2409	object *
2607	load_object_str (const char *obstr)	2410	load_object_str (const char *obstr)
2608	{	2411	{
2609	object *op;	2412	object *op;
2610	char filename[MAX_BUF];	2413	char filename[MAX_BUF];
…		…
2620	}	2423	}
2621		2424
2622	fprintf (tempfile, obstr);	2425	fprintf (tempfile, obstr);
2623	fclose (tempfile);	2426	fclose (tempfile);
2624		2427
2625	op = get_object ();	2428	op = object::create ();
2626		2429
2627	object_thawer thawer (filename);	2430	object_thawer thawer (filename);
2628		2431
2629	if (thawer)	2432	if (thawer)
2630	load_object (thawer, op, 0);	2433	load_object (thawer, op, 0);
…		…
2640	* returns NULL if no match.	2443	* returns NULL if no match.
2641	*/	2444	*/
2642	object *	2445	object *
2643	find_obj_by_type_subtype (const object *who, int type, int subtype)	2446	find_obj_by_type_subtype (const object *who, int type, int subtype)
2644	{	2447	{
2645	object *tmp;
2646
2647	for (tmp = who->inv; tmp; tmp = tmp->below)	2448	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2648	if (tmp->type == type && tmp->subtype == subtype)	2449	if (tmp->type == type && tmp->subtype == subtype)
2649	return tmp;	2450	return tmp;
2650		2451
2651	return NULL;	2452	return 0;
2652	}	2453	}
2653		2454
2654	/* If ob has a field named key, return the link from the list,	2455	/* If ob has a field named key, return the link from the list,
2655	* otherwise return NULL.	2456	* otherwise return NULL.
2656	*	2457	*
…		…
2658	* do the desired thing.	2459	* do the desired thing.
2659	*/	2460	*/
2660	key_value *	2461	key_value *
2661	get_ob_key_link (const object *ob, const char *key)	2462	get_ob_key_link (const object *ob, const char *key)
2662	{	2463	{
2663	key_value *link;
2664
2665	for (link = ob->key_values; link != NULL; link = link->next)	2464	for (key_value *link = ob->key_values; link; link = link->next)
2666	if (link->key == key)	2465	if (link->key == key)
2667	return link;	2466	return link;
2668		2467
2669	return NULL;	2468	return 0;
2670	}	2469	}
2671		2470
2672	/*	2471	/*
2673	* Returns the value of op has an extra_field for key, or NULL.	2472	* Returns the value of op has an extra_field for key, or NULL.
2674	*	2473	*
…		…
2714	* Returns TRUE on success.	2513	* Returns TRUE on success.
2715	*/	2514	*/
2716	int	2515	int
2717	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2516	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2718	{	2517	{
2719	key_value *
2720	field = NULL, *last = NULL;	2518	key_value *field = NULL, *last = NULL;
2721		2519
2722	for (field = op->key_values; field != NULL; field = field->next)	2520	for (field = op->key_values; field != NULL; field = field->next)
2723	{	2521	{
2724	if (field->key != canonical_key)	2522	if (field->key != canonical_key)
2725	{	2523	{
…		…
2753	/* IF we get here, key doesn't exist */	2551	/* IF we get here, key doesn't exist */
2754		2552
2755	/* No field, we'll have to add it. */	2553	/* No field, we'll have to add it. */
2756		2554
2757	if (!add_key)	2555	if (!add_key)
2758	{
2759	return FALSE;	2556	return FALSE;
2760	}	2557
2761	/* There isn't any good reason to store a null	2558	/* There isn't any good reason to store a null
2762	* value in the key/value list. If the archetype has	2559	* value in the key/value list. If the archetype has
2763	* this key, then we should also have it, so shouldn't	2560	* this key, then we should also have it, so shouldn't
2764	* be here. If user wants to store empty strings,	2561	* be here. If user wants to store empty strings,
2765	* should pass in ""	2562	* should pass in ""

Diff Legend

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