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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.44 by root, Thu Sep 14 17:29:27 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 root Exp $";
5	*/
6		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
…		…
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	34	#include <loader.h>
		35
43	int nrofallocobjects = 0;	36	int nrofallocobjects = 0;
		37	static UUID uuid;
		38	const uint64 UUID_SKIP = 1<<19;
44		39
45	object *objects; /* Pointer to the list of used objects */	40	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
47		42
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
56	};	51	};
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	55	};
		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %lld\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
61		133
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	286	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	287	return 0;
216		288
217	switch (ob1->type)	289	switch (ob1->type)
218	{	290	{
219	case SCROLL:	291	case SCROLL:
220	if (ob1->level != ob2->level)	292	if (ob1->level != ob2->level)
221	return 0;	293	return 0;
222	break;	294	break;
223	}	295	}
224		296
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	297	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	298	{
227	/* At least one of these has key_values. */	299	/* At least one of these has key_values. */
…		…
249	/*	321	/*
250	* sum_weight() is a recursive function which calculates the weight	322	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	323	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	324	* containers are carrying, and sums it up.
253	*/	325	*/
254	signed long	326	long
255	sum_weight (object *op)	327	sum_weight (object *op)
256	{	328	{
257	signed long sum;	329	long sum;
258	object *inv;	330	object *inv;
259		331
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	332	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	333	{
262	if (inv->inv)	334	if (inv->inv)
263	sum_weight (inv);	335	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	337	}
		338
266	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
268	if (op->carrying != sum)	342	if (op->carrying != sum)
269	op->carrying = sum;	343	op->carrying = sum;
		344
270	return sum;	345	return sum;
271	}	346	}
272		347
273	/**	348	/**
274	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
423	*/	498	*/
424		499
425	object *	500	object *
426	find_object_name (const char *str)	501	find_object_name (const char *str)
427	{	502	{
428	const char *name = shstr::find (str);	503	shstr_cmp str_ (str);
429	object *op;	504	object *op;
430		505
431	for (op = objects; op != NULL; op = op->next)	506	for (op = objects; op != NULL; op = op->next)
432	if (&op->name == name)	507	if (op->name == str_)
433	break;	508	break;
434		509
435	return op;	510	return op;
436	}	511	}
437		512
…		…
440	{	515	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	516	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	517	}
443		518
444	/*	519	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	520	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	521	* skill and experience objects.
485	*/	522	*/
486	void	523	void
487	set_owner (object *op, object *owner)	524	object::set_owner (object *owner)
488	{	525	{
489	if (owner == NULL || op == NULL)	526	if (!owner)
490	return;	527	return;
491		528
492	/* next line added to allow objects which own objects */	529	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	530	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	531	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	532	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	533	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	534	* didn't match, this check is valid and I believe that cause is valid.
498	*/	535	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	536	while (owner->owner)
500	owner = owner->owner;	537	owner = owner->owner;
501		538
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	539	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	540	}
543		541
544	/* Zero the key_values on op, decrementing the shared-string	542	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	543	* refcounts and freeing the links.
546	*/	544	*/
…		…
562	{	560	{
563	attachable_base::clear ();	561	attachable_base::clear ();
564		562
565	free_key_values (this);	563	free_key_values (this);
566		564
		565	owner = 0;
567	name = 0;	566	name = 0;
568	name_pl = 0;	567	name_pl = 0;
569	title = 0;	568	title = 0;
570	race = 0;	569	race = 0;
571	slaying = 0;	570	slaying = 0;
572	skill = 0;	571	skill = 0;
573	msg = 0;	572	msg = 0;
574	lore = 0;	573	lore = 0;
575	custom_name = 0;	574	custom_name = 0;
576	materialname = 0;	575	materialname = 0;
		576	contr = 0;
		577	below = 0;
		578	above = 0;
		579	inv = 0;
		580	container = 0;
		581	env = 0;
		582	more = 0;
		583	head = 0;
		584	map = 0;
		585	active_next = 0;
		586	active_prev = 0;
577		587
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	588	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		589
580	SET_FLAG (this, FLAG_REMOVED);	590	SET_FLAG (this, FLAG_REMOVED);
		591
		592	/* What is not cleared is next, prev, and count */
		593
		594	expmul = 1.0;
		595	face = blank_face;
		596
		597	if (settings.casting_time)
		598	casting_time = -1;
581	}	599	}
582		600
583	void object::clone (object *destination)	601	void object::clone (object *destination)
584	{	602	{
585	*(object_copy *) destination = *this;	603	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	604	*(object_pod *)destination = *this;
587		605
588	if (self || cb)	606	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	607	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}	608	}
623		609
624	/*	610	/*
625	* copy object first frees everything allocated by the second object,	611	* copy object first frees everything allocated by the second object,
626	* and then copies the contends of the first object into the second	612	* and then copies the contends of the first object into the second
627	* object, allocating what needs to be allocated. Basically, any	613	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	615	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	616	* will point at garbage.
631	*/	617	*/
632
633	void	618	void
634	copy_object (object *op2, object *op)	619	copy_object (object *op2, object *op)
635	{	620	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	621	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	622	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	682	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	683	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	684	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	685	* This function needs to be called whenever the speed of an object changes.
701	*/	686	*/
702
703	void	687	void
704	update_ob_speed (object *op)	688	update_ob_speed (object *op)
705	{	689	{
706	extern int arch_init;	690	extern int arch_init;
707		691
…		…
716	abort ();	700	abort ();
717	#else	701	#else
718	op->speed = 0;	702	op->speed = 0;
719	#endif	703	#endif
720	}	704	}
		705
721	if (arch_init)	706	if (arch_init)
722	{
723	return;	707	return;
724	}	708
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	709	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	710	{
727	/* If already on active list, don't do anything */	711	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	712	if (op->active_next || op->active_prev || op == active_objects)
729	return;	713	return;
730		714
731	/* process_events() expects us to insert the object at the beginning	715	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	716	* of the list. */
733	op->active_next = active_objects;	717	op->active_next = active_objects;
		718
734	if (op->active_next != NULL)	719	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	720	op->active_next->active_prev = op;
		721
736	active_objects = op;	722	active_objects = op;
737	}	723	}
738	else	724	else
739	{	725	{
740	/* If not on the active list, nothing needs to be done */	726	/* If not on the active list, nothing needs to be done */
…		…
742	return;	728	return;
743		729
744	if (op->active_prev == NULL)	730	if (op->active_prev == NULL)
745	{	731	{
746	active_objects = op->active_next;	732	active_objects = op->active_next;
		733
747	if (op->active_next != NULL)	734	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	735	op->active_next->active_prev = NULL;
749	}	736	}
750	else	737	else
751	{	738	{
752	op->active_prev->active_next = op->active_next;	739	op->active_prev->active_next = op->active_next;
		740
753	if (op->active_next)	741	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	742	op->active_next->active_prev = op->active_prev;
755	}	743	}
		744
756	op->active_next = NULL;	745	op->active_next = NULL;
757	op->active_prev = NULL;	746	op->active_prev = NULL;
758	}	747	}
759	}	748	}
760		749
…		…
890	/* if the object is being removed, we can't make intelligent	879	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	880	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	881	* that is being removed.
893	*/	882	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	883	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	884	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	885	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	886	/* Nothing to do for that case */ ;
901	}
902	else	887	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	888	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		889
907	if (update_now)	890	if (update_now)
908	{	891	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	892	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);	893	update_position (op->map, op->x, op->y);
…		…
912		895
913	if (op->more != NULL)	896	if (op->more != NULL)
914	update_object (op->more, action);	897	update_object (op->more, action);
915	}	898	}
916		899
917	static	900	static unordered_vector<object *> mortals;
918	std::vector < object *>
919	mortals;
920		901
921	void object::free_mortals ()	902	void object::free_mortals ()
922	{	903	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	904	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	delete *	905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
925	i;	908	{
		909	delete *i;
		910	mortals.erase (i);
		911	}
926		912
927	mortals.clear ();	913	static int lastmortals = 0;//D
		914
		915	if (mortals.size() != lastmortals)//D
		916	{
		917	lastmortals = mortals.size ();//D
		918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		919	}
928	}	920	}
929		921
930	object::object ()	922	object::object ()
931	{	923	{
932	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
933		925
934	expmul = 1.0;	926	expmul = 1.0;
935	face = blank_face;	927	face = blank_face;
936	attacked_by_count = -1;
937	}	928	}
938		929
939	object::~object ()	930	object::~object ()
940	{	931	{
941	free_key_values (this);	932	free_key_values (this);
942	}	933	}
943		934
944	void object::link ()	935	void object::link ()
945	{	936	{
946	count = ++ob_count;	937	count = ++ob_count;
		938	uuid = gen_uuid ();
947		939
948	prev = 0;	940	prev = 0;
949	next = objects;	941	next = objects;
950		942
951	if (objects)	943	if (objects)
…		…
954	objects = this;	946	objects = this;
955	}	947	}
956		948
957	void object::unlink ()	949	void object::unlink ()
958	{	950	{
959	count = 0;	951	//count = 0;//D
		952	if (!prev && !next) return;//D
960		953
961	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;
964	if (next)
965	next->prev = prev;
966	if (this == objects)	954	if (this == objects)
967	objects = next;	955	objects = next;
		956
		957	/* Remove this object from the list of used objects */
		958	if (prev) prev->next = next;
		959	if (next) next->prev = prev;
		960
		961	prev = 0;
		962	next = 0;
968	}	963	}
969		964
970	object *object::create ()	965	object *object::create ()
971	{	966	{
972	object *
973	op = new object;	967	object *op = new object;
974
975	op->link ();	968	op->link ();
976	return op;	969	return op;
977	}	970	}
978		971
979	/*	972	/*
…		…
986	* If free_inventory is set, free inventory as well. Else drop items in	979	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	980	* inventory to the ground.
988	*/	981	*/
989	void object::free (bool free_inventory)	982	void object::free (bool free_inventory)
990	{	983	{
		984	if (QUERY_FLAG (this, FLAG_FREED))
		985	return;
		986
		987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		988	remove_friendly_object (this);
		989
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	991	remove_ob (this);
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		992
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	993	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		994
1013	if (more)	995	if (more)
1014	{	996	{
1015	more->free (free_inventory);	997	more->free (free_inventory);
1016	more = 0;	998	more = 0;
…		…
1020	{	1002	{
1021	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	1004	* if some form of movement is allowed, let objects
1023	* drop on that space.	1005	* drop on that space.
1024	*/	1006	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	1008	{
1027	object *	1009	object *op = inv;
1028	op = inv;
1029		1010
1030	while (op)	1011	while (op)
1031	{	1012	{
1032	object *
1033	tmp = op->below;	1013	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	1014	op->free (free_inventory);
1037	op = tmp;	1015	op = tmp;
1038	}	1016	}
1039	}	1017	}
1040	else	1018	else
1041	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
1042	object *	1020	object *op = inv;
1043	op = inv;
1044		1021
1045	while (op)	1022	while (op)
1046	{	1023	{
1047	object *
1048	tmp = op->below;	1024	object *tmp = op->below;
1049		1025
1050	remove_ob (op);	1026	remove_ob (op);
1051		1027
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1029	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	1038	op = tmp;
1063	}	1039	}
1064	}	1040	}
1065	}	1041	}
1066		1042
		1043	// clear those pointers that likely might have circular references to us
		1044	owner = 0;
		1045	enemy = 0;
		1046	attacked_by = 0;
		1047
1067	/* Remove object from the active list */	1048	/* Remove object from the active list */
1068	speed = 0;	1049	speed = 0;
1069	update_ob_speed (this);	1050	update_ob_speed (this);
1070		1051
1071	unlink ();	1052	unlink ();
1072
1073	SET_FLAG (this, FLAG_FREED);
1074		1053
1075	mortals.push_back (this);	1054	mortals.push_back (this);
1076	}	1055	}
1077		1056
1078	/*	1057	/*
…		…
1109	object *	1088	object *
1110	tmp, *	1089	tmp, *
1111	last = NULL;	1090	last = NULL;
1112	object *	1091	object *
1113	otmp;	1092	otmp;
		1093
1114	tag_t	1094	tag_t
1115	tag;	1095	tag;
1116	int	1096	int
1117	check_walk_off;	1097	check_walk_off;
1118	mapstruct *	1098	mapstruct *
1119	m;	1099	m;
		1100
1120	sint16	1101	sint16
1121	x,	1102	x,
1122	y;	1103	y;
1123		1104
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1105	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1106	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1107
1130	/* Changed it to always dump core in this case. As has been learned	1108	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1109
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)	1110	if (op->more != NULL)
1143	remove_ob (op->more);	1111	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1112
1147	/*	1113	/*
1148	* In this case, the object to be removed is in someones	1114	* In this case, the object to be removed is in someones
1149	* inventory.	1115	* inventory.
1150	*/	1116	*/
…		…
1176	*/	1142	*/
1177	op->x = op->env->x, op->y = op->env->y;	1143	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1144	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1145	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1146	op->env = NULL;
1181	return;	1147	}
		1148	else if (op->map)
1182	}	1149	{
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;	1150	x = op->x;
1189	y = op->y;	1151	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1152	m = get_map_from_coord (op->map, &x, &y);
1191		1153
1192	if (!m)	1154	if (!m)
1193	{	1155	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1156	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1195	op->map->path, op->x, op->y);	1157	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.	1158	/* in old days, we used to set x and y to 0 and continue.
1197	* it seems if we get into this case, something is probablye	1159	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.	1160	* screwed up and should be fixed.
		1161	*/
		1162	abort ();
		1163	}
		1164
		1165	if (op->map != m)
		1166	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1167	op->map->path, m->path, op->x, op->y, x, y);
		1168
		1169	/* Re did the following section of code - it looks like it had
		1170	* lots of logic for things we no longer care about
1199	*/	1171	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1172
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1173	/* link the object above us */
1213	if (op->above)	1174	if (op->above)
1214	op->above->below = op->below;	1175	op->above->below = op->below;
1215	else	1176	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1177	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217		1178
1218	/* Relink the object below us, if there is one */	1179	/* Relink the object below us, if there is one */
1219	if (op->below)	1180	if (op->below)
1220	{
1221	op->below->above = op->above;	1181	op->below->above = op->above;
1222	}
1223	else	1182	else
1224	{	1183	{
1225	/* Nothing below, which means we need to relink map object for this space	1184	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	1185	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1186	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1187	*/
1259	if (tmp->container == op)	1188	if (GET_MAP_OB (m, x, y) != op)
1260	{	1189	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1190	dump_object (op);
1262	tmp->container = NULL;	1191	LOG (llevError,
		1192	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1193	dump_object (GET_MAP_OB (m, x, y));
		1194	LOG (llevError, "%s\n", errmsg);
1263	}	1195	}
1264	tmp->contr->socket.update_look = 1;	1196
1265	}	1197	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1198	}
1269		1199
1270	move_apply (tmp, op, NULL);	1200	op->above = 0;
1271	if (was_destroyed (op, tag))	1201	op->below = 0;
		1202
		1203	if (op->map->in_memory == MAP_SAVING)
		1204	return;
		1205
		1206	tag = op->count;
		1207	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1208
		1209	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1210	{
		1211	/* No point updating the players look faces if he is the object
		1212	* being removed.
		1213	*/
		1214
		1215	if (tmp->type == PLAYER && tmp != op)
1272	{	1216	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1217	/* If a container that the player is currently using somehow gets
		1218	* removed (most likely destroyed), update the player view
		1219	* appropriately.
		1220	*/
		1221	if (tmp->container == op)
		1222	{
		1223	CLEAR_FLAG (op, FLAG_APPLIED);
		1224	tmp->container = NULL;
		1225	}
		1226
		1227	tmp->contr->socket.update_look = 1;
1274	}	1228	}
		1229
		1230	/* See if player moving off should effect something */
		1231	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1232	{
		1233	move_apply (tmp, op, NULL);
		1234
		1235	if (was_destroyed (op, tag))
		1236	{
		1237	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1238	}
1275	}	1239	}
1276		1240
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1241	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1242
1279	if (tmp->above == tmp)	1243	if (tmp->above == tmp)
1280	tmp->above = NULL;	1244	tmp->above = NULL;
		1245
1281	last = tmp;	1246	last = tmp;
1282	}	1247	}
		1248
1283	/* last == NULL of there are no objects on this space */	1249	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1250	if (last == NULL)
1285	{	1251	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1252	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1253	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1254	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1255	* be correct anyways.
1290	*/	1256	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1257	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1258	update_position (op->map, op->x, op->y);
1293	}	1259	}
1294	else	1260	else
1295	update_object (last, UP_OBJ_REMOVE);	1261	update_object (last, UP_OBJ_REMOVE);
1296		1262
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1263	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1264	update_all_los (op->map, op->x, op->y);
1299		1265	}
1300	}	1266	}
1301		1267
1302	/*	1268	/*
1303	* merge_ob(op,top):	1269	* merge_ob(op,top):
1304	*	1270	*
1305	* This function goes through all objects below and including top, and	1271	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1272	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1273	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1274	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1275	*/
1310
1311	object *	1276	object *
1312	merge_ob (object *op, object *top)	1277	merge_ob (object *op, object *top)
1313	{	1278	{
1314	if (!op->nrof)	1279	if (!op->nrof)
1315	return 0;	1280	return 0;
		1281
1316	if (top == NULL)	1282	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1283	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1284
1318	for (; top != NULL; top = top->below)	1285	for (; top != NULL; top = top->below)
1319	{	1286	{
1320	if (top == op)	1287	if (top == op)
1321	continue;	1288	continue;
1322	if (CAN_MERGE (op, top))	1289	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1295	remove_ob (op);
1329	free_object (op);	1296	free_object (op);
1330	return top;	1297	return top;
1331	}	1298	}
1332	}	1299	}
		1300
1333	return NULL;	1301	return NULL;
1334	}	1302	}
1335		1303
1336	/*	1304	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1305	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1306	* job preparing multi-part monsters
1339	*/	1307	*/
1340	object *	1308	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1309	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1342	{	1310	{
1343	object *	1311	object *tmp;
1344	tmp;
1345		1312
1346	if (op->head)	1313	if (op->head)
1347	op = op->head;	1314	op = op->head;
		1315
1348	for (tmp = op; tmp; tmp = tmp->more)	1316	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1317	{
1350	tmp->x = x + tmp->arch->clone.x;	1318	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1319	tmp->y = y + tmp->arch->clone.y;
1352	}	1320	}
		1321
1353	return insert_ob_in_map (op, m, originator, flag);	1322	return insert_ob_in_map (op, m, originator, flag);
1354	}	1323	}
1355		1324
1356	/*	1325	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1326	* insert_ob_in_map (op, map, originator, flag):
…		…
1375	*/	1344	*/
1376		1345
1377	object *	1346	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1347	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1379	{	1348	{
1380	object *	1349	object *tmp, *top, *floor = NULL;
1381	tmp, *	1350	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1351
1388	if (QUERY_FLAG (op, FLAG_FREED))	1352	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1353	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1354	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1355	return NULL;
1392	}	1356	}
		1357
1393	if (m == NULL)	1358	if (m == NULL)
1394	{	1359	{
1395	dump_object (op);	1360	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1361	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;	1362	return op;
1398	}	1363	}
		1364
1399	if (out_of_map (m, op->x, op->y))	1365	if (out_of_map (m, op->x, op->y))
1400	{	1366	{
1401	dump_object (op);	1367	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1368	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES	1369	#ifdef MANY_CORES
…		…
1407	*/	1373	*/
1408	abort ();	1374	abort ();
1409	#endif	1375	#endif
1410	return op;	1376	return op;
1411	}	1377	}
		1378
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1379	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1380	{
1414	dump_object (op);	1381	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1382	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;	1383	return op;
1417	}	1384	}
		1385
1418	if (op->more != NULL)	1386	if (op->more != NULL)
1419	{	1387	{
1420	/* The part may be on a different map. */	1388	/* The part may be on a different map. */
1421		1389
1422	object *
1423	more = op->more;	1390	object *more = op->more;
1424		1391
1425	/* We really need the caller to normalize coordinates - if	1392	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1393	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1394	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1395	* is clear wrong do we normalize it.
1429	*/	1396	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1397	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1398	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1399	else if (!more->map)
1435	{	1400	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1401	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1402	* more->map should always point to the parent.
1438	*/	1403	*/
…		…
1441		1406
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1407	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1408	{
1444	if (!op->head)	1409	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1410	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1411
1446	return NULL;	1412	return NULL;
1447	}	1413	}
1448	}	1414	}
		1415
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1416	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1417
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1418	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1419	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1420	* need extra work
…		…
1457	y = op->y;	1424	y = op->y;
1458		1425
1459	/* this has to be done after we translate the coordinates.	1426	/* this has to be done after we translate the coordinates.
1460	*/	1427	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1428	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1429	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1430	if (CAN_MERGE (op, tmp))
1465	{	1431	{
1466	op->nrof += tmp->nrof;	1432	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1433	remove_ob (tmp);
1468	free_object (tmp);	1434	free_object (tmp);
1469	}	1435	}
1470	}
1471		1436
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1437	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1438	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1439
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1440	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1441	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1442
1477	if (flag & INS_BELOW_ORIGINATOR)	1443	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1444	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1445	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1446	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1447	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1448	abort ();
1483	}	1449	}
		1450
1484	op->above = originator;	1451	op->above = originator;
1485	op->below = originator->below;	1452	op->below = originator->below;
		1453
1486	if (op->below)	1454	if (op->below)
1487	op->below->above = op;	1455	op->below->above = op;
1488	else	1456	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1457	SET_MAP_OB (op->map, op->x, op->y, op);
		1458
1490	/* since *below* originator, no need to update top */	1459	/* since *below* originator, no need to update top */
1491	originator->below = op;	1460	originator->below = op;
1492	}	1461	}
1493	else	1462	else
1494	{	1463	{
1495	/* If there are other objects, then */	1464	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1465	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1466	{
1498	object *
1499	last = NULL;	1467	object *last = NULL;
1500		1468
1501	/*	1469	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1470	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1471	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1472	* Generally, we want to put the new object on top. But if
…		…
1513		1481
1514	while (top != NULL)	1482	while (top != NULL)
1515	{	1483	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1484	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1485	floor = top;
		1486
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1487	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1488	{
1520	/* We insert above top, so we want this object below this */	1489	/* We insert above top, so we want this object below this */
1521	top = top->below;	1490	top = top->below;
1522	break;	1491	break;
1523	}	1492	}
		1493
1524	last = top;	1494	last = top;
1525	top = top->above;	1495	top = top->above;
1526	}	1496	}
		1497
1527	/* Don't want top to be NULL, so set it to the last valid object */	1498	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1499	top = last;
1529		1500
1530	/* We let update_position deal with figuring out what the space	1501	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1502	* looks like instead of lots of conditions here.
…		…
1551	*/	1522	*/
1552	if (last && last->below && last != floor)	1523	if (last && last->below && last != floor)
1553	top = last->below;	1524	top = last->below;
1554	}	1525	}
1555	} /* If objects on this space */	1526	} /* If objects on this space */
		1527
1556	if (flag & INS_MAP_LOAD)	1528	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1529	top = GET_MAP_TOP (op->map, op->x, op->y);
		1530
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1531	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1532	top = floor;
1560		1533
1561	/* Top is the object that our object (op) is going to get inserted above.	1534	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1535	*/
1563		1536
1564	/* First object on this space */	1537	/* First object on this space */
1565	if (!top)	1538	if (!top)
1566	{	1539	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1540	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1541
1568	if (op->above)	1542	if (op->above)
1569	op->above->below = op;	1543	op->above->below = op;
		1544
1570	op->below = NULL;	1545	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1546	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1547	}
1573	else	1548	else
1574	{ /* get inserted into the stack above top */	1549	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1550	op->above = top->above;
		1551
1576	if (op->above)	1552	if (op->above)
1577	op->above->below = op;	1553	op->above->below = op;
		1554
1578	op->below = top;	1555	op->below = top;
1579	top->above = op;	1556	top->above = op;
1580	}	1557	}
		1558
1581	if (op->above == NULL)	1559	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1560	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1561	} /* else not INS_BELOW_ORIGINATOR */
1584		1562
1585	if (op->type == PLAYER)	1563	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1566	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1567	* it, so save a few ticks and start from there.
1590	*/	1568	*/
1591	if (!(flag & INS_MAP_LOAD))	1569	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1570	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1571	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1572	tmp->contr->socket.update_look = 1;
1596	}
1597		1573
1598	/* If this object glows, it may affect lighting conditions that are	1574	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1575	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1576	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1577	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1581	* of effect may be sufficient.
1606	*/	1582	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1583	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1584	update_all_los (op->map, op->x, op->y);
1609		1585
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1586	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1587	update_object (op, UP_OBJ_INSERT);
1613
1614		1588
1615	/* Don't know if moving this to the end will break anything. However,	1589	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1590	* we want to have update_look set above before calling this.
1617	*	1591	*
1618	* check_move_on() must be after this because code called from	1592	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1594	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1595	* update_object().
1622	*/	1596	*/
1623		1597
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1598	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1599	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1600	{
1628	if (check_move_on (op, originator))	1601	if (check_move_on (op, originator))
1629	return NULL;	1602	return NULL;
1630		1603
…		…
1633	*/	1606	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1607	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1608	if (check_move_on (tmp, originator))
1636	return NULL;	1609	return NULL;
1637	}	1610	}
		1611
1638	return op;	1612	return op;
1639	}	1613	}
1640		1614
1641	/* this function inserts an object in the map, but if it	1615	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1616	* finds an object of its own type, it'll remove that one first.
…		…
1660	free_object (tmp);	1634	free_object (tmp);
1661	}	1635	}
1662	}	1636	}
1663		1637
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1638	tmp1 = arch_to_object (find_archetype (arch_string));
1665
1666		1639
1667	tmp1->x = op->x;	1640	tmp1->x = op->x;
1668	tmp1->y = op->y;	1641	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1642	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1643	}
…		…
1688	if (orig_ob->nrof < nr)	1661	if (orig_ob->nrof < nr)
1689	{	1662	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1663	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1664	return NULL;
1692	}	1665	}
		1666
1693	newob = object_create_clone (orig_ob);	1667	newob = object_create_clone (orig_ob);
		1668
1694	if ((orig_ob->nrof -= nr) < 1)	1669	if ((orig_ob->nrof -= nr) < 1)
1695	{	1670	{
1696	if (!is_removed)	1671	if (!is_removed)
1697	remove_ob (orig_ob);	1672	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1673	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1681	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1682	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1683	return NULL;
1709	}	1684	}
1710	}	1685	}
		1686
1711	newob->nrof = nr;	1687	newob->nrof = nr;
1712		1688
1713	return newob;	1689	return newob;
1714	}	1690	}
1715		1691
…		…
1722	*/	1698	*/
1723		1699
1724	object *	1700	object *
1725	decrease_ob_nr (object *op, uint32 i)	1701	decrease_ob_nr (object *op, uint32 i)
1726	{	1702	{
1727	object *	1703	object *tmp;
1728	tmp;
1729	player *	1704	player *pl;
1730	pl;
1731		1705
1732	if (i == 0) /* objects with op->nrof require this check */	1706	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1707	return op;
1734		1708
1735	if (i > op->nrof)	1709	if (i > op->nrof)
1736	i = op->nrof;	1710	i = op->nrof;
1737		1711
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1712	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1713	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1714	else if (op->env != NULL)
1743	{	1715	{
1744	/* is this object in the players inventory, or sub container	1716	/* is this object in the players inventory, or sub container
1745	* therein?	1717	* therein?
1746	*/	1718	*/
…		…
1781	}	1753	}
1782	}	1754	}
1783	}	1755	}
1784	else	1756	else
1785	{	1757	{
1786	object *
1787	above = op->above;	1758	object *above = op->above;
1788		1759
1789	if (i < op->nrof)	1760	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1761	op->nrof -= i;
1792	}
1793	else	1762	else
1794	{	1763	{
1795	remove_ob (op);	1764	remove_ob (op);
1796	op->nrof = 0;	1765	op->nrof = 0;
1797	}	1766	}
		1767
1798	/* Since we just removed op, op->above is null */	1768	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1769	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1770	if (tmp->type == PLAYER)
1801	{	1771	{
1802	if (op->nrof)	1772	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1775	esrv_del_item (tmp->contr, op->count);
1806	}	1776	}
1807	}	1777	}
1808		1778
1809	if (op->nrof)	1779	if (op->nrof)
1810	{
1811	return op;	1780	return op;
1812	}
1813	else	1781	else
1814	{	1782	{
1815	free_object (op);	1783	free_object (op);
1816	return NULL;	1784	return NULL;
1817	}	1785	}
…		…
1826	add_weight (object *op, signed long weight)	1794	add_weight (object *op, signed long weight)
1827	{	1795	{
1828	while (op != NULL)	1796	while (op != NULL)
1829	{	1797	{
1830	if (op->type == CONTAINER)	1798	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1799	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1800
1834	op->carrying += weight;	1801	op->carrying += weight;
1835	op = op->env;	1802	op = op->env;
1836	}	1803	}
1837	}	1804	}
1838		1805
…		…
1861	{	1828	{
1862	dump_object (op);	1829	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1830	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;	1831	return op;
1865	}	1832	}
		1833
1866	if (where == NULL)	1834	if (where == NULL)
1867	{	1835	{
1868	dump_object (op);	1836	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1837	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;	1838	return op;
1871	}	1839	}
		1840
1872	if (where->head)	1841	if (where->head)
1873	{	1842	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1843	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1844	where = where->head;
1876	}	1845	}
		1846
1877	if (op->more)	1847	if (op->more)
1878	{	1848	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1849	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1850	return op;
1881	}	1851	}
		1852
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1853	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1854	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1855	if (op->nrof)
1885	{	1856	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1857	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1979	tag;	1950	tag;
1980	mapstruct *	1951	mapstruct *
1981	m = op->map;	1952	m = op->map;
1982	int	1953	int
1983	x = op->x, y = op->y;	1954	x = op->x, y = op->y;
		1955
1984	MoveType	1956	MoveType
1985	move_on,	1957	move_on,
1986	move_slow,	1958	move_slow,
1987	move_block;	1959	move_block;
1988		1960
…		…
2022	* we don't need to check all of them.	1994	* we don't need to check all of them.
2023	*/	1995	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1996	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1997	break;
2026	}	1998	}
		1999
2027	for (; tmp != NULL; tmp = tmp->below)	2000	for (; tmp; tmp = tmp->below)
2028	{	2001	{
2029	if (tmp == op)	2002	if (tmp == op)
2030	continue; /* Can't apply yourself */	2003	continue; /* Can't apply yourself */
2031		2004
2032	/* Check to see if one of the movement types should be slowed down.	2005	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2013	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	2014	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	2015	{
2043		2016
2044	float	2017	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	2018	diff = tmp->move_slow_penalty * FABS (op->speed);
		2019
2048	if (op->type == PLAYER)	2020	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	2021	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2022	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	2023	diff /= 4.0;
2054	}	2024
2055	}
2056	op->speed_left -= diff;	2025	op->speed_left -= diff;
2057	}	2026	}
2058	}	2027	}
2059		2028
2060	/* Basically same logic as above, except now for actual apply. */	2029	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2030	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2031	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	2032	{
2064
2065	move_apply (tmp, op, originator);	2033	move_apply (tmp, op, originator);
		2034
2066	if (was_destroyed (op, tag))	2035	if (was_destroyed (op, tag))
2067	return 1;	2036	return 1;
2068		2037
2069	/* what the person/creature stepped onto has moved the object	2038	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	2039	* someplace new. Don't process any further - if we did,
…		…
2072	*/	2041	*/
2073	if (op->map != m || op->x != x || op->y != y)	2042	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	2043	return 0;
2075	}	2044	}
2076	}	2045	}
		2046
2077	return 0;	2047	return 0;
2078	}	2048	}
2079		2049
2080	/*	2050	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	2051	* present_arch(arch, map, x, y) searches for any objects with
…		…
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2342	find_dir (mapstruct *m, int x, int y, object *exclude)
2373	{	2343	{
2374	int	2344	int
2375	i,	2345	i,
2376	max = SIZEOFFREE, mflags;	2346	max = SIZEOFFREE, mflags;
2377	sint16	2347
2378	nx,	2348	sint16 nx, ny;
2379	ny;
2380	object *	2349	object *
2381	tmp;	2350	tmp;
2382	mapstruct *	2351	mapstruct *
2383	mp;	2352	mp;
2384	MoveType	2353
2385	blocked,	2354	MoveType blocked, move_type;
2386	move_type;
2387		2355
2388	if (exclude && exclude->head)	2356	if (exclude && exclude->head)
2389	{	2357	{
2390	exclude = exclude->head;	2358	exclude = exclude->head;
2391	move_type = exclude->move_type;	2359	move_type = exclude->move_type;
…		…
2598		2566
2599		2567
2600	int	2568	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2569	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2602	{	2570	{
2603	sint16	2571	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2572	int
2607	mflags;	2573	mflags;
2608		2574
2609	if (dir < 0)	2575	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2576	return 0; /* exit condition: invalid direction */
…		…
2735		2701
2736	if (tempfile == NULL)	2702	if (tempfile == NULL)
2737	{	2703	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2704	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2705	return NULL;
2740	};	2706	}
		2707
2741	fprintf (tempfile, obstr);	2708	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2709	fclose (tempfile);
2743		2710
2744	op = get_object ();	2711	op = get_object ();
2745		2712
2746	object_thawer	2713	object_thawer thawer (filename);
2747	thawer (filename);
2748		2714
2749	if (thawer)	2715	if (thawer)
2750	load_object (thawer, op, 0);	2716	load_object (thawer, op, 0);
2751		2717
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2718	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2803	* The returned string is shared.	2769	* The returned string is shared.
2804	*/	2770	*/
2805	const char *	2771	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2772	get_ob_key_value (const object *op, const char *const key)
2807	{	2773	{
2808	key_value *	2774	key_value *link;
2809	link;	2775	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2776
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2777	if (!canonical_key)
2816	{	2778	{
2817	/* 1. There being a field named key on any object	2779	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2780	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2781	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2782	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2783	*/
2822	return NULL;	2784	return 0;
2823	}	2785	}
2824		2786
2825	/* This is copied from get_ob_key_link() above -	2787	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2788	* only 4 lines, and saves the function call overhead.
2827	*/	2789	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2790	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2791	if (link->key == canonical_key)
2831	{
2832	return link->value;	2792	return link->value;
2833	}	2793
2834	}
2835	return NULL;	2794	return 0;
2836	}	2795	}
2837		2796
2838		2797
2839	/*	2798	/*
2840	* Updates the canonical_key in op to value.	2799	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2835	if (last)
2877	last->next = field->next;	2836	last->next = field->next;
2878	else	2837	else
2879	op->key_values = field->next;	2838	op->key_values = field->next;
2880		2839
2881	delete
2882	field;	2840	delete field;
2883	}	2841	}
2884	}	2842	}
2885	return TRUE;	2843	return TRUE;
2886	}	2844	}
2887	/* IF we get here, key doesn't exist */	2845	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2880	* Returns TRUE on success.
2923	*/	2881	*/
2924	int	2882	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2883	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2884	{
2927	shstr
2928	key_ (key);	2885	shstr key_ (key);
2929		2886
2930	return set_ob_key_value_s (op, key_, value, add_key);	2887	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2888	}
		2889
		2890	object::depth_iterator::depth_iterator (object *container)
		2891	: iterator_base (container)
		2892	{
		2893	while (item->inv)
		2894	item = item->inv;
		2895	}
		2896
		2897	void
		2898	object::depth_iterator::next ()
		2899	{
		2900	if (item->below)
		2901	{
		2902	item = item->below;
		2903
		2904	while (item->inv)
		2905	item = item->inv;
		2906	}
		2907	else
		2908	item = item->env;
		2909	}
		2910
		2911	// return a suitable string describing an objetc in enough detail to find it
		2912	const char *
		2913	object::debug_desc (char *info) const
		2914	{
		2915	char info2[256 * 3];
		2916	char *p = info;
		2917
		2918	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2919	count,
		2920	&name,
		2921	title ? " " : "",
		2922	title ? (const char *)title : "");
		2923
		2924	if (env)
		2925	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2926
		2927	if (map)
		2928	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2929
		2930	return info;
		2931	}
		2932
		2933	const char *
		2934	object::debug_desc () const
		2935	{
		2936	static char info[256 * 3];
		2937	return debug_desc (info);
		2938	}
		2939

Diff Legend

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