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.58 by pippijn, Mon Dec 4 17:48:35 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.
…		…
406	*/	412	*/
407		413
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	418	if (op->count == i)
415	break;	419	return op;
		420
416	return op;	421	return 0;
417	}	422	}
418		423
419	/*	424	/*
420	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
423	*/	428	*/
424		429
425	object *	430	object *
426	find_object_name (const char *str)	431	find_object_name (const char *str)
427	{	432	{
428	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
429	object *op;	434	object *op;
430		435
431	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	437	if (op->name == str_)
433	break;	438	break;
434		439
435	return op;	440	return op;
436	}	441	}
437		442
…		…
440	{	445	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	447	}
443		448
444	/*	449	/*
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	450	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	451	* skill and experience objects.
485	*/	452	*/
486	void	453	void
487	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
488	{	455	{
489	if (owner == NULL || op == NULL)	456	if (!owner)
490	return;	457	return;
491		458
492	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	460	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	462	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	463	* 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.	464	* didn't match, this check is valid and I believe that cause is valid.
498	*/	465	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
500	owner = owner->owner;	467	owner = owner->owner;
501		468
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;	469	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	}	470	}
542		471
543	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	473	* refcounts and freeing the links.
545	*/	474	*/
…		…
561	{	490	{
562	attachable_base::clear ();	491	attachable_base::clear ();
563		492
564	free_key_values (this);	493	free_key_values (this);
565		494
566	clear_owner (this);	495	owner = 0;
567
568	name = 0;	496	name = 0;
569	name_pl = 0;	497	name_pl = 0;
570	title = 0;	498	title = 0;
571	race = 0;	499	race = 0;
572	slaying = 0;	500	slaying = 0;
573	skill = 0;	501	skill = 0;
574	msg = 0;	502	msg = 0;
575	lore = 0;	503	lore = 0;
576	custom_name = 0;	504	custom_name = 0;
577	materialname = 0;	505	materialname = 0;
		506	contr = 0;
		507	below = 0;
		508	above = 0;
		509	inv = 0;
		510	container = 0;
		511	env = 0;
		512	more = 0;
		513	head = 0;
		514	map = 0;
		515	active_next = 0;
		516	active_prev = 0;
578		517
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		519
581	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
		521
		522	/* What is not cleared is next, prev, and count */
		523
		524	expmul = 1.0;
		525	face = blank_face;
		526
		527	if (settings.casting_time)
		528	casting_time = -1;
582	}	529	}
583		530
584	void object::clone (object *destination)	531	void object::clone (object *destination)
585	{	532	{
586	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
588		535
589	if (self || cb)	536	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	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	}	538	}
624		539
625	/*	540	/*
626	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	542	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	545	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	546	* will point at garbage.
632	*/	547	*/
633
634	void	548	void
635	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
636	{	550	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	612	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	613	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	614	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	615	* This function needs to be called whenever the speed of an object changes.
702	*/	616	*/
703
704	void	617	void
705	update_ob_speed (object *op)	618	update_ob_speed (object *op)
706	{	619	{
707	extern int arch_init;	620	extern int arch_init;
708		621
…		…
717	abort ();	630	abort ();
718	#else	631	#else
719	op->speed = 0;	632	op->speed = 0;
720	#endif	633	#endif
721	}	634	}
		635
722	if (arch_init)	636	if (arch_init)
723	{
724	return;	637	return;
725	}	638
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	640	{
728	/* If already on active list, don't do anything */	641	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	642	if (op->active_next || op->active_prev || op == active_objects)
730	return;	643	return;
731		644
732	/* process_events() expects us to insert the object at the beginning	645	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	646	* of the list. */
734	op->active_next = active_objects;	647	op->active_next = active_objects;
		648
735	if (op->active_next != NULL)	649	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	650	op->active_next->active_prev = op;
		651
737	active_objects = op;	652	active_objects = op;
738	}	653	}
739	else	654	else
740	{	655	{
741	/* If not on the active list, nothing needs to be done */	656	/* If not on the active list, nothing needs to be done */
…		…
743	return;	658	return;
744		659
745	if (op->active_prev == NULL)	660	if (op->active_prev == NULL)
746	{	661	{
747	active_objects = op->active_next;	662	active_objects = op->active_next;
		663
748	if (op->active_next != NULL)	664	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	665	op->active_next->active_prev = NULL;
750	}	666	}
751	else	667	else
752	{	668	{
753	op->active_prev->active_next = op->active_next;	669	op->active_prev->active_next = op->active_next;
		670
754	if (op->active_next)	671	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	672	op->active_next->active_prev = op->active_prev;
756	}	673	}
		674
757	op->active_next = NULL;	675	op->active_next = NULL;
758	op->active_prev = NULL;	676	op->active_prev = NULL;
759	}	677	}
760	}	678	}
761		679
…		…
893	* that is being removed.	811	* that is being removed.
894	*/	812	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	814	update_now = 1;
897	else if (action == UP_OBJ_FACE)	815	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	816	/* Nothing to do for that case */ ;
899	else	817	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	818	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		819
902	if (update_now)	820	if (update_now)
903	{	821	{
…		…
907		825
908	if (op->more != NULL)	826	if (op->more != NULL)
909	update_object (op->more, action);	827	update_object (op->more, action);
910	}	828	}
911		829
912	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
913	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
914		833
915	void object::free_mortals ()	834	void object::free_mortals ()
916	{	835	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
919	{	840	{
920	freed.push_back (*i);	841	delete *i;
921	mortals.erase (i);	842	mortals.erase (i);
922	}	843	}
923	else
924	++i;
925	}	844	}
926		845
927	object::object ()	846	object::object ()
928	{	847	{
929	SET_FLAG (this, FLAG_REMOVED);	848	SET_FLAG (this, FLAG_REMOVED);
930		849
931	expmul = 1.0;	850	expmul = 1.0;
932	face = blank_face;	851	face = blank_face;
933	attacked_by_count = -1;
934	}	852	}
935		853
936	object::~object ()	854	object::~object ()
937	{	855	{
938	free_key_values (this);	856	free_key_values (this);
939	}	857	}
940		858
941	void object::link ()	859	void object::link ()
942	{	860	{
943	count = ++ob_count;	861	count = ++ob_count;
		862	uuid = gen_uuid ();
944		863
945	prev = 0;	864	prev = 0;
946	next = objects;	865	next = object::first;
947		866
948	if (objects)	867	if (object::first)
949	objects->prev = this;	868	object::first->prev = this;
950		869
951	objects = this;	870	object::first = this;
952	}	871	}
953		872
954	void object::unlink ()	873	void object::unlink ()
955	{	874	{
956	count = 0;	875	if (this == object::first)
		876	object::first = next;
957		877
958	/* Remove this object from the list of used objects */	878	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	879	if (prev) prev->next = next;
		880	if (next) next->prev = prev;
		881
962	prev = 0;	882	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	883	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	884	}
974		885
975	object *object::create ()	886	object *object::create ()
976	{	887	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	888	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 ();	889	op->link ();
990	return op;	890	return op;
991	}	891	}
992		892
993	/*	893	/*
…		…
995	* it from the list of used objects, and puts it on the list of	895	* 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.	896	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	897	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	898	* this function to succeed.
999	*	899	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	900	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	901	* inventory to the ground.
1002	*/	902	*/
1003	void object::free (bool free_inventory)	903	void object::destroy (bool destroy_inventory)
1004	{	904	{
		905	if (QUERY_FLAG (this, FLAG_FREED))
		906	return;
		907
		908	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		909	remove_friendly_object (this);
		910
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	911	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	912	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		913
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))	914	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		915
1027	if (more)	916	if (more)
1028	{	917	{
1029	more->free (free_inventory);	918	more->destroy (destroy_inventory);
1030	more = 0;	919	more = 0;
1031	}	920	}
1032		921
1033	if (inv)	922	if (inv)
1034	{	923	{
1035	/* Only if the space blocks everything do we not process -	924	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	925	* if some form of movement is allowed, let objects
1037	* drop on that space.	926	* drop on that space.
1038	*/	927	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	928	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	929	{
1041	object *	930	object *op = inv;
1042	op = inv;
1043		931
1044	while (op)	932	while (op)
1045	{	933	{
1046	object *
1047	tmp = op->below;	934	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	935	op->destroy (destroy_inventory);
1051	op = tmp;	936	op = tmp;
1052	}	937	}
1053	}	938	}
1054	else	939	else
1055	{ /* Put objects in inventory onto this space */	940	{ /* Put objects in inventory onto this space */
1056	object *	941	object *op = inv;
1057	op = inv;
1058		942
1059	while (op)	943	while (op)
1060	{	944	{
1061	object *
1062	tmp = op->below;	945	object *tmp = op->below;
1063		946
1064	remove_ob (op);	947	remove_ob (op);
1065		948
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	949	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))	950	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	959	op = tmp;
1077	}	960	}
1078	}	961	}
1079	}	962	}
1080		963
1081	clear_owner (this);	964	// hack to ensure that freed objects still have a valid map
		965	{
		966	static maptile *freed_map; // freed objects are moved here to avoid crashes
		967
		968	if (!freed_map)
		969	{
		970	freed_map = new maptile;
		971
		972	freed_map->name = "/internal/freed_objects_map";
		973	freed_map->width = 3;
		974	freed_map->height = 3;
		975
		976	freed_map->allocate ();
		977	}
		978
		979	map = freed_map;
		980	x = 1;
		981	y = 1;
		982	}
		983
		984	// clear those pointers that likely might have circular references to us
		985	owner = 0;
		986	enemy = 0;
		987	attacked_by = 0;
		988
		989	// only relevant for players(?), but make sure of it anyways
		990	contr = 0;
1082		991
1083	/* Remove object from the active list */	992	/* Remove object from the active list */
1084	speed = 0;	993	speed = 0;
1085	update_ob_speed (this);	994	update_ob_speed (this);
1086		995
1087	unlink ();	996	unlink ();
1088		997
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	998	mortals.push_back (this);
1092	}	999	}
1093		1000
1094	/*	1001	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1002	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	1007	sub_weight (object *op, signed long weight)
1101	{	1008	{
1102	while (op != NULL)	1009	while (op != NULL)
1103	{	1010	{
1104	if (op->type == CONTAINER)	1011	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1012	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1013
1108	op->carrying -= weight;	1014	op->carrying -= weight;
1109	op = op->env;	1015	op = op->env;
1110	}	1016	}
1111	}	1017	}
1112		1018
…		…
1120	*/	1026	*/
1121		1027
1122	void	1028	void
1123	remove_ob (object *op)	1029	remove_ob (object *op)
1124	{	1030	{
1125	object *tmp, *last = NULL;	1031	object *tmp, *last = 0;
1126	object *otmp;	1032	object *otmp;
1127		1033
1128	tag_t tag;
1129	int check_walk_off;	1034	int check_walk_off;
1130	mapstruct *m;	1035	maptile *m;
1131		1036
1132	sint16 x, y;	1037	sint16 x, y;
1133		1038
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1040	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1041
1139	/* Changed it to always dump core in this case. As has been learned	1042	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		1043
1152	if (op->more != NULL)	1044	if (op->more != NULL)
1153	remove_ob (op->more);	1045	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1046
1157	/*	1047	/*
1158	* In this case, the object to be removed is in someones	1048	* In this case, the object to be removed is in someones
1159	* inventory.	1049	* inventory.
1160	*/	1050	*/
…		…
1186	*/	1076	*/
1187	op->x = op->env->x, op->y = op->env->y;	1077	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1078	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1079	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1080	op->env = NULL;
1191	return;	1081	}
		1082	else if (op->map)
1192	}	1083	{
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;	1084	x = op->x;
1199	y = op->y;	1085	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1086	m = get_map_from_coord (op->map, &x, &y);
1201		1087
1202	if (!m)	1088	if (!m)
1203	{	1089	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1090	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);	1091	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1092	/* 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	1093	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1094	* screwed up and should be fixed.
		1095	*/
		1096	abort ();
		1097	}
		1098
		1099	if (op->map != m)
		1100	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1101	op->map->path, m->path, op->x, op->y, x, y);
		1102
		1103	/* Re did the following section of code - it looks like it had
		1104	* lots of logic for things we no longer care about
1209	*/	1105	*/
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		1106
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 */	1107	/* link the object above us */
1223	if (op->above)	1108	if (op->above)
1224	op->above->below = op->below;	1109	op->above->below = op->below;
1225	else	1110	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1111	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1112
1228	/* Relink the object below us, if there is one */	1113	/* Relink the object below us, if there is one */
1229	if (op->below)	1114	if (op->below)
1230	op->below->above = op->above;	1115	op->below->above = op->above;
1231	else	1116	else
1232	{	1117	{
1233	/* Nothing below, which means we need to relink map object for this space	1118	/* 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	1119	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1120	* 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	*/	1121	*/
1270	if (tmp->container == op)	1122	if (GET_MAP_OB (m, x, y) != op)
1271	{	1123	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1124	char *dump = dump_object (op);
1273	tmp->container = NULL;	1125	LOG (llevError,
		1126	"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);
		1127	free (dump);
		1128	dump = dump_object (GET_MAP_OB (m, x, y));
		1129	LOG (llevError, "%s\n", dump);
		1130	free (dump);
1274	}	1131	}
1275		1132
1276	tmp->contr->socket.update_look = 1;	1133	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	{	1134	}
1281	move_apply (tmp, op, NULL);
1282		1135
1283	if (was_destroyed (op, tag))	1136	op->above = 0;
		1137	op->below = 0;
		1138
		1139	if (op->map->in_memory == MAP_SAVING)
		1140	return;
		1141
		1142	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1143
		1144	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1145	{
		1146	/* No point updating the players look faces if he is the object
		1147	* being removed.
		1148	*/
		1149
		1150	if (tmp->type == PLAYER && tmp != op)
1284	{	1151	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1152	/* If a container that the player is currently using somehow gets
		1153	* removed (most likely destroyed), update the player view
		1154	* appropriately.
		1155	*/
		1156	if (tmp->container == op)
		1157	{
		1158	CLEAR_FLAG (op, FLAG_APPLIED);
		1159	tmp->container = NULL;
		1160	}
		1161
		1162	tmp->contr->socket.update_look = 1;
1286	}	1163	}
		1164
		1165	/* See if player moving off should effect something */
		1166	if (check_walk_off
		1167	&& ((op->move_type & tmp->move_off)
		1168	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1169	{
		1170	move_apply (tmp, op, NULL);
		1171
		1172	if (op->destroyed ())
		1173	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1174	}
1288		1175
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1176	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1177
1291	if (tmp->above == tmp)	1178	if (tmp->above == tmp)
1292	tmp->above = NULL;	1179	tmp->above = NULL;
1293		1180
1294	last = tmp;	1181	last = tmp;
1295	}	1182	}
1296		1183
1297	/* last == NULL of there are no objects on this space */	1184	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1185	if (last == NULL)
1299	{	1186	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1187	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1188	* 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	1189	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1190	* be correct anyways.
1304	*/	1191	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1192	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1193	update_position (op->map, op->x, op->y);
1307	}	1194	}
1308	else	1195	else
1309	update_object (last, UP_OBJ_REMOVE);	1196	update_object (last, UP_OBJ_REMOVE);
1310		1197
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1198	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1199	update_all_los (op->map, op->x, op->y);
		1200	}
1313	}	1201	}
1314		1202
1315	/*	1203	/*
1316	* merge_ob(op,top):	1204	* merge_ob(op,top):
1317	*	1205	*
1318	* This function goes through all objects below and including top, and	1206	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1207	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1208	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1209	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1210	*/
1323
1324	object *	1211	object *
1325	merge_ob (object *op, object *top)	1212	merge_ob (object *op, object *top)
1326	{	1213	{
1327	if (!op->nrof)	1214	if (!op->nrof)
1328	return 0;	1215	return 0;
		1216
1329	if (top == NULL)	1217	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1218	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1219
1331	for (; top != NULL; top = top->below)	1220	for (; top != NULL; top = top->below)
1332	{	1221	{
1333	if (top == op)	1222	if (top == op)
1334	continue;	1223	continue;
1335	if (CAN_MERGE (op, top))	1224	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1230	remove_ob (op);
1342	free_object (op);	1231	free_object (op);
1343	return top;	1232	return top;
1344	}	1233	}
1345	}	1234	}
		1235
1346	return NULL;	1236	return 0;
1347	}	1237	}
1348		1238
1349	/*	1239	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1240	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1241	* job preparing multi-part monsters
1352	*/	1242	*/
1353	object *	1243	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1245	{
1356	object *	1246	object *tmp;
1357	tmp;
1358		1247
1359	if (op->head)	1248	if (op->head)
1360	op = op->head;	1249	op = op->head;
		1250
1361	for (tmp = op; tmp; tmp = tmp->more)	1251	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1252	{
1363	tmp->x = x + tmp->arch->clone.x;	1253	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1254	tmp->y = y + tmp->arch->clone.y;
1365	}	1255	}
		1256
1366	return insert_ob_in_map (op, m, originator, flag);	1257	return insert_ob_in_map (op, m, originator, flag);
1367	}	1258	}
1368		1259
1369	/*	1260	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1261	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1277	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1278	* just 'op' otherwise
1388	*/	1279	*/
1389		1280
1390	object *	1281	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1282	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1283	{
1393	object *tmp, *top, *floor = NULL;	1284	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1285	sint16 x, y;
1395		1286
1396	if (QUERY_FLAG (op, FLAG_FREED))	1287	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1290	return NULL;
1400	}	1291	}
1401		1292
1402	if (m == NULL)	1293	if (m == NULL)
1403	{	1294	{
1404	dump_object (op);	1295	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1296	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1297	free (dump);
1406	return op;	1298	return op;
1407	}	1299	}
1408		1300
1409	if (out_of_map (m, op->x, op->y))	1301	if (out_of_map (m, op->x, op->y))
1410	{	1302	{
1411	dump_object (op);	1303	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1305	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1306	/* 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	1307	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1308	* improperly inserted.
1417	*/	1309	*/
1418	abort ();	1310	abort ();
1419	#endif	1311	#endif
		1312	free (dump);
1420	return op;	1313	return op;
1421	}	1314	}
1422		1315
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1316	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1317	{
1425	dump_object (op);	1318	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1319	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1320	free (dump);
1427	return op;	1321	return op;
1428	}	1322	}
1429		1323
1430	if (op->more != NULL)	1324	if (op->more != NULL)
1431	{	1325	{
…		…
1661	* op is the object to insert it under: supplies x and the map.	1555	* op is the object to insert it under: supplies x and the map.
1662	*/	1556	*/
1663	void	1557	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1558	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1559	{
1666	object *tmp;	1560	object *
		1561	tmp;
1667	object *tmp1;	1562	object *
		1563	tmp1;
1668		1564
1669	/* first search for itself and remove any old instances */	1565	/* first search for itself and remove any old instances */
1670		1566
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1567	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1568	{
…		…
1675	remove_ob (tmp);	1571	remove_ob (tmp);
1676	free_object (tmp);	1572	free_object (tmp);
1677	}	1573	}
1678	}	1574	}
1679		1575
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1576	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1577
1682	tmp1->x = op->x;	1578	tmp1->x = op->x;
1683	tmp1->y = op->y;	1579	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1580	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1581	}
…		…
1703	if (orig_ob->nrof < nr)	1599	if (orig_ob->nrof < nr)
1704	{	1600	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1601	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1602	return NULL;
1707	}	1603	}
		1604
1708	newob = object_create_clone (orig_ob);	1605	newob = object_create_clone (orig_ob);
		1606
1709	if ((orig_ob->nrof -= nr) < 1)	1607	if ((orig_ob->nrof -= nr) < 1)
1710	{	1608	{
1711	if (!is_removed)	1609	if (!is_removed)
1712	remove_ob (orig_ob);	1610	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1611	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1619	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");	1620	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1621	return NULL;
1724	}	1622	}
1725	}	1623	}
		1624
1726	newob->nrof = nr;	1625	newob->nrof = nr;
1727		1626
1728	return newob;	1627	return newob;
1729	}	1628	}
1730		1629
…		…
1737	*/	1636	*/
1738		1637
1739	object *	1638	object *
1740	decrease_ob_nr (object *op, uint32 i)	1639	decrease_ob_nr (object *op, uint32 i)
1741	{	1640	{
1742	object *	1641	object *tmp;
1743	tmp;
1744	player *	1642	player *pl;
1745	pl;
1746		1643
1747	if (i == 0) /* objects with op->nrof require this check */	1644	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1645	return op;
1749		1646
1750	if (i > op->nrof)	1647	if (i > op->nrof)
1751	i = op->nrof;	1648	i = op->nrof;
1752		1649
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1650	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1651	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1652	else if (op->env != NULL)
1758	{	1653	{
1759	/* is this object in the players inventory, or sub container	1654	/* is this object in the players inventory, or sub container
1760	* therein?	1655	* therein?
1761	*/	1656	*/
…		…
1796	}	1691	}
1797	}	1692	}
1798	}	1693	}
1799	else	1694	else
1800	{	1695	{
1801	object *
1802	above = op->above;	1696	object *above = op->above;
1803		1697
1804	if (i < op->nrof)	1698	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1699	op->nrof -= i;
1807	}
1808	else	1700	else
1809	{	1701	{
1810	remove_ob (op);	1702	remove_ob (op);
1811	op->nrof = 0;	1703	op->nrof = 0;
1812	}	1704	}
		1705
1813	/* Since we just removed op, op->above is null */	1706	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1707	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1708	if (tmp->type == PLAYER)
1816	{	1709	{
1817	if (op->nrof)	1710	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1713	esrv_del_item (tmp->contr, op->count);
1821	}	1714	}
1822	}	1715	}
1823		1716
1824	if (op->nrof)	1717	if (op->nrof)
1825	{
1826	return op;	1718	return op;
1827	}
1828	else	1719	else
1829	{	1720	{
1830	free_object (op);	1721	free_object (op);
1831	return NULL;	1722	return NULL;
1832	}	1723	}
…		…
1841	add_weight (object *op, signed long weight)	1732	add_weight (object *op, signed long weight)
1842	{	1733	{
1843	while (op != NULL)	1734	while (op != NULL)
1844	{	1735	{
1845	if (op->type == CONTAINER)	1736	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1737	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1738
1849	op->carrying += weight;	1739	op->carrying += weight;
1850	op = op->env;	1740	op = op->env;
1851	}	1741	}
1852	}	1742	}
1853		1743
…		…
1872	tmp, *	1762	tmp, *
1873	otmp;	1763	otmp;
1874		1764
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1765	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1766	{
1877	dump_object (op);	1767	char *dump = dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1768	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1769	free (dump);
1879	return op;	1770	return op;
1880	}	1771	}
		1772
1881	if (where == NULL)	1773	if (where == NULL)
1882	{	1774	{
1883	dump_object (op);	1775	char *dump = dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1777	free (dump);
1885	return op;	1778	return op;
1886	}	1779	}
		1780
1887	if (where->head)	1781	if (where->head)
1888	{	1782	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1783	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1784	where = where->head;
1891	}	1785	}
		1786
1892	if (op->more)	1787	if (op->more)
1893	{	1788	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1789	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1790	return op;
1896	}	1791	}
		1792
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1793	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1794	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1795	if (op->nrof)
1900	{	1796	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1797	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1987		1883
1988	int	1884	int
1989	check_move_on (object *op, object *originator)	1885	check_move_on (object *op, object *originator)
1990	{	1886	{
1991	object *tmp;	1887	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1888	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1889	int x = op->x, y = op->y;
1995		1890
1996	MoveType move_on, move_slow, move_block;	1891	MoveType move_on, move_slow, move_block;
1997		1892
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1893	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1894	return 0;
2000
2001	tag = op->count;
2002		1895
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1896	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);	1897	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);	1898	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1899
…		…
2049	{	1942	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1943	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))	1944	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1945	{
2053		1946
		1947	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1948	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1949
2056	if (op->type == PLAYER)	1950	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1951	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)))	1952	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1953	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1960	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))	1961	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1962	{
2069	move_apply (tmp, op, originator);	1963	move_apply (tmp, op, originator);
2070		1964
2071	if (was_destroyed (op, tag))	1965	if (op->destroyed ())
2072	return 1;	1966	return 1;
2073		1967
2074	/* what the person/creature stepped onto has moved the object	1968	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1969	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1970	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1982	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1983	* The first matching object is returned, or NULL if none.
2090	*/	1984	*/
2091		1985
2092	object *	1986	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1987	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1988	{
2095	object *	1989	object *
2096	tmp;	1990	tmp;
2097		1991
2098	if (m == NULL || out_of_map (m, x, y))	1992	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	2005	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	2006	* The first matching object is returned, or NULL if none.
2113	*/	2007	*/
2114		2008
2115	object *	2009	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	2010	present (unsigned char type, maptile *m, int x, int y)
2117	{	2011	{
2118	object *	2012	object *
2119	tmp;	2013	tmp;
2120		2014
2121	if (out_of_map (m, x, y))	2015	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2155	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2156	* customized, changed states, etc.
2263	*/	2157	*/
2264		2158
2265	int	2159	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2160	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2161	{
2268	int	2162	int
2269	i,	2163	i,
2270	index = 0, flag;	2164	index = 0, flag;
2271	static int	2165	static int
…		…
2292	return -1;	2186	return -1;
2293	return altern[RANDOM () % index];	2187	return altern[RANDOM () % index];
2294	}	2188	}
2295		2189
2296	/*	2190	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2191	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2192	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2193	* 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.	2194	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2195	*/
2302		2196
2303	int	2197	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2198	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2199	{
2306	int	2200	int
2307	i;	2201	i;
2308		2202
2309	for (i = 0; i < SIZEOFFREE; i++)	2203	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2267	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2268	* there is capable of.
2375	*/	2269	*/
2376		2270
2377	int	2271	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2272	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2273	{
2380	int	2274	int
2381	i,	2275	i,
2382	max = SIZEOFFREE, mflags;	2276	max = SIZEOFFREE, mflags;
2383	sint16	2277
2384	nx,	2278	sint16 nx, ny;
2385	ny;
2386	object *	2279	object *
2387	tmp;	2280	tmp;
2388	mapstruct *	2281	maptile *
2389	mp;	2282	mp;
2390	MoveType	2283
2391	blocked,	2284	MoveType blocked, move_type;
2392	move_type;
2393		2285
2394	if (exclude && exclude->head)	2286	if (exclude && exclude->head)
2395	{	2287	{
2396	exclude = exclude->head;	2288	exclude = exclude->head;
2397	move_type = exclude->move_type;	2289	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2494	* Modified to be map tile aware -.MSW
2603	*/	2495	*/
2604		2496
2605		2497
2606	int	2498	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2499	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2500	{
2609	sint16	2501	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2502	int
2613	mflags;	2503	mflags;
2614		2504
2615	if (dir < 0)	2505	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2506	return 0; /* exit condition: invalid direction */
…		…
2694	if (prev)	2584	if (prev)
2695	prev->more = tmp;	2585	prev->more = tmp;
2696	prev = tmp;	2586	prev = tmp;
2697	}	2587	}
2698		2588
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2589	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2590	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2591
2705	return dst;	2592	return dst;
2706	}	2593	}
2707		2594
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. */	2595	/* 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 */	2596	/* 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, */	2597	/* 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. */	2598	/* 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. */	2599	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2600	/* Also remember that multiparts objects are not supported for now. */
2728		2601
2729	object *	2602	object *
2730	load_object_str (const char *obstr)	2603	load_object_str (const char *obstr)
2731	{	2604	{
2732	object *	2605	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2606	char filename[MAX_BUF];
2736		2607
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2608	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2609
2739	FILE *
2740	tempfile = fopen (filename, "w");	2610	FILE *tempfile = fopen (filename, "w");
2741		2611
2742	if (tempfile == NULL)	2612	if (tempfile == NULL)
2743	{	2613	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2614	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2615	return NULL;
2746	};	2616	}
		2617
2747	fprintf (tempfile, obstr);	2618	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2619	fclose (tempfile);
2749		2620
2750	op = get_object ();	2621	op = get_object ();
2751		2622
2752	object_thawer	2623	object_thawer thawer (filename);
2753	thawer (filename);
2754		2624
2755	if (thawer)	2625	if (thawer)
2756	load_object (thawer, op, 0);	2626	load_object (thawer, op, 0);
2757		2627
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2628	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2636	* returns NULL if no match.
2767	*/	2637	*/
2768	object *	2638	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2639	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2640	{
2771	object *	2641	object *tmp;
2772	tmp;
2773		2642
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2643	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2644	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2645	return tmp;
2777		2646
…		…
2785	* do the desired thing.	2654	* do the desired thing.
2786	*/	2655	*/
2787	key_value *	2656	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2657	get_ob_key_link (const object *ob, const char *key)
2789	{	2658	{
2790	key_value *	2659	key_value *link;
2791	link;
2792		2660
2793	for (link = ob->key_values; link != NULL; link = link->next)	2661	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2662	if (link->key == key)
2796	{
2797	return link;	2663	return link;
2798	}
2799	}
2800		2664
2801	return NULL;	2665	return NULL;
2802	}	2666	}
2803		2667
2804	/*	2668	/*
…		…
2809	* The returned string is shared.	2673	* The returned string is shared.
2810	*/	2674	*/
2811	const char *	2675	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2676	get_ob_key_value (const object *op, const char *const key)
2813	{	2677	{
2814	key_value *	2678	key_value *link;
2815	link;	2679	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2680
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2681	if (!canonical_key)
2822	{	2682	{
2823	/* 1. There being a field named key on any object	2683	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2684	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2685	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2686	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2687	*/
2828	return NULL;	2688	return 0;
2829	}	2689	}
2830		2690
2831	/* This is copied from get_ob_key_link() above -	2691	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2692	* only 4 lines, and saves the function call overhead.
2833	*/	2693	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2694	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2695	if (link->key == canonical_key)
2837	{
2838	return link->value;	2696	return link->value;
2839	}	2697
2840	}
2841	return NULL;	2698	return 0;
2842	}	2699	}
2843		2700
2844		2701
2845	/*	2702	/*
2846	* Updates the canonical_key in op to value.	2703	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2739	if (last)
2883	last->next = field->next;	2740	last->next = field->next;
2884	else	2741	else
2885	op->key_values = field->next;	2742	op->key_values = field->next;
2886		2743
2887	delete
2888	field;	2744	delete field;
2889	}	2745	}
2890	}	2746	}
2891	return TRUE;	2747	return TRUE;
2892	}	2748	}
2893	/* IF we get here, key doesn't exist */	2749	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2784	* Returns TRUE on success.
2929	*/	2785	*/
2930	int	2786	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2787	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2788	{
2933	shstr
2934	key_ (key);	2789	shstr key_ (key);
2935		2790
2936	return set_ob_key_value_s (op, key_, value, add_key);	2791	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2792	}
		2793
		2794	object::depth_iterator::depth_iterator (object *container)
		2795	: iterator_base (container)
		2796	{
		2797	while (item->inv)
		2798	item = item->inv;
		2799	}
		2800
		2801	void
		2802	object::depth_iterator::next ()
		2803	{
		2804	if (item->below)
		2805	{
		2806	item = item->below;
		2807
		2808	while (item->inv)
		2809	item = item->inv;
		2810	}
		2811	else
		2812	item = item->env;
		2813	}
		2814
		2815	// return a suitable string describing an objetc in enough detail to find it
		2816	const char *
		2817	object::debug_desc (char *info) const
		2818	{
		2819	char info2[256 * 3];
		2820	char *p = info;
		2821
		2822	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2823	count,
		2824	&name,
		2825	title ? " " : "",
		2826	title ? (const char *)title : "");
		2827
		2828	if (env)
		2829	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2830
		2831	if (map)
		2832	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2833
		2834	return info;
		2835	}
		2836
		2837	const char *
		2838	object::debug_desc () const
		2839	{
		2840	static char info[256 * 3];
		2841	return debug_desc (info);
		2842	}
		2843

Diff Legend

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