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.56 by root, Sun Dec 3 02:04:57 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	844
924	++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	}
925	}	852	}
926		853
927	object::object ()	854	object::object ()
928	{	855	{
929	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
930		857
931	expmul = 1.0;	858	expmul = 1.0;
932	face = blank_face;	859	face = blank_face;
933	attacked_by_count = -1;
934	}	860	}
935		861
936	object::~object ()	862	object::~object ()
937	{	863	{
938	free_key_values (this);	864	free_key_values (this);
939	}	865	}
940		866
941	void object::link ()	867	void object::link ()
942	{	868	{
943	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
944		871
945	prev = 0;	872	prev = 0;
946	next = objects;	873	next = object::first;
947		874
948	if (objects)	875	if (object::first)
949	objects->prev = this;	876	object::first->prev = this;
950		877
951	objects = this;	878	object::first = this;
952	}	879	}
953		880
954	void object::unlink ()	881	void object::unlink ()
955	{	882	{
956	count = 0;	883	if (this == object::first)
		884	object::first = next;
957		885
958	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
962	prev = 0;	890	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	891	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	892	}
974		893
975	object *object::create ()	894	object *object::create ()
976	{	895	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	896	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 ();	897	op->link ();
990	return op;	898	return op;
991	}	899	}
992		900
993	/*	901	/*
…		…
995	* 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
996	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	906	* this function to succeed.
999	*	907	*
1000	* 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
1001	* inventory to the ground.	909	* inventory to the ground.
1002	*/	910	*/
1003	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
1004	{	912	{
		913	if (QUERY_FLAG (this, FLAG_FREED))
		914	return;
		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
		920	remove_ob (this);
		921
		922	SET_FLAG (this, FLAG_FREED);
		923
		924	// hack to ensure that freed objects still have a valid map
		925	{
		926	static maptile *freed_map; // freed objects are moved here to avoid crashes
		927
		928	if (!freed_map)
1006	{	929	{
1007	LOG (llevDebug, "Free object called with non removed object\n");	930	freed_map = new maptile;
1008	dump_object (this);	931
1009	#ifdef MANY_CORES	932	freed_map->name = "/internal/freed_objects_map";
1010	abort ();	933	freed_map->width = 3;
1011	#endif	934	freed_map->height = 3;
		935
		936	freed_map->allocate ();
1012	}	937	}
1013		938
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))	939	map = freed_map;
1015	{	940	x = 1;
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");	941	y = 1;
1017	remove_friendly_object (this);
1018	}	942	}
1019
1020	if (QUERY_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		943
1027	if (more)	944	if (more)
1028	{	945	{
1029	more->free (free_inventory);	946	more->destroy (destroy_inventory);
1030	more = 0;	947	more = 0;
1031	}	948	}
1032		949
1033	if (inv)	950	if (inv)
1034	{	951	{
1035	/* Only if the space blocks everything do we not process -	952	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	953	* if some form of movement is allowed, let objects
1037	* drop on that space.	954	* drop on that space.
1038	*/	955	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	956	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	957	{
1041	object *	958	object *op = inv;
1042	op = inv;
1043		959
1044	while (op)	960	while (op)
1045	{	961	{
1046	object *
1047	tmp = op->below;	962	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	963	op->destroy (destroy_inventory);
1051	op = tmp;	964	op = tmp;
1052	}	965	}
1053	}	966	}
1054	else	967	else
1055	{ /* Put objects in inventory onto this space */	968	{ /* Put objects in inventory onto this space */
1056	object *	969	object *op = inv;
1057	op = inv;
1058		970
1059	while (op)	971	while (op)
1060	{	972	{
1061	object *
1062	tmp = op->below;	973	object *tmp = op->below;
1063		974
1064	remove_ob (op);	975	remove_ob (op);
1065		976
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	977	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))	978	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	987	op = tmp;
1077	}	988	}
1078	}	989	}
1079	}	990	}
1080		991
1081	clear_owner (this);	992	// clear those pointers that likely might have circular references to us
		993	owner = 0;
		994	enemy = 0;
		995	attacked_by = 0;
		996
		997	// only relevant for players(?), but make sure of it anyways
		998	contr = 0;
1082		999
1083	/* Remove object from the active list */	1000	/* Remove object from the active list */
1084	speed = 0;	1001	speed = 0;
1085	update_ob_speed (this);	1002	update_ob_speed (this);
1086		1003
1087	unlink ();	1004	unlink ();
1088		1005
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1006	mortals.push_back (this);
1092	}	1007	}
1093		1008
1094	/*	1009	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1010	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	1015	sub_weight (object *op, signed long weight)
1101	{	1016	{
1102	while (op != NULL)	1017	while (op != NULL)
1103	{	1018	{
1104	if (op->type == CONTAINER)	1019	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1021
1108	op->carrying -= weight;	1022	op->carrying -= weight;
1109	op = op->env;	1023	op = op->env;
1110	}	1024	}
1111	}	1025	}
1112		1026
…		…
1120	*/	1034	*/
1121		1035
1122	void	1036	void
1123	remove_ob (object *op)	1037	remove_ob (object *op)
1124	{	1038	{
1125	object *tmp, *last = NULL;	1039	object *tmp, *last = 0;
1126	object *otmp;	1040	object *otmp;
1127		1041
1128	tag_t tag;
1129	int check_walk_off;	1042	int check_walk_off;
1130	mapstruct *m;	1043	maptile *m;
1131		1044
1132	sint16 x, y;	1045	sint16 x, y;
1133		1046
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1047	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1048	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1049
1139	/* Changed it to always dump core in this case. As has been learned	1050	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		1051
1152	if (op->more != NULL)	1052	if (op->more != NULL)
1153	remove_ob (op->more);	1053	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1054
1157	/*	1055	/*
1158	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1159	* inventory.	1057	* inventory.
1160	*/	1058	*/
…		…
1186	*/	1084	*/
1187	op->x = op->env->x, op->y = op->env->y;	1085	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1086	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1087	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1088	op->env = NULL;
1191	return;	1089	}
		1090	else if (op->map)
1192	}	1091	{
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;	1092	x = op->x;
1199	y = op->y;	1093	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1094	m = get_map_from_coord (op->map, &x, &y);
1201		1095
1202	if (!m)	1096	if (!m)
1203	{	1097	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1098	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1205	op->map->path, op->x, op->y);	1099	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1100	/* in old days, we used to set x and y to 0 and continue.
1207	* it seems if we get into this case, something is probablye	1101	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1102	* screwed up and should be fixed.
		1103	*/
		1104	abort ();
		1105	}
		1106
		1107	if (op->map != m)
		1108	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1109	op->map->path, m->path, op->x, op->y, x, y);
		1110
		1111	/* Re did the following section of code - it looks like it had
		1112	* lots of logic for things we no longer care about
1209	*/	1113	*/
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		1114
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 */	1115	/* link the object above us */
1223	if (op->above)	1116	if (op->above)
1224	op->above->below = op->below;	1117	op->above->below = op->below;
1225	else	1118	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1119	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1120
1228	/* Relink the object below us, if there is one */	1121	/* Relink the object below us, if there is one */
1229	if (op->below)	1122	if (op->below)
1230	op->below->above = op->above;	1123	op->below->above = op->above;
1231	else	1124	else
1232	{	1125	{
1233	/* Nothing below, which means we need to relink map object for this space	1126	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1127	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1128	* 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	*/	1129	*/
1270	if (tmp->container == op)	1130	if (GET_MAP_OB (m, x, y) != op)
1271	{	1131	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1132	char *dump = dump_object (op);
1273	tmp->container = NULL;	1133	LOG (llevError,
		1134	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1135	free (dump);
		1136	dump = dump_object (GET_MAP_OB (m, x, y));
		1137	LOG (llevError, "%s\n", dump);
		1138	free (dump);
1274	}	1139	}
1275		1140
1276	tmp->contr->socket.update_look = 1;	1141	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	{	1142	}
1281	move_apply (tmp, op, NULL);
1282		1143
1283	if (was_destroyed (op, tag))	1144	op->above = 0;
		1145	op->below = 0;
		1146
		1147	if (op->map->in_memory == MAP_SAVING)
		1148	return;
		1149
		1150	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1151
		1152	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1153	{
		1154	/* No point updating the players look faces if he is the object
		1155	* being removed.
		1156	*/
		1157
		1158	if (tmp->type == PLAYER && tmp != op)
1284	{	1159	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1160	/* If a container that the player is currently using somehow gets
		1161	* removed (most likely destroyed), update the player view
		1162	* appropriately.
		1163	*/
		1164	if (tmp->container == op)
		1165	{
		1166	CLEAR_FLAG (op, FLAG_APPLIED);
		1167	tmp->container = NULL;
		1168	}
		1169
		1170	tmp->contr->socket.update_look = 1;
1286	}	1171	}
		1172
		1173	/* See if player moving off should effect something */
		1174	if (check_walk_off
		1175	&& ((op->move_type & tmp->move_off)
		1176	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1177	{
		1178	move_apply (tmp, op, NULL);
		1179
		1180	if (op->destroyed ())
		1181	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1182	}
1288		1183
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1184	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1185
1291	if (tmp->above == tmp)	1186	if (tmp->above == tmp)
1292	tmp->above = NULL;	1187	tmp->above = NULL;
1293		1188
1294	last = tmp;	1189	last = tmp;
1295	}	1190	}
1296		1191
1297	/* last == NULL of there are no objects on this space */	1192	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1193	if (last == NULL)
1299	{	1194	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1195	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1196	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1197	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1198	* be correct anyways.
1304	*/	1199	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1200	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1201	update_position (op->map, op->x, op->y);
1307	}	1202	}
1308	else	1203	else
1309	update_object (last, UP_OBJ_REMOVE);	1204	update_object (last, UP_OBJ_REMOVE);
1310		1205
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1206	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1207	update_all_los (op->map, op->x, op->y);
		1208	}
1313	}	1209	}
1314		1210
1315	/*	1211	/*
1316	* merge_ob(op,top):	1212	* merge_ob(op,top):
1317	*	1213	*
1318	* This function goes through all objects below and including top, and	1214	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1215	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1216	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1217	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1218	*/
1323
1324	object *	1219	object *
1325	merge_ob (object *op, object *top)	1220	merge_ob (object *op, object *top)
1326	{	1221	{
1327	if (!op->nrof)	1222	if (!op->nrof)
1328	return 0;	1223	return 0;
		1224
1329	if (top == NULL)	1225	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1226	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1227
1331	for (; top != NULL; top = top->below)	1228	for (; top != NULL; top = top->below)
1332	{	1229	{
1333	if (top == op)	1230	if (top == op)
1334	continue;	1231	continue;
1335	if (CAN_MERGE (op, top))	1232	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1238	remove_ob (op);
1342	free_object (op);	1239	free_object (op);
1343	return top;	1240	return top;
1344	}	1241	}
1345	}	1242	}
		1243
1346	return NULL;	1244	return 0;
1347	}	1245	}
1348		1246
1349	/*	1247	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1248	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1249	* job preparing multi-part monsters
1352	*/	1250	*/
1353	object *	1251	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1252	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1253	{
1356	object *	1254	object *tmp;
1357	tmp;
1358		1255
1359	if (op->head)	1256	if (op->head)
1360	op = op->head;	1257	op = op->head;
		1258
1361	for (tmp = op; tmp; tmp = tmp->more)	1259	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1260	{
1363	tmp->x = x + tmp->arch->clone.x;	1261	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1262	tmp->y = y + tmp->arch->clone.y;
1365	}	1263	}
		1264
1366	return insert_ob_in_map (op, m, originator, flag);	1265	return insert_ob_in_map (op, m, originator, flag);
1367	}	1266	}
1368		1267
1369	/*	1268	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1269	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1285	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1286	* just 'op' otherwise
1388	*/	1287	*/
1389		1288
1390	object *	1289	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1290	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1291	{
1393	object *tmp, *top, *floor = NULL;	1292	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1293	sint16 x, y;
1395		1294
1396	if (QUERY_FLAG (op, FLAG_FREED))	1295	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1298	return NULL;
1400	}	1299	}
1401		1300
1402	if (m == NULL)	1301	if (m == NULL)
1403	{	1302	{
1404	dump_object (op);	1303	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1305	free (dump);
1406	return op;	1306	return op;
1407	}	1307	}
1408		1308
1409	if (out_of_map (m, op->x, op->y))	1309	if (out_of_map (m, op->x, op->y))
1410	{	1310	{
1411	dump_object (op);	1311	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1312	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1313	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1314	/* Better to catch this here, as otherwise the next use of this object
1415	* is likely to cause a crash. Better to find out where it is getting	1315	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1316	* improperly inserted.
1417	*/	1317	*/
1418	abort ();	1318	abort ();
1419	#endif	1319	#endif
		1320	free (dump);
1420	return op;	1321	return op;
1421	}	1322	}
1422		1323
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1324	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1325	{
1425	dump_object (op);	1326	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1327	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1328	free (dump);
1427	return op;	1329	return op;
1428	}	1330	}
1429		1331
1430	if (op->more != NULL)	1332	if (op->more != NULL)
1431	{	1333	{
…		…
1661	* op is the object to insert it under: supplies x and the map.	1563	* op is the object to insert it under: supplies x and the map.
1662	*/	1564	*/
1663	void	1565	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1566	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1567	{
1666	object *tmp;	1568	object *
		1569	tmp;
1667	object *tmp1;	1570	object *
		1571	tmp1;
1668		1572
1669	/* first search for itself and remove any old instances */	1573	/* first search for itself and remove any old instances */
1670		1574
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1575	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1576	{
…		…
1675	remove_ob (tmp);	1579	remove_ob (tmp);
1676	free_object (tmp);	1580	free_object (tmp);
1677	}	1581	}
1678	}	1582	}
1679		1583
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1584	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1585
1682	tmp1->x = op->x;	1586	tmp1->x = op->x;
1683	tmp1->y = op->y;	1587	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1588	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1589	}
…		…
1703	if (orig_ob->nrof < nr)	1607	if (orig_ob->nrof < nr)
1704	{	1608	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1609	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1610	return NULL;
1707	}	1611	}
		1612
1708	newob = object_create_clone (orig_ob);	1613	newob = object_create_clone (orig_ob);
		1614
1709	if ((orig_ob->nrof -= nr) < 1)	1615	if ((orig_ob->nrof -= nr) < 1)
1710	{	1616	{
1711	if (!is_removed)	1617	if (!is_removed)
1712	remove_ob (orig_ob);	1618	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1619	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1627	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1628	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1629	return NULL;
1724	}	1630	}
1725	}	1631	}
		1632
1726	newob->nrof = nr;	1633	newob->nrof = nr;
1727		1634
1728	return newob;	1635	return newob;
1729	}	1636	}
1730		1637
…		…
1737	*/	1644	*/
1738		1645
1739	object *	1646	object *
1740	decrease_ob_nr (object *op, uint32 i)	1647	decrease_ob_nr (object *op, uint32 i)
1741	{	1648	{
1742	object *	1649	object *tmp;
1743	tmp;
1744	player *	1650	player *pl;
1745	pl;
1746		1651
1747	if (i == 0) /* objects with op->nrof require this check */	1652	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1653	return op;
1749		1654
1750	if (i > op->nrof)	1655	if (i > op->nrof)
1751	i = op->nrof;	1656	i = op->nrof;
1752		1657
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1658	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1659	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1660	else if (op->env != NULL)
1758	{	1661	{
1759	/* is this object in the players inventory, or sub container	1662	/* is this object in the players inventory, or sub container
1760	* therein?	1663	* therein?
1761	*/	1664	*/
…		…
1796	}	1699	}
1797	}	1700	}
1798	}	1701	}
1799	else	1702	else
1800	{	1703	{
1801	object *
1802	above = op->above;	1704	object *above = op->above;
1803		1705
1804	if (i < op->nrof)	1706	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1707	op->nrof -= i;
1807	}
1808	else	1708	else
1809	{	1709	{
1810	remove_ob (op);	1710	remove_ob (op);
1811	op->nrof = 0;	1711	op->nrof = 0;
1812	}	1712	}
		1713
1813	/* Since we just removed op, op->above is null */	1714	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1715	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1716	if (tmp->type == PLAYER)
1816	{	1717	{
1817	if (op->nrof)	1718	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1721	esrv_del_item (tmp->contr, op->count);
1821	}	1722	}
1822	}	1723	}
1823		1724
1824	if (op->nrof)	1725	if (op->nrof)
1825	{
1826	return op;	1726	return op;
1827	}
1828	else	1727	else
1829	{	1728	{
1830	free_object (op);	1729	free_object (op);
1831	return NULL;	1730	return NULL;
1832	}	1731	}
…		…
1841	add_weight (object *op, signed long weight)	1740	add_weight (object *op, signed long weight)
1842	{	1741	{
1843	while (op != NULL)	1742	while (op != NULL)
1844	{	1743	{
1845	if (op->type == CONTAINER)	1744	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1745	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1746
1849	op->carrying += weight;	1747	op->carrying += weight;
1850	op = op->env;	1748	op = op->env;
1851	}	1749	}
1852	}	1750	}
1853		1751
…		…
1872	tmp, *	1770	tmp, *
1873	otmp;	1771	otmp;
1874		1772
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1773	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1774	{
1877	dump_object (op);	1775	char *dump = dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1777	free (dump);
1879	return op;	1778	return op;
1880	}	1779	}
		1780
1881	if (where == NULL)	1781	if (where == NULL)
1882	{	1782	{
1883	dump_object (op);	1783	char *dump = dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1784	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1785	free (dump);
1885	return op;	1786	return op;
1886	}	1787	}
		1788
1887	if (where->head)	1789	if (where->head)
1888	{	1790	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1791	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1792	where = where->head;
1891	}	1793	}
		1794
1892	if (op->more)	1795	if (op->more)
1893	{	1796	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1797	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1798	return op;
1896	}	1799	}
		1800
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1801	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1802	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1803	if (op->nrof)
1900	{	1804	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1805	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1987		1891
1988	int	1892	int
1989	check_move_on (object *op, object *originator)	1893	check_move_on (object *op, object *originator)
1990	{	1894	{
1991	object *tmp;	1895	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1896	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1897	int x = op->x, y = op->y;
1995		1898
1996	MoveType move_on, move_slow, move_block;	1899	MoveType move_on, move_slow, move_block;
1997		1900
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1901	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1902	return 0;
2000
2001	tag = op->count;
2002		1903
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1904	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2004	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1905	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2005	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1906	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1907
…		…
2049	{	1950	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1951	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))	1952	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1953	{
2053		1954
		1955	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1956	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1957
2056	if (op->type == PLAYER)	1958	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1959	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1960	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1961	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1968	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))	1969	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1970	{
2069	move_apply (tmp, op, originator);	1971	move_apply (tmp, op, originator);
2070		1972
2071	if (was_destroyed (op, tag))	1973	if (op->destroyed ())
2072	return 1;	1974	return 1;
2073		1975
2074	/* what the person/creature stepped onto has moved the object	1976	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1977	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1978	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1990	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1991	* The first matching object is returned, or NULL if none.
2090	*/	1992	*/
2091		1993
2092	object *	1994	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1995	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1996	{
2095	object *	1997	object *
2096	tmp;	1998	tmp;
2097		1999
2098	if (m == NULL || out_of_map (m, x, y))	2000	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	2013	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	2014	* The first matching object is returned, or NULL if none.
2113	*/	2015	*/
2114		2016
2115	object *	2017	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	2018	present (unsigned char type, maptile *m, int x, int y)
2117	{	2019	{
2118	object *	2020	object *
2119	tmp;	2021	tmp;
2120		2022
2121	if (out_of_map (m, x, y))	2023	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2163	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2164	* customized, changed states, etc.
2263	*/	2165	*/
2264		2166
2265	int	2167	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2168	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2169	{
2268	int	2170	int
2269	i,	2171	i,
2270	index = 0, flag;	2172	index = 0, flag;
2271	static int	2173	static int
…		…
2292	return -1;	2194	return -1;
2293	return altern[RANDOM () % index];	2195	return altern[RANDOM () % index];
2294	}	2196	}
2295		2197
2296	/*	2198	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2199	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2200	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2201	* But it will return the first available spot, not a random choice.
2300	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2202	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2203	*/
2302		2204
2303	int	2205	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2206	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2207	{
2306	int	2208	int
2307	i;	2209	i;
2308		2210
2309	for (i = 0; i < SIZEOFFREE; i++)	2211	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2275	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2276	* there is capable of.
2375	*/	2277	*/
2376		2278
2377	int	2279	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2280	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2281	{
2380	int	2282	int
2381	i,	2283	i,
2382	max = SIZEOFFREE, mflags;	2284	max = SIZEOFFREE, mflags;
2383	sint16	2285
2384	nx,	2286	sint16 nx, ny;
2385	ny;
2386	object *	2287	object *
2387	tmp;	2288	tmp;
2388	mapstruct *	2289	maptile *
2389	mp;	2290	mp;
2390	MoveType	2291
2391	blocked,	2292	MoveType blocked, move_type;
2392	move_type;
2393		2293
2394	if (exclude && exclude->head)	2294	if (exclude && exclude->head)
2395	{	2295	{
2396	exclude = exclude->head;	2296	exclude = exclude->head;
2397	move_type = exclude->move_type;	2297	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2502	* Modified to be map tile aware -.MSW
2603	*/	2503	*/
2604		2504
2605		2505
2606	int	2506	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2507	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2508	{
2609	sint16	2509	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2510	int
2613	mflags;	2511	mflags;
2614		2512
2615	if (dir < 0)	2513	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2514	return 0; /* exit condition: invalid direction */
…		…
2694	if (prev)	2592	if (prev)
2695	prev->more = tmp;	2593	prev->more = tmp;
2696	prev = tmp;	2594	prev = tmp;
2697	}	2595	}
2698		2596
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2597	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2598	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2599
2705	return dst;	2600	return dst;
2706	}	2601	}
2707		2602
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. */	2603	/* 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 */	2604	/* 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, */	2605	/* 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. */	2606	/* 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. */	2607	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2608	/* Also remember that multiparts objects are not supported for now. */
2728		2609
2729	object *	2610	object *
2730	load_object_str (const char *obstr)	2611	load_object_str (const char *obstr)
2731	{	2612	{
2732	object *	2613	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2614	char filename[MAX_BUF];
2736		2615
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2616	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2617
2739	FILE *
2740	tempfile = fopen (filename, "w");	2618	FILE *tempfile = fopen (filename, "w");
2741		2619
2742	if (tempfile == NULL)	2620	if (tempfile == NULL)
2743	{	2621	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2622	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2623	return NULL;
2746	};	2624	}
		2625
2747	fprintf (tempfile, obstr);	2626	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2627	fclose (tempfile);
2749		2628
2750	op = get_object ();	2629	op = get_object ();
2751		2630
2752	object_thawer	2631	object_thawer thawer (filename);
2753	thawer (filename);
2754		2632
2755	if (thawer)	2633	if (thawer)
2756	load_object (thawer, op, 0);	2634	load_object (thawer, op, 0);
2757		2635
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2636	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2644	* returns NULL if no match.
2767	*/	2645	*/
2768	object *	2646	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2647	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2648	{
2771	object *	2649	object *tmp;
2772	tmp;
2773		2650
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2651	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2652	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2653	return tmp;
2777		2654
…		…
2785	* do the desired thing.	2662	* do the desired thing.
2786	*/	2663	*/
2787	key_value *	2664	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2665	get_ob_key_link (const object *ob, const char *key)
2789	{	2666	{
2790	key_value *	2667	key_value *link;
2791	link;
2792		2668
2793	for (link = ob->key_values; link != NULL; link = link->next)	2669	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2670	if (link->key == key)
2796	{
2797	return link;	2671	return link;
2798	}
2799	}
2800		2672
2801	return NULL;	2673	return NULL;
2802	}	2674	}
2803		2675
2804	/*	2676	/*
…		…
2809	* The returned string is shared.	2681	* The returned string is shared.
2810	*/	2682	*/
2811	const char *	2683	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2684	get_ob_key_value (const object *op, const char *const key)
2813	{	2685	{
2814	key_value *	2686	key_value *link;
2815	link;	2687	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2688
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2689	if (!canonical_key)
2822	{	2690	{
2823	/* 1. There being a field named key on any object	2691	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2692	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2693	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2694	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2695	*/
2828	return NULL;	2696	return 0;
2829	}	2697	}
2830		2698
2831	/* This is copied from get_ob_key_link() above -	2699	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2700	* only 4 lines, and saves the function call overhead.
2833	*/	2701	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2702	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2703	if (link->key == canonical_key)
2837	{
2838	return link->value;	2704	return link->value;
2839	}	2705
2840	}
2841	return NULL;	2706	return 0;
2842	}	2707	}
2843		2708
2844		2709
2845	/*	2710	/*
2846	* Updates the canonical_key in op to value.	2711	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2747	if (last)
2883	last->next = field->next;	2748	last->next = field->next;
2884	else	2749	else
2885	op->key_values = field->next;	2750	op->key_values = field->next;
2886		2751
2887	delete
2888	field;	2752	delete field;
2889	}	2753	}
2890	}	2754	}
2891	return TRUE;	2755	return TRUE;
2892	}	2756	}
2893	/* IF we get here, key doesn't exist */	2757	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2792	* Returns TRUE on success.
2929	*/	2793	*/
2930	int	2794	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2795	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2796	{
2933	shstr
2934	key_ (key);	2797	shstr key_ (key);
2935		2798
2936	return set_ob_key_value_s (op, key_, value, add_key);	2799	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2800	}
		2801
		2802	object::depth_iterator::depth_iterator (object *container)
		2803	: iterator_base (container)
		2804	{
		2805	while (item->inv)
		2806	item = item->inv;
		2807	}
		2808
		2809	void
		2810	object::depth_iterator::next ()
		2811	{
		2812	if (item->below)
		2813	{
		2814	item = item->below;
		2815
		2816	while (item->inv)
		2817	item = item->inv;
		2818	}
		2819	else
		2820	item = item->env;
		2821	}
		2822
		2823	// return a suitable string describing an objetc in enough detail to find it
		2824	const char *
		2825	object::debug_desc (char *info) const
		2826	{
		2827	char info2[256 * 3];
		2828	char *p = info;
		2829
		2830	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2831	count,
		2832	&name,
		2833	title ? " " : "",
		2834	title ? (const char *)title : "");
		2835
		2836	if (env)
		2837	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2838
		2839	if (map)
		2840	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2841
		2842	return info;
		2843	}
		2844
		2845	const char *
		2846	object::debug_desc () const
		2847	{
		2848	static char info[256 * 3];
		2849	return debug_desc (info);
		2850	}
		2851

Diff Legend

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