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.53 by root, Tue Nov 7 16:30:54 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.
…		…
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	object *op;
405		418
406	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
407	if (op->count == i)	420	if (op->count == i)
408	break;	421	break;
		422
409	return op;	423	return op;
410	}	424	}
411		425
412	/*	426	/*
413	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
…		…
416	*/	430	*/
417		431
418	object *	432	object *
419	find_object_name (const char *str)	433	find_object_name (const char *str)
420	{	434	{
421	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
422	object *op;	436	object *op;
423		437
424	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	439	if (op->name == str_)
426	break;	440	break;
427		441
428	return op;	442	return op;
429	}	443	}
430		444
…		…
433	{	447	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	449	}
436		450
437	/*	451	/*
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	452	* Sets the owner and sets the skill and exp pointers to owner's current
477	* skill and experience objects.	453	* skill and experience objects.
478	*/	454	*/
479	void	455	void
480	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
481	{	457	{
482	if (owner == NULL || op == NULL)	458	if (!owner)
483	return;	459	return;
484		460
485	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* 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	463	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	465	* 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.	466	* didn't match, this check is valid and I believe that cause is valid.
491	*/	467	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
493	owner = owner->owner;	469	owner = owner->owner;
494		470
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;	471	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	}	472	}
535		473
536	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	475	* refcounts and freeing the links.
538	*/	476	*/
…		…
554	{	492	{
555	attachable_base::clear ();	493	attachable_base::clear ();
556		494
557	free_key_values (this);	495	free_key_values (this);
558		496
559	clear_owner (this);	497	owner = 0;
560
561	name = 0;	498	name = 0;
562	name_pl = 0;	499	name_pl = 0;
563	title = 0;	500	title = 0;
564	race = 0;	501	race = 0;
565	slaying = 0;	502	slaying = 0;
566	skill = 0;	503	skill = 0;
567	msg = 0;	504	msg = 0;
568	lore = 0;	505	lore = 0;
569	custom_name = 0;	506	custom_name = 0;
570	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
571		519
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		521
574	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
		523
		524	/* What is not cleared is next, prev, and count */
		525
		526	expmul = 1.0;
		527	face = blank_face;
		528
		529	if (settings.casting_time)
		530	casting_time = -1;
575	}	531	}
576		532
577	void object::clone (object *destination)	533	void object::clone (object *destination)
578	{	534	{
579	*(object_copy *) destination = *this;	535	*(object_copy *)destination = *this;
580	*(object_pod *) destination = *this;	536	*(object_pod *)destination = *this;
581		537
582	if (self || cb)	538	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	539	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	}	540	}
617		541
618	/*	542	/*
619	* copy object first frees everything allocated by the second object,	543	* copy object first frees everything allocated by the second object,
620	* and then copies the contends of the first object into the second	544	* and then copies the contends of the first object into the second
621	* object, allocating what needs to be allocated. Basically, any	545	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	546	* 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	547	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	548	* will point at garbage.
625	*/	549	*/
626
627	void	550	void
628	copy_object (object *op2, object *op)	551	copy_object (object *op2, object *op)
629	{	552	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
691	/*	614	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	615	* 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.	616	* 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.	617	* This function needs to be called whenever the speed of an object changes.
695	*/	618	*/
696
697	void	619	void
698	update_ob_speed (object *op)	620	update_ob_speed (object *op)
699	{	621	{
700	extern int arch_init;	622	extern int arch_init;
701		623
…		…
710	abort ();	632	abort ();
711	#else	633	#else
712	op->speed = 0;	634	op->speed = 0;
713	#endif	635	#endif
714	}	636	}
		637
715	if (arch_init)	638	if (arch_init)
716	{
717	return;	639	return;
718	}	640
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	642	{
721	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
723	return;	645	return;
724		646
725	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	648	* of the list. */
727	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
728	if (op->active_next != NULL)	651	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
730	active_objects = op;	654	active_objects = op;
731	}	655	}
732	else	656	else
733	{	657	{
734	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
736	return;	660	return;
737		661
738	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
739	{	663	{
740	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
741	if (op->active_next != NULL)	666	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
743	}	668	}
744	else	669	else
745	{	670	{
746	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
747	if (op->active_next)	673	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
749	}	675	}
		676
750	op->active_next = NULL;	677	op->active_next = NULL;
751	op->active_prev = NULL;	678	op->active_prev = NULL;
752	}	679	}
753	}	680	}
754		681
…		…
886	* that is being removed.	813	* that is being removed.
887	*/	814	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	816	update_now = 1;
890	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	818	/* Nothing to do for that case */ ;
892	else	819	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		821
895	if (update_now)	822	if (update_now)
896	{	823	{
…		…
900		827
901	if (op->more != NULL)	828	if (op->more != NULL)
902	update_object (op->more, action);	829	update_object (op->more, action);
903	}	830	}
904		831
905	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
906	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
907		835
908	void object::free_mortals ()	836	void object::free_mortals ()
909	{	837	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
912	{	842	{
913	freed.push_back (*i);	843	delete *i;
914	mortals.erase (i);	844	mortals.erase (i);
915	}	845	}
916	else	846
917	++i;	847	static int lastmortals = 0;//D
		848
		849	if (mortals.size() != lastmortals && lastmortals > 100)//D
		850	{
		851	lastmortals = mortals.size ();//D
		852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		853	}
918	}	854	}
919		855
920	object::object ()	856	object::object ()
921	{	857	{
922	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
923		859
924	expmul = 1.0;	860	expmul = 1.0;
925	face = blank_face;	861	face = blank_face;
926	attacked_by_count = -1;
927	}	862	}
928		863
929	object::~object ()	864	object::~object ()
930	{	865	{
931	free_key_values (this);	866	free_key_values (this);
932	}	867	}
933		868
934	void object::link ()	869	void object::link ()
935	{	870	{
936	count = ++ob_count;	871	count = ++ob_count;
		872	uuid = gen_uuid ();
937		873
938	prev = 0;	874	prev = 0;
939	next = objects;	875	next = object::first;
940		876
941	if (objects)	877	if (object::first)
942	objects->prev = this;	878	object::first->prev = this;
943		879
944	objects = this;	880	object::first = this;
945	}	881	}
946		882
947	void object::unlink ()	883	void object::unlink ()
948	{	884	{
949	count = 0;	885	if (this == object::first)
		886	object::first = next;
950		887
951	/* Remove this object from the list of used objects */	888	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	889	if (prev) prev->next = next;
		890	if (next) next->prev = prev;
		891
955	prev = 0;	892	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	893	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	894	}
967		895
968	object *object::create ()	896	object *object::create ()
969	{	897	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	898	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 ();	899	op->link ();
983	return op;	900	return op;
984	}	901	}
985		902
986	/*	903	/*
…		…
988	* it from the list of used objects, and puts it on the list of	905	* 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.	906	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	907	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	908	* this function to succeed.
992	*	909	*
993	* If free_inventory is set, free inventory as well. Else drop items in	910	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	911	* inventory to the ground.
995	*/	912	*/
996	void object::free (bool free_inventory)	913	void object::destroy (bool destroy_inventory)
997	{	914	{
		915	if (QUERY_FLAG (this, FLAG_FREED))
		916	return;
		917
		918	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		919	remove_friendly_object (this);
		920
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	921	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	922	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		923
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))	924	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		925
1020	if (more)	926	if (more)
1021	{	927	{
1022	more->free (free_inventory);	928	more->destroy (destroy_inventory);
1023	more = 0;	929	more = 0;
1024	}	930	}
1025		931
1026	if (inv)	932	if (inv)
1027	{	933	{
1028	/* Only if the space blocks everything do we not process -	934	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	935	* if some form of movement is allowed, let objects
1030	* drop on that space.	936	* drop on that space.
1031	*/	937	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	939	{
1034	object *	940	object *op = inv;
1035	op = inv;
1036		941
1037	while (op)	942	while (op)
1038	{	943	{
1039	object *
1040	tmp = op->below;	944	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	945	op->destroy (destroy_inventory);
1044	op = tmp;	946	op = tmp;
1045	}	947	}
1046	}	948	}
1047	else	949	else
1048	{ /* Put objects in inventory onto this space */	950	{ /* Put objects in inventory onto this space */
1049	object *	951	object *op = inv;
1050	op = inv;
1051		952
1052	while (op)	953	while (op)
1053	{	954	{
1054	object *
1055	tmp = op->below;	955	object *tmp = op->below;
1056		956
1057	remove_ob (op);	957	remove_ob (op);
1058		958
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	959	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))	960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1069	op = tmp;	969	op = tmp;
1070	}	970	}
1071	}	971	}
1072	}	972	}
1073		973
1074	clear_owner (this);	974	// clear those pointers that likely might have circular references to us
		975	owner = 0;
		976	enemy = 0;
		977	attacked_by = 0;
		978
		979	// only relevant for players(?), but make sure of it anyways
		980	contr = 0;
1075		981
1076	/* Remove object from the active list */	982	/* Remove object from the active list */
1077	speed = 0;	983	speed = 0;
1078	update_ob_speed (this);	984	update_ob_speed (this);
1079		985
1080	unlink ();	986	unlink ();
1081		987
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	988	mortals.push_back (this);
1085	}	989	}
1086		990
1087	/*	991	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	992	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1093	sub_weight (object *op, signed long weight)	997	sub_weight (object *op, signed long weight)
1094	{	998	{
1095	while (op != NULL)	999	while (op != NULL)
1096	{	1000	{
1097	if (op->type == CONTAINER)	1001	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1002	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1003
1101	op->carrying -= weight;	1004	op->carrying -= weight;
1102	op = op->env;	1005	op = op->env;
1103	}	1006	}
1104	}	1007	}
1105		1008
…		…
1113	*/	1016	*/
1114		1017
1115	void	1018	void
1116	remove_ob (object *op)	1019	remove_ob (object *op)
1117	{	1020	{
1118	object *tmp, *last = NULL;	1021	object *tmp, *last = 0;
1119	object *otmp;	1022	object *otmp;
1120		1023
1121	tag_t tag;
1122	int check_walk_off;	1024	int check_walk_off;
1123	mapstruct *m;	1025	maptile *m;
1124		1026
1125	sint16 x, y;	1027	sint16 x, y;
1126		1028
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1029	if (QUERY_FLAG (op, FLAG_REMOVED))
1128	{	1030	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1031
1132	/* Changed it to always dump core in this case. As has been learned	1032	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		1033
1145	if (op->more != NULL)	1034	if (op->more != NULL)
1146	remove_ob (op->more);	1035	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);
1149		1036
1150	/*	1037	/*
1151	* In this case, the object to be removed is in someones	1038	* In this case, the object to be removed is in someones
1152	* inventory.	1039	* inventory.
1153	*/	1040	*/
…		…
1179	*/	1066	*/
1180	op->x = op->env->x, op->y = op->env->y;	1067	op->x = op->env->x, op->y = op->env->y;
1181	op->map = op->env->map;	1068	op->map = op->env->map;
1182	op->above = NULL, op->below = NULL;	1069	op->above = NULL, op->below = NULL;
1183	op->env = NULL;	1070	op->env = NULL;
1184	return;	1071	}
		1072	else if (op->map)
1185	}	1073	{
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;	1074	x = op->x;
1192	y = op->y;	1075	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);	1076	m = get_map_from_coord (op->map, &x, &y);
1194		1077
1195	if (!m)	1078	if (!m)
1196	{	1079	{
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	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);	1081	op->map->path, op->x, op->y);
1199	/* in old days, we used to set x and y to 0 and continue.	1082	/* 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	1083	* it seems if we get into this case, something is probablye
1201	* screwed up and should be fixed.	1084	* screwed up and should be fixed.
		1085	*/
		1086	abort ();
		1087	}
		1088
		1089	if (op->map != m)
		1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1091	op->map->path, m->path, op->x, op->y, x, y);
		1092
		1093	/* Re did the following section of code - it looks like it had
		1094	* lots of logic for things we no longer care about
1202	*/	1095	*/
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		1096
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 */	1097	/* link the object above us */
1216	if (op->above)	1098	if (op->above)
1217	op->above->below = op->below;	1099	op->above->below = op->below;
1218	else	1100	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1101	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1220		1102
1221	/* Relink the object below us, if there is one */	1103	/* Relink the object below us, if there is one */
1222	if (op->below)	1104	if (op->below)
1223	op->below->above = op->above;	1105	op->below->above = op->above;
1224	else	1106	else
1225	{	1107	{
1226	/* Nothing below, which means we need to relink map object for this space	1108	/* 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	1109	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1110	* 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	*/	1111	*/
1263	if (tmp->container == op)	1112	if (GET_MAP_OB (m, x, y) != op)
1264	{	1113	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1114	char *dump = dump_object (op);
1266	tmp->container = NULL;	1115	LOG (llevError,
		1116	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1117	free (dump);
		1118	dump = dump_object (GET_MAP_OB (m, x, y));
		1119	LOG (llevError, "%s\n", dump);
		1120	free (dump);
1267	}	1121	}
1268		1122
1269	tmp->contr->socket.update_look = 1;	1123	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	{	1124	}
1274	move_apply (tmp, op, NULL);
1275		1125
1276	if (was_destroyed (op, tag))	1126	op->above = 0;
		1127	op->below = 0;
		1128
		1129	if (op->map->in_memory == MAP_SAVING)
		1130	return;
		1131
		1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1133
		1134	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1135	{
		1136	/* No point updating the players look faces if he is the object
		1137	* being removed.
		1138	*/
		1139
		1140	if (tmp->type == PLAYER && tmp != op)
1277	{	1141	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1142	/* If a container that the player is currently using somehow gets
		1143	* removed (most likely destroyed), update the player view
		1144	* appropriately.
		1145	*/
		1146	if (tmp->container == op)
		1147	{
		1148	CLEAR_FLAG (op, FLAG_APPLIED);
		1149	tmp->container = NULL;
		1150	}
		1151
		1152	tmp->contr->socket.update_look = 1;
1279	}	1153	}
		1154
		1155	/* See if player moving off should effect something */
		1156	if (check_walk_off
		1157	&& ((op->move_type & tmp->move_off)
		1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1159	{
		1160	move_apply (tmp, op, NULL);
		1161
		1162	if (op->destroyed ())
		1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1164	}
1281		1165
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1167
1284	if (tmp->above == tmp)	1168	if (tmp->above == tmp)
1285	tmp->above = NULL;	1169	tmp->above = NULL;
1286		1170
1287	last = tmp;	1171	last = tmp;
1288	}	1172	}
1289		1173
1290	/* last == NULL of there are no objects on this space */	1174	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1175	if (last == NULL)
1292	{	1176	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1178	* 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	1179	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1180	* be correct anyways.
1297	*/	1181	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1183	update_position (op->map, op->x, op->y);
1300	}	1184	}
1301	else	1185	else
1302	update_object (last, UP_OBJ_REMOVE);	1186	update_object (last, UP_OBJ_REMOVE);
1303		1187
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305	update_all_los (op->map, op->x, op->y);	1189	update_all_los (op->map, op->x, op->y);
		1190	}
1306	}	1191	}
1307		1192
1308	/*	1193	/*
1309	* merge_ob(op,top):	1194	* merge_ob(op,top):
1310	*	1195	*
1311	* This function goes through all objects below and including top, and	1196	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1197	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1198	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1199	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1200	*/
1316
1317	object *	1201	object *
1318	merge_ob (object *op, object *top)	1202	merge_ob (object *op, object *top)
1319	{	1203	{
1320	if (!op->nrof)	1204	if (!op->nrof)
1321	return 0;	1205	return 0;
		1206
1322	if (top == NULL)	1207	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1208	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1209
1324	for (; top != NULL; top = top->below)	1210	for (; top != NULL; top = top->below)
1325	{	1211	{
1326	if (top == op)	1212	if (top == op)
1327	continue;	1213	continue;
1328	if (CAN_MERGE (op, top))	1214	if (CAN_MERGE (op, top))
…		…
1334	remove_ob (op);	1220	remove_ob (op);
1335	free_object (op);	1221	free_object (op);
1336	return top;	1222	return top;
1337	}	1223	}
1338	}	1224	}
		1225
1339	return NULL;	1226	return 0;
1340	}	1227	}
1341		1228
1342	/*	1229	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1230	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1231	* job preparing multi-part monsters
1345	*/	1232	*/
1346	object *	1233	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1234	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1235	{
1349	object *	1236	object *tmp;
1350	tmp;
1351		1237
1352	if (op->head)	1238	if (op->head)
1353	op = op->head;	1239	op = op->head;
		1240
1354	for (tmp = op; tmp; tmp = tmp->more)	1241	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1242	{
1356	tmp->x = x + tmp->arch->clone.x;	1243	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1244	tmp->y = y + tmp->arch->clone.y;
1358	}	1245	}
		1246
1359	return insert_ob_in_map (op, m, originator, flag);	1247	return insert_ob_in_map (op, m, originator, flag);
1360	}	1248	}
1361		1249
1362	/*	1250	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1251	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1267	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1268	* just 'op' otherwise
1381	*/	1269	*/
1382		1270
1383	object *	1271	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1273	{
1386	object *tmp, *top, *floor = NULL;	1274	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1275	sint16 x, y;
1388		1276
1389	if (QUERY_FLAG (op, FLAG_FREED))	1277	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1280	return NULL;
1393	}	1281	}
1394		1282
1395	if (m == NULL)	1283	if (m == NULL)
1396	{	1284	{
1397	dump_object (op);	1285	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1286	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1287	free (dump);
1399	return op;	1288	return op;
1400	}	1289	}
1401		1290
1402	if (out_of_map (m, op->x, op->y))	1291	if (out_of_map (m, op->x, op->y))
1403	{	1292	{
1404	dump_object (op);	1293	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1294	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1295	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1296	/* 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	1297	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1298	* improperly inserted.
1410	*/	1299	*/
1411	abort ();	1300	abort ();
1412	#endif	1301	#endif
		1302	free (dump);
1413	return op;	1303	return op;
1414	}	1304	}
1415		1305
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1306	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1307	{
1418	dump_object (op);	1308	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1309	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1310	free (dump);
1420	return op;	1311	return op;
1421	}	1312	}
1422		1313
1423	if (op->more != NULL)	1314	if (op->more != NULL)
1424	{	1315	{
…		…
1654	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1655	*/	1546	*/
1656	void	1547	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1549	{
1659	object *tmp;	1550	object *
		1551	tmp;
1660	object *tmp1;	1552	object *
		1553	tmp1;
1661		1554
1662	/* first search for itself and remove any old instances */	1555	/* first search for itself and remove any old instances */
1663		1556
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1557	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{	1558	{
…		…
1668	remove_ob (tmp);	1561	remove_ob (tmp);
1669	free_object (tmp);	1562	free_object (tmp);
1670	}	1563	}
1671	}	1564	}
1672		1565
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1566	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1567
1675	tmp1->x = op->x;	1568	tmp1->x = op->x;
1676	tmp1->y = op->y;	1569	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1570	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1571	}
…		…
1696	if (orig_ob->nrof < nr)	1589	if (orig_ob->nrof < nr)
1697	{	1590	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1591	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1592	return NULL;
1700	}	1593	}
		1594
1701	newob = object_create_clone (orig_ob);	1595	newob = object_create_clone (orig_ob);
		1596
1702	if ((orig_ob->nrof -= nr) < 1)	1597	if ((orig_ob->nrof -= nr) < 1)
1703	{	1598	{
1704	if (!is_removed)	1599	if (!is_removed)
1705	remove_ob (orig_ob);	1600	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);	1601	free_object2 (orig_ob, 1);
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1609	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");	1610	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1611	return NULL;
1717	}	1612	}
1718	}	1613	}
		1614
1719	newob->nrof = nr;	1615	newob->nrof = nr;
1720		1616
1721	return newob;	1617	return newob;
1722	}	1618	}
1723		1619
…		…
1730	*/	1626	*/
1731		1627
1732	object *	1628	object *
1733	decrease_ob_nr (object *op, uint32 i)	1629	decrease_ob_nr (object *op, uint32 i)
1734	{	1630	{
1735	object *	1631	object *tmp;
1736	tmp;
1737	player *	1632	player *pl;
1738	pl;
1739		1633
1740	if (i == 0) /* objects with op->nrof require this check */	1634	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1635	return op;
1742		1636
1743	if (i > op->nrof)	1637	if (i > op->nrof)
1744	i = op->nrof;	1638	i = op->nrof;
1745		1639
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1640	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1641	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1642	else if (op->env != NULL)
1751	{	1643	{
1752	/* is this object in the players inventory, or sub container	1644	/* is this object in the players inventory, or sub container
1753	* therein?	1645	* therein?
1754	*/	1646	*/
…		…
1789	}	1681	}
1790	}	1682	}
1791	}	1683	}
1792	else	1684	else
1793	{	1685	{
1794	object *
1795	above = op->above;	1686	object *above = op->above;
1796		1687
1797	if (i < op->nrof)	1688	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1689	op->nrof -= i;
1800	}
1801	else	1690	else
1802	{	1691	{
1803	remove_ob (op);	1692	remove_ob (op);
1804	op->nrof = 0;	1693	op->nrof = 0;
1805	}	1694	}
		1695
1806	/* Since we just removed op, op->above is null */	1696	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1697	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1698	if (tmp->type == PLAYER)
1809	{	1699	{
1810	if (op->nrof)	1700	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1703	esrv_del_item (tmp->contr, op->count);
1814	}	1704	}
1815	}	1705	}
1816		1706
1817	if (op->nrof)	1707	if (op->nrof)
1818	{
1819	return op;	1708	return op;
1820	}
1821	else	1709	else
1822	{	1710	{
1823	free_object (op);	1711	free_object (op);
1824	return NULL;	1712	return NULL;
1825	}	1713	}
…		…
1834	add_weight (object *op, signed long weight)	1722	add_weight (object *op, signed long weight)
1835	{	1723	{
1836	while (op != NULL)	1724	while (op != NULL)
1837	{	1725	{
1838	if (op->type == CONTAINER)	1726	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1727	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1728
1842	op->carrying += weight;	1729	op->carrying += weight;
1843	op = op->env;	1730	op = op->env;
1844	}	1731	}
1845	}	1732	}
1846		1733
…		…
1865	tmp, *	1752	tmp, *
1866	otmp;	1753	otmp;
1867		1754
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1756	{
1870	dump_object (op);	1757	char *dump = dump_object (op);
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1759	free (dump);
1872	return op;	1760	return op;
1873	}	1761	}
		1762
1874	if (where == NULL)	1763	if (where == NULL)
1875	{	1764	{
1876	dump_object (op);	1765	char *dump = dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1766	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1767	free (dump);
1878	return op;	1768	return op;
1879	}	1769	}
		1770
1880	if (where->head)	1771	if (where->head)
1881	{	1772	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1773	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;	1774	where = where->head;
1884	}	1775	}
		1776
1885	if (op->more)	1777	if (op->more)
1886	{	1778	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1779	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1780	return op;
1889	}	1781	}
		1782
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1784	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1785	if (op->nrof)
1893	{	1786	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1980		1873
1981	int	1874	int
1982	check_move_on (object *op, object *originator)	1875	check_move_on (object *op, object *originator)
1983	{	1876	{
1984	object *tmp;	1877	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1878	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1879	int x = op->x, y = op->y;
1988		1880
1989	MoveType move_on, move_slow, move_block;	1881	MoveType move_on, move_slow, move_block;
1990		1882
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1883	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1884	return 0;
1993
1994	tag = op->count;
1995		1885
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1886	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);	1887	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);	1888	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1889
…		…
2042	{	1932	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1933	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))	1934	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1935	{
2046		1936
		1937	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1938	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1939
2049	if (op->type == PLAYER)	1940	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1941	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)))	1942	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1943	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1950	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))	1951	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1952	{
2062	move_apply (tmp, op, originator);	1953	move_apply (tmp, op, originator);
2063		1954
2064	if (was_destroyed (op, tag))	1955	if (op->destroyed ())
2065	return 1;	1956	return 1;
2066		1957
2067	/* what the person/creature stepped onto has moved the object	1958	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1959	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1960	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1972	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2083	*/	1974	*/
2084		1975
2085	object *	1976	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1977	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1978	{
2088	object *	1979	object *
2089	tmp;	1980	tmp;
2090		1981
2091	if (m == NULL || out_of_map (m, x, y))	1982	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1995	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1996	* The first matching object is returned, or NULL if none.
2106	*/	1997	*/
2107		1998
2108	object *	1999	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	2000	present (unsigned char type, maptile *m, int x, int y)
2110	{	2001	{
2111	object *	2002	object *
2112	tmp;	2003	tmp;
2113		2004
2114	if (out_of_map (m, x, y))	2005	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2145	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2146	* customized, changed states, etc.
2256	*/	2147	*/
2257		2148
2258	int	2149	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2150	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2151	{
2261	int	2152	int
2262	i,	2153	i,
2263	index = 0, flag;	2154	index = 0, flag;
2264	static int	2155	static int
…		…
2285	return -1;	2176	return -1;
2286	return altern[RANDOM () % index];	2177	return altern[RANDOM () % index];
2287	}	2178	}
2288		2179
2289	/*	2180	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2181	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2182	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2183	* 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.	2184	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2185	*/
2295		2186
2296	int	2187	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2188	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2189	{
2299	int	2190	int
2300	i;	2191	i;
2301		2192
2302	for (i = 0; i < SIZEOFFREE; i++)	2193	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2257	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2258	* there is capable of.
2368	*/	2259	*/
2369		2260
2370	int	2261	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2262	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2263	{
2373	int	2264	int
2374	i,	2265	i,
2375	max = SIZEOFFREE, mflags;	2266	max = SIZEOFFREE, mflags;
2376	sint16	2267
2377	nx,	2268	sint16 nx, ny;
2378	ny;
2379	object *	2269	object *
2380	tmp;	2270	tmp;
2381	mapstruct *	2271	maptile *
2382	mp;	2272	mp;
2383	MoveType	2273
2384	blocked,	2274	MoveType blocked, move_type;
2385	move_type;
2386		2275
2387	if (exclude && exclude->head)	2276	if (exclude && exclude->head)
2388	{	2277	{
2389	exclude = exclude->head;	2278	exclude = exclude->head;
2390	move_type = exclude->move_type;	2279	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2484	* Modified to be map tile aware -.MSW
2596	*/	2485	*/
2597		2486
2598		2487
2599	int	2488	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2489	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2490	{
2602	sint16	2491	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2492	int
2606	mflags;	2493	mflags;
2607		2494
2608	if (dir < 0)	2495	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2496	return 0; /* exit condition: invalid direction */
…		…
2687	if (prev)	2574	if (prev)
2688	prev->more = tmp;	2575	prev->more = tmp;
2689	prev = tmp;	2576	prev = tmp;
2690	}	2577	}
2691		2578
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2579	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2580	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2581
2698	return dst;	2582	return dst;
2699	}	2583	}
2700		2584
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. */	2585	/* 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 */	2586	/* 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, */	2587	/* 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. */	2588	/* 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. */	2589	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2590	/* Also remember that multiparts objects are not supported for now. */
2721		2591
2722	object *	2592	object *
2723	load_object_str (const char *obstr)	2593	load_object_str (const char *obstr)
2724	{	2594	{
2725	object *	2595	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2596	char filename[MAX_BUF];
2729		2597
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2598	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2599
2732	FILE *
2733	tempfile = fopen (filename, "w");	2600	FILE *tempfile = fopen (filename, "w");
2734		2601
2735	if (tempfile == NULL)	2602	if (tempfile == NULL)
2736	{	2603	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2604	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2605	return NULL;
2739	};	2606	}
		2607
2740	fprintf (tempfile, obstr);	2608	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2609	fclose (tempfile);
2742		2610
2743	op = get_object ();	2611	op = get_object ();
2744		2612
2745	object_thawer	2613	object_thawer thawer (filename);
2746	thawer (filename);
2747		2614
2748	if (thawer)	2615	if (thawer)
2749	load_object (thawer, op, 0);	2616	load_object (thawer, op, 0);
2750		2617
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2618	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2626	* returns NULL if no match.
2760	*/	2627	*/
2761	object *	2628	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2629	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2630	{
2764	object *	2631	object *tmp;
2765	tmp;
2766		2632
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2633	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2634	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2635	return tmp;
2770		2636
…		…
2778	* do the desired thing.	2644	* do the desired thing.
2779	*/	2645	*/
2780	key_value *	2646	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2647	get_ob_key_link (const object *ob, const char *key)
2782	{	2648	{
2783	key_value *	2649	key_value *link;
2784	link;
2785		2650
2786	for (link = ob->key_values; link != NULL; link = link->next)	2651	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2652	if (link->key == key)
2789	{
2790	return link;	2653	return link;
2791	}
2792	}
2793		2654
2794	return NULL;	2655	return NULL;
2795	}	2656	}
2796		2657
2797	/*	2658	/*
…		…
2802	* The returned string is shared.	2663	* The returned string is shared.
2803	*/	2664	*/
2804	const char *	2665	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2666	get_ob_key_value (const object *op, const char *const key)
2806	{	2667	{
2807	key_value *	2668	key_value *link;
2808	link;	2669	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2670
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2671	if (!canonical_key)
2815	{	2672	{
2816	/* 1. There being a field named key on any object	2673	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2674	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2675	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2676	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2677	*/
2821	return NULL;	2678	return 0;
2822	}	2679	}
2823		2680
2824	/* This is copied from get_ob_key_link() above -	2681	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2682	* only 4 lines, and saves the function call overhead.
2826	*/	2683	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2684	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2685	if (link->key == canonical_key)
2830	{
2831	return link->value;	2686	return link->value;
2832	}	2687
2833	}
2834	return NULL;	2688	return 0;
2835	}	2689	}
2836		2690
2837		2691
2838	/*	2692	/*
2839	* Updates the canonical_key in op to value.	2693	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2729	if (last)
2876	last->next = field->next;	2730	last->next = field->next;
2877	else	2731	else
2878	op->key_values = field->next;	2732	op->key_values = field->next;
2879		2733
2880	delete
2881	field;	2734	delete field;
2882	}	2735	}
2883	}	2736	}
2884	return TRUE;	2737	return TRUE;
2885	}	2738	}
2886	/* IF we get here, key doesn't exist */	2739	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2774	* Returns TRUE on success.
2922	*/	2775	*/
2923	int	2776	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2777	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2778	{
2926	shstr
2927	key_ (key);	2779	shstr key_ (key);
2928		2780
2929	return set_ob_key_value_s (op, key_, value, add_key);	2781	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2782	}
		2783
		2784	object::depth_iterator::depth_iterator (object *container)
		2785	: iterator_base (container)
		2786	{
		2787	while (item->inv)
		2788	item = item->inv;
		2789	}
		2790
		2791	void
		2792	object::depth_iterator::next ()
		2793	{
		2794	if (item->below)
		2795	{
		2796	item = item->below;
		2797
		2798	while (item->inv)
		2799	item = item->inv;
		2800	}
		2801	else
		2802	item = item->env;
		2803	}
		2804
		2805	// return a suitable string describing an objetc in enough detail to find it
		2806	const char *
		2807	object::debug_desc (char *info) const
		2808	{
		2809	char info2[256 * 3];
		2810	char *p = info;
		2811
		2812	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2813	count,
		2814	&name,
		2815	title ? " " : "",
		2816	title ? (const char *)title : "");
		2817
		2818	if (env)
		2819	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2820
		2821	if (map)
		2822	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2823
		2824	return info;
		2825	}
		2826
		2827	const char *
		2828	object::debug_desc () const
		2829	{
		2830	static char info[256 * 3];
		2831	return debug_desc (info);
		2832	}
		2833

Diff Legend

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