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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.57 by root, Sun Dec 3 02:46:33 2006 UTC

…		…
16		16
17	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
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	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>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <skills.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
53	};	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: %lld\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	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	135	{
…		…
207	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
208	return 0;	285	return 0;
209		286
210	switch (ob1->type)	287	switch (ob1->type)
211	{	288	{
212	case SCROLL:	289	case SCROLL:
213	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
214	return 0;	291	return 0;
215	break;	292	break;
216	}	293	}
217		294
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	296	{
220	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	375	* Some error messages.
296	* 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.
297	*/	377	*/
298		378
299	void	379	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	380	dump_object (object *op)
355	{	381	{
356	if (op == NULL)	382	if (!op)
357	{	383	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		384
365	void	385	object_freezer freezer;
366	dump_all_objects (void)	386	save_object (freezer, op, 3);
367	{	387	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	388	}
376		389
377	/*	390	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
399	*/	412	*/
400		413
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	418	if (op->count == i)
408	break;	419	return op;
		420
409	return op;	421	return 0;
410	}	422	}
411		423
412	/*	424	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
416	*/	428	*/
417		429
418	object *	430	object *
419	find_object_name (const char *str)	431	find_object_name (const char *str)
420	{	432	{
421	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
422	object *op;	434	object *op;
423		435
424	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	437	if (op->name == str_)
426	break;	438	break;
427		439
428	return op;	440	return op;
429	}	441	}
430		442
…		…
433	{	445	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	447	}
436		448
437	/*	449	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* 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
477	* skill and experience objects.	451	* skill and experience objects.
478	*/	452	*/
479	void	453	void
480	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
481	{	455	{
482	if (owner == NULL || op == NULL)	456	if (!owner)
483	return;	457	return;
484		458
485	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	460	/* Add a check for ownercounts in here, as I got into an endless loop
487	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	462	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	463	* freed and then another object replacing it. Since the ownercounts
490	* didn't match, this check is valid and I believe that cause is valid.	464	* didn't match, this check is valid and I believe that cause is valid.
491	*/	465	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
493	owner = owner->owner;	467	owner = owner->owner;
494		468
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	469	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	470	}
535		471
536	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	473	* refcounts and freeing the links.
538	*/	474	*/
…		…
554	{	490	{
555	attachable_base::clear ();	491	attachable_base::clear ();
556		492
557	free_key_values (this);	493	free_key_values (this);
558		494
559	clear_owner (this);	495	owner = 0;
560
561	name = 0;	496	name = 0;
562	name_pl = 0;	497	name_pl = 0;
563	title = 0;	498	title = 0;
564	race = 0;	499	race = 0;
565	slaying = 0;	500	slaying = 0;
566	skill = 0;	501	skill = 0;
567	msg = 0;	502	msg = 0;
568	lore = 0;	503	lore = 0;
569	custom_name = 0;	504	custom_name = 0;
570	materialname = 0;	505	materialname = 0;
		506	contr = 0;
		507	below = 0;
		508	above = 0;
		509	inv = 0;
		510	container = 0;
		511	env = 0;
		512	more = 0;
		513	head = 0;
		514	map = 0;
		515	active_next = 0;
		516	active_prev = 0;
571		517
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		519
574	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
		521
		522	/* What is not cleared is next, prev, and count */
		523
		524	expmul = 1.0;
		525	face = blank_face;
		526
		527	if (settings.casting_time)
		528	casting_time = -1;
575	}	529	}
576		530
577	void object::clone (object *destination)	531	void object::clone (object *destination)
578	{	532	{
579	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
580	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
581		535
582	if (self || cb)	536	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */
609
610	op->expmul = 1.0;
611	op->face = blank_face;
612	op->attacked_by_count = -1;
613
614	if (settings.casting_time)
615	op->casting_time = -1;
616	}	538	}
617		539
618	/*	540	/*
619	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
620	* and then copies the contends of the first object into the second	542	* and then copies the contends of the first object into the second
621	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
623	* if the first object is freed, the pointers in the new object	545	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	546	* will point at garbage.
625	*/	547	*/
626
627	void	548	void
628	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
629	{	550	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
691	/*	612	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	613	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	614	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	615	* This function needs to be called whenever the speed of an object changes.
695	*/	616	*/
696
697	void	617	void
698	update_ob_speed (object *op)	618	update_ob_speed (object *op)
699	{	619	{
700	extern int arch_init;	620	extern int arch_init;
701		621
…		…
710	abort ();	630	abort ();
711	#else	631	#else
712	op->speed = 0;	632	op->speed = 0;
713	#endif	633	#endif
714	}	634	}
		635
715	if (arch_init)	636	if (arch_init)
716	{
717	return;	637	return;
718	}	638
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	640	{
721	/* If already on active list, don't do anything */	641	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	642	if (op->active_next || op->active_prev || op == active_objects)
723	return;	643	return;
724		644
725	/* process_events() expects us to insert the object at the beginning	645	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	646	* of the list. */
727	op->active_next = active_objects;	647	op->active_next = active_objects;
		648
728	if (op->active_next != NULL)	649	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	650	op->active_next->active_prev = op;
		651
730	active_objects = op;	652	active_objects = op;
731	}	653	}
732	else	654	else
733	{	655	{
734	/* If not on the active list, nothing needs to be done */	656	/* If not on the active list, nothing needs to be done */
…		…
736	return;	658	return;
737		659
738	if (op->active_prev == NULL)	660	if (op->active_prev == NULL)
739	{	661	{
740	active_objects = op->active_next;	662	active_objects = op->active_next;
		663
741	if (op->active_next != NULL)	664	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	665	op->active_next->active_prev = NULL;
743	}	666	}
744	else	667	else
745	{	668	{
746	op->active_prev->active_next = op->active_next;	669	op->active_prev->active_next = op->active_next;
		670
747	if (op->active_next)	671	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	672	op->active_next->active_prev = op->active_prev;
749	}	673	}
		674
750	op->active_next = NULL;	675	op->active_next = NULL;
751	op->active_prev = NULL;	676	op->active_prev = NULL;
752	}	677	}
753	}	678	}
754		679
…		…
886	* that is being removed.	811	* that is being removed.
887	*/	812	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	814	update_now = 1;
890	else if (action == UP_OBJ_FACE)	815	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	816	/* Nothing to do for that case */ ;
892	else	817	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	818	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		819
895	if (update_now)	820	if (update_now)
896	{	821	{
…		…
900		825
901	if (op->more != NULL)	826	if (op->more != NULL)
902	update_object (op->more, action);	827	update_object (op->more, action);
903	}	828	}
904		829
905	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
906	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
907		833
908	void object::free_mortals ()	834	void object::free_mortals ()
909	{	835	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
912	{	840	{
913	freed.push_back (*i);	841	delete *i;
914	mortals.erase (i);	842	mortals.erase (i);
915	}	843	}
916	else	844
917	++i;	845	static int lastmortals = 0;//D
		846
		847	if (mortals.size() != lastmortals && lastmortals > 100)//D
		848	{
		849	lastmortals = mortals.size ();//D
		850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		851	}
918	}	852	}
919		853
920	object::object ()	854	object::object ()
921	{	855	{
922	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
923		857
924	expmul = 1.0;	858	expmul = 1.0;
925	face = blank_face;	859	face = blank_face;
926	attacked_by_count = -1;
927	}	860	}
928		861
929	object::~object ()	862	object::~object ()
930	{	863	{
931	free_key_values (this);	864	free_key_values (this);
932	}	865	}
933		866
934	void object::link ()	867	void object::link ()
935	{	868	{
936	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
937		871
938	prev = 0;	872	prev = 0;
939	next = objects;	873	next = object::first;
940		874
941	if (objects)	875	if (object::first)
942	objects->prev = this;	876	object::first->prev = this;
943		877
944	objects = this;	878	object::first = this;
945	}	879	}
946		880
947	void object::unlink ()	881	void object::unlink ()
948	{	882	{
949	count = 0;	883	if (this == object::first)
		884	object::first = next;
950		885
951	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
955	prev = 0;	890	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	891	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	892	}
967		893
968	object *object::create ()	894	object *object::create ()
969	{	895	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	896	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	897	op->link ();
983	return op;	898	return op;
984	}	899	}
985		900
986	/*	901	/*
…		…
988	* it from the list of used objects, and puts it on the list of	903	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	906	* this function to succeed.
992	*	907	*
993	* If free_inventory is set, free inventory as well. Else drop items in	908	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	909	* inventory to the ground.
995	*/	910	*/
996	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
997	{	912	{
		913	if (QUERY_FLAG (this, FLAG_FREED))
		914	return;
		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	920	remove_ob (this);
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		921
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008	{
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010	remove_friendly_object (this);
1011	}
1012
1013	if (QUERY_FLAG (this, FLAG_FREED))	922	SET_FLAG (this, FLAG_FREED);
1014	{
1015	dump_object (this);
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017	return;
1018	}
1019		923
1020	if (more)	924	if (more)
1021	{	925	{
1022	more->free (free_inventory);	926	more->destroy (destroy_inventory);
1023	more = 0;	927	more = 0;
1024	}	928	}
1025		929
1026	if (inv)	930	if (inv)
1027	{	931	{
1028	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
1030	* drop on that space.	934	* drop on that space.
1031	*/	935	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	936	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	937	{
1034	object *	938	object *op = inv;
1035	op = inv;
1036		939
1037	while (op)	940	while (op)
1038	{	941	{
1039	object *
1040	tmp = op->below;	942	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	943	op->destroy (destroy_inventory);
1044	op = tmp;	944	op = tmp;
1045	}	945	}
1046	}	946	}
1047	else	947	else
1048	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
1049	object *	949	object *op = inv;
1050	op = inv;
1051		950
1052	while (op)	951	while (op)
1053	{	952	{
1054	object *
1055	tmp = op->below;	953	object *tmp = op->below;
1056		954
1057	remove_ob (op);	955	remove_ob (op);
1058		956
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	958	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1069	op = tmp;	967	op = tmp;
1070	}	968	}
1071	}	969	}
1072	}	970	}
1073		971
1074	clear_owner (this);	972	// hack to ensure that freed objects still have a valid map
		973	{
		974	static maptile *freed_map; // freed objects are moved here to avoid crashes
		975
		976	if (!freed_map)
		977	{
		978	freed_map = new maptile;
		979
		980	freed_map->name = "/internal/freed_objects_map";
		981	freed_map->width = 3;
		982	freed_map->height = 3;
		983
		984	freed_map->allocate ();
		985	}
		986
		987	map = freed_map;
		988	x = 1;
		989	y = 1;
		990	}
		991
		992	// clear those pointers that likely might have circular references to us
		993	owner = 0;
		994	enemy = 0;
		995	attacked_by = 0;
		996
		997	// only relevant for players(?), but make sure of it anyways
		998	contr = 0;
1075		999
1076	/* Remove object from the active list */	1000	/* Remove object from the active list */
1077	speed = 0;	1001	speed = 0;
1078	update_ob_speed (this);	1002	update_ob_speed (this);
1079		1003
1080	unlink ();	1004	unlink ();
1081		1005
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1006	mortals.push_back (this);
1085	}	1007	}
1086		1008
1087	/*	1009	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1010	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1093	sub_weight (object *op, signed long weight)	1015	sub_weight (object *op, signed long weight)
1094	{	1016	{
1095	while (op != NULL)	1017	while (op != NULL)
1096	{	1018	{
1097	if (op->type == CONTAINER)	1019	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1021
1101	op->carrying -= weight;	1022	op->carrying -= weight;
1102	op = op->env;	1023	op = op->env;
1103	}	1024	}
1104	}	1025	}
1105		1026
…		…
1113	*/	1034	*/
1114		1035
1115	void	1036	void
1116	remove_ob (object *op)	1037	remove_ob (object *op)
1117	{	1038	{
1118	object *tmp, *last = NULL;	1039	object *tmp, *last = 0;
1119	object *otmp;	1040	object *otmp;
1120		1041
1121	tag_t tag;
1122	int check_walk_off;	1042	int check_walk_off;
1123	mapstruct *m;	1043	maptile *m;
1124		1044
1125	sint16 x, y;	1045	sint16 x, y;
1126		1046
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1047	if (QUERY_FLAG (op, FLAG_REMOVED))
1128	{	1048	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1049
1132	/* Changed it to always dump core in this case. As has been learned	1050	SET_FLAG (op, FLAG_REMOVED);
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144		1051
1145	if (op->more != NULL)	1052	if (op->more != NULL)
1146	remove_ob (op->more);	1053	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);
1149		1054
1150	/*	1055	/*
1151	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1152	* inventory.	1057	* inventory.
1153	*/	1058	*/
…		…
1179	*/	1084	*/
1180	op->x = op->env->x, op->y = op->env->y;	1085	op->x = op->env->x, op->y = op->env->y;
1181	op->map = op->env->map;	1086	op->map = op->env->map;
1182	op->above = NULL, op->below = NULL;	1087	op->above = NULL, op->below = NULL;
1183	op->env = NULL;	1088	op->env = NULL;
1184	return;	1089	}
		1090	else if (op->map)
1185	}	1091	{
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;	1092	x = op->x;
1192	y = op->y;	1093	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);	1094	m = get_map_from_coord (op->map, &x, &y);
1194		1095
1195	if (!m)	1096	if (!m)
1196	{	1097	{
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1098	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1198	op->map->path, op->x, op->y);	1099	op->map->path, op->x, op->y);
1199	/* in old days, we used to set x and y to 0 and continue.	1100	/* in old days, we used to set x and y to 0 and continue.
1200	* it seems if we get into this case, something is probablye	1101	* it seems if we get into this case, something is probablye
1201	* screwed up and should be fixed.	1102	* screwed up and should be fixed.
		1103	*/
		1104	abort ();
		1105	}
		1106
		1107	if (op->map != m)
		1108	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1109	op->map->path, m->path, op->x, op->y, x, y);
		1110
		1111	/* Re did the following section of code - it looks like it had
		1112	* lots of logic for things we no longer care about
1202	*/	1113	*/
1203	abort ();
1204	}
1205	if (op->map != m)
1206	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208	op->map->path, m->path, op->x, op->y, x, y);
1209	}
1210		1114
1211	/* Re did the following section of code - it looks like it had
1212	* lots of logic for things we no longer care about
1213	*/
1214
1215	/* link the object above us */	1115	/* link the object above us */
1216	if (op->above)	1116	if (op->above)
1217	op->above->below = op->below;	1117	op->above->below = op->below;
1218	else	1118	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1119	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1220		1120
1221	/* Relink the object below us, if there is one */	1121	/* Relink the object below us, if there is one */
1222	if (op->below)	1122	if (op->below)
1223	op->below->above = op->above;	1123	op->below->above = op->above;
1224	else	1124	else
1225	{	1125	{
1226	/* Nothing below, which means we need to relink map object for this space	1126	/* Nothing below, which means we need to relink map object for this space
1227	* use translated coordinates in case some oddness with map tiling is	1127	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1128	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{
1232	dump_object (op);
1233	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",
1234	errmsg);
1235	dump_object (GET_MAP_OB (m, x, y));
1236	LOG (llevError, "%s\n", errmsg);
1237	}
1238
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240	}
1241
1242	op->above = NULL;
1243	op->below = NULL;
1244
1245	if (op->map->in_memory == MAP_SAVING)
1246	return;
1247
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{
1259	/* If a container that the player is currently using somehow gets
1260	* removed (most likely destroyed), update the player view
1261	* appropriately.
1262	*/	1129	*/
1263	if (tmp->container == op)	1130	if (GET_MAP_OB (m, x, y) != op)
1264	{	1131	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1132	char *dump = dump_object (op);
1266	tmp->container = NULL;	1133	LOG (llevError,
		1134	"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);
		1135	free (dump);
		1136	dump = dump_object (GET_MAP_OB (m, x, y));
		1137	LOG (llevError, "%s\n", dump);
		1138	free (dump);
1267	}	1139	}
1268		1140
1269	tmp->contr->socket.update_look = 1;	1141	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1270	}
1271	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273	{	1142	}
1274	move_apply (tmp, op, NULL);
1275		1143
1276	if (was_destroyed (op, tag))	1144	op->above = 0;
		1145	op->below = 0;
		1146
		1147	if (op->map->in_memory == MAP_SAVING)
		1148	return;
		1149
		1150	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1151
		1152	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1153	{
		1154	/* No point updating the players look faces if he is the object
		1155	* being removed.
		1156	*/
		1157
		1158	if (tmp->type == PLAYER && tmp != op)
1277	{	1159	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1160	/* If a container that the player is currently using somehow gets
		1161	* removed (most likely destroyed), update the player view
		1162	* appropriately.
		1163	*/
		1164	if (tmp->container == op)
		1165	{
		1166	CLEAR_FLAG (op, FLAG_APPLIED);
		1167	tmp->container = NULL;
		1168	}
		1169
		1170	tmp->contr->socket.update_look = 1;
1279	}	1171	}
		1172
		1173	/* See if player moving off should effect something */
		1174	if (check_walk_off
		1175	&& ((op->move_type & tmp->move_off)
		1176	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1177	{
		1178	move_apply (tmp, op, NULL);
		1179
		1180	if (op->destroyed ())
		1181	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1182	}
1281		1183
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1184	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1185
1284	if (tmp->above == tmp)	1186	if (tmp->above == tmp)
1285	tmp->above = NULL;	1187	tmp->above = NULL;
1286		1188
1287	last = tmp;	1189	last = tmp;
1288	}	1190	}
1289		1191
1290	/* last == NULL of there are no objects on this space */	1192	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1193	if (last == NULL)
1292	{	1194	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1195	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1196	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't	1197	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1198	* be correct anyways.
1297	*/	1199	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1200	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1201	update_position (op->map, op->x, op->y);
1300	}	1202	}
1301	else	1203	else
1302	update_object (last, UP_OBJ_REMOVE);	1204	update_object (last, UP_OBJ_REMOVE);
1303		1205
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1206	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305	update_all_los (op->map, op->x, op->y);	1207	update_all_los (op->map, op->x, op->y);
		1208	}
1306	}	1209	}
1307		1210
1308	/*	1211	/*
1309	* merge_ob(op,top):	1212	* merge_ob(op,top):
1310	*	1213	*
1311	* This function goes through all objects below and including top, and	1214	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1215	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1216	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1217	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1218	*/
1316
1317	object *	1219	object *
1318	merge_ob (object *op, object *top)	1220	merge_ob (object *op, object *top)
1319	{	1221	{
1320	if (!op->nrof)	1222	if (!op->nrof)
1321	return 0;	1223	return 0;
		1224
1322	if (top == NULL)	1225	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1226	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1227
1324	for (; top != NULL; top = top->below)	1228	for (; top != NULL; top = top->below)
1325	{	1229	{
1326	if (top == op)	1230	if (top == op)
1327	continue;	1231	continue;
1328	if (CAN_MERGE (op, top))	1232	if (CAN_MERGE (op, top))
…		…
1334	remove_ob (op);	1238	remove_ob (op);
1335	free_object (op);	1239	free_object (op);
1336	return top;	1240	return top;
1337	}	1241	}
1338	}	1242	}
		1243
1339	return NULL;	1244	return 0;
1340	}	1245	}
1341		1246
1342	/*	1247	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1248	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1249	* job preparing multi-part monsters
1345	*/	1250	*/
1346	object *	1251	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1252	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1253	{
1349	object *	1254	object *tmp;
1350	tmp;
1351		1255
1352	if (op->head)	1256	if (op->head)
1353	op = op->head;	1257	op = op->head;
		1258
1354	for (tmp = op; tmp; tmp = tmp->more)	1259	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1260	{
1356	tmp->x = x + tmp->arch->clone.x;	1261	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1262	tmp->y = y + tmp->arch->clone.y;
1358	}	1263	}
		1264
1359	return insert_ob_in_map (op, m, originator, flag);	1265	return insert_ob_in_map (op, m, originator, flag);
1360	}	1266	}
1361		1267
1362	/*	1268	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1269	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1285	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1286	* just 'op' otherwise
1381	*/	1287	*/
1382		1288
1383	object *	1289	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1290	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1291	{
1386	object *tmp, *top, *floor = NULL;	1292	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1293	sint16 x, y;
1388		1294
1389	if (QUERY_FLAG (op, FLAG_FREED))	1295	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1298	return NULL;
1393	}	1299	}
1394		1300
1395	if (m == NULL)	1301	if (m == NULL)
1396	{	1302	{
1397	dump_object (op);	1303	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1305	free (dump);
1399	return op;	1306	return op;
1400	}	1307	}
1401		1308
1402	if (out_of_map (m, op->x, op->y))	1309	if (out_of_map (m, op->x, op->y))
1403	{	1310	{
1404	dump_object (op);	1311	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1312	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1313	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1314	/* Better to catch this here, as otherwise the next use of this object
1408	* is likely to cause a crash. Better to find out where it is getting	1315	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1316	* improperly inserted.
1410	*/	1317	*/
1411	abort ();	1318	abort ();
1412	#endif	1319	#endif
		1320	free (dump);
1413	return op;	1321	return op;
1414	}	1322	}
1415		1323
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1324	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1325	{
1418	dump_object (op);	1326	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1327	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1328	free (dump);
1420	return op;	1329	return op;
1421	}	1330	}
1422		1331
1423	if (op->more != NULL)	1332	if (op->more != NULL)
1424	{	1333	{
…		…
1654	* op is the object to insert it under: supplies x and the map.	1563	* op is the object to insert it under: supplies x and the map.
1655	*/	1564	*/
1656	void	1565	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1566	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1567	{
1659	object *tmp;	1568	object *
		1569	tmp;
1660	object *tmp1;	1570	object *
		1571	tmp1;
1661		1572
1662	/* first search for itself and remove any old instances */	1573	/* first search for itself and remove any old instances */
1663		1574
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1575	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{	1576	{
…		…
1668	remove_ob (tmp);	1579	remove_ob (tmp);
1669	free_object (tmp);	1580	free_object (tmp);
1670	}	1581	}
1671	}	1582	}
1672		1583
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1584	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1585
1675	tmp1->x = op->x;	1586	tmp1->x = op->x;
1676	tmp1->y = op->y;	1587	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1588	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1589	}
…		…
1696	if (orig_ob->nrof < nr)	1607	if (orig_ob->nrof < nr)
1697	{	1608	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1609	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1610	return NULL;
1700	}	1611	}
		1612
1701	newob = object_create_clone (orig_ob);	1613	newob = object_create_clone (orig_ob);
		1614
1702	if ((orig_ob->nrof -= nr) < 1)	1615	if ((orig_ob->nrof -= nr) < 1)
1703	{	1616	{
1704	if (!is_removed)	1617	if (!is_removed)
1705	remove_ob (orig_ob);	1618	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);	1619	free_object2 (orig_ob, 1);
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1627	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1628	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1629	return NULL;
1717	}	1630	}
1718	}	1631	}
		1632
1719	newob->nrof = nr;	1633	newob->nrof = nr;
1720		1634
1721	return newob;	1635	return newob;
1722	}	1636	}
1723		1637
…		…
1730	*/	1644	*/
1731		1645
1732	object *	1646	object *
1733	decrease_ob_nr (object *op, uint32 i)	1647	decrease_ob_nr (object *op, uint32 i)
1734	{	1648	{
1735	object *	1649	object *tmp;
1736	tmp;
1737	player *	1650	player *pl;
1738	pl;
1739		1651
1740	if (i == 0) /* objects with op->nrof require this check */	1652	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1653	return op;
1742		1654
1743	if (i > op->nrof)	1655	if (i > op->nrof)
1744	i = op->nrof;	1656	i = op->nrof;
1745		1657
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1658	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1659	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1660	else if (op->env != NULL)
1751	{	1661	{
1752	/* is this object in the players inventory, or sub container	1662	/* is this object in the players inventory, or sub container
1753	* therein?	1663	* therein?
1754	*/	1664	*/
…		…
1789	}	1699	}
1790	}	1700	}
1791	}	1701	}
1792	else	1702	else
1793	{	1703	{
1794	object *
1795	above = op->above;	1704	object *above = op->above;
1796		1705
1797	if (i < op->nrof)	1706	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1707	op->nrof -= i;
1800	}
1801	else	1708	else
1802	{	1709	{
1803	remove_ob (op);	1710	remove_ob (op);
1804	op->nrof = 0;	1711	op->nrof = 0;
1805	}	1712	}
		1713
1806	/* Since we just removed op, op->above is null */	1714	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1715	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1716	if (tmp->type == PLAYER)
1809	{	1717	{
1810	if (op->nrof)	1718	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1721	esrv_del_item (tmp->contr, op->count);
1814	}	1722	}
1815	}	1723	}
1816		1724
1817	if (op->nrof)	1725	if (op->nrof)
1818	{
1819	return op;	1726	return op;
1820	}
1821	else	1727	else
1822	{	1728	{
1823	free_object (op);	1729	free_object (op);
1824	return NULL;	1730	return NULL;
1825	}	1731	}
…		…
1834	add_weight (object *op, signed long weight)	1740	add_weight (object *op, signed long weight)
1835	{	1741	{
1836	while (op != NULL)	1742	while (op != NULL)
1837	{	1743	{
1838	if (op->type == CONTAINER)	1744	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1745	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1746
1842	op->carrying += weight;	1747	op->carrying += weight;
1843	op = op->env;	1748	op = op->env;
1844	}	1749	}
1845	}	1750	}
1846		1751
…		…
1865	tmp, *	1770	tmp, *
1866	otmp;	1771	otmp;
1867		1772
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1773	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1774	{
1870	dump_object (op);	1775	char *dump = dump_object (op);
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1777	free (dump);
1872	return op;	1778	return op;
1873	}	1779	}
		1780
1874	if (where == NULL)	1781	if (where == NULL)
1875	{	1782	{
1876	dump_object (op);	1783	char *dump = dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1784	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1785	free (dump);
1878	return op;	1786	return op;
1879	}	1787	}
		1788
1880	if (where->head)	1789	if (where->head)
1881	{	1790	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1791	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;	1792	where = where->head;
1884	}	1793	}
		1794
1885	if (op->more)	1795	if (op->more)
1886	{	1796	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1797	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1798	return op;
1889	}	1799	}
		1800
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1801	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1802	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1803	if (op->nrof)
1893	{	1804	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1805	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1980		1891
1981	int	1892	int
1982	check_move_on (object *op, object *originator)	1893	check_move_on (object *op, object *originator)
1983	{	1894	{
1984	object *tmp;	1895	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1896	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1897	int x = op->x, y = op->y;
1988		1898
1989	MoveType move_on, move_slow, move_block;	1899	MoveType move_on, move_slow, move_block;
1990		1900
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1901	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1902	return 0;
1993
1994	tag = op->count;
1995		1903
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1904	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1905	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1906	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1907
…		…
2042	{	1950	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1951	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1952	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1953	{
2046		1954
		1955	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1956	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1957
2049	if (op->type == PLAYER)	1958	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1959	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)))	1960	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1961	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1968	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1969	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1970	{
2062	move_apply (tmp, op, originator);	1971	move_apply (tmp, op, originator);
2063		1972
2064	if (was_destroyed (op, tag))	1973	if (op->destroyed ())
2065	return 1;	1974	return 1;
2066		1975
2067	/* what the person/creature stepped onto has moved the object	1976	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1977	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1978	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1990	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1991	* The first matching object is returned, or NULL if none.
2083	*/	1992	*/
2084		1993
2085	object *	1994	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1995	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1996	{
2088	object *	1997	object *
2089	tmp;	1998	tmp;
2090		1999
2091	if (m == NULL || out_of_map (m, x, y))	2000	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	2013	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	2014	* The first matching object is returned, or NULL if none.
2106	*/	2015	*/
2107		2016
2108	object *	2017	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	2018	present (unsigned char type, maptile *m, int x, int y)
2110	{	2019	{
2111	object *	2020	object *
2112	tmp;	2021	tmp;
2113		2022
2114	if (out_of_map (m, x, y))	2023	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2163	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2164	* customized, changed states, etc.
2256	*/	2165	*/
2257		2166
2258	int	2167	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2168	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2169	{
2261	int	2170	int
2262	i,	2171	i,
2263	index = 0, flag;	2172	index = 0, flag;
2264	static int	2173	static int
…		…
2285	return -1;	2194	return -1;
2286	return altern[RANDOM () % index];	2195	return altern[RANDOM () % index];
2287	}	2196	}
2288		2197
2289	/*	2198	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2199	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2200	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2201	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2202	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2203	*/
2295		2204
2296	int	2205	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2206	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2207	{
2299	int	2208	int
2300	i;	2209	i;
2301		2210
2302	for (i = 0; i < SIZEOFFREE; i++)	2211	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2275	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2276	* there is capable of.
2368	*/	2277	*/
2369		2278
2370	int	2279	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2280	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2281	{
2373	int	2282	int
2374	i,	2283	i,
2375	max = SIZEOFFREE, mflags;	2284	max = SIZEOFFREE, mflags;
2376	sint16	2285
2377	nx,	2286	sint16 nx, ny;
2378	ny;
2379	object *	2287	object *
2380	tmp;	2288	tmp;
2381	mapstruct *	2289	maptile *
2382	mp;	2290	mp;
2383	MoveType	2291
2384	blocked,	2292	MoveType blocked, move_type;
2385	move_type;
2386		2293
2387	if (exclude && exclude->head)	2294	if (exclude && exclude->head)
2388	{	2295	{
2389	exclude = exclude->head;	2296	exclude = exclude->head;
2390	move_type = exclude->move_type;	2297	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2502	* Modified to be map tile aware -.MSW
2596	*/	2503	*/
2597		2504
2598		2505
2599	int	2506	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2507	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2508	{
2602	sint16	2509	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2510	int
2606	mflags;	2511	mflags;
2607		2512
2608	if (dir < 0)	2513	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2514	return 0; /* exit condition: invalid direction */
…		…
2687	if (prev)	2592	if (prev)
2688	prev->more = tmp;	2593	prev->more = tmp;
2689	prev = tmp;	2594	prev = tmp;
2690	}	2595	}
2691		2596
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2597	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2598	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2599
2698	return dst;	2600	return dst;
2699	}	2601	}
2700		2602
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2603	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* Basically, we save the content of the string to a temp file, then call */	2604	/* Basically, we save the content of the string to a temp file, then call */
2713
2714	/* load_object on it. I admit it is a highly inefficient way to make things, */	2605	/* load_object on it. I admit it is a highly inefficient way to make things, */
2715
2716	/* but it was simple to make and allows reusing the load_object function. */	2606	/* but it was simple to make and allows reusing the load_object function. */
2717
2718	/* Remember not to use load_object_str in a time-critical situation. */	2607	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2608	/* Also remember that multiparts objects are not supported for now. */
2721		2609
2722	object *	2610	object *
2723	load_object_str (const char *obstr)	2611	load_object_str (const char *obstr)
2724	{	2612	{
2725	object *	2613	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2614	char filename[MAX_BUF];
2729		2615
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2616	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2617
2732	FILE *
2733	tempfile = fopen (filename, "w");	2618	FILE *tempfile = fopen (filename, "w");
2734		2619
2735	if (tempfile == NULL)	2620	if (tempfile == NULL)
2736	{	2621	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2622	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2623	return NULL;
2739	};	2624	}
		2625
2740	fprintf (tempfile, obstr);	2626	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2627	fclose (tempfile);
2742		2628
2743	op = get_object ();	2629	op = get_object ();
2744		2630
2745	object_thawer	2631	object_thawer thawer (filename);
2746	thawer (filename);
2747		2632
2748	if (thawer)	2633	if (thawer)
2749	load_object (thawer, op, 0);	2634	load_object (thawer, op, 0);
2750		2635
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2636	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2644	* returns NULL if no match.
2760	*/	2645	*/
2761	object *	2646	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2647	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2648	{
2764	object *	2649	object *tmp;
2765	tmp;
2766		2650
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2651	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2652	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2653	return tmp;
2770		2654
…		…
2778	* do the desired thing.	2662	* do the desired thing.
2779	*/	2663	*/
2780	key_value *	2664	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2665	get_ob_key_link (const object *ob, const char *key)
2782	{	2666	{
2783	key_value *	2667	key_value *link;
2784	link;
2785		2668
2786	for (link = ob->key_values; link != NULL; link = link->next)	2669	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2670	if (link->key == key)
2789	{
2790	return link;	2671	return link;
2791	}
2792	}
2793		2672
2794	return NULL;	2673	return NULL;
2795	}	2674	}
2796		2675
2797	/*	2676	/*
…		…
2802	* The returned string is shared.	2681	* The returned string is shared.
2803	*/	2682	*/
2804	const char *	2683	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2684	get_ob_key_value (const object *op, const char *const key)
2806	{	2685	{
2807	key_value *	2686	key_value *link;
2808	link;	2687	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2688
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2689	if (!canonical_key)
2815	{	2690	{
2816	/* 1. There being a field named key on any object	2691	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2692	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2693	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2694	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2695	*/
2821	return NULL;	2696	return 0;
2822	}	2697	}
2823		2698
2824	/* This is copied from get_ob_key_link() above -	2699	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2700	* only 4 lines, and saves the function call overhead.
2826	*/	2701	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2702	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2703	if (link->key == canonical_key)
2830	{
2831	return link->value;	2704	return link->value;
2832	}	2705
2833	}
2834	return NULL;	2706	return 0;
2835	}	2707	}
2836		2708
2837		2709
2838	/*	2710	/*
2839	* Updates the canonical_key in op to value.	2711	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2747	if (last)
2876	last->next = field->next;	2748	last->next = field->next;
2877	else	2749	else
2878	op->key_values = field->next;	2750	op->key_values = field->next;
2879		2751
2880	delete
2881	field;	2752	delete field;
2882	}	2753	}
2883	}	2754	}
2884	return TRUE;	2755	return TRUE;
2885	}	2756	}
2886	/* IF we get here, key doesn't exist */	2757	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2792	* Returns TRUE on success.
2922	*/	2793	*/
2923	int	2794	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2795	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2796	{
2926	shstr
2927	key_ (key);	2797	shstr key_ (key);
2928		2798
2929	return set_ob_key_value_s (op, key_, value, add_key);	2799	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2800	}
		2801
		2802	object::depth_iterator::depth_iterator (object *container)
		2803	: iterator_base (container)
		2804	{
		2805	while (item->inv)
		2806	item = item->inv;
		2807	}
		2808
		2809	void
		2810	object::depth_iterator::next ()
		2811	{
		2812	if (item->below)
		2813	{
		2814	item = item->below;
		2815
		2816	while (item->inv)
		2817	item = item->inv;
		2818	}
		2819	else
		2820	item = item->env;
		2821	}
		2822
		2823	// return a suitable string describing an objetc in enough detail to find it
		2824	const char *
		2825	object::debug_desc (char *info) const
		2826	{
		2827	char info2[256 * 3];
		2828	char *p = info;
		2829
		2830	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2831	count,
		2832	&name,
		2833	title ? " " : "",
		2834	title ? (const char *)title : "");
		2835
		2836	if (env)
		2837	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2838
		2839	if (map)
		2840	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2841
		2842	return info;
		2843	}
		2844
		2845	const char *
		2846	object::debug_desc () const
		2847	{
		2848	static char info[256 * 3];
		2849	return debug_desc (info);
		2850	}
		2851

Diff Legend

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