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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.54 by root, Fri Nov 17 19:40:53 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 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
…		…
891	/* if the object is being removed, we can't make intelligent	809	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	810	* decisions, because remove_ob can't really pass the object
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	{
897	update_now = 1;	814	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	815	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	816	/* Nothing to do for that case */ ;
902	}
903	else	817	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	818	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		819
908	if (update_now)	820	if (update_now)
909	{	821	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	823	update_position (op->map, op->x, op->y);
…		…
913		825
914	if (op->more != NULL)	826	if (op->more != NULL)
915	update_object (op->more, action);	827	update_object (op->more, action);
916	}	828	}
917		829
918	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
919	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
920		833
921	void object::free_mortals ()	834	void object::free_mortals ()
922	{	835	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
925	{	840	{
926	freed.push_back (*i);	841	delete *i;
927	mortals.erase (i);	842	mortals.erase (i);
928	}	843	}
929	else	844
930	++i;	845	static int lastmortals = 0;//D
		846
		847	if (mortals.size() != lastmortals && lastmortals > 100)//D
		848	{
		849	lastmortals = mortals.size ();//D
		850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		851	}
931	}	852	}
932		853
933	object::object ()	854	object::object ()
934	{	855	{
935	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
936		857
937	expmul = 1.0;	858	expmul = 1.0;
938	face = blank_face;	859	face = blank_face;
939	attacked_by_count = -1;
940	}	860	}
941		861
942	object::~object ()	862	object::~object ()
943	{	863	{
944	free_key_values (this);	864	free_key_values (this);
945	}	865	}
946		866
947	void object::link ()	867	void object::link ()
948	{	868	{
949	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
950		871
951	prev = 0;	872	prev = 0;
952	next = objects;	873	next = object::first;
953		874
954	if (objects)	875	if (object::first)
955	objects->prev = this;	876	object::first->prev = this;
956		877
957	objects = this;	878	object::first = this;
958	}	879	}
959		880
960	void object::unlink ()	881	void object::unlink ()
961	{	882	{
962	count = 0;	883	if (this == object::first)
		884	object::first = next;
963		885
964	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
968	prev = 0;	890	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	891	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	892	}
980		893
981	object *object::create ()	894	object *object::create ()
982	{	895	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	896	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	897	op->link ();
996	return op;	898	return op;
997	}	899	}
998		900
999	/*	901	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	903	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	906	* this function to succeed.
1005	*	907	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	908	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	909	* inventory to the ground.
1008	*/	910	*/
1009	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
1010	{	912	{
		913	if (QUERY_FLAG (this, FLAG_FREED))
		914	return;
		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	920	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		921
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	922	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		923
1033	if (more)	924	if (more)
1034	{	925	{
1035	more->free (free_inventory);	926	more->destroy (destroy_inventory);
1036	more = 0;	927	more = 0;
1037	}	928	}
1038		929
1039	if (inv)	930	if (inv)
1040	{	931	{
1041	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
1043	* drop on that space.	934	* drop on that space.
1044	*/	935	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	936	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	937	{
1047	object *	938	object *op = inv;
1048	op = inv;
1049		939
1050	while (op)	940	while (op)
1051	{	941	{
1052	object *
1053	tmp = op->below;	942	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	943	op->destroy (destroy_inventory);
1057	op = tmp;	944	op = tmp;
1058	}	945	}
1059	}	946	}
1060	else	947	else
1061	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
1062	object *	949	object *op = inv;
1063	op = inv;
1064		950
1065	while (op)	951	while (op)
1066	{	952	{
1067	object *
1068	tmp = op->below;	953	object *tmp = op->below;
1069		954
1070	remove_ob (op);	955	remove_ob (op);
1071		956
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	958	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	967	op = tmp;
1083	}	968	}
1084	}	969	}
1085	}	970	}
1086		971
1087	clear_owner (this);	972	// clear those pointers that likely might have circular references to us
		973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1088		979
1089	/* Remove object from the active list */	980	/* Remove object from the active list */
1090	speed = 0;	981	speed = 0;
1091	update_ob_speed (this);	982	update_ob_speed (this);
1092		983
1093	unlink ();	984	unlink ();
1094		985
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	986	mortals.push_back (this);
1098	}	987	}
1099		988
1100	/*	989	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1106	sub_weight (object *op, signed long weight)	995	sub_weight (object *op, signed long weight)
1107	{	996	{
1108	while (op != NULL)	997	while (op != NULL)
1109	{	998	{
1110	if (op->type == CONTAINER)	999	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1000	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1001
1114	op->carrying -= weight;	1002	op->carrying -= weight;
1115	op = op->env;	1003	op = op->env;
1116	}	1004	}
1117	}	1005	}
1118		1006
…		…
1126	*/	1014	*/
1127		1015
1128	void	1016	void
1129	remove_ob (object *op)	1017	remove_ob (object *op)
1130	{	1018	{
1131	object *tmp, *last = NULL;	1019	object *tmp, *last = 0;
1132	object *otmp;	1020	object *otmp;
1133		1021
1134	tag_t tag;
1135	int check_walk_off;	1022	int check_walk_off;
1136	mapstruct *m;	1023	maptile *m;
1137		1024
1138	sint16 x, y;	1025	sint16 x, y;
1139		1026
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1027	if (QUERY_FLAG (op, FLAG_REMOVED))
1141	{	1028	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1029
1145	/* Changed it to always dump core in this case. As has been learned	1030	SET_FLAG (op, FLAG_REMOVED);
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157		1031
1158	if (op->more != NULL)	1032	if (op->more != NULL)
1159	remove_ob (op->more);	1033	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);
1162		1034
1163	/*	1035	/*
1164	* In this case, the object to be removed is in someones	1036	* In this case, the object to be removed is in someones
1165	* inventory.	1037	* inventory.
1166	*/	1038	*/
…		…
1192	*/	1064	*/
1193	op->x = op->env->x, op->y = op->env->y;	1065	op->x = op->env->x, op->y = op->env->y;
1194	op->map = op->env->map;	1066	op->map = op->env->map;
1195	op->above = NULL, op->below = NULL;	1067	op->above = NULL, op->below = NULL;
1196	op->env = NULL;	1068	op->env = NULL;
1197	return;	1069	}
		1070	else if (op->map)
1198	}	1071	{
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;	1072	x = op->x;
1205	y = op->y;	1073	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);	1074	m = get_map_from_coord (op->map, &x, &y);
1207		1075
1208	if (!m)	1076	if (!m)
1209	{	1077	{
1210	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1078	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1211	op->map->path, op->x, op->y);	1079	op->map->path, op->x, op->y);
1212	/* in old days, we used to set x and y to 0 and continue.	1080	/* in old days, we used to set x and y to 0 and continue.
1213	* it seems if we get into this case, something is probablye	1081	* it seems if we get into this case, something is probablye
1214	* screwed up and should be fixed.	1082	* screwed up and should be fixed.
		1083	*/
		1084	abort ();
		1085	}
		1086
		1087	if (op->map != m)
		1088	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1089	op->map->path, m->path, op->x, op->y, x, y);
		1090
		1091	/* Re did the following section of code - it looks like it had
		1092	* lots of logic for things we no longer care about
1215	*/	1093	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1094
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1095	/* link the object above us */
1229	if (op->above)	1096	if (op->above)
1230	op->above->below = op->below;	1097	op->above->below = op->below;
1231	else	1098	else
1232	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1099	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1233		1100
1234	/* Relink the object below us, if there is one */	1101	/* Relink the object below us, if there is one */
1235	if (op->below)	1102	if (op->below)
1236	op->below->above = op->above;	1103	op->below->above = op->above;
1237	else	1104	else
1238	{	1105	{
1239	/* Nothing below, which means we need to relink map object for this space	1106	/* Nothing below, which means we need to relink map object for this space
1240	* use translated coordinates in case some oddness with map tiling is	1107	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1108	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	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",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1109	*/
1276	if (tmp->container == op)	1110	if (GET_MAP_OB (m, x, y) != op)
1277	{	1111	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1112	char *dump = dump_object (op);
1279	tmp->container = NULL;	1113	LOG (llevError,
		1114	"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);
		1115	free (dump);
		1116	dump = dump_object (GET_MAP_OB (m, x, y));
		1117	LOG (llevError, "%s\n", dump);
		1118	free (dump);
1280	}	1119	}
1281		1120
1282	tmp->contr->socket.update_look = 1;	1121	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1122	}
1287	move_apply (tmp, op, NULL);
1288		1123
1289	if (was_destroyed (op, tag))	1124	op->above = 0;
		1125	op->below = 0;
		1126
		1127	if (op->map->in_memory == MAP_SAVING)
		1128	return;
		1129
		1130	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1131
		1132	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1133	{
		1134	/* No point updating the players look faces if he is the object
		1135	* being removed.
		1136	*/
		1137
		1138	if (tmp->type == PLAYER && tmp != op)
1290	{	1139	{
1291	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1140	/* If a container that the player is currently using somehow gets
		1141	* removed (most likely destroyed), update the player view
		1142	* appropriately.
		1143	*/
		1144	if (tmp->container == op)
		1145	{
		1146	CLEAR_FLAG (op, FLAG_APPLIED);
		1147	tmp->container = NULL;
		1148	}
		1149
		1150	tmp->contr->socket.update_look = 1;
1292	}	1151	}
		1152
		1153	/* See if player moving off should effect something */
		1154	if (check_walk_off
		1155	&& ((op->move_type & tmp->move_off)
		1156	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1157	{
		1158	move_apply (tmp, op, NULL);
		1159
		1160	if (op->destroyed ())
		1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1293	}	1162	}
1294		1163
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1164	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1165
1297	if (tmp->above == tmp)	1166	if (tmp->above == tmp)
1298	tmp->above = NULL;	1167	tmp->above = NULL;
1299		1168
1300	last = tmp;	1169	last = tmp;
1301	}	1170	}
1302		1171
1303	/* last == NULL of there are no objects on this space */	1172	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1173	if (last == NULL)
1305	{	1174	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1175	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1176	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1308	* those out anyways, and if there are any flags set right now, they won't	1177	* those out anyways, and if there are any flags set right now, they won't
1309	* be correct anyways.	1178	* be correct anyways.
1310	*/	1179	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1180	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1181	update_position (op->map, op->x, op->y);
1313	}	1182	}
1314	else	1183	else
1315	update_object (last, UP_OBJ_REMOVE);	1184	update_object (last, UP_OBJ_REMOVE);
1316		1185
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1186	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1318	update_all_los (op->map, op->x, op->y);	1187	update_all_los (op->map, op->x, op->y);
		1188	}
1319	}	1189	}
1320		1190
1321	/*	1191	/*
1322	* merge_ob(op,top):	1192	* merge_ob(op,top):
1323	*	1193	*
1324	* This function goes through all objects below and including top, and	1194	* This function goes through all objects below and including top, and
1325	* merges op to the first matching object.	1195	* merges op to the first matching object.
1326	* If top is NULL, it is calculated.	1196	* If top is NULL, it is calculated.
1327	* Returns pointer to object if it succeded in the merge, otherwise NULL	1197	* Returns pointer to object if it succeded in the merge, otherwise NULL
1328	*/	1198	*/
1329
1330	object *	1199	object *
1331	merge_ob (object *op, object *top)	1200	merge_ob (object *op, object *top)
1332	{	1201	{
1333	if (!op->nrof)	1202	if (!op->nrof)
1334	return 0;	1203	return 0;
		1204
1335	if (top == NULL)	1205	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1206	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1207
1337	for (; top != NULL; top = top->below)	1208	for (; top != NULL; top = top->below)
1338	{	1209	{
1339	if (top == op)	1210	if (top == op)
1340	continue;	1211	continue;
1341	if (CAN_MERGE (op, top))	1212	if (CAN_MERGE (op, top))
…		…
1347	remove_ob (op);	1218	remove_ob (op);
1348	free_object (op);	1219	free_object (op);
1349	return top;	1220	return top;
1350	}	1221	}
1351	}	1222	}
		1223
1352	return NULL;	1224	return 0;
1353	}	1225	}
1354		1226
1355	/*	1227	/*
1356	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1228	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1357	* job preparing multi-part monsters	1229	* job preparing multi-part monsters
1358	*/	1230	*/
1359	object *	1231	object *
1360	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1361	{	1233	{
1362	object *	1234	object *tmp;
1363	tmp;
1364		1235
1365	if (op->head)	1236	if (op->head)
1366	op = op->head;	1237	op = op->head;
		1238
1367	for (tmp = op; tmp; tmp = tmp->more)	1239	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1240	{
1369	tmp->x = x + tmp->arch->clone.x;	1241	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1242	tmp->y = y + tmp->arch->clone.y;
1371	}	1243	}
		1244
1372	return insert_ob_in_map (op, m, originator, flag);	1245	return insert_ob_in_map (op, m, originator, flag);
1373	}	1246	}
1374		1247
1375	/*	1248	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1249	* insert_ob_in_map (op, map, originator, flag):
…		…
1392	* NULL if 'op' was destroyed	1265	* NULL if 'op' was destroyed
1393	* just 'op' otherwise	1266	* just 'op' otherwise
1394	*/	1267	*/
1395		1268
1396	object *	1269	object *
1397	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1270	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1398	{	1271	{
1399	object *tmp, *top, *floor = NULL;	1272	object *tmp, *top, *floor = NULL;
1400	sint16 x, y;	1273	sint16 x, y;
1401		1274
1402	if (QUERY_FLAG (op, FLAG_FREED))	1275	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1405	return NULL;	1278	return NULL;
1406	}	1279	}
1407		1280
1408	if (m == NULL)	1281	if (m == NULL)
1409	{	1282	{
1410	dump_object (op);	1283	char *dump = dump_object (op);
1411	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1285	free (dump);
1412	return op;	1286	return op;
1413	}	1287	}
1414		1288
1415	if (out_of_map (m, op->x, op->y))	1289	if (out_of_map (m, op->x, op->y))
1416	{	1290	{
1417	dump_object (op);	1291	char *dump = dump_object (op);
1418	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1292	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1419	#ifdef MANY_CORES	1293	#ifdef MANY_CORES
1420	/* Better to catch this here, as otherwise the next use of this object	1294	/* Better to catch this here, as otherwise the next use of this object
1421	* is likely to cause a crash. Better to find out where it is getting	1295	* is likely to cause a crash. Better to find out where it is getting
1422	* improperly inserted.	1296	* improperly inserted.
1423	*/	1297	*/
1424	abort ();	1298	abort ();
1425	#endif	1299	#endif
		1300	free (dump);
1426	return op;	1301	return op;
1427	}	1302	}
1428		1303
1429	if (!QUERY_FLAG (op, FLAG_REMOVED))	1304	if (!QUERY_FLAG (op, FLAG_REMOVED))
1430	{	1305	{
1431	dump_object (op);	1306	char *dump = dump_object (op);
1432	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1307	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1308	free (dump);
1433	return op;	1309	return op;
1434	}	1310	}
1435		1311
1436	if (op->more != NULL)	1312	if (op->more != NULL)
1437	{	1313	{
…		…
1667	* op is the object to insert it under: supplies x and the map.	1543	* op is the object to insert it under: supplies x and the map.
1668	*/	1544	*/
1669	void	1545	void
1670	replace_insert_ob_in_map (const char *arch_string, object *op)	1546	replace_insert_ob_in_map (const char *arch_string, object *op)
1671	{	1547	{
1672	object *tmp;	1548	object *
		1549	tmp;
1673	object *tmp1;	1550	object *
		1551	tmp1;
1674		1552
1675	/* first search for itself and remove any old instances */	1553	/* first search for itself and remove any old instances */
1676		1554
1677	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1555	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1678	{	1556	{
…		…
1681	remove_ob (tmp);	1559	remove_ob (tmp);
1682	free_object (tmp);	1560	free_object (tmp);
1683	}	1561	}
1684	}	1562	}
1685		1563
1686	tmp1 = arch_to_object (find_archetype (arch_string));	1564	tmp1 = arch_to_object (archetype::find (arch_string));
1687		1565
1688	tmp1->x = op->x;	1566	tmp1->x = op->x;
1689	tmp1->y = op->y;	1567	tmp1->y = op->y;
1690	insert_ob_in_map (tmp1, op->map, op, 0);	1568	insert_ob_in_map (tmp1, op->map, op, 0);
1691	}	1569	}
…		…
1709	if (orig_ob->nrof < nr)	1587	if (orig_ob->nrof < nr)
1710	{	1588	{
1711	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1589	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1712	return NULL;	1590	return NULL;
1713	}	1591	}
		1592
1714	newob = object_create_clone (orig_ob);	1593	newob = object_create_clone (orig_ob);
		1594
1715	if ((orig_ob->nrof -= nr) < 1)	1595	if ((orig_ob->nrof -= nr) < 1)
1716	{	1596	{
1717	if (!is_removed)	1597	if (!is_removed)
1718	remove_ob (orig_ob);	1598	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);	1599	free_object2 (orig_ob, 1);
…		…
1727	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1607	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1728	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1608	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1729	return NULL;	1609	return NULL;
1730	}	1610	}
1731	}	1611	}
		1612
1732	newob->nrof = nr;	1613	newob->nrof = nr;
1733		1614
1734	return newob;	1615	return newob;
1735	}	1616	}
1736		1617
…		…
1743	*/	1624	*/
1744		1625
1745	object *	1626	object *
1746	decrease_ob_nr (object *op, uint32 i)	1627	decrease_ob_nr (object *op, uint32 i)
1747	{	1628	{
1748	object *	1629	object *tmp;
1749	tmp;
1750	player *	1630	player *pl;
1751	pl;
1752		1631
1753	if (i == 0) /* objects with op->nrof require this check */	1632	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1633	return op;
1755		1634
1756	if (i > op->nrof)	1635	if (i > op->nrof)
1757	i = op->nrof;	1636	i = op->nrof;
1758		1637
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1638	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1639	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1640	else if (op->env != NULL)
1764	{	1641	{
1765	/* is this object in the players inventory, or sub container	1642	/* is this object in the players inventory, or sub container
1766	* therein?	1643	* therein?
1767	*/	1644	*/
…		…
1802	}	1679	}
1803	}	1680	}
1804	}	1681	}
1805	else	1682	else
1806	{	1683	{
1807	object *
1808	above = op->above;	1684	object *above = op->above;
1809		1685
1810	if (i < op->nrof)	1686	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1687	op->nrof -= i;
1813	}
1814	else	1688	else
1815	{	1689	{
1816	remove_ob (op);	1690	remove_ob (op);
1817	op->nrof = 0;	1691	op->nrof = 0;
1818	}	1692	}
		1693
1819	/* Since we just removed op, op->above is null */	1694	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1695	for (tmp = above; tmp != NULL; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1696	if (tmp->type == PLAYER)
1822	{	1697	{
1823	if (op->nrof)	1698	if (op->nrof)
…		…
1826	esrv_del_item (tmp->contr, op->count);	1701	esrv_del_item (tmp->contr, op->count);
1827	}	1702	}
1828	}	1703	}
1829		1704
1830	if (op->nrof)	1705	if (op->nrof)
1831	{
1832	return op;	1706	return op;
1833	}
1834	else	1707	else
1835	{	1708	{
1836	free_object (op);	1709	free_object (op);
1837	return NULL;	1710	return NULL;
1838	}	1711	}
…		…
1847	add_weight (object *op, signed long weight)	1720	add_weight (object *op, signed long weight)
1848	{	1721	{
1849	while (op != NULL)	1722	while (op != NULL)
1850	{	1723	{
1851	if (op->type == CONTAINER)	1724	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1725	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1726
1855	op->carrying += weight;	1727	op->carrying += weight;
1856	op = op->env;	1728	op = op->env;
1857	}	1729	}
1858	}	1730	}
1859		1731
…		…
1878	tmp, *	1750	tmp, *
1879	otmp;	1751	otmp;
1880		1752
1881	if (!QUERY_FLAG (op, FLAG_REMOVED))	1753	if (!QUERY_FLAG (op, FLAG_REMOVED))
1882	{	1754	{
1883	dump_object (op);	1755	char *dump = dump_object (op);
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1756	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1757	free (dump);
1885	return op;	1758	return op;
1886	}	1759	}
		1760
1887	if (where == NULL)	1761	if (where == NULL)
1888	{	1762	{
1889	dump_object (op);	1763	char *dump = dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1764	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1765	free (dump);
1891	return op;	1766	return op;
1892	}	1767	}
		1768
1893	if (where->head)	1769	if (where->head)
1894	{	1770	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1771	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;	1772	where = where->head;
1897	}	1773	}
		1774
1898	if (op->more)	1775	if (op->more)
1899	{	1776	{
1900	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1777	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1901	return op;	1778	return op;
1902	}	1779	}
		1780
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1781	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1782	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1783	if (op->nrof)
1906	{	1784	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1785	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1993		1871
1994	int	1872	int
1995	check_move_on (object *op, object *originator)	1873	check_move_on (object *op, object *originator)
1996	{	1874	{
1997	object *tmp;	1875	object *tmp;
1998	tag_t tag;
1999	mapstruct *m = op->map;	1876	maptile *m = op->map;
2000	int x = op->x, y = op->y;	1877	int x = op->x, y = op->y;
2001		1878
2002	MoveType move_on, move_slow, move_block;	1879	MoveType move_on, move_slow, move_block;
2003		1880
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1881	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1882	return 0;
2006
2007	tag = op->count;
2008		1883
2009	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1884	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2010	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1885	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2011	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1886	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2012		1887
…		…
2055	{	1930	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1931	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1932	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1933	{
2059		1934
		1935	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1936	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1937
2062	if (op->type == PLAYER)	1938	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1939	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1940	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1941	diff /= 4.0;
…		…
2072	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1948	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2073	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1949	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2074	{	1950	{
2075	move_apply (tmp, op, originator);	1951	move_apply (tmp, op, originator);
2076		1952
2077	if (was_destroyed (op, tag))	1953	if (op->destroyed ())
2078	return 1;	1954	return 1;
2079		1955
2080	/* what the person/creature stepped onto has moved the object	1956	/* what the person/creature stepped onto has moved the object
2081	* someplace new. Don't process any further - if we did,	1957	* someplace new. Don't process any further - if we did,
2082	* have a feeling strange problems would result.	1958	* have a feeling strange problems would result.
…		…
2094	* a matching archetype at the given map and coordinates.	1970	* a matching archetype at the given map and coordinates.
2095	* The first matching object is returned, or NULL if none.	1971	* The first matching object is returned, or NULL if none.
2096	*/	1972	*/
2097		1973
2098	object *	1974	object *
2099	present_arch (const archetype *at, mapstruct *m, int x, int y)	1975	present_arch (const archetype *at, maptile *m, int x, int y)
2100	{	1976	{
2101	object *	1977	object *
2102	tmp;	1978	tmp;
2103		1979
2104	if (m == NULL || out_of_map (m, x, y))	1980	if (m == NULL || out_of_map (m, x, y))
…		…
2117	* a matching type variable at the given map and coordinates.	1993	* a matching type variable at the given map and coordinates.
2118	* The first matching object is returned, or NULL if none.	1994	* The first matching object is returned, or NULL if none.
2119	*/	1995	*/
2120		1996
2121	object *	1997	object *
2122	present (unsigned char type, mapstruct *m, int x, int y)	1998	present (unsigned char type, maptile *m, int x, int y)
2123	{	1999	{
2124	object *	2000	object *
2125	tmp;	2001	tmp;
2126		2002
2127	if (out_of_map (m, x, y))	2003	if (out_of_map (m, x, y))
…		…
2267	* the archetype because that isn't correct if the monster has been	2143	* the archetype because that isn't correct if the monster has been
2268	* customized, changed states, etc.	2144	* customized, changed states, etc.
2269	*/	2145	*/
2270		2146
2271	int	2147	int
2272	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2148	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2273	{	2149	{
2274	int	2150	int
2275	i,	2151	i,
2276	index = 0, flag;	2152	index = 0, flag;
2277	static int	2153	static int
…		…
2298	return -1;	2174	return -1;
2299	return altern[RANDOM () % index];	2175	return altern[RANDOM () % index];
2300	}	2176	}
2301		2177
2302	/*	2178	/*
2303	* find_first_free_spot(archetype, mapstruct, x, y) works like	2179	* find_first_free_spot(archetype, maptile, x, y) works like
2304	* find_free_spot(), but it will search max number of squares.	2180	* find_free_spot(), but it will search max number of squares.
2305	* But it will return the first available spot, not a random choice.	2181	* But it will return the first available spot, not a random choice.
2306	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2182	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2307	*/	2183	*/
2308		2184
2309	int	2185	int
2310	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2186	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2311	{	2187	{
2312	int	2188	int
2313	i;	2189	i;
2314		2190
2315	for (i = 0; i < SIZEOFFREE; i++)	2191	for (i = 0; i < SIZEOFFREE; i++)
…		…
2379	* because we have to know what movement the thing looking to move	2255	* because we have to know what movement the thing looking to move
2380	* there is capable of.	2256	* there is capable of.
2381	*/	2257	*/
2382		2258
2383	int	2259	int
2384	find_dir (mapstruct *m, int x, int y, object *exclude)	2260	find_dir (maptile *m, int x, int y, object *exclude)
2385	{	2261	{
2386	int	2262	int
2387	i,	2263	i,
2388	max = SIZEOFFREE, mflags;	2264	max = SIZEOFFREE, mflags;
2389	sint16	2265
2390	nx,	2266	sint16 nx, ny;
2391	ny;
2392	object *	2267	object *
2393	tmp;	2268	tmp;
2394	mapstruct *	2269	maptile *
2395	mp;	2270	mp;
2396	MoveType	2271
2397	blocked,	2272	MoveType blocked, move_type;
2398	move_type;
2399		2273
2400	if (exclude && exclude->head)	2274	if (exclude && exclude->head)
2401	{	2275	{
2402	exclude = exclude->head;	2276	exclude = exclude->head;
2403	move_type = exclude->move_type;	2277	move_type = exclude->move_type;
…		…
2608	* Modified to be map tile aware -.MSW	2482	* Modified to be map tile aware -.MSW
2609	*/	2483	*/
2610		2484
2611		2485
2612	int	2486	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2487	can_see_monsterP (maptile *m, int x, int y, int dir)
2614	{	2488	{
2615	sint16	2489	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2490	int
2619	mflags;	2491	mflags;
2620		2492
2621	if (dir < 0)	2493	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2494	return 0; /* exit condition: invalid direction */
…		…
2700	if (prev)	2572	if (prev)
2701	prev->more = tmp;	2573	prev->more = tmp;
2702	prev = tmp;	2574	prev = tmp;
2703	}	2575	}
2704		2576
2705	/*** copy inventory ***/
2706	for (item = src->inv; item; item = item->below)	2577	for (item = src->inv; item; item = item->below)
2707	{
2708	(void) insert_ob_in_ob (object_create_clone (item), dst);	2578	insert_ob_in_ob (object_create_clone (item), dst);
2709	}
2710		2579
2711	return dst;	2580	return dst;
2712	}	2581	}
2713		2582
2714	/* return true if the object was destroyed, 0 otherwise */
2715	int
2716	was_destroyed (const object *op, tag_t old_tag)
2717	{
2718	/* checking for FLAG_FREED isn't necessary, but makes this function more
2719	* robust */
2720	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2721	}
2722
2723	/* GROS - Creates an object using a string representing its content. */	2583	/* GROS - Creates an object using a string representing its content. */
2724
2725	/* Basically, we save the content of the string to a temp file, then call */	2584	/* Basically, we save the content of the string to a temp file, then call */
2726
2727	/* load_object on it. I admit it is a highly inefficient way to make things, */	2585	/* load_object on it. I admit it is a highly inefficient way to make things, */
2728
2729	/* but it was simple to make and allows reusing the load_object function. */	2586	/* but it was simple to make and allows reusing the load_object function. */
2730
2731	/* Remember not to use load_object_str in a time-critical situation. */	2587	/* Remember not to use load_object_str in a time-critical situation. */
2732
2733	/* Also remember that multiparts objects are not supported for now. */	2588	/* Also remember that multiparts objects are not supported for now. */
2734		2589
2735	object *	2590	object *
2736	load_object_str (const char *obstr)	2591	load_object_str (const char *obstr)
2737	{	2592	{
2738	object *	2593	object *op;
2739	op;
2740	char
2741	filename[MAX_BUF];	2594	char filename[MAX_BUF];
2742		2595
2743	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2596	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2744		2597
2745	FILE *
2746	tempfile = fopen (filename, "w");	2598	FILE *tempfile = fopen (filename, "w");
2747		2599
2748	if (tempfile == NULL)	2600	if (tempfile == NULL)
2749	{	2601	{
2750	LOG (llevError, "Error - Unable to access load object temp file\n");	2602	LOG (llevError, "Error - Unable to access load object temp file\n");
2751	return NULL;	2603	return NULL;
2752	};	2604	}
		2605
2753	fprintf (tempfile, obstr);	2606	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2607	fclose (tempfile);
2755		2608
2756	op = get_object ();	2609	op = get_object ();
2757		2610
2758	object_thawer	2611	object_thawer thawer (filename);
2759	thawer (filename);
2760		2612
2761	if (thawer)	2613	if (thawer)
2762	load_object (thawer, op, 0);	2614	load_object (thawer, op, 0);
2763		2615
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2616	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2772	* returns NULL if no match.	2624	* returns NULL if no match.
2773	*/	2625	*/
2774	object *	2626	object *
2775	find_obj_by_type_subtype (const object *who, int type, int subtype)	2627	find_obj_by_type_subtype (const object *who, int type, int subtype)
2776	{	2628	{
2777	object *	2629	object *tmp;
2778	tmp;
2779		2630
2780	for (tmp = who->inv; tmp; tmp = tmp->below)	2631	for (tmp = who->inv; tmp; tmp = tmp->below)
2781	if (tmp->type == type && tmp->subtype == subtype)	2632	if (tmp->type == type && tmp->subtype == subtype)
2782	return tmp;	2633	return tmp;
2783		2634
…		…
2791	* do the desired thing.	2642	* do the desired thing.
2792	*/	2643	*/
2793	key_value *	2644	key_value *
2794	get_ob_key_link (const object *ob, const char *key)	2645	get_ob_key_link (const object *ob, const char *key)
2795	{	2646	{
2796	key_value *	2647	key_value *link;
2797	link;
2798		2648
2799	for (link = ob->key_values; link != NULL; link = link->next)	2649	for (link = ob->key_values; link != NULL; link = link->next)
2800	{
2801	if (link->key == key)	2650	if (link->key == key)
2802	{
2803	return link;	2651	return link;
2804	}
2805	}
2806		2652
2807	return NULL;	2653	return NULL;
2808	}	2654	}
2809		2655
2810	/*	2656	/*
…		…
2815	* The returned string is shared.	2661	* The returned string is shared.
2816	*/	2662	*/
2817	const char *	2663	const char *
2818	get_ob_key_value (const object *op, const char *const key)	2664	get_ob_key_value (const object *op, const char *const key)
2819	{	2665	{
2820	key_value *	2666	key_value *link;
2821	link;	2667	shstr_cmp canonical_key (key);
2822	const char *
2823	canonical_key;
2824		2668
2825	canonical_key = shstr::find (key);
2826
2827	if (canonical_key == NULL)	2669	if (!canonical_key)
2828	{	2670	{
2829	/* 1. There being a field named key on any object	2671	/* 1. There being a field named key on any object
2830	* implies there'd be a shared string to find.	2672	* implies there'd be a shared string to find.
2831	* 2. Since there isn't, no object has this field.	2673	* 2. Since there isn't, no object has this field.
2832	* 3. Therefore, *this* object doesn't have this field.	2674	* 3. Therefore, *this* object doesn't have this field.
2833	*/	2675	*/
2834	return NULL;	2676	return 0;
2835	}	2677	}
2836		2678
2837	/* This is copied from get_ob_key_link() above -	2679	/* This is copied from get_ob_key_link() above -
2838	* only 4 lines, and saves the function call overhead.	2680	* only 4 lines, and saves the function call overhead.
2839	*/	2681	*/
2840	for (link = op->key_values; link != NULL; link = link->next)	2682	for (link = op->key_values; link; link = link->next)
2841	{
2842	if (link->key == canonical_key)	2683	if (link->key == canonical_key)
2843	{
2844	return link->value;	2684	return link->value;
2845	}	2685
2846	}
2847	return NULL;	2686	return 0;
2848	}	2687	}
2849		2688
2850		2689
2851	/*	2690	/*
2852	* Updates the canonical_key in op to value.	2691	* Updates the canonical_key in op to value.
…		…
2888	if (last)	2727	if (last)
2889	last->next = field->next;	2728	last->next = field->next;
2890	else	2729	else
2891	op->key_values = field->next;	2730	op->key_values = field->next;
2892		2731
2893	delete
2894	field;	2732	delete field;
2895	}	2733	}
2896	}	2734	}
2897	return TRUE;	2735	return TRUE;
2898	}	2736	}
2899	/* IF we get here, key doesn't exist */	2737	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2772	* Returns TRUE on success.
2935	*/	2773	*/
2936	int	2774	int
2937	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2775	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2938	{	2776	{
2939	shstr
2940	key_ (key);	2777	shstr key_ (key);
2941		2778
2942	return set_ob_key_value_s (op, key_, value, add_key);	2779	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2780	}
		2781
		2782	object::depth_iterator::depth_iterator (object *container)
		2783	: iterator_base (container)
		2784	{
		2785	while (item->inv)
		2786	item = item->inv;
		2787	}
		2788
		2789	void
		2790	object::depth_iterator::next ()
		2791	{
		2792	if (item->below)
		2793	{
		2794	item = item->below;
		2795
		2796	while (item->inv)
		2797	item = item->inv;
		2798	}
		2799	else
		2800	item = item->env;
		2801	}
		2802
		2803	// return a suitable string describing an objetc in enough detail to find it
		2804	const char *
		2805	object::debug_desc (char *info) const
		2806	{
		2807	char info2[256 * 3];
		2808	char *p = info;
		2809
		2810	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2811	count,
		2812	&name,
		2813	title ? " " : "",
		2814	title ? (const char *)title : "");
		2815
		2816	if (env)
		2817	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2818
		2819	if (map)
		2820	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2821
		2822	return info;
		2823	}
		2824
		2825	const char *
		2826	object::debug_desc () const
		2827	{
		2828	static char info[256 * 3];
		2829	return debug_desc (info);
		2830	}
		2831

Diff Legend

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