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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
43	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
44		38
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		40
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	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,
49	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
50	};	43	};
…		…
56	};	49	};
57	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	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,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	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
60	};	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	}
61		131
62	/* 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. */
63	static int	133	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	135	{
…		…
214	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)
215	return 0;	285	return 0;
216		286
217	switch (ob1->type)	287	switch (ob1->type)
218	{	288	{
219	case SCROLL:	289	case SCROLL:
220	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
221	return 0;	291	return 0;
222	break;	292	break;
223	}	293	}
224		294
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	296	{
227	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
249	/*	319	/*
250	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
253	*/	323	*/
254	signed long	324	long
255	sum_weight (object *op)	325	sum_weight (object *op)
256	{	326	{
257	signed long sum;	327	long sum;
258	object *inv;	328	object *inv;
259		329
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	331	{
262	if (inv->inv)	332	if (inv->inv)
263	sum_weight (inv);	333	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	335	}
		336
266	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
268	if (op->carrying != sum)	340	if (op->carrying != sum)
269	op->carrying = sum;	341	op->carrying = sum;
		342
270	return sum;	343	return sum;
271	}	344	}
272		345
273	/**	346	/**
274	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	375	* Some error messages.
303	* 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.
304	*/	377	*/
305		378
306	void	379	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	380	dump_object (object *op)
362	{	381	{
363	if (op == NULL)	382	if (!op)
364	{	383	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		384
372	void	385	object_freezer freezer;
373	dump_all_objects (void)	386	save_object (freezer, op, 3);
374	{	387	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	388	}
383		389
384	/*	390	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	object *op;
412		418
413	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	420	if (op->count == i)
415	break;	421	break;
		422
416	return op;	423	return op;
417	}	424	}
418		425
419	/*	426	/*
420	* 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.
…		…
423	*/	430	*/
424		431
425	object *	432	object *
426	find_object_name (const char *str)	433	find_object_name (const char *str)
427	{	434	{
428	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
429	object *op;	436	object *op;
430		437
431	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	439	if (op->name == str_)
433	break;	440	break;
434		441
435	return op;	442	return op;
436	}	443	}
437		444
…		…
440	{	447	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	449	}
443		450
444	/*	451	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	453	* skill and experience objects.
485	*/	454	*/
486	void	455	void
487	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
488	{	457	{
489	if (owner == NULL || op == NULL)	458	if (!owner)
490	return;	459	return;
491		460
492	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	463	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	465	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	466	* didn't match, this check is valid and I believe that cause is valid.
498	*/	467	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
500	owner = owner->owner;	469	owner = owner->owner;
501		470
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	471	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	472	}
542		473
543	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	475	* refcounts and freeing the links.
545	*/	476	*/
…		…
561	{	492	{
562	attachable_base::clear ();	493	attachable_base::clear ();
563		494
564	free_key_values (this);	495	free_key_values (this);
565		496
566	clear_owner (this);	497	owner = 0;
567
568	name = 0;	498	name = 0;
569	name_pl = 0;	499	name_pl = 0;
570	title = 0;	500	title = 0;
571	race = 0;	501	race = 0;
572	slaying = 0;	502	slaying = 0;
573	skill = 0;	503	skill = 0;
574	msg = 0;	504	msg = 0;
575	lore = 0;	505	lore = 0;
576	custom_name = 0;	506	custom_name = 0;
577	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;
578		519
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		521
581	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;
582	}	531	}
583		532
584	void object::clone (object *destination)	533	void object::clone (object *destination)
585	{	534	{
586	*(object_copy *) destination = *this;	535	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	536	*(object_pod *)destination = *this;
588		537
589	if (self || cb)	538	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	540	}
624		541
625	/*	542	/*
626	* copy object first frees everything allocated by the second object,	543	* copy object first frees everything allocated by the second object,
627	* 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
628	* object, allocating what needs to be allocated. Basically, any	545	* object, allocating what needs to be allocated. Basically, any
629	* 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,
630	* 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
631	* will point at garbage.	548	* will point at garbage.
632	*/	549	*/
633
634	void	550	void
635	copy_object (object *op2, object *op)	551	copy_object (object *op2, object *op)
636	{	552	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	614	/*
699	* 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
700	* 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.
701	* 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.
702	*/	618	*/
703
704	void	619	void
705	update_ob_speed (object *op)	620	update_ob_speed (object *op)
706	{	621	{
707	extern int arch_init;	622	extern int arch_init;
708		623
…		…
717	abort ();	632	abort ();
718	#else	633	#else
719	op->speed = 0;	634	op->speed = 0;
720	#endif	635	#endif
721	}	636	}
		637
722	if (arch_init)	638	if (arch_init)
723	{
724	return;	639	return;
725	}	640
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	642	{
728	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
730	return;	645	return;
731		646
732	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	648	* of the list. */
734	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
735	if (op->active_next != NULL)	651	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
737	active_objects = op;	654	active_objects = op;
738	}	655	}
739	else	656	else
740	{	657	{
741	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
743	return;	660	return;
744		661
745	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
746	{	663	{
747	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
748	if (op->active_next != NULL)	666	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
750	}	668	}
751	else	669	else
752	{	670	{
753	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
754	if (op->active_next)	673	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
756	}	675	}
		676
757	op->active_next = NULL;	677	op->active_next = NULL;
758	op->active_prev = NULL;	678	op->active_prev = NULL;
759	}	679	}
760	}	680	}
761		681
…		…
893	* that is being removed.	813	* that is being removed.
894	*/	814	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	816	update_now = 1;
897	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	818	/* Nothing to do for that case */ ;
899	else	819	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		821
902	if (update_now)	822	if (update_now)
903	{	823	{
…		…
907		827
908	if (op->more != NULL)	828	if (op->more != NULL)
909	update_object (op->more, action);	829	update_object (op->more, action);
910	}	830	}
911		831
912	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
913	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
914		835
915	void object::free_mortals ()	836	void object::free_mortals ()
916	{	837	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
919	{	842	{
920	freed.push_back (*i);	843	delete *i;
921	mortals.erase (i);	844	mortals.erase (i);
922	}	845	}
923	else	846
924	++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	}
925	}	854	}
926		855
927	object::object ()	856	object::object ()
928	{	857	{
929	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
930		859
931	expmul = 1.0;	860	expmul = 1.0;
932	face = blank_face;	861	face = blank_face;
933	attacked_by_count = -1;
934	}	862	}
935		863
936	object::~object ()	864	object::~object ()
937	{	865	{
938	free_key_values (this);	866	free_key_values (this);
939	}	867	}
940		868
941	void object::link ()	869	void object::link ()
942	{	870	{
943	count = ++ob_count;	871	count = ++ob_count;
		872	uuid = gen_uuid ();
944		873
945	prev = 0;	874	prev = 0;
946	next = objects;	875	next = object::first;
947		876
948	if (objects)	877	if (object::first)
949	objects->prev = this;	878	object::first->prev = this;
950		879
951	objects = this;	880	object::first = this;
952	}	881	}
953		882
954	void object::unlink ()	883	void object::unlink ()
955	{	884	{
956	count = 0;	885	if (this == object::first)
		886	object::first = next;
957		887
958	/* Remove this object from the list of used objects */	888	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	889	if (prev) prev->next = next;
		890	if (next) next->prev = prev;
		891
962	prev = 0;	892	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	893	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	894	}
974		895
975	object *object::create ()	896	object *object::create ()
976	{	897	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	898	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	899	op->link ();
990	return op;	900	return op;
991	}	901	}
992		902
993	/*	903	/*
…		…
995	* 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
996	* free objects. The IS_FREED() flag is set in the object.	906	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	907	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	908	* this function to succeed.
999	*	909	*
1000	* 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
1001	* inventory to the ground.	911	* inventory to the ground.
1002	*/	912	*/
1003	void object::free (bool free_inventory)	913	void object::destroy (bool destroy_inventory)
1004	{	914	{
		915	if (QUERY_FLAG (this, FLAG_FREED))
		916	return;
		917
		918	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		919	remove_friendly_object (this);
		920
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	921	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	922	remove_ob (this);
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		923
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);
1018	}
1019
1020	if (QUERY_FLAG (this, FLAG_FREED))	924	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		925
1027	if (more)	926	if (more)
1028	{	927	{
1029	more->free (free_inventory);	928	more->destroy (destroy_inventory);
1030	more = 0;	929	more = 0;
1031	}	930	}
1032		931
1033	if (inv)	932	if (inv)
1034	{	933	{
1035	/* Only if the space blocks everything do we not process -	934	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	935	* if some form of movement is allowed, let objects
1037	* drop on that space.	936	* drop on that space.
1038	*/	937	*/
1039	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)
1040	{	939	{
1041	object *	940	object *op = inv;
1042	op = inv;
1043		941
1044	while (op)	942	while (op)
1045	{	943	{
1046	object *
1047	tmp = op->below;	944	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	945	op->destroy (destroy_inventory);
1051	op = tmp;	946	op = tmp;
1052	}	947	}
1053	}	948	}
1054	else	949	else
1055	{ /* Put objects in inventory onto this space */	950	{ /* Put objects in inventory onto this space */
1056	object *	951	object *op = inv;
1057	op = inv;
1058		952
1059	while (op)	953	while (op)
1060	{	954	{
1061	object *
1062	tmp = op->below;	955	object *tmp = op->below;
1063		956
1064	remove_ob (op);	957	remove_ob (op);
1065		958
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	959	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	|| 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))
…		…
1076	op = tmp;	969	op = tmp;
1077	}	970	}
1078	}	971	}
1079	}	972	}
1080		973
1081	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;
1082		981
1083	/* Remove object from the active list */	982	/* Remove object from the active list */
1084	speed = 0;	983	speed = 0;
1085	update_ob_speed (this);	984	update_ob_speed (this);
1086		985
1087	unlink ();	986	unlink ();
1088		987
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	988	mortals.push_back (this);
1092	}	989	}
1093		990
1094	/*	991	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	992	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	997	sub_weight (object *op, signed long weight)
1101	{	998	{
1102	while (op != NULL)	999	while (op != NULL)
1103	{	1000	{
1104	if (op->type == CONTAINER)	1001	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1002	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1003
1108	op->carrying -= weight;	1004	op->carrying -= weight;
1109	op = op->env;	1005	op = op->env;
1110	}	1006	}
1111	}	1007	}
1112		1008
…		…
1120	*/	1016	*/
1121		1017
1122	void	1018	void
1123	remove_ob (object *op)	1019	remove_ob (object *op)
1124	{	1020	{
1125	object *tmp, *last = NULL;	1021	object *tmp, *last = 0;
1126	object *otmp;	1022	object *otmp;
1127		1023
1128	tag_t tag;
1129	int check_walk_off;	1024	int check_walk_off;
1130	mapstruct *m;	1025	maptile *m;
1131		1026
1132	sint16 x, y;	1027	sint16 x, y;
1133		1028
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1029	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1030	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1031
1139	/* Changed it to always dump core in this case. As has been learned	1032	SET_FLAG (op, FLAG_REMOVED);
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151		1033
1152	if (op->more != NULL)	1034	if (op->more != NULL)
1153	remove_ob (op->more);	1035	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1036
1157	/*	1037	/*
1158	* In this case, the object to be removed is in someones	1038	* In this case, the object to be removed is in someones
1159	* inventory.	1039	* inventory.
1160	*/	1040	*/
…		…
1186	*/	1066	*/
1187	op->x = op->env->x, op->y = op->env->y;	1067	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1068	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1069	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1070	op->env = NULL;
1191	return;	1071	}
		1072	else if (op->map)
1192	}	1073	{
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;	1074	x = op->x;
1199	y = op->y;	1075	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1076	m = get_map_from_coord (op->map, &x, &y);
1201		1077
1202	if (!m)	1078	if (!m)
1203	{	1079	{
1204	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",
1205	op->map->path, op->x, op->y);	1081	op->map->path, op->x, op->y);
1206	/* 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.
1207	* it seems if we get into this case, something is probablye	1083	* it seems if we get into this case, something is probablye
1208	* 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
1209	*/	1095	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1096
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1097	/* link the object above us */
1223	if (op->above)	1098	if (op->above)
1224	op->above->below = op->below;	1099	op->above->below = op->below;
1225	else	1100	else
1226	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 */
1227		1102
1228	/* Relink the object below us, if there is one */	1103	/* Relink the object below us, if there is one */
1229	if (op->below)	1104	if (op->below)
1230	op->below->above = op->above;	1105	op->below->above = op->above;
1231	else	1106	else
1232	{	1107	{
1233	/* 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
1234	* use translated coordinates in case some oddness with map tiling is	1109	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1110	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	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",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1111	*/
1270	if (tmp->container == op)	1112	if (GET_MAP_OB (m, x, y) != op)
1271	{	1113	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1114	char *dump = dump_object (op);
1273	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);
1274	}	1121	}
1275		1122
1276	tmp->contr->socket.update_look = 1;	1123	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1124	}
1281	move_apply (tmp, op, NULL);
1282		1125
1283	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)
1284	{	1141	{
1285	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;
1286	}	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 ());
1287	}	1164	}
1288		1165
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1167
1291	if (tmp->above == tmp)	1168	if (tmp->above == tmp)
1292	tmp->above = NULL;	1169	tmp->above = NULL;
1293		1170
1294	last = tmp;	1171	last = tmp;
1295	}	1172	}
1296		1173
1297	/* last == NULL of there are no objects on this space */	1174	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1175	if (last == NULL)
1299	{	1176	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* 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
1302	* 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
1303	* be correct anyways.	1180	* be correct anyways.
1304	*/	1181	*/
1305	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);
1306	update_position (op->map, op->x, op->y);	1183	update_position (op->map, op->x, op->y);
1307	}	1184	}
1308	else	1185	else
1309	update_object (last, UP_OBJ_REMOVE);	1186	update_object (last, UP_OBJ_REMOVE);
1310		1187
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1189	update_all_los (op->map, op->x, op->y);
		1190	}
1313	}	1191	}
1314		1192
1315	/*	1193	/*
1316	* merge_ob(op,top):	1194	* merge_ob(op,top):
1317	*	1195	*
1318	* This function goes through all objects below and including top, and	1196	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1197	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1198	* If top is NULL, it is calculated.
1321	* 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
1322	*/	1200	*/
1323
1324	object *	1201	object *
1325	merge_ob (object *op, object *top)	1202	merge_ob (object *op, object *top)
1326	{	1203	{
1327	if (!op->nrof)	1204	if (!op->nrof)
1328	return 0;	1205	return 0;
		1206
1329	if (top == NULL)	1207	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1208	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1209
1331	for (; top != NULL; top = top->below)	1210	for (; top != NULL; top = top->below)
1332	{	1211	{
1333	if (top == op)	1212	if (top == op)
1334	continue;	1213	continue;
1335	if (CAN_MERGE (op, top))	1214	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1220	remove_ob (op);
1342	free_object (op);	1221	free_object (op);
1343	return top;	1222	return top;
1344	}	1223	}
1345	}	1224	}
		1225
1346	return NULL;	1226	return 0;
1347	}	1227	}
1348		1228
1349	/*	1229	/*
1350	* 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
1351	* job preparing multi-part monsters	1231	* job preparing multi-part monsters
1352	*/	1232	*/
1353	object *	1233	object *
1354	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)
1355	{	1235	{
1356	object *	1236	object *tmp;
1357	tmp;
1358		1237
1359	if (op->head)	1238	if (op->head)
1360	op = op->head;	1239	op = op->head;
		1240
1361	for (tmp = op; tmp; tmp = tmp->more)	1241	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1242	{
1363	tmp->x = x + tmp->arch->clone.x;	1243	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1244	tmp->y = y + tmp->arch->clone.y;
1365	}	1245	}
		1246
1366	return insert_ob_in_map (op, m, originator, flag);	1247	return insert_ob_in_map (op, m, originator, flag);
1367	}	1248	}
1368		1249
1369	/*	1250	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1251	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1267	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1268	* just 'op' otherwise
1388	*/	1269	*/
1389		1270
1390	object *	1271	object *
1391	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)
1392	{	1273	{
1393	object *tmp, *top, *floor = NULL;	1274	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1275	sint16 x, y;
1395		1276
1396	if (QUERY_FLAG (op, FLAG_FREED))	1277	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1280	return NULL;
1400	}	1281	}
1401		1282
1402	if (m == NULL)	1283	if (m == NULL)
1403	{	1284	{
1404	dump_object (op);	1285	char *dump = dump_object (op);
1405	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);
1406	return op;	1288	return op;
1407	}	1289	}
1408		1290
1409	if (out_of_map (m, op->x, op->y))	1291	if (out_of_map (m, op->x, op->y))
1410	{	1292	{
1411	dump_object (op);	1293	char *dump = dump_object (op);
1412	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);
1413	#ifdef MANY_CORES	1295	#ifdef MANY_CORES
1414	/* 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
1415	* 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
1416	* improperly inserted.	1298	* improperly inserted.
1417	*/	1299	*/
1418	abort ();	1300	abort ();
1419	#endif	1301	#endif
		1302	free (dump);
1420	return op;	1303	return op;
1421	}	1304	}
1422		1305
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1306	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1307	{
1425	dump_object (op);	1308	char *dump = dump_object (op);
1426	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);
1427	return op;	1311	return op;
1428	}	1312	}
1429		1313
1430	if (op->more != NULL)	1314	if (op->more != NULL)
1431	{	1315	{
…		…
1661	* 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.
1662	*/	1546	*/
1663	void	1547	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1549	{
1666	object *tmp;	1550	object *
		1551	tmp;
1667	object *tmp1;	1552	object *
		1553	tmp1;
1668		1554
1669	/* first search for itself and remove any old instances */	1555	/* first search for itself and remove any old instances */
1670		1556
1671	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)
1672	{	1558	{
…		…
1675	remove_ob (tmp);	1561	remove_ob (tmp);
1676	free_object (tmp);	1562	free_object (tmp);
1677	}	1563	}
1678	}	1564	}
1679		1565
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1566	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1567
1682	tmp1->x = op->x;	1568	tmp1->x = op->x;
1683	tmp1->y = op->y;	1569	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1570	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1571	}
…		…
1703	if (orig_ob->nrof < nr)	1589	if (orig_ob->nrof < nr)
1704	{	1590	{
1705	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);
1706	return NULL;	1592	return NULL;
1707	}	1593	}
		1594
1708	newob = object_create_clone (orig_ob);	1595	newob = object_create_clone (orig_ob);
		1596
1709	if ((orig_ob->nrof -= nr) < 1)	1597	if ((orig_ob->nrof -= nr) < 1)
1710	{	1598	{
1711	if (!is_removed)	1599	if (!is_removed)
1712	remove_ob (orig_ob);	1600	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1601	free_object2 (orig_ob, 1);
…		…
1721	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.");
1722	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");
1723	return NULL;	1611	return NULL;
1724	}	1612	}
1725	}	1613	}
		1614
1726	newob->nrof = nr;	1615	newob->nrof = nr;
1727		1616
1728	return newob;	1617	return newob;
1729	}	1618	}
1730		1619
…		…
1737	*/	1626	*/
1738		1627
1739	object *	1628	object *
1740	decrease_ob_nr (object *op, uint32 i)	1629	decrease_ob_nr (object *op, uint32 i)
1741	{	1630	{
1742	object *	1631	object *tmp;
1743	tmp;
1744	player *	1632	player *pl;
1745	pl;
1746		1633
1747	if (i == 0) /* objects with op->nrof require this check */	1634	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1635	return op;
1749		1636
1750	if (i > op->nrof)	1637	if (i > op->nrof)
1751	i = op->nrof;	1638	i = op->nrof;
1752		1639
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1640	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1641	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1642	else if (op->env != NULL)
1758	{	1643	{
1759	/* is this object in the players inventory, or sub container	1644	/* is this object in the players inventory, or sub container
1760	* therein?	1645	* therein?
1761	*/	1646	*/
…		…
1796	}	1681	}
1797	}	1682	}
1798	}	1683	}
1799	else	1684	else
1800	{	1685	{
1801	object *
1802	above = op->above;	1686	object *above = op->above;
1803		1687
1804	if (i < op->nrof)	1688	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1689	op->nrof -= i;
1807	}
1808	else	1690	else
1809	{	1691	{
1810	remove_ob (op);	1692	remove_ob (op);
1811	op->nrof = 0;	1693	op->nrof = 0;
1812	}	1694	}
		1695
1813	/* Since we just removed op, op->above is null */	1696	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1697	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1698	if (tmp->type == PLAYER)
1816	{	1699	{
1817	if (op->nrof)	1700	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1703	esrv_del_item (tmp->contr, op->count);
1821	}	1704	}
1822	}	1705	}
1823		1706
1824	if (op->nrof)	1707	if (op->nrof)
1825	{
1826	return op;	1708	return op;
1827	}
1828	else	1709	else
1829	{	1710	{
1830	free_object (op);	1711	free_object (op);
1831	return NULL;	1712	return NULL;
1832	}	1713	}
…		…
1841	add_weight (object *op, signed long weight)	1722	add_weight (object *op, signed long weight)
1842	{	1723	{
1843	while (op != NULL)	1724	while (op != NULL)
1844	{	1725	{
1845	if (op->type == CONTAINER)	1726	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1727	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1728
1849	op->carrying += weight;	1729	op->carrying += weight;
1850	op = op->env;	1730	op = op->env;
1851	}	1731	}
1852	}	1732	}
1853		1733
…		…
1872	tmp, *	1752	tmp, *
1873	otmp;	1753	otmp;
1874		1754
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1756	{
1877	dump_object (op);	1757	char *dump = dump_object (op);
1878	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);
1879	return op;	1760	return op;
1880	}	1761	}
		1762
1881	if (where == NULL)	1763	if (where == NULL)
1882	{	1764	{
1883	dump_object (op);	1765	char *dump = dump_object (op);
1884	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);
1885	return op;	1768	return op;
1886	}	1769	}
		1770
1887	if (where->head)	1771	if (where->head)
1888	{	1772	{
1889	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");
1890	where = where->head;	1774	where = where->head;
1891	}	1775	}
		1776
1892	if (op->more)	1777	if (op->more)
1893	{	1778	{
1894	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);
1895	return op;	1780	return op;
1896	}	1781	}
		1782
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1784	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1785	if (op->nrof)
1900	{	1786	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1987		1873
1988	int	1874	int
1989	check_move_on (object *op, object *originator)	1875	check_move_on (object *op, object *originator)
1990	{	1876	{
1991	object *tmp;	1877	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1878	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1879	int x = op->x, y = op->y;
1995		1880
1996	MoveType move_on, move_slow, move_block;	1881	MoveType move_on, move_slow, move_block;
1997		1882
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1883	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1884	return 0;
2000
2001	tag = op->count;
2002		1885
2003	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);
2004	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);
2005	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);
2006		1889
…		…
2049	{	1932	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1933	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2051	((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))
2052	{	1935	{
2053		1936
		1937	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1938	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1939
2056	if (op->type == PLAYER)	1940	if (op->type == PLAYER)
2057	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)) ||
2058	(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)))
2059	diff /= 4.0;	1943	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1950	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2067	((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))
2068	{	1952	{
2069	move_apply (tmp, op, originator);	1953	move_apply (tmp, op, originator);
2070		1954
2071	if (was_destroyed (op, tag))	1955	if (op->destroyed ())
2072	return 1;	1956	return 1;
2073		1957
2074	/* what the person/creature stepped onto has moved the object	1958	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1959	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1960	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1972	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2090	*/	1974	*/
2091		1975
2092	object *	1976	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1977	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1978	{
2095	object *	1979	object *
2096	tmp;	1980	tmp;
2097		1981
2098	if (m == NULL || out_of_map (m, x, y))	1982	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	1995	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	1996	* The first matching object is returned, or NULL if none.
2113	*/	1997	*/
2114		1998
2115	object *	1999	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	2000	present (unsigned char type, maptile *m, int x, int y)
2117	{	2001	{
2118	object *	2002	object *
2119	tmp;	2003	tmp;
2120		2004
2121	if (out_of_map (m, x, y))	2005	if (out_of_map (m, x, y))
…		…
2261	* 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
2262	* customized, changed states, etc.	2146	* customized, changed states, etc.
2263	*/	2147	*/
2264		2148
2265	int	2149	int
2266	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)
2267	{	2151	{
2268	int	2152	int
2269	i,	2153	i,
2270	index = 0, flag;	2154	index = 0, flag;
2271	static int	2155	static int
…		…
2292	return -1;	2176	return -1;
2293	return altern[RANDOM () % index];	2177	return altern[RANDOM () % index];
2294	}	2178	}
2295		2179
2296	/*	2180	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2181	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2182	* find_free_spot(), but it will search max number of squares.
2299	* 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.
2300	* 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.
2301	*/	2185	*/
2302		2186
2303	int	2187	int
2304	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)
2305	{	2189	{
2306	int	2190	int
2307	i;	2191	i;
2308		2192
2309	for (i = 0; i < SIZEOFFREE; i++)	2193	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* 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
2374	* there is capable of.	2258	* there is capable of.
2375	*/	2259	*/
2376		2260
2377	int	2261	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2262	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2263	{
2380	int	2264	int
2381	i,	2265	i,
2382	max = SIZEOFFREE, mflags;	2266	max = SIZEOFFREE, mflags;
2383	sint16	2267
2384	nx,	2268	sint16 nx, ny;
2385	ny;
2386	object *	2269	object *
2387	tmp;	2270	tmp;
2388	mapstruct *	2271	maptile *
2389	mp;	2272	mp;
2390	MoveType	2273
2391	blocked,	2274	MoveType blocked, move_type;
2392	move_type;
2393		2275
2394	if (exclude && exclude->head)	2276	if (exclude && exclude->head)
2395	{	2277	{
2396	exclude = exclude->head;	2278	exclude = exclude->head;
2397	move_type = exclude->move_type;	2279	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2484	* Modified to be map tile aware -.MSW
2603	*/	2485	*/
2604		2486
2605		2487
2606	int	2488	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2489	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2490	{
2609	sint16	2491	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2492	int
2613	mflags;	2493	mflags;
2614		2494
2615	if (dir < 0)	2495	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2496	return 0; /* exit condition: invalid direction */
…		…
2694	if (prev)	2574	if (prev)
2695	prev->more = tmp;	2575	prev->more = tmp;
2696	prev = tmp;	2576	prev = tmp;
2697	}	2577	}
2698		2578
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2579	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2580	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2581
2705	return dst;	2582	return dst;
2706	}	2583	}
2707		2584
2708	/* return true if the object was destroyed, 0 otherwise */
2709	int
2710	was_destroyed (const object *op, tag_t old_tag)
2711	{
2712	/* checking for FLAG_FREED isn't necessary, but makes this function more
2713	* robust */
2714	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2715	}
2716
2717	/* GROS - Creates an object using a string representing its content. */	2585	/* GROS - Creates an object using a string representing its content. */
2718
2719	/* 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 */
2720
2721	/* 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, */
2722
2723	/* 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. */
2724
2725	/* 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. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2590	/* Also remember that multiparts objects are not supported for now. */
2728		2591
2729	object *	2592	object *
2730	load_object_str (const char *obstr)	2593	load_object_str (const char *obstr)
2731	{	2594	{
2732	object *	2595	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2596	char filename[MAX_BUF];
2736		2597
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2598	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2599
2739	FILE *
2740	tempfile = fopen (filename, "w");	2600	FILE *tempfile = fopen (filename, "w");
2741		2601
2742	if (tempfile == NULL)	2602	if (tempfile == NULL)
2743	{	2603	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2604	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2605	return NULL;
2746	};	2606	}
		2607
2747	fprintf (tempfile, obstr);	2608	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2609	fclose (tempfile);
2749		2610
2750	op = get_object ();	2611	op = get_object ();
2751		2612
2752	object_thawer	2613	object_thawer thawer (filename);
2753	thawer (filename);
2754		2614
2755	if (thawer)	2615	if (thawer)
2756	load_object (thawer, op, 0);	2616	load_object (thawer, op, 0);
2757		2617
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2618	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2626	* returns NULL if no match.
2767	*/	2627	*/
2768	object *	2628	object *
2769	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)
2770	{	2630	{
2771	object *	2631	object *tmp;
2772	tmp;
2773		2632
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2633	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2634	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2635	return tmp;
2777		2636
…		…
2785	* do the desired thing.	2644	* do the desired thing.
2786	*/	2645	*/
2787	key_value *	2646	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2647	get_ob_key_link (const object *ob, const char *key)
2789	{	2648	{
2790	key_value *	2649	key_value *link;
2791	link;
2792		2650
2793	for (link = ob->key_values; link != NULL; link = link->next)	2651	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2652	if (link->key == key)
2796	{
2797	return link;	2653	return link;
2798	}
2799	}
2800		2654
2801	return NULL;	2655	return NULL;
2802	}	2656	}
2803		2657
2804	/*	2658	/*
…		…
2809	* The returned string is shared.	2663	* The returned string is shared.
2810	*/	2664	*/
2811	const char *	2665	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2666	get_ob_key_value (const object *op, const char *const key)
2813	{	2667	{
2814	key_value *	2668	key_value *link;
2815	link;	2669	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2670
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2671	if (!canonical_key)
2822	{	2672	{
2823	/* 1. There being a field named key on any object	2673	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2674	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2675	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2676	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2677	*/
2828	return NULL;	2678	return 0;
2829	}	2679	}
2830		2680
2831	/* This is copied from get_ob_key_link() above -	2681	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2682	* only 4 lines, and saves the function call overhead.
2833	*/	2683	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2684	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2685	if (link->key == canonical_key)
2837	{
2838	return link->value;	2686	return link->value;
2839	}	2687
2840	}
2841	return NULL;	2688	return 0;
2842	}	2689	}
2843		2690
2844		2691
2845	/*	2692	/*
2846	* Updates the canonical_key in op to value.	2693	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2729	if (last)
2883	last->next = field->next;	2730	last->next = field->next;
2884	else	2731	else
2885	op->key_values = field->next;	2732	op->key_values = field->next;
2886		2733
2887	delete
2888	field;	2734	delete field;
2889	}	2735	}
2890	}	2736	}
2891	return TRUE;	2737	return TRUE;
2892	}	2738	}
2893	/* IF we get here, key doesn't exist */	2739	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2774	* Returns TRUE on success.
2929	*/	2775	*/
2930	int	2776	int
2931	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)
2932	{	2778	{
2933	shstr
2934	key_ (key);	2779	shstr key_ (key);
2935		2780
2936	return set_ob_key_value_s (op, key_, value, add_key);	2781	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	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