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.53 by root, Tue Nov 7 16:30:54 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	*/
…		…
354	op = op->env;	352	op = op->env;
355	return op;	353	return op;
356	}	354	}
357		355
358	/*	356	/*
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;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	358	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
377	*/	360	*/
378		361
…		…
412	*/	395	*/
413		396
414	object *	397	object *
415	find_object (tag_t i)	398	find_object (tag_t i)
416	{	399	{
417	object *op;
418
419	for (op = object::first; op != NULL; op = op->next)	400	for (object *op = object::first; op; op = op->next)
420	if (op->count == i)	401	if (op->count == i)
421	break;	402	return op;
422		403
423	return op;	404	return 0;
424	}	405	}
425		406
426	/*	407	/*
427	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
428	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
486	}	467	}
487		468
488	op->key_values = 0;	469	op->key_values = 0;
489	}	470	}
490		471
491	void object::clear ()
492	{
493	attachable_base::clear ();
494
495	free_key_values (this);
496
497	owner = 0;
498	name = 0;
499	name_pl = 0;
500	title = 0;
501	race = 0;
502	slaying = 0;
503	skill = 0;
504	msg = 0;
505	lore = 0;
506	custom_name = 0;
507	materialname = 0;
508	contr = 0;
509	below = 0;
510	above = 0;
511	inv = 0;
512	container = 0;
513	env = 0;
514	more = 0;
515	head = 0;
516	map = 0;
517	active_next = 0;
518	active_prev = 0;
519
520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
521
522	SET_FLAG (this, FLAG_REMOVED);
523
524	/* What is not cleared is next, prev, and count */
525
526	expmul = 1.0;
527	face = blank_face;
528
529	if (settings.casting_time)
530	casting_time = -1;
531	}
532
533	void object::clone (object *destination)
534	{
535	*(object_copy *)destination = *this;
536	*(object_pod *)destination = *this;
537
538	if (self || cb)
539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
540	}
541
542	/*	472	/*
543	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
544	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
545	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
546	* 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,
547	* 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
548	* will point at garbage.	478	* will point at garbage.
549	*/	479	*/
550	void	480	void
551	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
552	{	482	{
553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
555		485
556	op2->clone (op);	486	*(object_copy *)dst = *this;
557		487
558	if (is_freed)	488	if (is_freed)
559	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
560	if (is_removed)	491	if (is_removed)
561	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
562		493
563	if (op2->speed < 0)	494	if (speed < 0)
564	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
565		496
566	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
567	if (op2->key_values)	498	if (key_values)
568	{	499	{
569	key_value *tail = 0;	500	key_value *tail = 0;
570	key_value *i;	501	key_value *i;
571		502
572	op->key_values = 0;	503	dst->key_values = 0;
573		504
574	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
575	{	506	{
576	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
577		508
578	new_link->next = 0;	509	new_link->next = 0;
579	new_link->key = i->key;	510	new_link->key = i->key;
580	new_link->value = i->value;	511	new_link->value = i->value;
581		512
582	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
583	if (!op->key_values)	514	if (!dst->key_values)
584	{	515	{
585	op->key_values = new_link;	516	dst->key_values = new_link;
586	tail = new_link;	517	tail = new_link;
587	}	518	}
588	else	519	else
589	{	520	{
590	tail->next = new_link;	521	tail->next = new_link;
591	tail = new_link;	522	tail = new_link;
592	}	523	}
593	}	524	}
594	}	525	}
595		526
596	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;
597	}	536	}
598		537
599	/*	538	/*
600	* 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
601	* 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
…		…
709	op->active_next = NULL;	648	op->active_next = NULL;
710	op->active_prev = NULL;	649	op->active_prev = NULL;
711	}	650	}
712		651
713	/*	652	/*
714	* update_object() updates the array which represents the map.	653	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
716	* 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
717	* invisible object, etc...)	656	* invisible object, etc...)
718	* 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
719	* 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
720	* updating that window, though, since update_object() is called _often_)	659	* updating that window, though, since update_object() is called _often_)
721	*	660	*
722	* 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.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	662	* current action are:
728	* UP_OBJ_INSERT: op was inserted	663	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	664	* UP_OBJ_REMOVE: op was removed
730	* 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
731	* 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.
732	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
733	*/	668	*/
734
735	void	669	void
736	update_object (object *op, int action)	670	update_object (object *op, int action)
737	{	671	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;	672	MoveType move_on, move_off, move_block, move_slow;
740		673
741	if (op == NULL)	674	if (op == NULL)
742	{	675	{
743	/* this should never happen */	676	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	677	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	678	return;
746	}	679	}
747		680
748	if (op->env != NULL)	681	if (op->env)
749	{	682	{
750	/* Animation is currently handled by client, so nothing	683	/* Animation is currently handled by client, so nothing
751	* to do in this case.	684	* to do in this case.
752	*/	685	*/
753	return;	686	return;
…		…
758	*/	691	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	692	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	693	return;
761		694
762	/* make sure the object is within map boundaries */	695	/* make sure the object is within map boundaries */
763	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)
764	{	697	{
765	LOG (llevError, "update_object() called for object out of map!\n");	698	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	699	#ifdef MANY_CORES
767	abort ();	700	abort ();
768	#endif	701	#endif
769	return;	702	return;
770	}	703	}
771		704
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	705	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		706
		707	if (m.flags_ & P_NEED_UPDATE)
		708	/* nop */;
779	if (action == UP_OBJ_INSERT)	709	else if (action == UP_OBJ_INSERT)
780	{	710	{
		711	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	713	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	714	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		715	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		716	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	717	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	718	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	719	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	720	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* 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
803	* to have move_allow right now.	722	* to have move_allow right now.
804	*/	723	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		726	m.flags_ = P_NEED_UPDATE;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	727	}
811	/* if the object is being removed, we can't make intelligent	728	/* if the object is being removed, we can't make intelligent
812	* decisions, because remove_ob can't really pass the object	729	* decisions, because remove_ob can't really pass the object
813	* that is being removed.	730	* that is being removed.
814	*/	731	*/
815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816	update_now = 1;	733	m.flags_ = P_NEED_UPDATE;
817	else if (action == UP_OBJ_FACE)	734	else if (action == UP_OBJ_FACE)
818	/* Nothing to do for that case */ ;	735	/* Nothing to do for that case */ ;
819	else	736	else
820	LOG (llevError, "update_object called with invalid action: %d\n", action);	737	LOG (llevError, "update_object called with invalid action: %d\n", action);
821		738
822	if (update_now)
823	{
824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825	update_position (op->map, op->x, op->y);
826	}
827
828	if (op->more != NULL)	739	if (op->more)
829	update_object (op->more, action);	740	update_object (op->more, action);
830	}	741	}
831		742
832	object::vector object::mortals;
833	object::vector object::objects; // not yet used	743	object::vector object::objects; // not yet used
834	object *object::first;	744	object *object::first;
835
836	void object::free_mortals ()
837	{
838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
839	if ((*i)->refcnt)
840	++i; // further delay freeing
841	else
842	{
843	delete *i;
844	mortals.erase (i);
845	}
846
847	static int lastmortals = 0;//D
848
849	if (mortals.size() != lastmortals && lastmortals > 100)//D
850	{
851	lastmortals = mortals.size ();//D
852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853	}
854	}
855		745
856	object::object ()	746	object::object ()
857	{	747	{
858	SET_FLAG (this, FLAG_REMOVED);	748	SET_FLAG (this, FLAG_REMOVED);
859		749
…		…
908	* this function to succeed.	798	* this function to succeed.
909	*	799	*
910	* 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
911	* inventory to the ground.	801	* inventory to the ground.
912	*/	802	*/
913	void object::destroy (bool destroy_inventory)	803	void
		804	object::do_destroy ()
914	{	805	{
915	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])
916	return;	818	return;
917		819
918	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	flag [FLAG_FREED] = 1;
919	remove_friendly_object (this);
920		821
921	if (!QUERY_FLAG (this, FLAG_REMOVED))	822	// hack to ensure that freed objects still have a valid map
922	remove_ob (this);
923
924	SET_FLAG (this, FLAG_FREED);
925
926	if (more)
927	{	823	{
928	more->destroy (destroy_inventory);	824	static maptile *freed_map; // freed objects are moved here to avoid crashes
929	more = 0;
930	}
931		825
932	if (inv)	826	if (!freed_map)
933	{
934	/* Only if the space blocks everything do we not process -
935	* if some form of movement is allowed, let objects
936	* drop on that space.
937	*/
938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
939	{	827	{
940	object *op = inv;	828	freed_map = new maptile;
941		829
942	while (op)	830	freed_map->name = "/internal/freed_objects_map";
943	{	831	freed_map->width = 3;
944	object *tmp = op->below;	832	freed_map->height = 3;
945	op->destroy (destroy_inventory);	833
946	op = tmp;	834	freed_map->allocate ();
947	}
948	}	835	}
949	else
950	{ /* Put objects in inventory onto this space */
951	object *op = inv;
952		836
953	while (op)	837	map = freed_map;
954	{	838	x = 1;
955	object *tmp = op->below;	839	y = 1;
956
957	remove_ob (op);
958
959	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961	free_object (op);
962	else
963	{
964	op->x = x;
965	op->y = y;
966	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
967	}
968
969	op = tmp;
970	}
971	}
972	}	840	}
		841
		842	more = 0;
		843	head = 0;
		844	inv = 0;
973		845
974	// clear those pointers that likely might have circular references to us	846	// clear those pointers that likely might have circular references to us
975	owner = 0;	847	owner = 0;
976	enemy = 0;	848	enemy = 0;
977	attacked_by = 0;	849	attacked_by = 0;
…		…
982	/* Remove object from the active list */	854	/* Remove object from the active list */
983	speed = 0;	855	speed = 0;
984	update_ob_speed (this);	856	update_ob_speed (this);
985		857
986	unlink ();	858	unlink ();
		859	}
987		860
988	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 ();
989	}	923	}
990		924
991	/*	925	/*
992	* sub_weight() recursively (outwards) subtracts a number from the	926	* sub_weight() recursively (outwards) subtracts a number from the
993	* 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)).
994	*/	928	*/
995
996	void	929	void
997	sub_weight (object *op, signed long weight)	930	sub_weight (object *op, signed long weight)
998	{	931	{
999	while (op != NULL)	932	while (op != NULL)
1000	{	933	{
…		…
1004	op->carrying -= weight;	937	op->carrying -= weight;
1005	op = op->env;	938	op = op->env;
1006	}	939	}
1007	}	940	}
1008		941
1009	/* remove_ob(op):	942	/* op->remove ():
1010	* 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
1011	* 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
1012	* object will have no environment. If the object previously had an	945	* object will have no environment. If the object previously had an
1013	* environment, the x and y coordinates will be updated to	946	* environment, the x and y coordinates will be updated to
1014	* the previous environment.	947	* the previous environment.
1015	* Beware: This function is called from the editor as well!	948	* Beware: This function is called from the editor as well!
1016	*/	949	*/
1017
1018	void	950	void
1019	remove_ob (object *op)	951	object::remove ()
1020	{	952	{
1021	object *tmp, *last = 0;	953	object *tmp, *last = 0;
1022	object *otmp;	954	object *otmp;
1023		955
1024	int check_walk_off;
1025	maptile *m;
1026
1027	sint16 x, y;
1028
1029	if (QUERY_FLAG (op, FLAG_REMOVED))	956	if (QUERY_FLAG (this, FLAG_REMOVED))
1030	return;	957	return;
1031		958
1032	SET_FLAG (op, FLAG_REMOVED);	959	SET_FLAG (this, FLAG_REMOVED);
		960	INVOKE_OBJECT (REMOVE, this);
1033		961
1034	if (op->more != NULL)	962	if (more)
1035	remove_ob (op->more);	963	more->remove ();
1036		964
1037	/*	965	/*
1038	* In this case, the object to be removed is in someones	966	* In this case, the object to be removed is in someones
1039	* inventory.	967	* inventory.
1040	*/	968	*/
1041	if (op->env != NULL)	969	if (env)
1042	{	970	{
1043	if (op->nrof)	971	if (nrof)
1044	sub_weight (op->env, op->weight * op->nrof);	972	sub_weight (env, weight * nrof);
1045	else	973	else
1046	sub_weight (op->env, op->weight + op->carrying);	974	sub_weight (env, weight + carrying);
1047		975
1048	/* 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
1049	* made to players inventory. If set, avoiding the call	977	* made to players inventory. If set, avoiding the call
1050	* to save cpu time.	978	* to save cpu time.
1051	*/	979	*/
1052	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))
1053	fix_player (otmp);	981	otmp->update_stats ();
1054		982
1055	if (op->above != NULL)	983	if (above != NULL)
1056	op->above->below = op->below;	984	above->below = below;
1057	else	985	else
1058	op->env->inv = op->below;	986	env->inv = below;
1059		987
1060	if (op->below != NULL)	988	if (below != NULL)
1061	op->below->above = op->above;	989	below->above = above;
1062		990
1063	/* we set up values so that it could be inserted into	991	/* we set up values so that it could be inserted into
1064	* 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
1065	* to the caller to decide what we want to do.	993	* to the caller to decide what we want to do.
1066	*/	994	*/
1067	op->x = op->env->x, op->y = op->env->y;	995	x = env->x, y = env->y;
1068	op->map = op->env->map;	996	map = env->map;
1069	op->above = NULL, op->below = NULL;	997	above = 0, below = 0;
1070	op->env = NULL;	998	env = 0;
1071	}	999	}
1072	else if (op->map)	1000	else if (map)
1073	{	1001	{
1074	x = op->x;
1075	y = op->y;
1076	m = get_map_from_coord (op->map, &x, &y);
1077
1078	if (!m)
1079	{
1080	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1081	op->map->path, op->x, op->y);
1082	/* in old days, we used to set x and y to 0 and continue.
1083	* it seems if we get into this case, something is probablye
1084	* screwed up and should be fixed.
1085	*/
1086	abort ();
1087	}
1088
1089	if (op->map != m)
1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1091	op->map->path, m->path, op->x, op->y, x, y);
1092
1093	/* 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
1094	* lots of logic for things we no longer care about	1003	* lots of logic for things we no longer care about
1095	*/	1004	*/
1096		1005
1097	/* link the object above us */	1006	/* link the object above us */
1098	if (op->above)	1007	if (above)
1099	op->above->below = op->below;	1008	above->below = below;
1100	else	1009	else
1101	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 */
1102		1011
1103	/* Relink the object below us, if there is one */	1012	/* Relink the object below us, if there is one */
1104	if (op->below)	1013	if (below)
1105	op->below->above = op->above;	1014	below->above = above;
1106	else	1015	else
1107	{	1016	{
1108	/* 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
1109	* use translated coordinates in case some oddness with map tiling is	1018	* use translated coordinates in case some oddness with map tiling is
1110	* evident	1019	* evident
1111	*/	1020	*/
1112	if (GET_MAP_OB (m, x, y) != op)	1021	if (GET_MAP_OB (map, x, y) != this)
1113	{	1022	{
1114	char *dump = dump_object (op);	1023	char *dump = dump_object (this);
1115	LOG (llevError,	1024	LOG (llevError,
1116	"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);
1117	free (dump);	1026	free (dump);
1118	dump = dump_object (GET_MAP_OB (m, x, y));	1027	dump = dump_object (GET_MAP_OB (map, x, y));
1119	LOG (llevError, "%s\n", dump);	1028	LOG (llevError, "%s\n", dump);
1120	free (dump);	1029	free (dump);
1121	}	1030	}
1122		1031
1123	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1032	map->at (x, y).bot = above; /* goes on above it. */
1124	}	1033	}
1125		1034
1126	op->above = 0;	1035	above = 0;
1127	op->below = 0;	1036	below = 0;
1128		1037
1129	if (op->map->in_memory == MAP_SAVING)	1038	if (map->in_memory == MAP_SAVING)
1130	return;	1039	return;
1131		1040
1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1041	int check_walk_off = !flag [FLAG_NO_APPLY];
1133		1042
1134	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)
1135	{	1044	{
1136	/* 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
1137	* being removed.	1046	* being removed.
1138	*/	1047	*/
1139		1048
1140	if (tmp->type == PLAYER && tmp != op)	1049	if (tmp->type == PLAYER && tmp != this)
1141	{	1050	{
1142	/* If a container that the player is currently using somehow gets	1051	/* If a container that the player is currently using somehow gets
1143	* removed (most likely destroyed), update the player view	1052	* removed (most likely destroyed), update the player view
1144	* appropriately.	1053	* appropriately.
1145	*/	1054	*/
1146	if (tmp->container == op)	1055	if (tmp->container == this)
1147	{	1056	{
1148	CLEAR_FLAG (op, FLAG_APPLIED);	1057	flag [FLAG_APPLIED] = 0;
1149	tmp->container = NULL;	1058	tmp->container = 0;
1150	}	1059	}
1151		1060
1152	tmp->contr->socket.update_look = 1;	1061	if (tmp->contr->ns)
		1062	tmp->contr->ns->floorbox_update ();
1153	}	1063	}
1154		1064
1155	/* See if player moving off should effect something */	1065	/* See if player moving off should effect something */
1156	if (check_walk_off	1066	if (check_walk_off
1157	&& ((op->move_type & tmp->move_off)	1067	&& ((move_type & tmp->move_off)
1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159	{	1069	{
1160	move_apply (tmp, op, NULL);	1070	move_apply (tmp, this, 0);
1161		1071
1162	if (op->destroyed ())	1072	if (destroyed ())
1163	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 ());
1164	}	1074	}
1165		1075
1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167		1077
1168	if (tmp->above == tmp)	1078	if (tmp->above == tmp)
1169	tmp->above = NULL;	1079	tmp->above = 0;
1170		1080
1171	last = tmp;	1081	last = tmp;
1172	}	1082	}
1173		1083
1174	/* last == NULL of there are no objects on this space */	1084	/* last == NULL of there are no objects on this space */
1175	if (last == NULL)	1085	if (!last)
1176	{	1086	map->at (x, y).flags_ = P_NEED_UPDATE;
1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1179	* those out anyways, and if there are any flags set right now, they won't
1180	* be correct anyways.
1181	*/
1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1183	update_position (op->map, op->x, op->y);
1184	}
1185	else	1087	else
1186	update_object (last, UP_OBJ_REMOVE);	1088	update_object (last, UP_OBJ_REMOVE);
1187		1089
1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1189	update_all_los (op->map, op->x, op->y);	1091	update_all_los (map, x, y);
1190	}	1092	}
1191	}	1093	}
1192		1094
1193	/*	1095	/*
1194	* merge_ob(op,top):	1096	* merge_ob(op,top):
…		…
1202	merge_ob (object *op, object *top)	1104	merge_ob (object *op, object *top)
1203	{	1105	{
1204	if (!op->nrof)	1106	if (!op->nrof)
1205	return 0;	1107	return 0;
1206		1108
1207	if (top == NULL)	1109	if (top)
1208	for (top = op; top != NULL && top->above != NULL; top = top->above);	1110	for (top = op; top && top->above; top = top->above)
		1111	;
1209		1112
1210	for (; top != NULL; top = top->below)	1113	for (; top; top = top->below)
1211	{	1114	{
1212	if (top == op)	1115	if (top == op)
1213	continue;	1116	continue;
1214	if (CAN_MERGE (op, top))	1117
		1118	if (object::can_merge (op, top))
1215	{	1119	{
1216	top->nrof += op->nrof;	1120	top->nrof += op->nrof;
1217		1121
1218	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1122	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219	op->weight = 0; /* Don't want any adjustements now */	1123	op->weight = 0; /* Don't want any adjustements now */
1220	remove_ob (op);	1124	op->destroy ();
1221	free_object (op);
1222	return top;	1125	return top;
1223	}	1126	}
1224	}	1127	}
1225		1128
1226	return 0;	1129	return 0;
…		…
1265	* Return value:	1168	* Return value:
1266	* new object if 'op' was merged with other object	1169	* new object if 'op' was merged with other object
1267	* NULL if 'op' was destroyed	1170	* NULL if 'op' was destroyed
1268	* just 'op' otherwise	1171	* just 'op' otherwise
1269	*/	1172	*/
1270
1271	object *	1173	object *
1272	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)
1273	{	1175	{
1274	object *tmp, *top, *floor = NULL;	1176	object *tmp, *top, *floor = NULL;
1275	sint16 x, y;	1177	sint16 x, y;
…		…
1309	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);
1310	free (dump);	1212	free (dump);
1311	return op;	1213	return op;
1312	}	1214	}
1313		1215
1314	if (op->more != NULL)	1216	if (op->more)
1315	{	1217	{
1316	/* The part may be on a different map. */	1218	/* The part may be on a different map. */
1317		1219
1318	object *more = op->more;	1220	object *more = op->more;
1319		1221
…		…
1335	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1336	{	1238	{
1337	if (!op->head)	1239	if (!op->head)
1338	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");
1339		1241
1340	return NULL;	1242	return 0;
1341	}	1243	}
1342	}	1244	}
1343		1245
1344	CLEAR_FLAG (op, FLAG_REMOVED);	1246	CLEAR_FLAG (op, FLAG_REMOVED);
1345		1247
…		…
1353		1255
1354	/* this has to be done after we translate the coordinates.	1256	/* this has to be done after we translate the coordinates.
1355	*/	1257	*/
1356	if (op->nrof && !(flag & INS_NO_MERGE))	1258	if (op->nrof && !(flag & INS_NO_MERGE))
1357	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)
1358	if (CAN_MERGE (op, tmp))	1260	if (object::can_merge (op, tmp))
1359	{	1261	{
1360	op->nrof += tmp->nrof;	1262	op->nrof += tmp->nrof;
1361	remove_ob (tmp);	1263	tmp->destroy ();
1362	free_object (tmp);
1363	}	1264	}
1364		1265
1365	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 */
1366	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1267	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367		1268
…		…
1380	op->below = originator->below;	1281	op->below = originator->below;
1381		1282
1382	if (op->below)	1283	if (op->below)
1383	op->below->above = op;	1284	op->below->above = op;
1384	else	1285	else
1385	SET_MAP_OB (op->map, op->x, op->y, op);	1286	op->ms ().bot = op;
1386		1287
1387	/* since *below* originator, no need to update top */	1288	/* since *below* originator, no need to update top */
1388	originator->below = op;	1289	originator->below = op;
1389	}	1290	}
1390	else	1291	else
…		…
1436	* If INS_ON_TOP is used, don't do this processing	1337	* If INS_ON_TOP is used, don't do this processing
1437	* Need to find the object that in fact blocks view, otherwise	1338	* Need to find the object that in fact blocks view, otherwise
1438	* stacking is a bit odd.	1339	* stacking is a bit odd.
1439	*/	1340	*/
1440	if (!(flag & INS_ON_TOP) &&	1341	if (!(flag & INS_ON_TOP) &&
1441	(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))
1442	{	1343	{
1443	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1444	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1445	break;	1346	break;
1446	/* Check to see if we found the object that blocks view,	1347	/* Check to see if we found the object that blocks view,
…		…
1469		1370
1470	if (op->above)	1371	if (op->above)
1471	op->above->below = op;	1372	op->above->below = op;
1472		1373
1473	op->below = NULL;	1374	op->below = NULL;
1474	SET_MAP_OB (op->map, op->x, op->y, op);	1375	op->ms ().bot = op;
1475	}	1376	}
1476	else	1377	else
1477	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1478	op->above = top->above;	1379	op->above = top->above;
1479		1380
…		…
1483	op->below = top;	1384	op->below = top;
1484	top->above = op;	1385	top->above = op;
1485	}	1386	}
1486		1387
1487	if (op->above == NULL)	1388	if (op->above == NULL)
1488	SET_MAP_TOP (op->map, op->x, op->y, op);	1389	op->ms ().top = op;
1489	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1490		1391
1491	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
1492	op->contr->do_los = 1;	1393	op->contr->do_los = 1;
1493		1394
1494	/* 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
1495	* it, so save a few ticks and start from there.	1396	* it, so save a few ticks and start from there.
1496	*/	1397	*/
1497	if (!(flag & INS_MAP_LOAD))	1398	if (!(flag & INS_MAP_LOAD))
1498	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 ())
1499	if (tmp->type == PLAYER)	1400	if (pl->contr->ns)
1500	tmp->contr->socket.update_look = 1;	1401	pl->contr->ns->floorbox_update ();
1501		1402
1502	/* If this object glows, it may affect lighting conditions that are	1403	/* If this object glows, it may affect lighting conditions that are
1503	* 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
1504	* 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
1505	* on the map will get recalculated. The players could very well	1406	* on the map will get recalculated. The players could very well
1506	* 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 -
1507	* this should get redone to only look for players within range,	1408	* this should get redone to only look for players within range,
1508	* 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
1509	* of effect may be sufficient.	1410	* of effect may be sufficient.
1510	*/	1411	*/
1511	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1412	if (op->map->darkness && (op->glow_radius != 0))
1512	update_all_los (op->map, op->x, op->y);	1413	update_all_los (op->map, op->x, op->y);
1513		1414
1514	/* updates flags (blocked, alive, no magic, etc) for this map space */	1415	/* updates flags (blocked, alive, no magic, etc) for this map space */
1515	update_object (op, UP_OBJ_INSERT);	1416	update_object (op, UP_OBJ_INSERT);
1516		1417
		1418	INVOKE_OBJECT (INSERT, op);
		1419
1517	/* 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,
1518	* we want to have update_look set above before calling this.	1421	* we want to have floorbox_update called before calling this.
1519	*	1422	*
1520	* check_move_on() must be after this because code called from	1423	* check_move_on() must be after this because code called from
1521	* check_move_on() depends on correct map flags (so functions like	1424	* check_move_on() depends on correct map flags (so functions like
1522	* blocked() and wall() work properly), and these flags are updated by	1425	* blocked() and wall() work properly), and these flags are updated by
1523	* update_object().	1426	* update_object().
…		…
1525		1428
1526	/* 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 */
1527	if (!(flag & INS_NO_WALK_ON) && !op->head)	1430	if (!(flag & INS_NO_WALK_ON) && !op->head)
1528	{	1431	{
1529	if (check_move_on (op, originator))	1432	if (check_move_on (op, originator))
1530	return NULL;	1433	return 0;
1531		1434
1532	/* 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
1533	* walk on's.	1436	* walk on's.
1534	*/	1437	*/
1535	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1536	if (check_move_on (tmp, originator))	1439	if (check_move_on (tmp, originator))
1537	return NULL;	1440	return 0;
1538	}	1441	}
1539		1442
1540	return op;	1443	return op;
1541	}	1444	}
1542		1445
1543	/* this function inserts an object in the map, but if it	1446	/* this function inserts an object in the map, but if it
1544	* 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.
1545	* 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.
1546	*/	1449	*/
1547	void	1450	void
1548	replace_insert_ob_in_map (const char *arch_string, object *op)	1451	replace_insert_ob_in_map (const char *arch_string, object *op)
1549	{	1452	{
1550	object *	1453	object *tmp, *tmp1;
1551	tmp;
1552	object *
1553	tmp1;
1554		1454
1555	/* first search for itself and remove any old instances */	1455	/* first search for itself and remove any old instances */
1556		1456
1557	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)
1558	{
1559	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560	{	1459	tmp->destroy ();
1561	remove_ob (tmp);
1562	free_object (tmp);
1563	}
1564	}
1565		1460
1566	tmp1 = arch_to_object (archetype::find (arch_string));	1461	tmp1 = arch_to_object (archetype::find (arch_string));
1567		1462
1568	tmp1->x = op->x;	1463	tmp1->x = op->x;
1569	tmp1->y = op->y;	1464	tmp1->y = op->y;
…		…
1579	*/	1474	*/
1580		1475
1581	object *	1476	object *
1582	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1583	{	1478	{
1584	object *	1479	object *newob;
1585	newob;
1586	int
1587	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1588		1481
1589	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1590	{	1483	{
1591	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);
1592	return NULL;	1485	return NULL;
1593	}	1486	}
1594		1487
1595	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
1596		1489
1597	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1598	{	1491	orig_ob->destroy (1);
1599	if (!is_removed)
1600	remove_ob (orig_ob);
1601	free_object2 (orig_ob, 1);
1602	}
1603	else if (!is_removed)	1492	else if (!is_removed)
1604	{	1493	{
1605	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1606	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1607	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)
…		…
1627		1516
1628	object *	1517	object *
1629	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1630	{	1519	{
1631	object *tmp;	1520	object *tmp;
1632	player *pl;
1633		1521
1634	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1635	return op;	1523	return op;
1636		1524
1637	if (i > op->nrof)	1525	if (i > op->nrof)
1638	i = op->nrof;	1526	i = op->nrof;
1639		1527
1640	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1641	op->nrof -= i;	1529	op->nrof -= i;
1642	else if (op->env != NULL)	1530	else if (op->env)
1643	{	1531	{
1644	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1645	* therein?	1533	* therein?
1646	*/	1534	*/
1647	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1648	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1649	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1650	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1651	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1652	* and then searching the map for a player.	1540	* and then searching the map for a player.
1653	*/	1541	*/
1654	if (!tmp)	1542	if (!tmp)
1655	{	1543	for_all_players (pl)
1656	for (pl = first_player; pl; pl = pl->next)
1657	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1658	break;	1547	break;
1659	if (pl)
1660	tmp = pl->ob;
1661	else
1662	tmp = NULL;
1663	}	1548	}
1664		1549
1665	if (i < op->nrof)	1550	if (i < op->nrof)
1666	{	1551	{
1667	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1668	op->nrof -= i;	1553	op->nrof -= i;
1669	if (tmp)	1554	if (tmp)
1670	{
1671	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1672	}
1673	}	1556	}
1674	else	1557	else
1675	{	1558	{
1676	remove_ob (op);	1559	op->remove ();
1677	op->nrof = 0;	1560	op->nrof = 0;
1678	if (tmp)	1561	if (tmp)
1679	{
1680	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1681	}
1682	}	1563	}
1683	}	1564	}
1684	else	1565	else
1685	{	1566	{
1686	object *above = op->above;	1567	object *above = op->above;
1687		1568
1688	if (i < op->nrof)	1569	if (i < op->nrof)
1689	op->nrof -= i;	1570	op->nrof -= i;
1690	else	1571	else
1691	{	1572	{
1692	remove_ob (op);	1573	op->remove ();
1693	op->nrof = 0;	1574	op->nrof = 0;
1694	}	1575	}
1695		1576
1696	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1697	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1698	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1699	{	1580	{
1700	if (op->nrof)	1581	if (op->nrof)
1701	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1702	else	1583	else
…		…
1706		1587
1707	if (op->nrof)	1588	if (op->nrof)
1708	return op;	1589	return op;
1709	else	1590	else
1710	{	1591	{
1711	free_object (op);	1592	op->destroy ();
1712	return NULL;	1593	return 0;
1713	}	1594	}
1714	}	1595	}
1715		1596
1716	/*	1597	/*
1717	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1729	op->carrying += weight;	1610	op->carrying += weight;
1730	op = op->env;	1611	op = op->env;
1731	}	1612	}
1732	}	1613	}
1733		1614
1734	/*
1735	* insert_ob_in_ob(op,environment):
1736	* This function inserts the object op in the linked list
1737	* inside the object environment.
1738	*
1739	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1740	* the inventory at the last position or next to other objects of the same
1741	* type.
1742	* Frank: Now sorted by type, archetype and magic!
1743	*
1744	* The function returns now pointer to inserted item, and return value can
1745	* be != op, if items are merged. -Tero
1746	*/
1747
1748	object *	1615	object *
1749	insert_ob_in_ob (object *op, object *where)	1616	insert_ob_in_ob (object *op, object *where)
1750	{	1617	{
1751	object *	1618	if (!where)
1752	tmp, *
1753	otmp;
1754
1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1756	{
1757	char *dump = dump_object (op);
1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759	free (dump);
1760	return op;
1761	}
1762
1763	if (where == NULL)
1764	{	1619	{
1765	char *dump = dump_object (op);	1620	char *dump = dump_object (op);
1766	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);
1767	free (dump);	1622	free (dump);
1768	return op;	1623	return op;
1769	}	1624	}
1770		1625
1771	if (where->head)	1626	if (where->head)
1772	{	1627	{
1773	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");
1774	where = where->head;	1629	where = where->head;
1775	}	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 ();
1776		1651
1777	if (op->more)	1652	if (op->more)
1778	{	1653	{
1779	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);
1780	return op;	1655	return op;
…		…
1782		1657
1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1785	if (op->nrof)	1660	if (op->nrof)
1786	{	1661	{
1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1789	{	1664	{
1790	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1791	(client needs the original object) */	1666	(client needs the original object) */
1792	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1793	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
1794	* tmp->nrof, we need to increase the weight.	1669	* tmp->nrof, we need to increase the weight.
1795	*/	1670	*/
1796	add_weight (where, op->weight * op->nrof);	1671	add_weight (this, op->weight * op->nrof);
1797	SET_FLAG (op, FLAG_REMOVED);	1672	SET_FLAG (op, FLAG_REMOVED);
1798	free_object (op); /* free the inserted object */	1673	op->destroy (); /* free the inserted object */
1799	op = tmp;	1674	op = tmp;
1800	remove_ob (op); /* and fix old object's links */	1675	op->remove (); /* and fix old object's links */
1801	CLEAR_FLAG (op, FLAG_REMOVED);	1676	CLEAR_FLAG (op, FLAG_REMOVED);
1802	break;	1677	break;
1803	}	1678	}
1804		1679
1805	/* I assume combined objects have no inventory	1680	/* I assume combined objects have no inventory
1806	* We add the weight - this object could have just been removed	1681	* We add the weight - this object could have just been removed
1807	* (if it was possible to merge). calling remove_ob will subtract	1682	* (if it was possible to merge). calling remove_ob will subtract
1808	* 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
1809	* the linking below	1684	* the linking below
1810	*/	1685	*/
1811	add_weight (where, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1812	}	1687	}
1813	else	1688	else
1814	add_weight (where, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1815		1690
1816	otmp = is_player_inv (where);	1691	otmp = this->in_player ();
1817	if (otmp && otmp->contr != NULL)	1692	if (otmp && otmp->contr)
1818	{
1819	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820	fix_player (otmp);	1694	otmp->update_stats ();
1821	}
1822		1695
1823	op->map = NULL;	1696	op->map = 0;
1824	op->env = where;	1697	op->env = this;
1825	op->above = NULL;	1698	op->above = 0;
1826	op->below = NULL;	1699	op->below = 0;
1827	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1828		1701
1829	/* 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 */
1830	if ((op->glow_radius != 0) && where->map)	1703	if ((op->glow_radius != 0) && map)
1831	{	1704	{
1832	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1833	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);
1834	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1835	if (MAP_DARKNESS (where->map))	1708	if (map->darkness)
1836	update_all_los (where->map, where->x, where->y);	1709	update_all_los (map, x, y);
1837	}	1710	}
1838		1711
1839	/* 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.
1840	* It sure simplifies this function...	1713	* It sure simplifies this function...
1841	*/	1714	*/
1842	if (where->inv == NULL)	1715	if (!inv)
1843	where->inv = op;	1716	inv = op;
1844	else	1717	else
1845	{	1718	{
1846	op->below = where->inv;	1719	op->below = inv;
1847	op->below->above = op;	1720	op->below->above = op;
1848	where->inv = op;	1721	inv = op;
1849	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
		1725
1850	return op;	1726	return op;
1851	}	1727	}
1852		1728
1853	/*	1729	/*
1854	* Checks if any objects has a move_type that matches objects	1730	* Checks if any objects has a move_type that matches objects
…		…
1905		1781
1906	/* The objects have to be checked from top to bottom.	1782	/* The objects have to be checked from top to bottom.
1907	* Hence, we first go to the top:	1783	* Hence, we first go to the top:
1908	*/	1784	*/
1909		1785
1910	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)
1911	{	1787	{
1912	/* Trim the search when we find the first other spell effect	1788	/* Trim the search when we find the first other spell effect
1913	* 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,
1914	* we don't need to check all of them.	1790	* we don't need to check all of them.
1915	*/	1791	*/
…		…
1970	/*	1846	/*
1971	* present_arch(arch, map, x, y) searches for any objects with	1847	* present_arch(arch, map, x, y) searches for any objects with
1972	* a matching archetype at the given map and coordinates.	1848	* a matching archetype at the given map and coordinates.
1973	* The first matching object is returned, or NULL if none.	1849	* The first matching object is returned, or NULL if none.
1974	*/	1850	*/
1975
1976	object *	1851	object *
1977	present_arch (const archetype *at, maptile *m, int x, int y)	1852	present_arch (const archetype *at, maptile *m, int x, int y)
1978	{	1853	{
1979	object *
1980	tmp;
1981
1982	if (m == NULL || out_of_map (m, x, y))	1854	if (m == NULL || out_of_map (m, x, y))
1983	{	1855	{
1984	LOG (llevError, "Present_arch called outside map.\n");	1856	LOG (llevError, "Present_arch called outside map.\n");
1985	return NULL;	1857	return NULL;
1986	}	1858	}
		1859
1987	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)
1988	if (tmp->arch == at)	1861	if (tmp->arch == at)
1989	return tmp;	1862	return tmp;
		1863
1990	return NULL;	1864	return NULL;
1991	}	1865	}
1992		1866
1993	/*	1867	/*
1994	* present(type, map, x, y) searches for any objects with	1868	* present(type, map, x, y) searches for any objects with
1995	* a matching type variable at the given map and coordinates.	1869	* a matching type variable at the given map and coordinates.
1996	* The first matching object is returned, or NULL if none.	1870	* The first matching object is returned, or NULL if none.
1997	*/	1871	*/
1998
1999	object *	1872	object *
2000	present (unsigned char type, maptile *m, int x, int y)	1873	present (unsigned char type, maptile *m, int x, int y)
2001	{	1874	{
2002	object *
2003	tmp;
2004
2005	if (out_of_map (m, x, y))	1875	if (out_of_map (m, x, y))
2006	{	1876	{
2007	LOG (llevError, "Present called outside map.\n");	1877	LOG (llevError, "Present called outside map.\n");
2008	return NULL;	1878	return NULL;
2009	}	1879	}
		1880
2010	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)
2011	if (tmp->type == type)	1882	if (tmp->type == type)
2012	return tmp;	1883	return tmp;
		1884
2013	return NULL;	1885	return NULL;
2014	}	1886	}
2015		1887
2016	/*	1888	/*
2017	* present_in_ob(type, object) searches for any objects with	1889	* present_in_ob(type, object) searches for any objects with
2018	* a matching type variable in the inventory of the given object.	1890	* a matching type variable in the inventory of the given object.
2019	* The first matching object is returned, or NULL if none.	1891	* The first matching object is returned, or NULL if none.
2020	*/	1892	*/
2021
2022	object *	1893	object *
2023	present_in_ob (unsigned char type, const object *op)	1894	present_in_ob (unsigned char type, const object *op)
2024	{	1895	{
2025	object *
2026	tmp;
2027
2028	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1896	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2029	if (tmp->type == type)	1897	if (tmp->type == type)
2030	return tmp;	1898	return tmp;
		1899
2031	return NULL;	1900	return NULL;
2032	}	1901	}
2033		1902
2034	/*	1903	/*
2035	* present_in_ob (type, str, object) searches for any objects with	1904	* present_in_ob (type, str, object) searches for any objects with
…		…
2043	* 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
2044	* 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
2045	* 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
2046	* to be unique.	1915	* to be unique.
2047	*/	1916	*/
2048
2049	object *	1917	object *
2050	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)
2051	{	1919	{
2052	object *
2053	tmp;
2054
2055	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2056	{
2057	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1921	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2058	return tmp;	1922	return tmp;
2059	}	1923
2060	return NULL;	1924	return 0;
2061	}	1925	}
2062		1926
2063	/*	1927	/*
2064	* present_arch_in_ob(archetype, object) searches for any objects with	1928	* present_arch_in_ob(archetype, object) searches for any objects with
2065	* a matching archetype in the inventory of the given object.	1929	* a matching archetype in the inventory of the given object.
2066	* The first matching object is returned, or NULL if none.	1930	* The first matching object is returned, or NULL if none.
2067	*/	1931	*/
2068
2069	object *	1932	object *
2070	present_arch_in_ob (const archetype *at, const object *op)	1933	present_arch_in_ob (const archetype *at, const object *op)
2071	{	1934	{
2072	object *
2073	tmp;
2074
2075	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2076	if (tmp->arch == at)	1936	if (tmp->arch == at)
2077	return tmp;	1937	return tmp;
		1938
2078	return NULL;	1939	return NULL;
2079	}	1940	}
2080		1941
2081	/*	1942	/*
2082	* activate recursively a flag on an object inventory	1943	* activate recursively a flag on an object inventory
2083	*/	1944	*/
2084	void	1945	void
2085	flag_inv (object *op, int flag)	1946	flag_inv (object *op, int flag)
2086	{	1947	{
2087	object *
2088	tmp;
2089
2090	if (op->inv)	1948	if (op->inv)
2091	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1949	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2092	{	1950	{
2093	SET_FLAG (tmp, flag);	1951	SET_FLAG (tmp, flag);
2094	flag_inv (tmp, flag);	1952	flag_inv (tmp, flag);
2095	}	1953	}
2096	} /*	1954	}
		1955
		1956	/*
2097	* desactivate recursively a flag on an object inventory	1957	* deactivate recursively a flag on an object inventory
2098	*/	1958	*/
2099	void	1959	void
2100	unflag_inv (object *op, int flag)	1960	unflag_inv (object *op, int flag)
2101	{	1961	{
2102	object *
2103	tmp;
2104
2105	if (op->inv)	1962	if (op->inv)
2106	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1963	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2107	{	1964	{
2108	CLEAR_FLAG (tmp, flag);	1965	CLEAR_FLAG (tmp, flag);
2109	unflag_inv (tmp, flag);	1966	unflag_inv (tmp, flag);
2110	}	1967	}
2111	}	1968	}
…		…
2114	* 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
2115	* all it's inventory (recursively).	1972	* all it's inventory (recursively).
2116	* 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
2117	* 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.
2118	*/	1975	*/
2119
2120	void	1976	void
2121	set_cheat (object *op)	1977	set_cheat (object *op)
2122	{	1978	{
2123	SET_FLAG (op, FLAG_WAS_WIZ);	1979	SET_FLAG (op, FLAG_WAS_WIZ);
2124	flag_inv (op, FLAG_WAS_WIZ);	1980	flag_inv (op, FLAG_WAS_WIZ);
…		…
2143	* 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
2144	* 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
2145	* 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
2146	* customized, changed states, etc.	2002	* customized, changed states, etc.
2147	*/	2003	*/
2148
2149	int	2004	int
2150	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)
2151	{	2006	{
2152	int
2153	i,
2154	index = 0, flag;	2007	int index = 0, flag;
2155	static int
2156	altern[SIZEOFFREE];	2008	int altern[SIZEOFFREE];
2157		2009
2158	for (i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
2159	{	2011	{
2160	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]);
2161	if (!flag)	2013	if (!flag)
2162	altern[index++] = i;	2014	altern [index++] = i;
2163		2015
2164	/* 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.
2165	* 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.
2166	* 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 -
2167	* 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
2168	* 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
2169	* to only the spaces immediately surrounding the target area, and	2021	* to only the spaces immediately surrounding the target area, and
2170	* won't look 2 spaces south of the target space.	2022	* won't look 2 spaces south of the target space.
2171	*/	2023	*/
2172	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2024	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2173	stop = maxfree[i];	2025	stop = maxfree[i];
2174	}	2026	}
		2027
2175	if (!index)	2028	if (!index)
2176	return -1;	2029	return -1;
		2030
2177	return altern[RANDOM () % index];	2031	return altern[RANDOM () % index];
2178	}	2032	}
2179		2033
2180	/*	2034	/*
2181	* find_first_free_spot(archetype, maptile, x, y) works like	2035	* find_first_free_spot(archetype, maptile, x, y) works like
2182	* find_free_spot(), but it will search max number of squares.	2036	* find_free_spot(), but it will search max number of squares.
2183	* 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.
2184	* 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.
2185	*/	2039	*/
2186
2187	int	2040	int
2188	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)
2189	{	2042	{
2190	int
2191	i;
2192
2193	for (i = 0; i < SIZEOFFREE; i++)	2043	for (int i = 0; i < SIZEOFFREE; i++)
2194	{
2195	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]))
2196	return i;	2045	return i;
2197	}	2046
2198	return -1;	2047	return -1;
2199	}	2048	}
2200		2049
2201	/*	2050	/*
2202	* The function permute(arr, begin, end) randomly reorders the array	2051	* The function permute(arr, begin, end) randomly reorders the array
2203	* arr[begin..end-1].	2052	* arr[begin..end-1].
		2053	* now uses a fisher-yates shuffle, old permute was broken
2204	*/	2054	*/
2205	static void	2055	static void
2206	permute (int *arr, int begin, int end)	2056	permute (int *arr, int begin, int end)
2207	{	2057	{
2208	int	2058	arr += begin;
2209	i,
2210	j,
2211	tmp,
2212	len;
2213
2214	len = end - begin;	2059	end -= begin;
2215	for (i = begin; i < end; i++)
2216	{
2217	j = begin + RANDOM () % len;
2218		2060
2219	tmp = arr[i];	2061	while (--end)
2220	arr[i] = arr[j];	2062	swap (arr [end], arr [RANDOM () % (end + 1)]);
2221	arr[j] = tmp;
2222	}
2223	}	2063	}
2224		2064
2225	/* new function to make monster searching more efficient, and effective!	2065	/* new function to make monster searching more efficient, and effective!
2226	* This basically returns a randomized array (in the passed pointer) of	2066	* This basically returns a randomized array (in the passed pointer) of
2227	* 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
…		…
2230	* 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.
2231	*/	2071	*/
2232	void	2072	void
2233	get_search_arr (int *search_arr)	2073	get_search_arr (int *search_arr)
2234	{	2074	{
2235	int	2075	int i;
2236	i;
2237		2076
2238	for (i = 0; i < SIZEOFFREE; i++)	2077	for (i = 0; i < SIZEOFFREE; i++)
2239	{
2240	search_arr[i] = i;	2078	search_arr[i] = i;
2241	}
2242		2079
2243	permute (search_arr, 1, SIZEOFFREE1 + 1);	2080	permute (search_arr, 1, SIZEOFFREE1 + 1);
2244	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2081	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2245	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2082	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2246	}	2083	}
…		…
2255	* Perhaps incorrectly, but I'm making the assumption that exclude	2092	* Perhaps incorrectly, but I'm making the assumption that exclude
2256	* 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
2257	* 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
2258	* there is capable of.	2095	* there is capable of.
2259	*/	2096	*/
2260
2261	int	2097	int
2262	find_dir (maptile *m, int x, int y, object *exclude)	2098	find_dir (maptile *m, int x, int y, object *exclude)
2263	{	2099	{
2264	int
2265	i,
2266	max = SIZEOFFREE, mflags;	2100	int i, max = SIZEOFFREE, mflags;
2267		2101
2268	sint16 nx, ny;	2102	sint16 nx, ny;
2269	object *	2103	object *tmp;
2270	tmp;
2271	maptile *	2104	maptile *mp;
2272	mp;
2273		2105
2274	MoveType blocked, move_type;	2106	MoveType blocked, move_type;
2275		2107
2276	if (exclude && exclude->head)	2108	if (exclude && exclude->head)
2277	{	2109	{
…		…
2289	mp = m;	2121	mp = m;
2290	nx = x + freearr_x[i];	2122	nx = x + freearr_x[i];
2291	ny = y + freearr_y[i];	2123	ny = y + freearr_y[i];
2292		2124
2293	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2125	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2126
2294	if (mflags & P_OUT_OF_MAP)	2127	if (mflags & P_OUT_OF_MAP)
2295	{
2296	max = maxfree[i];	2128	max = maxfree[i];
2297	}
2298	else	2129	else
2299	{	2130	{
2300	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2131	mapspace &ms = mp->at (nx, ny);
		2132
		2133	blocked = ms.move_block;
2301		2134
2302	if ((move_type & blocked) == move_type)	2135	if ((move_type & blocked) == move_type)
2303	{
2304	max = maxfree[i];	2136	max = maxfree[i];
2305	}
2306	else if (mflags & P_IS_ALIVE)	2137	else if (mflags & P_IS_ALIVE)
2307	{	2138	{
2308	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2139	for (tmp = ms.bot; tmp; tmp = tmp->above)
2309	{	2140	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2310	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2141	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2311	{
2312	break;	2142	break;
2313	}	2143
2314	}
2315	if (tmp)	2144	if (tmp)
2316	{
2317	return freedir[i];	2145	return freedir[i];
2318	}
2319	}	2146	}
2320	}	2147	}
2321	}	2148	}
		2149
2322	return 0;	2150	return 0;
2323	}	2151	}
2324		2152
2325	/*	2153	/*
2326	* distance(object 1, object 2) will return the square of the	2154	* distance(object 1, object 2) will return the square of the
2327	* distance between the two given objects.	2155	* distance between the two given objects.
2328	*/	2156	*/
2329
2330	int	2157	int
2331	distance (const object *ob1, const object *ob2)	2158	distance (const object *ob1, const object *ob2)
2332	{	2159	{
2333	int
2334	i;
2335
2336	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);
2337	return i;
2338	}	2161	}
2339		2162
2340	/*	2163	/*
2341	* 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
2342	* 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
2343	* object, needs to travel toward it.	2166	* object, needs to travel toward it.
2344	*/	2167	*/
2345
2346	int	2168	int
2347	find_dir_2 (int x, int y)	2169	find_dir_2 (int x, int y)
2348	{	2170	{
2349	int	2171	int q;
2350	q;
2351		2172
2352	if (y)	2173	if (y)
2353	q = x * 100 / y;	2174	q = x * 100 / y;
2354	else if (x)	2175	else if (x)
2355	q = -300 * x;	2176	q = -300 * x;
…		…
2390	int	2211	int
2391	absdir (int d)	2212	absdir (int d)
2392	{	2213	{
2393	while (d < 1)	2214	while (d < 1)
2394	d += 8;	2215	d += 8;
		2216
2395	while (d > 8)	2217	while (d > 8)
2396	d -= 8;	2218	d -= 8;
		2219
2397	return d;	2220	return d;
2398	}	2221	}
2399		2222
2400	/*	2223	/*
2401	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2224	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2403	*/	2226	*/
2404		2227
2405	int	2228	int
2406	dirdiff (int dir1, int dir2)	2229	dirdiff (int dir1, int dir2)
2407	{	2230	{
2408	int	2231	int d;
2409	d;
2410		2232
2411	d = abs (dir1 - dir2);	2233	d = abs (dir1 - dir2);
2412	if (d > 4)	2234	if (d > 4)
2413	d = 8 - d;	2235	d = 8 - d;
		2236
2414	return d;	2237	return d;
2415	}	2238	}
2416		2239
2417	/* peterm:	2240	/* peterm:
2418	* 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.
…		…
2421	* 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
2422	* 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.
2423	* 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
2424	* functions.	2247	* functions.
2425	*/	2248	*/
2426
2427	int
2428	reduction_dir[SIZEOFFREE][3] = {	2249	int reduction_dir[SIZEOFFREE][3] = {
2429	{0, 0, 0}, /* 0 */	2250	{0, 0, 0}, /* 0 */
2430	{0, 0, 0}, /* 1 */	2251	{0, 0, 0}, /* 1 */
2431	{0, 0, 0}, /* 2 */	2252	{0, 0, 0}, /* 2 */
2432	{0, 0, 0}, /* 3 */	2253	{0, 0, 0}, /* 3 */
2433	{0, 0, 0}, /* 4 */	2254	{0, 0, 0}, /* 4 */
…		…
2481	* find a path to that monster that we found. If not,	2302	* find a path to that monster that we found. If not,
2482	* we don't bother going toward it. Returns 1 if we	2303	* we don't bother going toward it. Returns 1 if we
2483	* can see a direct way to get it	2304	* can see a direct way to get it
2484	* Modified to be map tile aware -.MSW	2305	* Modified to be map tile aware -.MSW
2485	*/	2306	*/
2486
2487
2488	int	2307	int
2489	can_see_monsterP (maptile *m, int x, int y, int dir)	2308	can_see_monsterP (maptile *m, int x, int y, int dir)
2490	{	2309	{
2491	sint16 dx, dy;	2310	sint16 dx, dy;
2492	int
2493	mflags;	2311	int mflags;
2494		2312
2495	if (dir < 0)	2313	if (dir < 0)
2496	return 0; /* exit condition: invalid direction */	2314	return 0; /* exit condition: invalid direction */
2497		2315
2498	dx = x + freearr_x[dir];	2316	dx = x + freearr_x[dir];
…		…
2511	return 0;	2329	return 0;
2512		2330
2513	/* yes, can see. */	2331	/* yes, can see. */
2514	if (dir < 9)	2332	if (dir < 9)
2515	return 1;	2333	return 1;
		2334
2516	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2335	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2517	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]);
2518	}	2338	}
2519
2520
2521		2339
2522	/*	2340	/*
2523	* 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
2524	* picked up by the picker. Returnes 1 if it can be	2342	* picked up by the picker. Returnes 1 if it can be
2525	* picked up, otherwise 0.	2343	* picked up, otherwise 0.
…		…
2536	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2354	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2537	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2355	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2538	!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));
2539	}	2357	}
2540		2358
2541
2542	/*	2359	/*
2543	* create clone from object to another	2360	* create clone from object to another
2544	*/	2361	*/
2545	object *	2362	object *
2546	object_create_clone (object *asrc)	2363	object_create_clone (object *asrc)
2547	{	2364	{
2548	object *
2549	dst = NULL, *tmp, *src, *part, *prev, *item;	2365	object *dst = 0, *tmp, *src, *part, *prev, *item;
2550		2366
2551	if (!asrc)	2367	if (!asrc)
2552	return NULL;	2368	return 0;
		2369
2553	src = asrc;	2370	src = asrc;
2554	if (src->head)	2371	if (src->head)
2555	src = src->head;	2372	src = src->head;
2556		2373
2557	prev = NULL;	2374	prev = 0;
2558	for (part = src; part; part = part->more)	2375	for (part = src; part; part = part->more)
2559	{	2376	{
2560	tmp = get_object ();	2377	tmp = part->clone ();
2561	copy_object (part, tmp);
2562	tmp->x -= src->x;	2378	tmp->x -= src->x;
2563	tmp->y -= src->y;	2379	tmp->y -= src->y;
		2380
2564	if (!part->head)	2381	if (!part->head)
2565	{	2382	{
2566	dst = tmp;	2383	dst = tmp;
2567	tmp->head = NULL;	2384	tmp->head = 0;
2568	}	2385	}
2569	else	2386	else
2570	{
2571	tmp->head = dst;	2387	tmp->head = dst;
2572	}	2388
2573	tmp->more = NULL;	2389	tmp->more = 0;
		2390
2574	if (prev)	2391	if (prev)
2575	prev->more = tmp;	2392	prev->more = tmp;
		2393
2576	prev = tmp;	2394	prev = tmp;
2577	}	2395	}
2578		2396
2579	for (item = src->inv; item; item = item->below)	2397	for (item = src->inv; item; item = item->below)
2580	insert_ob_in_ob (object_create_clone (item), dst);	2398	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2586	/* 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 */
2587	/* 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, */
2588	/* 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. */
2589	/* 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. */
2590	/* Also remember that multiparts objects are not supported for now. */	2408	/* Also remember that multiparts objects are not supported for now. */
2591
2592	object *	2409	object *
2593	load_object_str (const char *obstr)	2410	load_object_str (const char *obstr)
2594	{	2411	{
2595	object *op;	2412	object *op;
2596	char filename[MAX_BUF];	2413	char filename[MAX_BUF];
…		…
2606	}	2423	}
2607		2424
2608	fprintf (tempfile, obstr);	2425	fprintf (tempfile, obstr);
2609	fclose (tempfile);	2426	fclose (tempfile);
2610		2427
2611	op = get_object ();	2428	op = object::create ();
2612		2429
2613	object_thawer thawer (filename);	2430	object_thawer thawer (filename);
2614		2431
2615	if (thawer)	2432	if (thawer)
2616	load_object (thawer, op, 0);	2433	load_object (thawer, op, 0);
…		…
2626	* returns NULL if no match.	2443	* returns NULL if no match.
2627	*/	2444	*/
2628	object *	2445	object *
2629	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)
2630	{	2447	{
2631	object *tmp;
2632
2633	for (tmp = who->inv; tmp; tmp = tmp->below)	2448	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2634	if (tmp->type == type && tmp->subtype == subtype)	2449	if (tmp->type == type && tmp->subtype == subtype)
2635	return tmp;	2450	return tmp;
2636		2451
2637	return NULL;	2452	return 0;
2638	}	2453	}
2639		2454
2640	/* 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,
2641	* otherwise return NULL.	2456	* otherwise return NULL.
2642	*	2457	*
…		…
2644	* do the desired thing.	2459	* do the desired thing.
2645	*/	2460	*/
2646	key_value *	2461	key_value *
2647	get_ob_key_link (const object *ob, const char *key)	2462	get_ob_key_link (const object *ob, const char *key)
2648	{	2463	{
2649	key_value *link;
2650
2651	for (link = ob->key_values; link != NULL; link = link->next)	2464	for (key_value *link = ob->key_values; link; link = link->next)
2652	if (link->key == key)	2465	if (link->key == key)
2653	return link;	2466	return link;
2654		2467
2655	return NULL;	2468	return 0;
2656	}	2469	}
2657		2470
2658	/*	2471	/*
2659	* 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.
2660	*	2473	*
…		…
2700	* Returns TRUE on success.	2513	* Returns TRUE on success.
2701	*/	2514	*/
2702	int	2515	int
2703	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)
2704	{	2517	{
2705	key_value *
2706	field = NULL, *last = NULL;	2518	key_value *field = NULL, *last = NULL;
2707		2519
2708	for (field = op->key_values; field != NULL; field = field->next)	2520	for (field = op->key_values; field != NULL; field = field->next)
2709	{	2521	{
2710	if (field->key != canonical_key)	2522	if (field->key != canonical_key)
2711	{	2523	{
…		…
2739	/* IF we get here, key doesn't exist */	2551	/* IF we get here, key doesn't exist */
2740		2552
2741	/* No field, we'll have to add it. */	2553	/* No field, we'll have to add it. */
2742		2554
2743	if (!add_key)	2555	if (!add_key)
2744	{
2745	return FALSE;	2556	return FALSE;
2746	}	2557
2747	/* There isn't any good reason to store a null	2558	/* There isn't any good reason to store a null
2748	* value in the key/value list. If the archetype has	2559	* value in the key/value list. If the archetype has
2749	* this key, then we should also have it, so shouldn't	2560	* this key, then we should also have it, so shouldn't
2750	* be here. If user wants to store empty strings,	2561	* be here. If user wants to store empty strings,
2751	* should pass in ""	2562	* should pass in ""

Diff Legend

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