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.40 by root, Thu Sep 14 00:07:15 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
…		…
449	* Changed 2004-02-12 - if the player is setting at the play again	524	* 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	525	* 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	526	* 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.	527	* anything - once an object is removed, it is basically dead anyways.
453	*/	528	*/
454
455	object *	529	object *
456	get_owner (object *op)	530	object::get_owner ()
457	{	531	{
458	if (op->owner == NULL)	532	if (!owner
459	return NULL;	533	|| QUERY_FLAG (owner, FLAG_FREED)
		534	|| QUERY_FLAG (owner, FLAG_REMOVED))
		535	owner = 0;
460		536
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;	537	return 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	}	538	}
481		539
482	/*	540	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	541	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	542	* skill and experience objects.
485	*/	543	*/
486	void	544	void
487	set_owner (object *op, object *owner)	545	object::set_owner (object *owner)
488	{	546	{
489	if (owner == NULL || op == NULL)	547	if (!owner)
490	return;	548	return;
491		549
492	/* next line added to allow objects which own objects */	550	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	551	/* 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	552	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	553	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	554	* 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.	555	* didn't match, this check is valid and I believe that cause is valid.
498	*/	556	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	557	while (owner->owner)
500	owner = owner->owner;	558	owner = owner->owner;
501		559
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;	560	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	}	561	}
543		562
544	/* Zero the key_values on op, decrementing the shared-string	563	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	564	* refcounts and freeing the links.
546	*/	565	*/
…		…
562	{	581	{
563	attachable_base::clear ();	582	attachable_base::clear ();
564		583
565	free_key_values (this);	584	free_key_values (this);
566		585
		586	owner = 0;
567	name = 0;	587	name = 0;
568	name_pl = 0;	588	name_pl = 0;
569	title = 0;	589	title = 0;
570	race = 0;	590	race = 0;
571	slaying = 0;	591	slaying = 0;
572	skill = 0;	592	skill = 0;
573	msg = 0;	593	msg = 0;
574	lore = 0;	594	lore = 0;
575	custom_name = 0;	595	custom_name = 0;
576	materialname = 0;	596	materialname = 0;
		597	contr = 0;
		598	below = 0;
		599	above = 0;
		600	inv = 0;
		601	container = 0;
		602	env = 0;
		603	more = 0;
		604	head = 0;
		605	map = 0;
		606	active_next = 0;
		607	active_prev = 0;
577		608
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	609	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		610
580	SET_FLAG (this, FLAG_REMOVED);	611	SET_FLAG (this, FLAG_REMOVED);
		612
		613	/* What is not cleared is next, prev, and count */
		614
		615	expmul = 1.0;
		616	face = blank_face;
		617	attacked_by_count = -1;
		618
		619	if (settings.casting_time)
		620	casting_time = -1;
581	}	621	}
582		622
583	void object::clone (object *destination)	623	void object::clone (object *destination)
584	{	624	{
585	*(object_copy *) destination = *this;	625	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	626	*(object_pod *)destination = *this;
587		627
588	if (self || cb)	628	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	629	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	}	630	}
623		631
624	/*	632	/*
625	* copy object first frees everything allocated by the second object,	633	* copy object first frees everything allocated by the second object,
626	* and then copies the contends of the first object into the second	634	* and then copies the contends of the first object into the second
627	* object, allocating what needs to be allocated. Basically, any	635	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	636	* 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	637	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	638	* will point at garbage.
631	*/	639	*/
632
633	void	640	void
634	copy_object (object *op2, object *op)	641	copy_object (object *op2, object *op)
635	{	642	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	643	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	644	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	704	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	705	* 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.	706	* 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.	707	* This function needs to be called whenever the speed of an object changes.
701	*/	708	*/
702
703	void	709	void
704	update_ob_speed (object *op)	710	update_ob_speed (object *op)
705	{	711	{
706	extern int arch_init;	712	extern int arch_init;
707		713
…		…
716	abort ();	722	abort ();
717	#else	723	#else
718	op->speed = 0;	724	op->speed = 0;
719	#endif	725	#endif
720	}	726	}
		727
721	if (arch_init)	728	if (arch_init)
722	{
723	return;	729	return;
724	}	730
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	731	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	732	{
727	/* If already on active list, don't do anything */	733	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	734	if (op->active_next || op->active_prev || op == active_objects)
729	return;	735	return;
730		736
731	/* process_events() expects us to insert the object at the beginning	737	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	738	* of the list. */
733	op->active_next = active_objects;	739	op->active_next = active_objects;
		740
734	if (op->active_next != NULL)	741	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	742	op->active_next->active_prev = op;
		743
736	active_objects = op;	744	active_objects = op;
737	}	745	}
738	else	746	else
739	{	747	{
740	/* If not on the active list, nothing needs to be done */	748	/* If not on the active list, nothing needs to be done */
…		…
742	return;	750	return;
743		751
744	if (op->active_prev == NULL)	752	if (op->active_prev == NULL)
745	{	753	{
746	active_objects = op->active_next;	754	active_objects = op->active_next;
		755
747	if (op->active_next != NULL)	756	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	757	op->active_next->active_prev = NULL;
749	}	758	}
750	else	759	else
751	{	760	{
752	op->active_prev->active_next = op->active_next;	761	op->active_prev->active_next = op->active_next;
		762
753	if (op->active_next)	763	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	764	op->active_next->active_prev = op->active_prev;
755	}	765	}
		766
756	op->active_next = NULL;	767	op->active_next = NULL;
757	op->active_prev = NULL;	768	op->active_prev = NULL;
758	}	769	}
759	}	770	}
760		771
…		…
890	/* if the object is being removed, we can't make intelligent	901	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	902	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	903	* that is being removed.
893	*/	904	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	905	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	906	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	907	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	908	/* Nothing to do for that case */ ;
901	}
902	else	909	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	910	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		911
907	if (update_now)	912	if (update_now)
908	{	913	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	914	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);	915	update_position (op->map, op->x, op->y);
…		…
912		917
913	if (op->more != NULL)	918	if (op->more != NULL)
914	update_object (op->more, action);	919	update_object (op->more, action);
915	}	920	}
916		921
917	static	922	static unordered_vector<object *> mortals;
918	std::vector < object *>	923	static std::vector<object *, slice_allocator <object *> > freed;
919	mortals;
920		924
921	void object::free_mortals ()	925	void object::free_mortals ()
922	{	926	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	927	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	delete *	928	if ((*i)->refcnt)
		929	++i; // further delay freeing
		930	else
925	i;	931	{
		932	//freed.push_back (*i);//D
		933	delete *i;
		934	mortals.erase (i);
		935	}
926		936
927	mortals.clear ();	937	if (mortals.size() && 0)//D
		938	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
928	}	939	}
929		940
930	object::object ()	941	object::object ()
931	{	942	{
932	SET_FLAG (this, FLAG_REMOVED);	943	SET_FLAG (this, FLAG_REMOVED);
…		…
955	}	966	}
956		967
957	void object::unlink ()	968	void object::unlink ()
958	{	969	{
959	count = 0;	970	count = 0;
		971	uuid = gen_uuid ();
		972
		973	if (this == objects)
		974	objects = next;
960		975
961	/* Remove this object from the list of used objects */	976	/* Remove this object from the list of used objects */
962	if (prev)	977	if (prev)
		978	{
963	prev->next = next;	979	prev->next = next;
		980	prev = 0;
		981	}
		982
964	if (next)	983	if (next)
		984	{
965	next->prev = prev;	985	next->prev = prev;
966	if (this == objects)	986	next = 0;
967	objects = next;	987	}
968	}	988	}
969		989
970	object *object::create ()	990	object *object::create ()
971	{	991	{
972	object *	992	object *op;
		993
		994	if (freed.empty ())
973	op = new object;	995	op = new object;
		996	else
		997	{
		998	// highly annoying, but the only way to get it stable right now
		999	op = freed.back ();
		1000	freed.pop_back ();
		1001	op->~object ();
		1002	new ((void *) op) object;
		1003	}
974		1004
975	op->link ();	1005	op->link ();
976	return op;	1006	return op;
977	}	1007	}
978		1008
…		…
986	* If free_inventory is set, free inventory as well. Else drop items in	1016	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	1017	* inventory to the ground.
988	*/	1018	*/
989	void object::free (bool free_inventory)	1019	void object::free (bool free_inventory)
990	{	1020	{
		1021	if (QUERY_FLAG (this, FLAG_FREED))
		1022	return;
		1023
		1024	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		1025	remove_friendly_object (this);
		1026
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	1027	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	1028	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		1029
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))	1030	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		1031
1013	if (more)	1032	if (more)
1014	{	1033	{
1015	more->free (free_inventory);	1034	more->free (free_inventory);
1016	more = 0;	1035	more = 0;
…		…
1020	{	1039	{
1021	/* Only if the space blocks everything do we not process -	1040	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	1041	* if some form of movement is allowed, let objects
1023	* drop on that space.	1042	* drop on that space.
1024	*/	1043	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1044	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	1045	{
1027	object *	1046	object *op = inv;
1028	op = inv;
1029		1047
1030	while (op)	1048	while (op)
1031	{	1049	{
1032	object *
1033	tmp = op->below;	1050	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	1051	op->free (free_inventory);
1037	op = tmp;	1052	op = tmp;
1038	}	1053	}
1039	}	1054	}
1040	else	1055	else
1041	{ /* Put objects in inventory onto this space */	1056	{ /* Put objects in inventory onto this space */
1042	object *	1057	object *op = inv;
1043	op = inv;
1044		1058
1045	while (op)	1059	while (op)
1046	{	1060	{
1047	object *
1048	tmp = op->below;	1061	object *tmp = op->below;
1049		1062
1050	remove_ob (op);	1063	remove_ob (op);
1051		1064
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1065	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))	1066	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	1075	op = tmp;
1063	}	1076	}
1064	}	1077	}
1065	}	1078	}
1066		1079
		1080	owner = 0;
		1081
1067	/* Remove object from the active list */	1082	/* Remove object from the active list */
1068	speed = 0;	1083	speed = 0;
1069	update_ob_speed (this);	1084	update_ob_speed (this);
1070		1085
1071	unlink ();	1086	unlink ();
1072
1073	SET_FLAG (this, FLAG_FREED);
1074		1087
1075	mortals.push_back (this);	1088	mortals.push_back (this);
1076	}	1089	}
1077		1090
1078	/*	1091	/*
…		…
1109	object *	1122	object *
1110	tmp, *	1123	tmp, *
1111	last = NULL;	1124	last = NULL;
1112	object *	1125	object *
1113	otmp;	1126	otmp;
		1127
1114	tag_t	1128	tag_t
1115	tag;	1129	tag;
1116	int	1130	int
1117	check_walk_off;	1131	check_walk_off;
1118	mapstruct *	1132	mapstruct *
1119	m;	1133	m;
		1134
1120	sint16	1135	sint16
1121	x,	1136	x,
1122	y;	1137	y;
1123		1138
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1139	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1140	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1141
1130	/* Changed it to always dump core in this case. As has been learned	1142	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1143
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)	1144	if (op->more != NULL)
1143	remove_ob (op->more);	1145	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1146
1147	/*	1147	/*
1148	* In this case, the object to be removed is in someones	1148	* In this case, the object to be removed is in someones
1149	* inventory.	1149	* inventory.
1150	*/	1150	*/
…		…
1176	*/	1176	*/
1177	op->x = op->env->x, op->y = op->env->y;	1177	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1178	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1179	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1180	op->env = NULL;
1181	return;	1181	}
		1182	else if (op->map)
1182	}	1183	{
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;	1184	x = op->x;
1189	y = op->y;	1185	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1186	m = get_map_from_coord (op->map, &x, &y);
1191		1187
1192	if (!m)	1188	if (!m)
1193	{	1189	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1190	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);	1191	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.	1192	/* 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	1193	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.	1194	* screwed up and should be fixed.
		1195	*/
		1196	abort ();
		1197	}
		1198
		1199	if (op->map != m)
		1200	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1201	op->map->path, m->path, op->x, op->y, x, y);
		1202
		1203	/* Re did the following section of code - it looks like it had
		1204	* lots of logic for things we no longer care about
1199	*/	1205	*/
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		1206
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 */	1207	/* link the object above us */
1213	if (op->above)	1208	if (op->above)
1214	op->above->below = op->below;	1209	op->above->below = op->below;
1215	else	1210	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1211	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217		1212
1218	/* Relink the object below us, if there is one */	1213	/* Relink the object below us, if there is one */
1219	if (op->below)	1214	if (op->below)
1220	{
1221	op->below->above = op->above;	1215	op->below->above = op->above;
1222	}
1223	else	1216	else
1224	{	1217	{
1225	/* Nothing below, which means we need to relink map object for this space	1218	/* 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	1219	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1220	* 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	*/	1221	*/
1259	if (tmp->container == op)	1222	if (GET_MAP_OB (m, x, y) != op)
1260	{	1223	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1224	dump_object (op);
1262	tmp->container = NULL;	1225	LOG (llevError,
		1226	"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);
		1227	dump_object (GET_MAP_OB (m, x, y));
		1228	LOG (llevError, "%s\n", errmsg);
1263	}	1229	}
1264	tmp->contr->socket.update_look = 1;	1230
1265	}	1231	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	{	1232	}
1269		1233
1270	move_apply (tmp, op, NULL);	1234	op->above = 0;
1271	if (was_destroyed (op, tag))	1235	op->below = 0;
		1236
		1237	if (op->map->in_memory == MAP_SAVING)
		1238	return;
		1239
		1240	tag = op->count;
		1241	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1242
		1243	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1244	{
		1245	/* No point updating the players look faces if he is the object
		1246	* being removed.
		1247	*/
		1248
		1249	if (tmp->type == PLAYER && tmp != op)
1272	{	1250	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1251	/* If a container that the player is currently using somehow gets
		1252	* removed (most likely destroyed), update the player view
		1253	* appropriately.
		1254	*/
		1255	if (tmp->container == op)
		1256	{
		1257	CLEAR_FLAG (op, FLAG_APPLIED);
		1258	tmp->container = NULL;
		1259	}
		1260
		1261	tmp->contr->socket.update_look = 1;
1274	}	1262	}
		1263
		1264	/* See if player moving off should effect something */
		1265	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1266	{
		1267	move_apply (tmp, op, NULL);
		1268
		1269	if (was_destroyed (op, tag))
		1270	{
		1271	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1272	}
1275	}	1273	}
1276		1274
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1275	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1276
1279	if (tmp->above == tmp)	1277	if (tmp->above == tmp)
1280	tmp->above = NULL;	1278	tmp->above = NULL;
		1279
1281	last = tmp;	1280	last = tmp;
1282	}	1281	}
		1282
1283	/* last == NULL of there are no objects on this space */	1283	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1284	if (last == NULL)
1285	{	1285	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1287	* 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	1288	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1289	* be correct anyways.
1290	*/	1290	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1292	update_position (op->map, op->x, op->y);
1293	}	1293	}
1294	else	1294	else
1295	update_object (last, UP_OBJ_REMOVE);	1295	update_object (last, UP_OBJ_REMOVE);
1296		1296
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1298	update_all_los (op->map, op->x, op->y);
1299		1299	}
1300	}	1300	}
1301		1301
1302	/*	1302	/*
1303	* merge_ob(op,top):	1303	* merge_ob(op,top):
1304	*	1304	*
1305	* This function goes through all objects below and including top, and	1305	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1306	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1307	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1308	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1309	*/
1310
1311	object *	1310	object *
1312	merge_ob (object *op, object *top)	1311	merge_ob (object *op, object *top)
1313	{	1312	{
1314	if (!op->nrof)	1313	if (!op->nrof)
1315	return 0;	1314	return 0;
		1315
1316	if (top == NULL)	1316	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1317	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1318
1318	for (; top != NULL; top = top->below)	1319	for (; top != NULL; top = top->below)
1319	{	1320	{
1320	if (top == op)	1321	if (top == op)
1321	continue;	1322	continue;
1322	if (CAN_MERGE (op, top))	1323	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1329	remove_ob (op);
1329	free_object (op);	1330	free_object (op);
1330	return top;	1331	return top;
1331	}	1332	}
1332	}	1333	}
		1334
1333	return NULL;	1335	return NULL;
1334	}	1336	}
1335		1337
1336	/*	1338	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1339	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1340	* job preparing multi-part monsters
1339	*/	1341	*/
1340	object *	1342	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1343	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1342	{	1344	{
1343	object *	1345	object *tmp;
1344	tmp;
1345		1346
1346	if (op->head)	1347	if (op->head)
1347	op = op->head;	1348	op = op->head;
		1349
1348	for (tmp = op; tmp; tmp = tmp->more)	1350	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1351	{
1350	tmp->x = x + tmp->arch->clone.x;	1352	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1353	tmp->y = y + tmp->arch->clone.y;
1352	}	1354	}
		1355
1353	return insert_ob_in_map (op, m, originator, flag);	1356	return insert_ob_in_map (op, m, originator, flag);
1354	}	1357	}
1355		1358
1356	/*	1359	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1360	* insert_ob_in_map (op, map, originator, flag):
…		…
1375	*/	1378	*/
1376		1379
1377	object *	1380	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1381	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1379	{	1382	{
1380	object *	1383	object *tmp, *top, *floor = NULL;
1381	tmp, *	1384	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1385
1388	if (QUERY_FLAG (op, FLAG_FREED))	1386	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1387	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1388	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1389	return NULL;
1392	}	1390	}
		1391
1393	if (m == NULL)	1392	if (m == NULL)
1394	{	1393	{
1395	dump_object (op);	1394	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1395	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;	1396	return op;
1398	}	1397	}
		1398
1399	if (out_of_map (m, op->x, op->y))	1399	if (out_of_map (m, op->x, op->y))
1400	{	1400	{
1401	dump_object (op);	1401	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES	1403	#ifdef MANY_CORES
…		…
1407	*/	1407	*/
1408	abort ();	1408	abort ();
1409	#endif	1409	#endif
1410	return op;	1410	return op;
1411	}	1411	}
		1412
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1413	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1414	{
1414	dump_object (op);	1415	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1416	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;	1417	return op;
1417	}	1418	}
		1419
1418	if (op->more != NULL)	1420	if (op->more != NULL)
1419	{	1421	{
1420	/* The part may be on a different map. */	1422	/* The part may be on a different map. */
1421		1423
1422	object *
1423	more = op->more;	1424	object *more = op->more;
1424		1425
1425	/* We really need the caller to normalize coordinates - if	1426	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1427	* 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	1428	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1429	* is clear wrong do we normalize it.
1429	*/	1430	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1431	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1432	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1433	else if (!more->map)
1435	{	1434	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1435	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1436	* more->map should always point to the parent.
1438	*/	1437	*/
…		…
1441		1440
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1441	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1442	{
1444	if (!op->head)	1443	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1444	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1445
1446	return NULL;	1446	return NULL;
1447	}	1447	}
1448	}	1448	}
		1449
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1450	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1451
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1452	/* 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	1453	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1454	* need extra work
…		…
1457	y = op->y;	1458	y = op->y;
1458		1459
1459	/* this has to be done after we translate the coordinates.	1460	/* this has to be done after we translate the coordinates.
1460	*/	1461	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1462	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1464	if (CAN_MERGE (op, tmp))
1465	{	1465	{
1466	op->nrof += tmp->nrof;	1466	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1467	remove_ob (tmp);
1468	free_object (tmp);	1468	free_object (tmp);
1469	}	1469	}
1470	}
1471		1470
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1471	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1472	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1473
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1474	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1475	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1476
1477	if (flag & INS_BELOW_ORIGINATOR)	1477	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1478	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1480	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1482	abort ();
1483	}	1483	}
		1484
1484	op->above = originator;	1485	op->above = originator;
1485	op->below = originator->below;	1486	op->below = originator->below;
		1487
1486	if (op->below)	1488	if (op->below)
1487	op->below->above = op;	1489	op->below->above = op;
1488	else	1490	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1491	SET_MAP_OB (op->map, op->x, op->y, op);
		1492
1490	/* since *below* originator, no need to update top */	1493	/* since *below* originator, no need to update top */
1491	originator->below = op;	1494	originator->below = op;
1492	}	1495	}
1493	else	1496	else
1494	{	1497	{
1495	/* If there are other objects, then */	1498	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1499	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1500	{
1498	object *
1499	last = NULL;	1501	object *last = NULL;
1500		1502
1501	/*	1503	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1504	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1505	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1506	* Generally, we want to put the new object on top. But if
…		…
1513		1515
1514	while (top != NULL)	1516	while (top != NULL)
1515	{	1517	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1518	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1519	floor = top;
		1520
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1521	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1522	{
1520	/* We insert above top, so we want this object below this */	1523	/* We insert above top, so we want this object below this */
1521	top = top->below;	1524	top = top->below;
1522	break;	1525	break;
1523	}	1526	}
		1527
1524	last = top;	1528	last = top;
1525	top = top->above;	1529	top = top->above;
1526	}	1530	}
		1531
1527	/* Don't want top to be NULL, so set it to the last valid object */	1532	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1533	top = last;
1529		1534
1530	/* We let update_position deal with figuring out what the space	1535	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1536	* looks like instead of lots of conditions here.
…		…
1551	*/	1556	*/
1552	if (last && last->below && last != floor)	1557	if (last && last->below && last != floor)
1553	top = last->below;	1558	top = last->below;
1554	}	1559	}
1555	} /* If objects on this space */	1560	} /* If objects on this space */
		1561
1556	if (flag & INS_MAP_LOAD)	1562	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1563	top = GET_MAP_TOP (op->map, op->x, op->y);
		1564
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1565	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1566	top = floor;
1560		1567
1561	/* Top is the object that our object (op) is going to get inserted above.	1568	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1569	*/
1563		1570
1564	/* First object on this space */	1571	/* First object on this space */
1565	if (!top)	1572	if (!top)
1566	{	1573	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1574	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1575
1568	if (op->above)	1576	if (op->above)
1569	op->above->below = op;	1577	op->above->below = op;
		1578
1570	op->below = NULL;	1579	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1580	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1581	}
1573	else	1582	else
1574	{ /* get inserted into the stack above top */	1583	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1584	op->above = top->above;
		1585
1576	if (op->above)	1586	if (op->above)
1577	op->above->below = op;	1587	op->above->below = op;
		1588
1578	op->below = top;	1589	op->below = top;
1579	top->above = op;	1590	top->above = op;
1580	}	1591	}
		1592
1581	if (op->above == NULL)	1593	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1594	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1595	} /* else not INS_BELOW_ORIGINATOR */
1584		1596
1585	if (op->type == PLAYER)	1597	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1600	/* 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.	1601	* it, so save a few ticks and start from there.
1590	*/	1602	*/
1591	if (!(flag & INS_MAP_LOAD))	1603	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1604	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1605	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1606	tmp->contr->socket.update_look = 1;
1596	}
1597		1607
1598	/* If this object glows, it may affect lighting conditions that are	1608	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1609	* 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	1610	* 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	1611	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1615	* of effect may be sufficient.
1606	*/	1616	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1617	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1618	update_all_los (op->map, op->x, op->y);
1609		1619
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1620	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1621	update_object (op, UP_OBJ_INSERT);
1613
1614		1622
1615	/* Don't know if moving this to the end will break anything. However,	1623	/* 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.	1624	* we want to have update_look set above before calling this.
1617	*	1625	*
1618	* check_move_on() must be after this because code called from	1626	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1628	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1629	* update_object().
1622	*/	1630	*/
1623		1631
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1632	/* 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)	1633	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1634	{
1628	if (check_move_on (op, originator))	1635	if (check_move_on (op, originator))
1629	return NULL;	1636	return NULL;
1630		1637
…		…
1633	*/	1640	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1641	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1642	if (check_move_on (tmp, originator))
1636	return NULL;	1643	return NULL;
1637	}	1644	}
		1645
1638	return op;	1646	return op;
1639	}	1647	}
1640		1648
1641	/* this function inserts an object in the map, but if it	1649	/* 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.	1650	* finds an object of its own type, it'll remove that one first.
…		…
1660	free_object (tmp);	1668	free_object (tmp);
1661	}	1669	}
1662	}	1670	}
1663		1671
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1672	tmp1 = arch_to_object (find_archetype (arch_string));
1665
1666		1673
1667	tmp1->x = op->x;	1674	tmp1->x = op->x;
1668	tmp1->y = op->y;	1675	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1676	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1677	}
…		…
1688	if (orig_ob->nrof < nr)	1695	if (orig_ob->nrof < nr)
1689	{	1696	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1697	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1698	return NULL;
1692	}	1699	}
		1700
1693	newob = object_create_clone (orig_ob);	1701	newob = object_create_clone (orig_ob);
		1702
1694	if ((orig_ob->nrof -= nr) < 1)	1703	if ((orig_ob->nrof -= nr) < 1)
1695	{	1704	{
1696	if (!is_removed)	1705	if (!is_removed)
1697	remove_ob (orig_ob);	1706	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1707	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1715	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");	1716	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1717	return NULL;
1709	}	1718	}
1710	}	1719	}
		1720
1711	newob->nrof = nr;	1721	newob->nrof = nr;
1712		1722
1713	return newob;	1723	return newob;
1714	}	1724	}
1715		1725
…		…
1722	*/	1732	*/
1723		1733
1724	object *	1734	object *
1725	decrease_ob_nr (object *op, uint32 i)	1735	decrease_ob_nr (object *op, uint32 i)
1726	{	1736	{
1727	object *	1737	object *tmp;
1728	tmp;
1729	player *	1738	player *pl;
1730	pl;
1731		1739
1732	if (i == 0) /* objects with op->nrof require this check */	1740	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1741	return op;
1734		1742
1735	if (i > op->nrof)	1743	if (i > op->nrof)
1736	i = op->nrof;	1744	i = op->nrof;
1737		1745
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1746	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1747	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1748	else if (op->env != NULL)
1743	{	1749	{
1744	/* is this object in the players inventory, or sub container	1750	/* is this object in the players inventory, or sub container
1745	* therein?	1751	* therein?
1746	*/	1752	*/
…		…
1781	}	1787	}
1782	}	1788	}
1783	}	1789	}
1784	else	1790	else
1785	{	1791	{
1786	object *
1787	above = op->above;	1792	object *above = op->above;
1788		1793
1789	if (i < op->nrof)	1794	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1795	op->nrof -= i;
1792	}
1793	else	1796	else
1794	{	1797	{
1795	remove_ob (op);	1798	remove_ob (op);
1796	op->nrof = 0;	1799	op->nrof = 0;
1797	}	1800	}
		1801
1798	/* Since we just removed op, op->above is null */	1802	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1803	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1804	if (tmp->type == PLAYER)
1801	{	1805	{
1802	if (op->nrof)	1806	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1809	esrv_del_item (tmp->contr, op->count);
1806	}	1810	}
1807	}	1811	}
1808		1812
1809	if (op->nrof)	1813	if (op->nrof)
1810	{
1811	return op;	1814	return op;
1812	}
1813	else	1815	else
1814	{	1816	{
1815	free_object (op);	1817	free_object (op);
1816	return NULL;	1818	return NULL;
1817	}	1819	}
…		…
1826	add_weight (object *op, signed long weight)	1828	add_weight (object *op, signed long weight)
1827	{	1829	{
1828	while (op != NULL)	1830	while (op != NULL)
1829	{	1831	{
1830	if (op->type == CONTAINER)	1832	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1833	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1834
1834	op->carrying += weight;	1835	op->carrying += weight;
1835	op = op->env;	1836	op = op->env;
1836	}	1837	}
1837	}	1838	}
1838		1839
…		…
1861	{	1862	{
1862	dump_object (op);	1863	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1864	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;	1865	return op;
1865	}	1866	}
		1867
1866	if (where == NULL)	1868	if (where == NULL)
1867	{	1869	{
1868	dump_object (op);	1870	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1871	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;	1872	return op;
1871	}	1873	}
		1874
1872	if (where->head)	1875	if (where->head)
1873	{	1876	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1877	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1878	where = where->head;
1876	}	1879	}
		1880
1877	if (op->more)	1881	if (op->more)
1878	{	1882	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1883	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1884	return op;
1881	}	1885	}
		1886
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1887	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1888	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1889	if (op->nrof)
1885	{	1890	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1891	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1979	tag;	1984	tag;
1980	mapstruct *	1985	mapstruct *
1981	m = op->map;	1986	m = op->map;
1982	int	1987	int
1983	x = op->x, y = op->y;	1988	x = op->x, y = op->y;
		1989
1984	MoveType	1990	MoveType
1985	move_on,	1991	move_on,
1986	move_slow,	1992	move_slow,
1987	move_block;	1993	move_block;
1988		1994
…		…
2022	* we don't need to check all of them.	2028	* we don't need to check all of them.
2023	*/	2029	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	2030	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	2031	break;
2026	}	2032	}
		2033
2027	for (; tmp != NULL; tmp = tmp->below)	2034	for (; tmp; tmp = tmp->below)
2028	{	2035	{
2029	if (tmp == op)	2036	if (tmp == op)
2030	continue; /* Can't apply yourself */	2037	continue; /* Can't apply yourself */
2031		2038
2032	/* Check to see if one of the movement types should be slowed down.	2039	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2047	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))	2048	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	2049	{
2043		2050
2044	float	2051	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	2052	diff = tmp->move_slow_penalty * FABS (op->speed);
		2053
2048	if (op->type == PLAYER)	2054	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	2055	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)))	2056	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	2057	diff /= 4.0;
2054	}	2058
2055	}
2056	op->speed_left -= diff;	2059	op->speed_left -= diff;
2057	}	2060	}
2058	}	2061	}
2059		2062
2060	/* Basically same logic as above, except now for actual apply. */	2063	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2064	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))	2065	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	2066	{
2064
2065	move_apply (tmp, op, originator);	2067	move_apply (tmp, op, originator);
		2068
2066	if (was_destroyed (op, tag))	2069	if (was_destroyed (op, tag))
2067	return 1;	2070	return 1;
2068		2071
2069	/* what the person/creature stepped onto has moved the object	2072	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	2073	* someplace new. Don't process any further - if we did,
…		…
2072	*/	2075	*/
2073	if (op->map != m || op->x != x || op->y != y)	2076	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	2077	return 0;
2075	}	2078	}
2076	}	2079	}
		2080
2077	return 0;	2081	return 0;
2078	}	2082	}
2079		2083
2080	/*	2084	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	2085	* present_arch(arch, map, x, y) searches for any objects with
…		…
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2376	find_dir (mapstruct *m, int x, int y, object *exclude)
2373	{	2377	{
2374	int	2378	int
2375	i,	2379	i,
2376	max = SIZEOFFREE, mflags;	2380	max = SIZEOFFREE, mflags;
2377	sint16	2381
2378	nx,	2382	sint16 nx, ny;
2379	ny;
2380	object *	2383	object *
2381	tmp;	2384	tmp;
2382	mapstruct *	2385	mapstruct *
2383	mp;	2386	mp;
2384	MoveType	2387
2385	blocked,	2388	MoveType blocked, move_type;
2386	move_type;
2387		2389
2388	if (exclude && exclude->head)	2390	if (exclude && exclude->head)
2389	{	2391	{
2390	exclude = exclude->head;	2392	exclude = exclude->head;
2391	move_type = exclude->move_type;	2393	move_type = exclude->move_type;
…		…
2598		2600
2599		2601
2600	int	2602	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2603	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2602	{	2604	{
2603	sint16	2605	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2606	int
2607	mflags;	2607	mflags;
2608		2608
2609	if (dir < 0)	2609	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2610	return 0; /* exit condition: invalid direction */
…		…
2741	fprintf (tempfile, obstr);	2741	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2742	fclose (tempfile);
2743		2743
2744	op = get_object ();	2744	op = get_object ();
2745		2745
2746	object_thawer	2746	object_thawer thawer (filename);
2747	thawer (filename);
2748		2747
2749	if (thawer)	2748	if (thawer)
2750	load_object (thawer, op, 0);	2749	load_object (thawer, op, 0);
2751		2750
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2803	* The returned string is shared.	2802	* The returned string is shared.
2804	*/	2803	*/
2805	const char *	2804	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2805	get_ob_key_value (const object *op, const char *const key)
2807	{	2806	{
2808	key_value *	2807	key_value *link;
2809	link;	2808	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2809
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2810	if (!canonical_key)
2816	{	2811	{
2817	/* 1. There being a field named key on any object	2812	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2813	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2814	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2815	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2816	*/
2822	return NULL;	2817	return 0;
2823	}	2818	}
2824		2819
2825	/* This is copied from get_ob_key_link() above -	2820	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2821	* only 4 lines, and saves the function call overhead.
2827	*/	2822	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2823	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2824	if (link->key == canonical_key)
2831	{
2832	return link->value;	2825	return link->value;
2833	}	2826
2834	}
2835	return NULL;	2827	return 0;
2836	}	2828	}
2837		2829
2838		2830
2839	/*	2831	/*
2840	* Updates the canonical_key in op to value.	2832	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2868	if (last)
2877	last->next = field->next;	2869	last->next = field->next;
2878	else	2870	else
2879	op->key_values = field->next;	2871	op->key_values = field->next;
2880		2872
2881	delete
2882	field;	2873	delete field;
2883	}	2874	}
2884	}	2875	}
2885	return TRUE;	2876	return TRUE;
2886	}	2877	}
2887	/* IF we get here, key doesn't exist */	2878	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2913	* Returns TRUE on success.
2923	*/	2914	*/
2924	int	2915	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2916	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2917	{
2927	shstr
2928	key_ (key);	2918	shstr key_ (key);
2929		2919
2930	return set_ob_key_value_s (op, key_, value, add_key);	2920	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2921	}
		2922
		2923	object::depth_iterator::depth_iterator (object *container)
		2924	: iterator_base (container)
		2925	{
		2926	while (item->inv)
		2927	item = item->inv;
		2928	}
		2929
		2930	void
		2931	object::depth_iterator::next ()
		2932	{
		2933	if (item->below)
		2934	{
		2935	item = item->below;
		2936
		2937	while (item->inv)
		2938	item = item->inv;
		2939	}
		2940	else
		2941	item = item->env;
		2942	}
		2943
		2944	// return a suitable string describing an objetc in enough detail to find it
		2945	const char *
		2946	object::debug_desc (char *info) const
		2947	{
		2948	char info2[256 * 3];
		2949	char *p = info;
		2950
		2951	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2952	count,
		2953	&name,
		2954	title ? " " : "",
		2955	title ? (const char *)title : "");
		2956
		2957	if (env)
		2958	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2959
		2960	if (map)
		2961	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2962
		2963	return info;
		2964	}
		2965
		2966	const char *
		2967	object::debug_desc () const
		2968	{
		2969	static char info[256 * 3];
		2970	return debug_desc (info);
		2971	}
		2972

Diff Legend

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