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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
41		40
42	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,	41	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	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
52	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,	51	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	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	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	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
55		131
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
432	void	443	void
433	free_all_object_data ()	444	free_all_object_data ()
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448	object *
449	object::get_owner ()
450	{
451	if (!owner
452	|| QUERY_FLAG (owner, FLAG_FREED)
453	|| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	447	}
458		448
459	/*	449	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	451	* skill and experience objects.
…		…
531		521
532	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
533		523
534	expmul = 1.0;	524	expmul = 1.0;
535	face = blank_face;	525	face = blank_face;
536	attacked_by_count = -1;
537		526
538	if (settings.casting_time)	527	if (settings.casting_time)
539	casting_time = -1;	528	casting_time = -1;
540	}	529	}
541		530
542	void object::clone (object *destination)
543	{
544	*(object_copy *)destination = *this;
545	*(object_pod *)destination = *this;
546
547	if (self || cb)
548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549	}
550
551	/*	531	/*
552	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
556	* if the first object is freed, the pointers in the new object	536	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	537	* will point at garbage.
558	*/	538	*/
559	void	539	void
560	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
561	{	541	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		544
565	op2->clone (op);	545	*(object_copy *)dst = *this;
		546	*(object_pod *)dst = *this;
		547
		548	if (self || cb)
		549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
566		550
567	if (is_freed)	551	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
569	if (is_removed)	554	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
571		556
572	if (op2->speed < 0)	557	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		559
575	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
576	if (op2->key_values)	561	if (key_values)
577	{	562	{
578	key_value *tail = 0;	563	key_value *tail = 0;
579	key_value *i;	564	key_value *i;
580		565
581	op->key_values = 0;	566	dst->key_values = 0;
582		567
583	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
584	{	569	{
585	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
586		571
587	new_link->next = 0;	572	new_link->next = 0;
588	new_link->key = i->key;	573	new_link->key = i->key;
589	new_link->value = i->value;	574	new_link->value = i->value;
590		575
591	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
592	if (!op->key_values)	577	if (!dst->key_values)
593	{	578	{
594	op->key_values = new_link;	579	dst->key_values = new_link;
595	tail = new_link;	580	tail = new_link;
596	}	581	}
597	else	582	else
598	{	583	{
599	tail->next = new_link;	584	tail->next = new_link;
600	tail = new_link;	585	tail = new_link;
601	}	586	}
602	}	587	}
603	}	588	}
604		589
605	update_ob_speed (op);	590	update_ob_speed (dst);
606	}	591	}
607		592
608	/*	593	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	594	* If an object with the IS_TURNABLE() flag needs to be turned due
610	* to the closest player being on the other side, this function can	595	* to the closest player being on the other side, this function can
…		…
623	/*	608	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	609	* Updates the speed of an object. If the speed changes from 0 to another
625	* value, or vice versa, then add/remove the object from the active list.	610	* value, or vice versa, then add/remove the object from the active list.
626	* This function needs to be called whenever the speed of an object changes.	611	* This function needs to be called whenever the speed of an object changes.
627	*/	612	*/
628
629	void	613	void
630	update_ob_speed (object *op)	614	update_ob_speed (object *op)
631	{	615	{
632	extern int arch_init;	616	extern int arch_init;
633		617
…		…
642	abort ();	626	abort ();
643	#else	627	#else
644	op->speed = 0;	628	op->speed = 0;
645	#endif	629	#endif
646	}	630	}
		631
647	if (arch_init)	632	if (arch_init)
648	{
649	return;	633	return;
650	}	634
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	635	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652	{	636	{
653	/* If already on active list, don't do anything */	637	/* If already on active list, don't do anything */
654	if (op->active_next || op->active_prev || op == active_objects)	638	if (op->active_next || op->active_prev || op == active_objects)
655	return;	639	return;
656		640
657	/* process_events() expects us to insert the object at the beginning	641	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	642	* of the list. */
659	op->active_next = active_objects;	643	op->active_next = active_objects;
		644
660	if (op->active_next != NULL)	645	if (op->active_next != NULL)
661	op->active_next->active_prev = op;	646	op->active_next->active_prev = op;
		647
662	active_objects = op;	648	active_objects = op;
663	}	649	}
664	else	650	else
665	{	651	{
666	/* If not on the active list, nothing needs to be done */	652	/* If not on the active list, nothing needs to be done */
…		…
668	return;	654	return;
669		655
670	if (op->active_prev == NULL)	656	if (op->active_prev == NULL)
671	{	657	{
672	active_objects = op->active_next;	658	active_objects = op->active_next;
		659
673	if (op->active_next != NULL)	660	if (op->active_next != NULL)
674	op->active_next->active_prev = NULL;	661	op->active_next->active_prev = NULL;
675	}	662	}
676	else	663	else
677	{	664	{
678	op->active_prev->active_next = op->active_next;	665	op->active_prev->active_next = op->active_next;
		666
679	if (op->active_next)	667	if (op->active_next)
680	op->active_next->active_prev = op->active_prev;	668	op->active_next->active_prev = op->active_prev;
681	}	669	}
		670
682	op->active_next = NULL;	671	op->active_next = NULL;
683	op->active_prev = NULL;	672	op->active_prev = NULL;
684	}	673	}
685	}	674	}
686		675
…		…
811	update_now = 1;	800	update_now = 1;
812		801
813	if ((move_slow | op->move_slow) != move_slow)	802	if ((move_slow | op->move_slow) != move_slow)
814	update_now = 1;	803	update_now = 1;
815	}	804	}
		805
816	/* if the object is being removed, we can't make intelligent	806	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	807	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	808	* that is being removed.
819	*/	809	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
832		822
833	if (op->more != NULL)	823	if (op->more != NULL)
834	update_object (op->more, action);	824	update_object (op->more, action);
835	}	825	}
836		826
837	static unordered_vector<object *> mortals;	827	object::vector object::mortals;
838	static std::vector<object *> freed;	828	object::vector object::objects; // not yet used
		829	object *object::first;
839		830
840	void object::free_mortals ()	831	void object::free_mortals ()
841	{	832	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843	if ((*i)->refcnt)	834	if ((*i)->refcnt)
844	++i; // further delay freeing	835	++i; // further delay freeing
845	else	836	else
846	{	837	{
847	freed.push_back (*i);//D
848	//delete *i;	838	delete *i;
849	mortals.erase (i);	839	mortals.erase (i);
850	}	840	}
851
852	if (mortals.size())//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854	}	841	}
855		842
856	object::object ()	843	object::object ()
857	{	844	{
858	SET_FLAG (this, FLAG_REMOVED);	845	SET_FLAG (this, FLAG_REMOVED);
859		846
860	expmul = 1.0;	847	expmul = 1.0;
861	face = blank_face;	848	face = blank_face;
862	attacked_by_count = -1;
863	}	849	}
864		850
865	object::~object ()	851	object::~object ()
866	{	852	{
867	free_key_values (this);	853	free_key_values (this);
868	}	854	}
869		855
870	void object::link ()	856	void object::link ()
871	{	857	{
872	count = ++ob_count;	858	count = ++ob_count;
		859	uuid = gen_uuid ();
873		860
874	prev = 0;	861	prev = 0;
875	next = objects;	862	next = object::first;
876		863
877	if (objects)	864	if (object::first)
878	objects->prev = this;	865	object::first->prev = this;
879		866
880	objects = this;	867	object::first = this;
881	}	868	}
882		869
883	void object::unlink ()	870	void object::unlink ()
884	{	871	{
885	count = 0;	872	if (this == object::first)
		873	object::first = next;
886		874
887	/* Remove this object from the list of used objects */	875	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	876	if (prev) prev->next = next;
		877	if (next) next->prev = prev;
		878
891	prev = 0;	879	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	880	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	881	}
903		882
904	object *object::create ()	883	object *object::create ()
905	{	884	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	885	object *op = new object;
911	else
912	{
913	// highly annoying, but the only way to get it stable right now
914	op = freed.back ();
915	freed.pop_back ();
916	op->~object ();
917	new ((void *) op) object;
918	}
919
920	op->link ();	886	op->link ();
921	return op;	887	return op;
922	}	888	}
923		889
924	/*	890	/*
…		…
926	* it from the list of used objects, and puts it on the list of	892	* it from the list of used objects, and puts it on the list of
927	* free objects. The IS_FREED() flag is set in the object.	893	* free objects. The IS_FREED() flag is set in the object.
928	* The object must have been removed by remove_ob() first for	894	* The object must have been removed by remove_ob() first for
929	* this function to succeed.	895	* this function to succeed.
930	*	896	*
931	* If free_inventory is set, free inventory as well. Else drop items in	897	* If destroy_inventory is set, free inventory as well. Else drop items in
932	* inventory to the ground.	898	* inventory to the ground.
933	*/	899	*/
934	void object::free (bool free_inventory)	900	void object::destroy (bool destroy_inventory)
935	{	901	{
936	if (QUERY_FLAG (this, FLAG_FREED))	902	if (QUERY_FLAG (this, FLAG_FREED))
937	return;	903	return;
938		904
939	if (!QUERY_FLAG (this, FLAG_REMOVED))
940	remove_ob (this);
941
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	906	remove_friendly_object (this);
944		907
		908	if (!QUERY_FLAG (this, FLAG_REMOVED))
		909	remove ();
		910
945	SET_FLAG (this, FLAG_FREED);	911	SET_FLAG (this, FLAG_FREED);
946		912
947	if (more)	913	if (more)
948	{	914	{
949	more->free (free_inventory);	915	more->destroy (destroy_inventory);
950	more = 0;	916	more = 0;
951	}	917	}
952		918
953	if (inv)	919	if (inv)
954	{	920	{
955	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
957	* drop on that space.	923	* drop on that space.
958	*/	924	*/
959	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
960	{	926	{
961	object *op = inv;	927	object *op = inv;
962		928
963	while (op)	929	while (op)
964	{	930	{
965	object *tmp = op->below;	931	object *tmp = op->below;
966	op->free (free_inventory);	932	op->destroy (destroy_inventory);
967	op = tmp;	933	op = tmp;
968	}	934	}
969	}	935	}
970	else	936	else
971	{ /* Put objects in inventory onto this space */	937	{ /* Put objects in inventory onto this space */
…		…
973		939
974	while (op)	940	while (op)
975	{	941	{
976	object *tmp = op->below;	942	object *tmp = op->below;
977		943
978	remove_ob (op);	944	op->remove ();
979		945
980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
981	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
982	free_object (op);	948	op->destroy ();
983	else	949	else
984	{	950	{
985	op->x = x;	951	op->x = x;
986	op->y = y;	952	op->y = y;
987	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
990	op = tmp;	956	op = tmp;
991	}	957	}
992	}	958	}
993	}	959	}
994		960
		961	// hack to ensure that freed objects still have a valid map
		962	{
		963	static maptile *freed_map; // freed objects are moved here to avoid crashes
		964
		965	if (!freed_map)
		966	{
		967	freed_map = new maptile;
		968
		969	freed_map->name = "/internal/freed_objects_map";
		970	freed_map->width = 3;
		971	freed_map->height = 3;
		972
		973	freed_map->allocate ();
		974	}
		975
		976	map = freed_map;
		977	x = 1;
		978	y = 1;
		979	}
		980
		981	// clear those pointers that likely might have circular references to us
995	owner = 0;	982	owner = 0;
		983	enemy = 0;
		984	attacked_by = 0;
		985
		986	// only relevant for players(?), but make sure of it anyways
		987	contr = 0;
996		988
997	/* Remove object from the active list */	989	/* Remove object from the active list */
998	speed = 0;	990	speed = 0;
999	update_ob_speed (this);	991	update_ob_speed (this);
1000		992
…		…
1005		997
1006	/*	998	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	999	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	1000	* weight of an object (and what is carried by it's environment(s)).
1009	*/	1001	*/
1010
1011	void	1002	void
1012	sub_weight (object *op, signed long weight)	1003	sub_weight (object *op, signed long weight)
1013	{	1004	{
1014	while (op != NULL)	1005	while (op != NULL)
1015	{	1006	{
1016	if (op->type == CONTAINER)	1007	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1008	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	1009
1020	op->carrying -= weight;	1010	op->carrying -= weight;
1021	op = op->env;	1011	op = op->env;
1022	}	1012	}
1023	}	1013	}
1024		1014
1025	/* remove_ob(op):	1015	/* op->remove ():
1026	* This function removes the object op from the linked list of objects	1016	* This function removes the object op from the linked list of objects
1027	* which it is currently tied to. When this function is done, the	1017	* which it is currently tied to. When this function is done, the
1028	* object will have no environment. If the object previously had an	1018	* object will have no environment. If the object previously had an
1029	* environment, the x and y coordinates will be updated to	1019	* environment, the x and y coordinates will be updated to
1030	* the previous environment.	1020	* the previous environment.
1031	* Beware: This function is called from the editor as well!	1021	* Beware: This function is called from the editor as well!
1032	*/	1022	*/
1033
1034	void	1023	void
1035	remove_ob (object *op)	1024	object::remove ()
1036	{	1025	{
		1026	object *tmp, *last = 0;
1037	object *	1027	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		1028
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;	1029	int check_walk_off;
1047	mapstruct *
1048	m;
1049		1030
1050	sint16
1051	x,
1052	y;
1053
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	1031	if (QUERY_FLAG (this, FLAG_REMOVED))
1055	return;	1032	return;
1056		1033
1057	SET_FLAG (op, FLAG_REMOVED);	1034	SET_FLAG (this, FLAG_REMOVED);
1058		1035
1059	if (op->more != NULL)	1036	if (more)
1060	remove_ob (op->more);	1037	more->remove ();
1061		1038
1062	/*	1039	/*
1063	* In this case, the object to be removed is in someones	1040	* In this case, the object to be removed is in someones
1064	* inventory.	1041	* inventory.
1065	*/	1042	*/
1066	if (op->env != NULL)	1043	if (env)
1067	{	1044	{
1068	if (op->nrof)	1045	if (nrof)
1069	sub_weight (op->env, op->weight * op->nrof);	1046	sub_weight (env, weight * nrof);
1070	else	1047	else
1071	sub_weight (op->env, op->weight + op->carrying);	1048	sub_weight (env, weight + carrying);
1072		1049
1073	/* NO_FIX_PLAYER is set when a great many changes are being	1050	/* NO_FIX_PLAYER is set when a great many changes are being
1074	* made to players inventory. If set, avoiding the call	1051	* made to players inventory. If set, avoiding the call
1075	* to save cpu time.	1052	* to save cpu time.
1076	*/	1053	*/
1077	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1054	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1078	fix_player (otmp);	1055	fix_player (otmp);
1079		1056
1080	if (op->above != NULL)	1057	if (above != NULL)
1081	op->above->below = op->below;	1058	above->below = below;
1082	else	1059	else
1083	op->env->inv = op->below;	1060	env->inv = below;
1084		1061
1085	if (op->below != NULL)	1062	if (below != NULL)
1086	op->below->above = op->above;	1063	below->above = above;
1087		1064
1088	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1089	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1090	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1091	*/	1068	*/
1092	op->x = op->env->x, op->y = op->env->y;	1069	x = env->x, y = env->y;
1093	op->map = op->env->map;	1070	map = env->map;
1094	op->above = NULL, op->below = NULL;	1071	above = 0, below = 0;
1095	op->env = NULL;	1072	env = 0;
1096	}	1073	}
1097	else if (op->map)	1074	else if (map)
1098	{	1075	{
1099	x = op->x;
1100	y = op->y;
1101	m = get_map_from_coord (op->map, &x, &y);
1102
1103	if (!m)
1104	{
1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1106	op->map->path, op->x, op->y);
1107	/* in old days, we used to set x and y to 0 and continue.
1108	* it seems if we get into this case, something is probablye
1109	* screwed up and should be fixed.
1110	*/
1111	abort ();
1112	}
1113
1114	if (op->map != m)
1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1116	op->map->path, m->path, op->x, op->y, x, y);
1117
1118	/* Re did the following section of code - it looks like it had	1076	/* Re did the following section of code - it looks like it had
1119	* lots of logic for things we no longer care about	1077	* lots of logic for things we no longer care about
1120	*/	1078	*/
1121		1079
1122	/* link the object above us */	1080	/* link the object above us */
1123	if (op->above)	1081	if (above)
1124	op->above->below = op->below;	1082	above->below = below;
1125	else	1083	else
1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1084	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1127		1085
1128	/* Relink the object below us, if there is one */	1086	/* Relink the object below us, if there is one */
1129	if (op->below)	1087	if (below)
1130	op->below->above = op->above;	1088	below->above = above;
1131	else	1089	else
1132	{	1090	{
1133	/* Nothing below, which means we need to relink map object for this space	1091	/* Nothing below, which means we need to relink map object for this space
1134	* use translated coordinates in case some oddness with map tiling is	1092	* use translated coordinates in case some oddness with map tiling is
1135	* evident	1093	* evident
1136	*/	1094	*/
1137	if (GET_MAP_OB (m, x, y) != op)	1095	if (GET_MAP_OB (map, x, y) != this)
1138	{	1096	{
1139	dump_object (op);	1097	char *dump = dump_object (this);
1140	LOG (llevError,	1098	LOG (llevError,
1141	"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);	1099	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1100	free (dump);
1142	dump_object (GET_MAP_OB (m, x, y));	1101	dump = dump_object (GET_MAP_OB (map, x, y));
1143	LOG (llevError, "%s\n", errmsg);	1102	LOG (llevError, "%s\n", dump);
		1103	free (dump);
1144	}	1104	}
1145		1105
1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1147	}	1107	}
1148		1108
1149	op->above = 0;	1109	above = 0;
1150	op->below = 0;	1110	below = 0;
1151		1111
1152	if (op->map->in_memory == MAP_SAVING)	1112	if (map->in_memory == MAP_SAVING)
1153	return;	1113	return;
1154		1114
1155	tag = op->count;
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1157		1116
1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1159	{	1118	{
1160	/* No point updating the players look faces if he is the object	1119	/* No point updating the players look faces if he is the object
1161	* being removed.	1120	* being removed.
1162	*/	1121	*/
1163		1122
1164	if (tmp->type == PLAYER && tmp != op)	1123	if (tmp->type == PLAYER && tmp != this)
1165	{	1124	{
1166	/* If a container that the player is currently using somehow gets	1125	/* If a container that the player is currently using somehow gets
1167	* removed (most likely destroyed), update the player view	1126	* removed (most likely destroyed), update the player view
1168	* appropriately.	1127	* appropriately.
1169	*/	1128	*/
1170	if (tmp->container == op)	1129	if (tmp->container == this)
1171	{	1130	{
1172	CLEAR_FLAG (op, FLAG_APPLIED);	1131	CLEAR_FLAG (this, FLAG_APPLIED);
1173	tmp->container = NULL;	1132	tmp->container = 0;
1174	}	1133	}
1175		1134
1176	tmp->contr->socket.update_look = 1;	1135	tmp->contr->socket.update_look = 1;
1177	}	1136	}
1178		1137
1179	/* See if player moving off should effect something */	1138	/* See if player moving off should effect something */
1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1139	if (check_walk_off
		1140	&& ((move_type & tmp->move_off)
		1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1142	{
1182	move_apply (tmp, op, NULL);	1143	move_apply (tmp, this, 0);
1183		1144
1184	if (was_destroyed (op, tag))	1145	if (destroyed ())
1185	{
1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1146	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187	}
1188	}	1147	}
1189		1148
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1150
1192	if (tmp->above == tmp)	1151	if (tmp->above == tmp)
1193	tmp->above = NULL;	1152	tmp->above = 0;
1194		1153
1195	last = tmp;	1154	last = tmp;
1196	}	1155	}
1197		1156
1198	/* last == NULL of there are no objects on this space */	1157	/* last == NULL of there are no objects on this space */
1199	if (last == NULL)	1158	if (!last)
1200	{	1159	{
1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1161	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1203	* those out anyways, and if there are any flags set right now, they won't	1162	* those out anyways, and if there are any flags set right now, they won't
1204	* be correct anyways.	1163	* be correct anyways.
1205	*/	1164	*/
1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1207	update_position (op->map, op->x, op->y);	1166	update_position (map, x, y);
1208	}	1167	}
1209	else	1168	else
1210	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1211		1170
1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1213	update_all_los (op->map, op->x, op->y);	1172	update_all_los (map, x, y);
1214	}	1173	}
1215	}	1174	}
1216		1175
1217	/*	1176	/*
1218	* merge_ob(op,top):	1177	* merge_ob(op,top):
…		…
1220	* This function goes through all objects below and including top, and	1179	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1180	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1181	* If top is NULL, it is calculated.
1223	* Returns pointer to object if it succeded in the merge, otherwise NULL	1182	* Returns pointer to object if it succeded in the merge, otherwise NULL
1224	*/	1183	*/
1225
1226	object *	1184	object *
1227	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1228	{	1186	{
1229	if (!op->nrof)	1187	if (!op->nrof)
1230	return 0;	1188	return 0;
…		…
1240	{	1198	{
1241	top->nrof += op->nrof;	1199	top->nrof += op->nrof;
1242		1200
1243	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244	op->weight = 0; /* Don't want any adjustements now */	1202	op->weight = 0; /* Don't want any adjustements now */
1245	remove_ob (op);	1203	op->destroy ();
1246	free_object (op);
1247	return top;	1204	return top;
1248	}	1205	}
1249	}	1206	}
1250		1207
1251	return NULL;	1208	return 0;
1252	}	1209	}
1253		1210
1254	/*	1211	/*
1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1212	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1256	* job preparing multi-part monsters	1213	* job preparing multi-part monsters
1257	*/	1214	*/
1258	object *	1215	object *
1259	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1216	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260	{	1217	{
1261	object *tmp;	1218	object *tmp;
1262		1219
1263	if (op->head)	1220	if (op->head)
1264	op = op->head;	1221	op = op->head;
…		…
1292	* NULL if 'op' was destroyed	1249	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1250	* just 'op' otherwise
1294	*/	1251	*/
1295		1252
1296	object *	1253	object *
1297	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1254	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298	{	1255	{
1299	object *tmp, *top, *floor = NULL;	1256	object *tmp, *top, *floor = NULL;
1300	sint16 x, y;	1257	sint16 x, y;
1301		1258
1302	if (QUERY_FLAG (op, FLAG_FREED))	1259	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1305	return NULL;	1262	return NULL;
1306	}	1263	}
1307		1264
1308	if (m == NULL)	1265	if (m == NULL)
1309	{	1266	{
1310	dump_object (op);	1267	char *dump = dump_object (op);
1311	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1269	free (dump);
1312	return op;	1270	return op;
1313	}	1271	}
1314		1272
1315	if (out_of_map (m, op->x, op->y))	1273	if (out_of_map (m, op->x, op->y))
1316	{	1274	{
1317	dump_object (op);	1275	char *dump = dump_object (op);
1318	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1319	#ifdef MANY_CORES	1277	#ifdef MANY_CORES
1320	/* Better to catch this here, as otherwise the next use of this object	1278	/* Better to catch this here, as otherwise the next use of this object
1321	* is likely to cause a crash. Better to find out where it is getting	1279	* is likely to cause a crash. Better to find out where it is getting
1322	* improperly inserted.	1280	* improperly inserted.
1323	*/	1281	*/
1324	abort ();	1282	abort ();
1325	#endif	1283	#endif
		1284	free (dump);
1326	return op;	1285	return op;
1327	}	1286	}
1328		1287
1329	if (!QUERY_FLAG (op, FLAG_REMOVED))	1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1330	{	1289	{
1331	dump_object (op);	1290	char *dump = dump_object (op);
1332	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1291	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1292	free (dump);
1333	return op;	1293	return op;
1334	}	1294	}
1335		1295
1336	if (op->more != NULL)	1296	if (op->more != NULL)
1337	{	1297	{
…		…
1378	if (op->nrof && !(flag & INS_NO_MERGE))	1338	if (op->nrof && !(flag & INS_NO_MERGE))
1379	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1339	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1380	if (CAN_MERGE (op, tmp))	1340	if (CAN_MERGE (op, tmp))
1381	{	1341	{
1382	op->nrof += tmp->nrof;	1342	op->nrof += tmp->nrof;
1383	remove_ob (tmp);	1343	tmp->destroy ();
1384	free_object (tmp);
1385	}	1344	}
1386		1345
1387	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1346	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1388	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1347	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389		1348
…		…
1575	tmp1;	1534	tmp1;
1576		1535
1577	/* first search for itself and remove any old instances */	1536	/* first search for itself and remove any old instances */
1578		1537
1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1538	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1580	{
1581	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1582	{	1540	tmp->destroy ();
1583	remove_ob (tmp);
1584	free_object (tmp);
1585	}
1586	}
1587		1541
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1542	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1543
1590	tmp1->x = op->x;	1544	tmp1->x = op->x;
1591	tmp1->y = op->y;	1545	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1546	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1547	}
…		…
1601	*/	1555	*/
1602		1556
1603	object *	1557	object *
1604	get_split_ob (object *orig_ob, uint32 nr)	1558	get_split_ob (object *orig_ob, uint32 nr)
1605	{	1559	{
1606	object *	1560	object *newob;
1607	newob;
1608	int
1609	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1610		1562
1611	if (orig_ob->nrof < nr)	1563	if (orig_ob->nrof < nr)
1612	{	1564	{
1613	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1565	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1614	return NULL;	1566	return NULL;
1615	}	1567	}
1616		1568
1617	newob = object_create_clone (orig_ob);	1569	newob = object_create_clone (orig_ob);
1618		1570
1619	if ((orig_ob->nrof -= nr) < 1)	1571	if ((orig_ob->nrof -= nr) < 1)
1620	{	1572	orig_ob->destroy (1);
1621	if (!is_removed)
1622	remove_ob (orig_ob);
1623	free_object2 (orig_ob, 1);
1624	}
1625	else if (!is_removed)	1573	else if (!is_removed)
1626	{	1574	{
1627	if (orig_ob->env != NULL)	1575	if (orig_ob->env != NULL)
1628	sub_weight (orig_ob->env, orig_ob->weight * nr);	1576	sub_weight (orig_ob->env, orig_ob->weight * nr);
1629	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1577	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1693	esrv_send_item (tmp, op);	1641	esrv_send_item (tmp, op);
1694	}	1642	}
1695	}	1643	}
1696	else	1644	else
1697	{	1645	{
1698	remove_ob (op);	1646	op->remove ();
1699	op->nrof = 0;	1647	op->nrof = 0;
1700	if (tmp)	1648	if (tmp)
1701	{	1649	{
1702	esrv_del_item (tmp->contr, op->count);	1650	esrv_del_item (tmp->contr, op->count);
1703	}	1651	}
…		…
1709		1657
1710	if (i < op->nrof)	1658	if (i < op->nrof)
1711	op->nrof -= i;	1659	op->nrof -= i;
1712	else	1660	else
1713	{	1661	{
1714	remove_ob (op);	1662	op->remove ();
1715	op->nrof = 0;	1663	op->nrof = 0;
1716	}	1664	}
1717		1665
1718	/* Since we just removed op, op->above is null */	1666	/* Since we just removed op, op->above is null */
1719	for (tmp = above; tmp != NULL; tmp = tmp->above)	1667	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1728		1676
1729	if (op->nrof)	1677	if (op->nrof)
1730	return op;	1678	return op;
1731	else	1679	else
1732	{	1680	{
1733	free_object (op);	1681	op->destroy ();
1734	return NULL;	1682	return NULL;
1735	}	1683	}
1736	}	1684	}
1737		1685
1738	/*	1686	/*
…		…
1751	op->carrying += weight;	1699	op->carrying += weight;
1752	op = op->env;	1700	op = op->env;
1753	}	1701	}
1754	}	1702	}
1755		1703
		1704	object *
		1705	insert_ob_in_ob (object *op, object *where)
		1706	{
		1707	if (!where)
		1708	{
		1709	char *dump = dump_object (op);
		1710	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1711	free (dump);
		1712	return op;
		1713	}
		1714
		1715	if (where->head)
		1716	{
		1717	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1718	where = where->head;
		1719	}
		1720
		1721	return where->insert (op);
		1722	}
		1723
1756	/*	1724	/*
1757	* insert_ob_in_ob(op,environment):	1725	* env->insert (op)
1758	* This function inserts the object op in the linked list	1726	* This function inserts the object op in the linked list
1759	* inside the object environment.	1727	* inside the object environment.
1760	*	1728	*
1761	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1762	* the inventory at the last position or next to other objects of the same
1763	* type.
1764	* Frank: Now sorted by type, archetype and magic!
1765	*
1766	* The function returns now pointer to inserted item, and return value can	1729	* The function returns now pointer to inserted item, and return value can
1767	* be != op, if items are merged. -Tero	1730	* be != op, if items are merged. -Tero
1768	*/	1731	*/
1769		1732
1770	object *	1733	object *
1771	insert_ob_in_ob (object *op, object *where)	1734	object::insert (object *op)
1772	{	1735	{
1773	object *	1736	object *tmp, *otmp;
1774	tmp, *
1775	otmp;
1776		1737
1777	if (!QUERY_FLAG (op, FLAG_REMOVED))	1738	if (!QUERY_FLAG (op, FLAG_REMOVED))
1778	{	1739	op->remove ();
1779	dump_object (op);
1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1781	return op;
1782	}
1783
1784	if (where == NULL)
1785	{
1786	dump_object (op);
1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1788	return op;
1789	}
1790
1791	if (where->head)
1792	{
1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1794	where = where->head;
1795	}
1796		1740
1797	if (op->more)	1741	if (op->more)
1798	{	1742	{
1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1743	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1800	return op;	1744	return op;
…		…
1802		1746
1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804	CLEAR_FLAG (op, FLAG_REMOVED);	1748	CLEAR_FLAG (op, FLAG_REMOVED);
1805	if (op->nrof)	1749	if (op->nrof)
1806	{	1750	{
1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1808	if (CAN_MERGE (tmp, op))	1752	if (CAN_MERGE (tmp, op))
1809	{	1753	{
1810	/* return the original object and remove inserted object	1754	/* return the original object and remove inserted object
1811	(client needs the original object) */	1755	(client needs the original object) */
1812	tmp->nrof += op->nrof;	1756	tmp->nrof += op->nrof;
1813	/* Weight handling gets pretty funky. Since we are adding to	1757	/* Weight handling gets pretty funky. Since we are adding to
1814	* tmp->nrof, we need to increase the weight.	1758	* tmp->nrof, we need to increase the weight.
1815	*/	1759	*/
1816	add_weight (where, op->weight * op->nrof);	1760	add_weight (this, op->weight * op->nrof);
1817	SET_FLAG (op, FLAG_REMOVED);	1761	SET_FLAG (op, FLAG_REMOVED);
1818	free_object (op); /* free the inserted object */	1762	op->destroy (); /* free the inserted object */
1819	op = tmp;	1763	op = tmp;
1820	remove_ob (op); /* and fix old object's links */	1764	op->remove (); /* and fix old object's links */
1821	CLEAR_FLAG (op, FLAG_REMOVED);	1765	CLEAR_FLAG (op, FLAG_REMOVED);
1822	break;	1766	break;
1823	}	1767	}
1824		1768
1825	/* I assume combined objects have no inventory	1769	/* I assume combined objects have no inventory
1826	* We add the weight - this object could have just been removed	1770	* We add the weight - this object could have just been removed
1827	* (if it was possible to merge). calling remove_ob will subtract	1771	* (if it was possible to merge). calling remove_ob will subtract
1828	* the weight, so we need to add it in again, since we actually do	1772	* the weight, so we need to add it in again, since we actually do
1829	* the linking below	1773	* the linking below
1830	*/	1774	*/
1831	add_weight (where, op->weight * op->nrof);	1775	add_weight (this, op->weight * op->nrof);
1832	}	1776	}
1833	else	1777	else
1834	add_weight (where, (op->weight + op->carrying));	1778	add_weight (this, (op->weight + op->carrying));
1835		1779
1836	otmp = is_player_inv (where);	1780	otmp = is_player_inv (this);
1837	if (otmp && otmp->contr != NULL)	1781	if (otmp && otmp->contr)
1838	{
1839	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840	fix_player (otmp);	1783	fix_player (otmp);
1841	}
1842		1784
1843	op->map = NULL;	1785	op->map = NULL;
1844	op->env = where;	1786	op->env = this;
1845	op->above = NULL;	1787	op->above = NULL;
1846	op->below = NULL;	1788	op->below = NULL;
1847	op->x = 0, op->y = 0;	1789	op->x = 0, op->y = 0;
1848		1790
1849	/* reset the light list and los of the players on the map */	1791	/* reset the light list and los of the players on the map */
1850	if ((op->glow_radius != 0) && where->map)	1792	if ((op->glow_radius != 0) && map)
1851	{	1793	{
1852	#ifdef DEBUG_LIGHTS	1794	#ifdef DEBUG_LIGHTS
1853	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1795	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1854	#endif /* DEBUG_LIGHTS */	1796	#endif /* DEBUG_LIGHTS */
1855	if (MAP_DARKNESS (where->map))	1797	if (MAP_DARKNESS (map))
1856	update_all_los (where->map, where->x, where->y);	1798	update_all_los (map, x, y);
1857	}	1799	}
1858		1800
1859	/* Client has no idea of ordering so lets not bother ordering it here.	1801	/* Client has no idea of ordering so lets not bother ordering it here.
1860	* It sure simplifies this function...	1802	* It sure simplifies this function...
1861	*/	1803	*/
1862	if (where->inv == NULL)	1804	if (!inv)
1863	where->inv = op;	1805	inv = op;
1864	else	1806	else
1865	{	1807	{
1866	op->below = where->inv;	1808	op->below = inv;
1867	op->below->above = op;	1809	op->below->above = op;
1868	where->inv = op;	1810	inv = op;
1869	}	1811	}
		1812
1870	return op;	1813	return op;
1871	}	1814	}
1872		1815
1873	/*	1816	/*
1874	* Checks if any objects has a move_type that matches objects	1817	* Checks if any objects has a move_type that matches objects
…		…
1892	*/	1835	*/
1893		1836
1894	int	1837	int
1895	check_move_on (object *op, object *originator)	1838	check_move_on (object *op, object *originator)
1896	{	1839	{
1897	object *	1840	object *tmp;
1898	tmp;	1841	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1842	int x = op->x, y = op->y;
1905		1843
1906	MoveType	1844	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1845
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1846	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1847	return 0;
1913
1914	tag = op->count;
1915		1848
1916	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1849	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1850	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1851	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919		1852
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1913	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1914	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	1915	{
1983	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
1984		1917
1985	if (was_destroyed (op, tag))	1918	if (op->destroyed ())
1986	return 1;	1919	return 1;
1987		1920
1988	/* what the person/creature stepped onto has moved the object	1921	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	1922	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	1923	* have a feeling strange problems would result.
…		…
2002	* a matching archetype at the given map and coordinates.	1935	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2004	*/	1937	*/
2005		1938
2006	object *	1939	object *
2007	present_arch (const archetype *at, mapstruct *m, int x, int y)	1940	present_arch (const archetype *at, maptile *m, int x, int y)
2008	{	1941	{
2009	object *	1942	object *
2010	tmp;	1943	tmp;
2011		1944
2012	if (m == NULL || out_of_map (m, x, y))	1945	if (m == NULL || out_of_map (m, x, y))
…		…
2025	* a matching type variable at the given map and coordinates.	1958	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
2027	*/	1960	*/
2028		1961
2029	object *	1962	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	1963	present (unsigned char type, maptile *m, int x, int y)
2031	{	1964	{
2032	object *	1965	object *
2033	tmp;	1966	tmp;
2034		1967
2035	if (out_of_map (m, x, y))	1968	if (out_of_map (m, x, y))
…		…
2175	* the archetype because that isn't correct if the monster has been	2108	* the archetype because that isn't correct if the monster has been
2176	* customized, changed states, etc.	2109	* customized, changed states, etc.
2177	*/	2110	*/
2178		2111
2179	int	2112	int
2180	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2113	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181	{	2114	{
2182	int	2115	int
2183	i,	2116	i,
2184	index = 0, flag;	2117	index = 0, flag;
2185	static int	2118	static int
…		…
2206	return -1;	2139	return -1;
2207	return altern[RANDOM () % index];	2140	return altern[RANDOM () % index];
2208	}	2141	}
2209		2142
2210	/*	2143	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2144	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2145	* find_free_spot(), but it will search max number of squares.
2213	* But it will return the first available spot, not a random choice.	2146	* But it will return the first available spot, not a random choice.
2214	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2147	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2215	*/	2148	*/
2216		2149
2217	int	2150	int
2218	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2151	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219	{	2152	{
2220	int	2153	int
2221	i;	2154	i;
2222		2155
2223	for (i = 0; i < SIZEOFFREE; i++)	2156	for (i = 0; i < SIZEOFFREE; i++)
…		…
2287	* because we have to know what movement the thing looking to move	2220	* because we have to know what movement the thing looking to move
2288	* there is capable of.	2221	* there is capable of.
2289	*/	2222	*/
2290		2223
2291	int	2224	int
2292	find_dir (mapstruct *m, int x, int y, object *exclude)	2225	find_dir (maptile *m, int x, int y, object *exclude)
2293	{	2226	{
2294	int	2227	int
2295	i,	2228	i,
2296	max = SIZEOFFREE, mflags;	2229	max = SIZEOFFREE, mflags;
2297		2230
2298	sint16 nx, ny;	2231	sint16 nx, ny;
2299	object *	2232	object *
2300	tmp;	2233	tmp;
2301	mapstruct *	2234	maptile *
2302	mp;	2235	mp;
2303		2236
2304	MoveType blocked, move_type;	2237	MoveType blocked, move_type;
2305		2238
2306	if (exclude && exclude->head)	2239	if (exclude && exclude->head)
…		…
2514	* Modified to be map tile aware -.MSW	2447	* Modified to be map tile aware -.MSW
2515	*/	2448	*/
2516		2449
2517		2450
2518	int	2451	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2452	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2453	{
2521	sint16 dx, dy;	2454	sint16 dx, dy;
2522	int	2455	int
2523	mflags;	2456	mflags;
2524		2457
…		…
2573	* create clone from object to another	2506	* create clone from object to another
2574	*/	2507	*/
2575	object *	2508	object *
2576	object_create_clone (object *asrc)	2509	object_create_clone (object *asrc)
2577	{	2510	{
2578	object *
2579	dst = NULL, *tmp, *src, *part, *prev, *item;	2511	object *dst = 0, *tmp, *src, *part, *prev, *item;
2580		2512
2581	if (!asrc)	2513	if (!asrc)
2582	return NULL;	2514	return 0;
		2515
2583	src = asrc;	2516	src = asrc;
2584	if (src->head)	2517	if (src->head)
2585	src = src->head;	2518	src = src->head;
2586		2519
2587	prev = NULL;	2520	prev = 0;
2588	for (part = src; part; part = part->more)	2521	for (part = src; part; part = part->more)
2589	{	2522	{
2590	tmp = get_object ();	2523	tmp = object::create ();
2591	copy_object (part, tmp);	2524	part->copy_to (tmp);
2592	tmp->x -= src->x;	2525	tmp->x -= src->x;
2593	tmp->y -= src->y;	2526	tmp->y -= src->y;
		2527
2594	if (!part->head)	2528	if (!part->head)
2595	{	2529	{
2596	dst = tmp;	2530	dst = tmp;
2597	tmp->head = NULL;	2531	tmp->head = 0;
2598	}	2532	}
2599	else	2533	else
2600	{	2534	{
2601	tmp->head = dst;	2535	tmp->head = dst;
2602	}	2536	}
		2537
2603	tmp->more = NULL;	2538	tmp->more = 0;
		2539
2604	if (prev)	2540	if (prev)
2605	prev->more = tmp;	2541	prev->more = tmp;
		2542
2606	prev = tmp;	2543	prev = tmp;
2607	}	2544	}
2608		2545
2609	/*** copy inventory ***/
2610	for (item = src->inv; item; item = item->below)	2546	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2547	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2548
2615	return dst;	2549	return dst;
2616	}	2550	}
2617		2551
2618	/* return true if the object was destroyed, 0 otherwise */
2619	int
2620	was_destroyed (const object *op, tag_t old_tag)
2621	{
2622	/* checking for FLAG_FREED isn't necessary, but makes this function more
2623	* robust */
2624	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625	}
2626
2627	/* GROS - Creates an object using a string representing its content. */	2552	/* GROS - Creates an object using a string representing its content. */
2628
2629	/* Basically, we save the content of the string to a temp file, then call */	2553	/* Basically, we save the content of the string to a temp file, then call */
2630
2631	/* load_object on it. I admit it is a highly inefficient way to make things, */	2554	/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633	/* but it was simple to make and allows reusing the load_object function. */	2555	/* but it was simple to make and allows reusing the load_object function. */
2634
2635	/* Remember not to use load_object_str in a time-critical situation. */	2556	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2557	/* Also remember that multiparts objects are not supported for now. */
2638		2558
2639	object *	2559	object *
2640	load_object_str (const char *obstr)	2560	load_object_str (const char *obstr)
2641	{	2561	{
2642	object *	2562	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2563	char filename[MAX_BUF];
2646		2564
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2566
2649	FILE *
2650	tempfile = fopen (filename, "w");	2567	FILE *tempfile = fopen (filename, "w");
2651		2568
2652	if (tempfile == NULL)	2569	if (tempfile == NULL)
2653	{	2570	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2572	return NULL;
2656	};	2573	}
		2574
2657	fprintf (tempfile, obstr);	2575	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2576	fclose (tempfile);
2659		2577
2660	op = get_object ();	2578	op = object::create ();
2661		2579
2662	object_thawer thawer (filename);	2580	object_thawer thawer (filename);
2663		2581
2664	if (thawer)	2582	if (thawer)
2665	load_object (thawer, op, 0);	2583	load_object (thawer, op, 0);
…		…
2675	* returns NULL if no match.	2593	* returns NULL if no match.
2676	*/	2594	*/
2677	object *	2595	object *
2678	find_obj_by_type_subtype (const object *who, int type, int subtype)	2596	find_obj_by_type_subtype (const object *who, int type, int subtype)
2679	{	2597	{
2680	object *	2598	object *tmp;
2681	tmp;
2682		2599
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2600	for (tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2601	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2602	return tmp;
2686		2603
…		…
2694	* do the desired thing.	2611	* do the desired thing.
2695	*/	2612	*/
2696	key_value *	2613	key_value *
2697	get_ob_key_link (const object *ob, const char *key)	2614	get_ob_key_link (const object *ob, const char *key)
2698	{	2615	{
2699	key_value *	2616	key_value *link;
2700	link;
2701		2617
2702	for (link = ob->key_values; link != NULL; link = link->next)	2618	for (link = ob->key_values; link != NULL; link = link->next)
2703	{
2704	if (link->key == key)	2619	if (link->key == key)
2705	{
2706	return link;	2620	return link;
2707	}
2708	}
2709		2621
2710	return NULL;	2622	return NULL;
2711	}	2623	}
2712		2624
2713	/*	2625	/*
…		…
2718	* The returned string is shared.	2630	* The returned string is shared.
2719	*/	2631	*/
2720	const char *	2632	const char *
2721	get_ob_key_value (const object *op, const char *const key)	2633	get_ob_key_value (const object *op, const char *const key)
2722	{	2634	{
2723	key_value *	2635	key_value *link;
2724	link;	2636	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2637
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2638	if (!canonical_key)
2731	{	2639	{
2732	/* 1. There being a field named key on any object	2640	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2641	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2642	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, *this* object doesn't have this field.	2643	* 3. Therefore, *this* object doesn't have this field.
2736	*/	2644	*/
2737	return NULL;	2645	return 0;
2738	}	2646	}
2739		2647
2740	/* This is copied from get_ob_key_link() above -	2648	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2649	* only 4 lines, and saves the function call overhead.
2742	*/	2650	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2651	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2652	if (link->key == canonical_key)
2746	{
2747	return link->value;	2653	return link->value;
2748	}	2654
2749	}
2750	return NULL;	2655	return 0;
2751	}	2656	}
2752		2657
2753		2658
2754	/*	2659	/*
2755	* Updates the canonical_key in op to value.	2660	* Updates the canonical_key in op to value.
…		…
2840	{	2745	{
2841	shstr key_ (key);	2746	shstr key_ (key);
2842		2747
2843	return set_ob_key_value_s (op, key_, value, add_key);	2748	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2749	}
		2750
		2751	object::depth_iterator::depth_iterator (object *container)
		2752	: iterator_base (container)
		2753	{
		2754	while (item->inv)
		2755	item = item->inv;
		2756	}
		2757
		2758	void
		2759	object::depth_iterator::next ()
		2760	{
		2761	if (item->below)
		2762	{
		2763	item = item->below;
		2764
		2765	while (item->inv)
		2766	item = item->inv;
		2767	}
		2768	else
		2769	item = item->env;
		2770	}
		2771
		2772	// return a suitable string describing an objetc in enough detail to find it
		2773	const char *
		2774	object::debug_desc (char *info) const
		2775	{
		2776	char info2[256 * 3];
		2777	char *p = info;
		2778
		2779	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2780	count,
		2781	&name,
		2782	title ? " " : "",
		2783	title ? (const char *)title : "");
		2784
		2785	if (env)
		2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2787
		2788	if (map)
		2789	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2790
		2791	return info;
		2792	}
		2793
		2794	const char *
		2795	object::debug_desc () const
		2796	{
		2797	static char info[256 * 3];
		2798	return debug_desc (info);
		2799	}
		2800

Diff Legend

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