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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.50 by root, Sat Sep 16 22:40:22 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 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.
…		…
372	void	445	void
373	dump_all_objects (void)	446	dump_all_objects (void)
374	{	447	{
375	object *op;	448	object *op;
376		449
377	for (op = objects; op != NULL; op = op->next)	450	for (op = object::first; op != NULL; op = op->next)
378	{	451	{
379	dump_object (op);	452	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
381	}	454	}
382	}	455	}
383		456
384	/*	457	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	458	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
408	object *	481	object *
409	find_object (tag_t i)	482	find_object (tag_t i)
410	{	483	{
411	object *op;	484	object *op;
412		485
413	for (op = objects; op != NULL; op = op->next)	486	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	487	if (op->count == i)
415	break;	488	break;
		489
416	return op;	490	return op;
417	}	491	}
418		492
419	/*	493	/*
420	* Returns the first object which has a name equal to the argument.	494	* Returns the first object which has a name equal to the argument.
…		…
423	*/	497	*/
424		498
425	object *	499	object *
426	find_object_name (const char *str)	500	find_object_name (const char *str)
427	{	501	{
428	const char *name = shstr::find (str);	502	shstr_cmp str_ (str);
429	object *op;	503	object *op;
430		504
431	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	506	if (op->name == str_)
433	break;	507	break;
434		508
435	return op;	509	return op;
436	}	510	}
437		511
…		…
440	{	514	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	516	}
443		517
444	/*	518	/*
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	519	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	520	* skill and experience objects.
485	*/	521	*/
486	void	522	void
487	set_owner (object *op, object *owner)	523	object::set_owner (object *owner)
488	{	524	{
489	if (owner == NULL || op == NULL)	525	if (!owner)
490	return;	526	return;
491		527
492	/* next line added to allow objects which own objects */	528	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	529	/* 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	530	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	531	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	532	* 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.	533	* didn't match, this check is valid and I believe that cause is valid.
498	*/	534	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	535	while (owner->owner)
500	owner = owner->owner;	536	owner = owner->owner;
501		537
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;	538	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	}	539	}
542		540
543	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	542	* refcounts and freeing the links.
545	*/	543	*/
…		…
561	{	559	{
562	attachable_base::clear ();	560	attachable_base::clear ();
563		561
564	free_key_values (this);	562	free_key_values (this);
565		563
566	clear_owner (this);	564	owner = 0;
567
568	name = 0;	565	name = 0;
569	name_pl = 0;	566	name_pl = 0;
570	title = 0;	567	title = 0;
571	race = 0;	568	race = 0;
572	slaying = 0;	569	slaying = 0;
573	skill = 0;	570	skill = 0;
574	msg = 0;	571	msg = 0;
575	lore = 0;	572	lore = 0;
576	custom_name = 0;	573	custom_name = 0;
577	materialname = 0;	574	materialname = 0;
		575	contr = 0;
		576	below = 0;
		577	above = 0;
		578	inv = 0;
		579	container = 0;
		580	env = 0;
		581	more = 0;
		582	head = 0;
		583	map = 0;
		584	active_next = 0;
		585	active_prev = 0;
578		586
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		588
581	SET_FLAG (this, FLAG_REMOVED);	589	SET_FLAG (this, FLAG_REMOVED);
		590
		591	/* What is not cleared is next, prev, and count */
		592
		593	expmul = 1.0;
		594	face = blank_face;
		595
		596	if (settings.casting_time)
		597	casting_time = -1;
582	}	598	}
583		599
584	void object::clone (object *destination)	600	void object::clone (object *destination)
585	{	601	{
586	*(object_copy *) destination = *this;	602	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	603	*(object_pod *)destination = *this;
588		604
589	if (self || cb)	605	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	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	}	607	}
624		608
625	/*	609	/*
626	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	611	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	613	* 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	614	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	615	* will point at garbage.
632	*/	616	*/
633
634	void	617	void
635	copy_object (object *op2, object *op)	618	copy_object (object *op2, object *op)
636	{	619	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	681	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	682	* 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.	683	* 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.	684	* This function needs to be called whenever the speed of an object changes.
702	*/	685	*/
703
704	void	686	void
705	update_ob_speed (object *op)	687	update_ob_speed (object *op)
706	{	688	{
707	extern int arch_init;	689	extern int arch_init;
708		690
…		…
717	abort ();	699	abort ();
718	#else	700	#else
719	op->speed = 0;	701	op->speed = 0;
720	#endif	702	#endif
721	}	703	}
		704
722	if (arch_init)	705	if (arch_init)
723	{
724	return;	706	return;
725	}	707
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	709	{
728	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	711	if (op->active_next || op->active_prev || op == active_objects)
730	return;	712	return;
731		713
732	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	715	* of the list. */
734	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
735	if (op->active_next != NULL)	718	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
737	active_objects = op;	721	active_objects = op;
738	}	722	}
739	else	723	else
740	{	724	{
741	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
743	return;	727	return;
744		728
745	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
746	{	730	{
747	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
748	if (op->active_next != NULL)	733	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
750	}	735	}
751	else	736	else
752	{	737	{
753	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
754	if (op->active_next)	740	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
756	}	742	}
		743
757	op->active_next = NULL;	744	op->active_next = NULL;
758	op->active_prev = NULL;	745	op->active_prev = NULL;
759	}	746	}
760	}	747	}
761		748
…		…
891	/* if the object is being removed, we can't make intelligent	878	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	879	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	880	* that is being removed.
894	*/	881	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	883	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	885	/* Nothing to do for that case */ ;
902	}
903	else	886	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		888
908	if (update_now)	889	if (update_now)
909	{	890	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	891	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);	892	update_position (op->map, op->x, op->y);
…		…
913		894
914	if (op->more != NULL)	895	if (op->more != NULL)
915	update_object (op->more, action);	896	update_object (op->more, action);
916	}	897	}
917		898
918	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
919	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
920		902
921	void object::free_mortals ()	903	void object::free_mortals ()
922	{	904	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
925	{	909	{
926	freed.push_back (*i);	910	delete *i;
927	mortals.erase (i);	911	mortals.erase (i);
928	}	912	}
929	else	913
930	++i;	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
931	}	921	}
932		922
933	object::object ()	923	object::object ()
934	{	924	{
935	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
936		926
937	expmul = 1.0;	927	expmul = 1.0;
938	face = blank_face;	928	face = blank_face;
939	attacked_by_count = -1;
940	}	929	}
941		930
942	object::~object ()	931	object::~object ()
943	{	932	{
944	free_key_values (this);	933	free_key_values (this);
945	}	934	}
946		935
947	void object::link ()	936	void object::link ()
948	{	937	{
949	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
950		940
951	prev = 0;	941	prev = 0;
952	next = objects;	942	next = object::first;
953		943
954	if (objects)	944	if (object::first)
955	objects->prev = this;	945	object::first->prev = this;
956		946
957	objects = this;	947	object::first = this;
958	}	948	}
959		949
960	void object::unlink ()	950	void object::unlink ()
961	{	951	{
962	count = 0;	952	if (this == object::first)
		953	object::first = next;
963		954
964	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
968	prev = 0;	959	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	960	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	961	}
980		962
981	object *object::create ()	963	object *object::create ()
982	{	964	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	965	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 ();	966	op->link ();
996	return op;	967	return op;
997	}	968	}
998		969
999	/*	970	/*
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	977	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	978	* inventory to the ground.
1008	*/	979	*/
1009	void object::free (bool free_inventory)	980	void object::free (bool free_inventory)
1010	{	981	{
		982	if (QUERY_FLAG (this, FLAG_FREED))
		983	return;
		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	989	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		990
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))	991	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		992
1033	if (more)	993	if (more)
1034	{	994	{
1035	more->free (free_inventory);	995	more->free (free_inventory);
1036	more = 0;	996	more = 0;
…		…
1040	{	1000	{
1041	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
1043	* drop on that space.	1003	* drop on that space.
1044	*/	1004	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	1006	{
1047	object *	1007	object *op = inv;
1048	op = inv;
1049		1008
1050	while (op)	1009	while (op)
1051	{	1010	{
1052	object *
1053	tmp = op->below;	1011	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	1012	op->free (free_inventory);
1057	op = tmp;	1013	op = tmp;
1058	}	1014	}
1059	}	1015	}
1060	else	1016	else
1061	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
1062	object *	1018	object *op = inv;
1063	op = inv;
1064		1019
1065	while (op)	1020	while (op)
1066	{	1021	{
1067	object *
1068	tmp = op->below;	1022	object *tmp = op->below;
1069		1023
1070	remove_ob (op);	1024	remove_ob (op);
1071		1025
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	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))	1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	1036	op = tmp;
1083	}	1037	}
1084	}	1038	}
1085	}	1039	}
1086		1040
1087	clear_owner (this);	1041	// clear those pointers that likely might have circular references to us
		1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
1088		1045
1089	/* Remove object from the active list */	1046	/* Remove object from the active list */
1090	speed = 0;	1047	speed = 0;
1091	update_ob_speed (this);	1048	update_ob_speed (this);
1092		1049
1093	unlink ();	1050	unlink ();
1094		1051
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1052	mortals.push_back (this);
1098	}	1053	}
1099		1054
1100	/*	1055	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1056	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1106	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1107	{	1062	{
1108	while (op != NULL)	1063	while (op != NULL)
1109	{	1064	{
1110	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1067
1114	op->carrying -= weight;	1068	op->carrying -= weight;
1115	op = op->env;	1069	op = op->env;
1116	}	1070	}
1117	}	1071	}
1118		1072
…		…
1126	*/	1080	*/
1127		1081
1128	void	1082	void
1129	remove_ob (object *op)	1083	remove_ob (object *op)
1130	{	1084	{
		1085	object *tmp, *last = 0;
1131	object *	1086	object *otmp;
1132	tmp, *	1087
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1088	int check_walk_off;
1140	mapstruct *	1089	maptile *m;
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1090
		1091	sint16 x, y;
1146		1092
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1094	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1095
1152	/* Changed it to always dump core in this case. As has been learned	1096	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1097
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1098	if (op->more != NULL)
1165	remove_ob (op->more);	1099	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1100
1169	/*	1101	/*
1170	* In this case, the object to be removed is in someones	1102	* In this case, the object to be removed is in someones
1171	* inventory.	1103	* inventory.
1172	*/	1104	*/
…		…
1198	*/	1130	*/
1199	op->x = op->env->x, op->y = op->env->y;	1131	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1132	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1133	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1134	op->env = NULL;
1203	return;	1135	}
		1136	else if (op->map)
1204	}	1137	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1138	x = op->x;
1211	y = op->y;	1139	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1140	m = get_map_from_coord (op->map, &x, &y);
1213		1141
1214	if (!m)	1142	if (!m)
1215	{	1143	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1144	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1145	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1146	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1147	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1148	* screwed up and should be fixed.
		1149	*/
		1150	abort ();
		1151	}
		1152
		1153	if (op->map != m)
		1154	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1155	op->map->path, m->path, op->x, op->y, x, y);
		1156
		1157	/* Re did the following section of code - it looks like it had
		1158	* lots of logic for things we no longer care about
1221	*/	1159	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1160
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1161	/* link the object above us */
1235	if (op->above)	1162	if (op->above)
1236	op->above->below = op->below;	1163	op->above->below = op->below;
1237	else	1164	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1165	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1166
1240	/* Relink the object below us, if there is one */	1167	/* Relink the object below us, if there is one */
1241	if (op->below)	1168	if (op->below)
1242	{
1243	op->below->above = op->above;	1169	op->below->above = op->above;
1244	}
1245	else	1170	else
1246	{	1171	{
1247	/* Nothing below, which means we need to relink map object for this space	1172	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1173	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1174	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	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",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1175	*/
1281	if (tmp->container == op)	1176	if (GET_MAP_OB (m, x, y) != op)
1282	{	1177	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1178	dump_object (op);
1284	tmp->container = NULL;	1179	LOG (llevError,
		1180	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1181	dump_object (GET_MAP_OB (m, x, y));
		1182	LOG (llevError, "%s\n", errmsg);
1285	}	1183	}
1286	tmp->contr->socket.update_look = 1;	1184
1287	}	1185	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1186	}
1291		1187
1292	move_apply (tmp, op, NULL);	1188	op->above = 0;
1293	if (was_destroyed (op, tag))	1189	op->below = 0;
		1190
		1191	if (op->map->in_memory == MAP_SAVING)
		1192	return;
		1193
		1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1195
		1196	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1197	{
		1198	/* No point updating the players look faces if he is the object
		1199	* being removed.
		1200	*/
		1201
		1202	if (tmp->type == PLAYER && tmp != op)
1294	{	1203	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1204	/* If a container that the player is currently using somehow gets
		1205	* removed (most likely destroyed), update the player view
		1206	* appropriately.
		1207	*/
		1208	if (tmp->container == op)
		1209	{
		1210	CLEAR_FLAG (op, FLAG_APPLIED);
		1211	tmp->container = NULL;
		1212	}
		1213
		1214	tmp->contr->socket.update_look = 1;
1296	}	1215	}
		1216
		1217	/* See if player moving off should effect something */
		1218	if (check_walk_off
		1219	&& ((op->move_type & tmp->move_off)
		1220	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1221	{
		1222	move_apply (tmp, op, NULL);
		1223
		1224	if (op->destroyed ())
		1225	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1297	}	1226	}
1298		1227
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1228	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1229
1301	if (tmp->above == tmp)	1230	if (tmp->above == tmp)
1302	tmp->above = NULL;	1231	tmp->above = NULL;
		1232
1303	last = tmp;	1233	last = tmp;
1304	}	1234	}
		1235
1305	/* last == NULL of there are no objects on this space */	1236	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1237	if (last == NULL)
1307	{	1238	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1239	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1240	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1241	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1242	* be correct anyways.
1312	*/	1243	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1244	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1245	update_position (op->map, op->x, op->y);
1315	}	1246	}
1316	else	1247	else
1317	update_object (last, UP_OBJ_REMOVE);	1248	update_object (last, UP_OBJ_REMOVE);
1318		1249
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1250	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1251	update_all_los (op->map, op->x, op->y);
1321		1252	}
1322	}	1253	}
1323		1254
1324	/*	1255	/*
1325	* merge_ob(op,top):	1256	* merge_ob(op,top):
1326	*	1257	*
1327	* This function goes through all objects below and including top, and	1258	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1259	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1260	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1261	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1262	*/
1332
1333	object *	1263	object *
1334	merge_ob (object *op, object *top)	1264	merge_ob (object *op, object *top)
1335	{	1265	{
1336	if (!op->nrof)	1266	if (!op->nrof)
1337	return 0;	1267	return 0;
		1268
1338	if (top == NULL)	1269	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1270	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1271
1340	for (; top != NULL; top = top->below)	1272	for (; top != NULL; top = top->below)
1341	{	1273	{
1342	if (top == op)	1274	if (top == op)
1343	continue;	1275	continue;
1344	if (CAN_MERGE (op, top))	1276	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1282	remove_ob (op);
1351	free_object (op);	1283	free_object (op);
1352	return top;	1284	return top;
1353	}	1285	}
1354	}	1286	}
		1287
1355	return NULL;	1288	return 0;
1356	}	1289	}
1357		1290
1358	/*	1291	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1292	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1293	* job preparing multi-part monsters
1361	*/	1294	*/
1362	object *	1295	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1296	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1297	{
1365	object *	1298	object *tmp;
1366	tmp;
1367		1299
1368	if (op->head)	1300	if (op->head)
1369	op = op->head;	1301	op = op->head;
		1302
1370	for (tmp = op; tmp; tmp = tmp->more)	1303	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1304	{
1372	tmp->x = x + tmp->arch->clone.x;	1305	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1306	tmp->y = y + tmp->arch->clone.y;
1374	}	1307	}
		1308
1375	return insert_ob_in_map (op, m, originator, flag);	1309	return insert_ob_in_map (op, m, originator, flag);
1376	}	1310	}
1377		1311
1378	/*	1312	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1313	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1329	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1330	* just 'op' otherwise
1397	*/	1331	*/
1398		1332
1399	object *	1333	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1334	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1335	{
1402	object *tmp, *top, *floor = NULL;	1336	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1337	sint16 x, y;
1404		1338
1405	if (QUERY_FLAG (op, FLAG_FREED))	1339	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1438		1372
1439	if (op->more != NULL)	1373	if (op->more != NULL)
1440	{	1374	{
1441	/* The part may be on a different map. */	1375	/* The part may be on a different map. */
1442		1376
1443	object *
1444	more = op->more;	1377	object *more = op->more;
1445		1378
1446	/* We really need the caller to normalize coordinates - if	1379	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1380	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1381	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1382	* is clear wrong do we normalize it.
1450	*/	1383	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1384	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1385	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1386	else if (!more->map)
1456	{	1387	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1388	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1389	* more->map should always point to the parent.
1459	*/	1390	*/
…		…
1462		1393
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1394	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1395	{
1465	if (!op->head)	1396	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1397	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1398
1467	return NULL;	1399	return NULL;
1468	}	1400	}
1469	}	1401	}
1470		1402
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1403	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1468
1537	while (top != NULL)	1469	while (top != NULL)
1538	{	1470	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1471	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1472	floor = top;
		1473
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1474	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1475	{
1543	/* We insert above top, so we want this object below this */	1476	/* We insert above top, so we want this object below this */
1544	top = top->below;	1477	top = top->below;
1545	break;	1478	break;
1546	}	1479	}
		1480
1547	last = top;	1481	last = top;
1548	top = top->above;	1482	top = top->above;
1549	}	1483	}
		1484
1550	/* Don't want top to be NULL, so set it to the last valid object */	1485	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1486	top = last;
1552		1487
1553	/* We let update_position deal with figuring out what the space	1488	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1489	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1568	* of effect may be sufficient.
1634	*/	1569	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1570	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1571	update_all_los (op->map, op->x, op->y);
1637		1572
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1573	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1574	update_object (op, UP_OBJ_INSERT);
1641
1642		1575
1643	/* Don't know if moving this to the end will break anything. However,	1576	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1577	* we want to have update_look set above before calling this.
1645	*	1578	*
1646	* check_move_on() must be after this because code called from	1579	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1604	* op is the object to insert it under: supplies x and the map.
1672	*/	1605	*/
1673	void	1606	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1607	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1608	{
1676	object *tmp;	1609	object *
		1610	tmp;
1677	object *tmp1;	1611	object *
		1612	tmp1;
1678		1613
1679	/* first search for itself and remove any old instances */	1614	/* first search for itself and remove any old instances */
1680		1615
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1616	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1617	{
…		…
1685	remove_ob (tmp);	1620	remove_ob (tmp);
1686	free_object (tmp);	1621	free_object (tmp);
1687	}	1622	}
1688	}	1623	}
1689		1624
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1625	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1626
1692	tmp1->x = op->x;	1627	tmp1->x = op->x;
1693	tmp1->y = op->y;	1628	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1629	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1630	}
…		…
1713	if (orig_ob->nrof < nr)	1648	if (orig_ob->nrof < nr)
1714	{	1649	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1650	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1651	return NULL;
1717	}	1652	}
		1653
1718	newob = object_create_clone (orig_ob);	1654	newob = object_create_clone (orig_ob);
		1655
1719	if ((orig_ob->nrof -= nr) < 1)	1656	if ((orig_ob->nrof -= nr) < 1)
1720	{	1657	{
1721	if (!is_removed)	1658	if (!is_removed)
1722	remove_ob (orig_ob);	1659	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1660	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1668	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1669	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1670	return NULL;
1734	}	1671	}
1735	}	1672	}
		1673
1736	newob->nrof = nr;	1674	newob->nrof = nr;
1737		1675
1738	return newob;	1676	return newob;
1739	}	1677	}
1740		1678
…		…
1747	*/	1685	*/
1748		1686
1749	object *	1687	object *
1750	decrease_ob_nr (object *op, uint32 i)	1688	decrease_ob_nr (object *op, uint32 i)
1751	{	1689	{
1752	object *	1690	object *tmp;
1753	tmp;
1754	player *	1691	player *pl;
1755	pl;
1756		1692
1757	if (i == 0) /* objects with op->nrof require this check */	1693	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1694	return op;
1759		1695
1760	if (i > op->nrof)	1696	if (i > op->nrof)
1761	i = op->nrof;	1697	i = op->nrof;
1762		1698
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1699	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1700	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1701	else if (op->env != NULL)
1768	{	1702	{
1769	/* is this object in the players inventory, or sub container	1703	/* is this object in the players inventory, or sub container
1770	* therein?	1704	* therein?
1771	*/	1705	*/
…		…
1806	}	1740	}
1807	}	1741	}
1808	}	1742	}
1809	else	1743	else
1810	{	1744	{
1811	object *
1812	above = op->above;	1745	object *above = op->above;
1813		1746
1814	if (i < op->nrof)	1747	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1748	op->nrof -= i;
1817	}
1818	else	1749	else
1819	{	1750	{
1820	remove_ob (op);	1751	remove_ob (op);
1821	op->nrof = 0;	1752	op->nrof = 0;
1822	}	1753	}
		1754
1823	/* Since we just removed op, op->above is null */	1755	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1756	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1757	if (tmp->type == PLAYER)
1826	{	1758	{
1827	if (op->nrof)	1759	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1762	esrv_del_item (tmp->contr, op->count);
1831	}	1763	}
1832	}	1764	}
1833		1765
1834	if (op->nrof)	1766	if (op->nrof)
1835	{
1836	return op;	1767	return op;
1837	}
1838	else	1768	else
1839	{	1769	{
1840	free_object (op);	1770	free_object (op);
1841	return NULL;	1771	return NULL;
1842	}	1772	}
…		…
1851	add_weight (object *op, signed long weight)	1781	add_weight (object *op, signed long weight)
1852	{	1782	{
1853	while (op != NULL)	1783	while (op != NULL)
1854	{	1784	{
1855	if (op->type == CONTAINER)	1785	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1786	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1787
1859	op->carrying += weight;	1788	op->carrying += weight;
1860	op = op->env;	1789	op = op->env;
1861	}	1790	}
1862	}	1791	}
1863		1792
…		…
1886	{	1815	{
1887	dump_object (op);	1816	dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1817	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;	1818	return op;
1890	}	1819	}
		1820
1891	if (where == NULL)	1821	if (where == NULL)
1892	{	1822	{
1893	dump_object (op);	1823	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1824	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;	1825	return op;
1896	}	1826	}
		1827
1897	if (where->head)	1828	if (where->head)
1898	{	1829	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1830	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1831	where = where->head;
1901	}	1832	}
		1833
1902	if (op->more)	1834	if (op->more)
1903	{	1835	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1836	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1837	return op;
1906	}	1838	}
		1839
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1840	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1841	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1842	if (op->nrof)
1910	{	1843	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1844	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1996	*/	1929	*/
1997		1930
1998	int	1931	int
1999	check_move_on (object *op, object *originator)	1932	check_move_on (object *op, object *originator)
2000	{	1933	{
2001	object *	1934	object *tmp;
2002	tmp;	1935	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1936	int x = op->x, y = op->y;
2009	MoveType	1937
2010	move_on,	1938	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1939
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1940	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1941	return 0;
2016
2017	tag = op->count;
2018		1942
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1943	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1944	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1945	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1946
…		…
2047	* we don't need to check all of them.	1971	* we don't need to check all of them.
2048	*/	1972	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1973	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1974	break;
2051	}	1975	}
		1976
2052	for (; tmp != NULL; tmp = tmp->below)	1977	for (; tmp; tmp = tmp->below)
2053	{	1978	{
2054	if (tmp == op)	1979	if (tmp == op)
2055	continue; /* Can't apply yourself */	1980	continue; /* Can't apply yourself */
2056		1981
2057	/* Check to see if one of the movement types should be slowed down.	1982	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1990	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1991	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1992	{
2068		1993
2069	float	1994	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1995	diff = tmp->move_slow_penalty * FABS (op->speed);
		1996
2073	if (op->type == PLAYER)	1997	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1998	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1999	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	2000	diff /= 4.0;
2079	}	2001
2080	}
2081	op->speed_left -= diff;	2002	op->speed_left -= diff;
2082	}	2003	}
2083	}	2004	}
2084		2005
2085	/* Basically same logic as above, except now for actual apply. */	2006	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2007	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2008	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	2009	{
2089
2090	move_apply (tmp, op, originator);	2010	move_apply (tmp, op, originator);
		2011
2091	if (was_destroyed (op, tag))	2012	if (op->destroyed ())
2092	return 1;	2013	return 1;
2093		2014
2094	/* what the person/creature stepped onto has moved the object	2015	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	2016	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	2017	* have a feeling strange problems would result.
2097	*/	2018	*/
2098	if (op->map != m || op->x != x || op->y != y)	2019	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	2020	return 0;
2100	}	2021	}
2101	}	2022	}
		2023
2102	return 0;	2024	return 0;
2103	}	2025	}
2104		2026
2105	/*	2027	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	2028	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	2029	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	2030	* The first matching object is returned, or NULL if none.
2109	*/	2031	*/
2110		2032
2111	object *	2033	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	2034	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	2035	{
2114	object *	2036	object *
2115	tmp;	2037	tmp;
2116		2038
2117	if (m == NULL || out_of_map (m, x, y))	2039	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	2052	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	2053	* The first matching object is returned, or NULL if none.
2132	*/	2054	*/
2133		2055
2134	object *	2056	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	2057	present (unsigned char type, maptile *m, int x, int y)
2136	{	2058	{
2137	object *	2059	object *
2138	tmp;	2060	tmp;
2139		2061
2140	if (out_of_map (m, x, y))	2062	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2202	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2203	* customized, changed states, etc.
2282	*/	2204	*/
2283		2205
2284	int	2206	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2207	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2208	{
2287	int	2209	int
2288	i,	2210	i,
2289	index = 0, flag;	2211	index = 0, flag;
2290	static int	2212	static int
…		…
2311	return -1;	2233	return -1;
2312	return altern[RANDOM () % index];	2234	return altern[RANDOM () % index];
2313	}	2235	}
2314		2236
2315	/*	2237	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2238	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2239	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2240	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2241	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2242	*/
2321		2243
2322	int	2244	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2245	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2246	{
2325	int	2247	int
2326	i;	2248	i;
2327		2249
2328	for (i = 0; i < SIZEOFFREE; i++)	2250	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2314	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2315	* there is capable of.
2394	*/	2316	*/
2395		2317
2396	int	2318	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2319	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2320	{
2399	int	2321	int
2400	i,	2322	i,
2401	max = SIZEOFFREE, mflags;	2323	max = SIZEOFFREE, mflags;
2402	sint16	2324
2403	nx,	2325	sint16 nx, ny;
2404	ny;
2405	object *	2326	object *
2406	tmp;	2327	tmp;
2407	mapstruct *	2328	maptile *
2408	mp;	2329	mp;
2409	MoveType	2330
2410	blocked,	2331	MoveType blocked, move_type;
2411	move_type;
2412		2332
2413	if (exclude && exclude->head)	2333	if (exclude && exclude->head)
2414	{	2334	{
2415	exclude = exclude->head;	2335	exclude = exclude->head;
2416	move_type = exclude->move_type;	2336	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2541	* Modified to be map tile aware -.MSW
2622	*/	2542	*/
2623		2543
2624		2544
2625	int	2545	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2546	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2547	{
2628	sint16	2548	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2549	int
2632	mflags;	2550	mflags;
2633		2551
2634	if (dir < 0)	2552	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2553	return 0; /* exit condition: invalid direction */
…		…
2713	if (prev)	2631	if (prev)
2714	prev->more = tmp;	2632	prev->more = tmp;
2715	prev = tmp;	2633	prev = tmp;
2716	}	2634	}
2717		2635
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2636	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2637	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2638
2724	return dst;	2639	return dst;
2725	}	2640	}
2726		2641
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2642	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2643	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2644	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2645	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2646	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2647	/* Also remember that multiparts objects are not supported for now. */
2747		2648
2748	object *	2649	object *
2749	load_object_str (const char *obstr)	2650	load_object_str (const char *obstr)
2750	{	2651	{
2751	object *	2652	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2653	char filename[MAX_BUF];
2755		2654
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2655	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2656
2758	FILE *
2759	tempfile = fopen (filename, "w");	2657	FILE *tempfile = fopen (filename, "w");
2760		2658
2761	if (tempfile == NULL)	2659	if (tempfile == NULL)
2762	{	2660	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2661	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2662	return NULL;
2765	};	2663	}
		2664
2766	fprintf (tempfile, obstr);	2665	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2666	fclose (tempfile);
2768		2667
2769	op = get_object ();	2668	op = get_object ();
2770		2669
2771	object_thawer	2670	object_thawer thawer (filename);
2772	thawer (filename);
2773		2671
2774	if (thawer)	2672	if (thawer)
2775	load_object (thawer, op, 0);	2673	load_object (thawer, op, 0);
2776		2674
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2675	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2683	* returns NULL if no match.
2786	*/	2684	*/
2787	object *	2685	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2686	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2687	{
2790	object *	2688	object *tmp;
2791	tmp;
2792		2689
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2690	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2691	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2692	return tmp;
2796		2693
…		…
2804	* do the desired thing.	2701	* do the desired thing.
2805	*/	2702	*/
2806	key_value *	2703	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2704	get_ob_key_link (const object *ob, const char *key)
2808	{	2705	{
2809	key_value *	2706	key_value *link;
2810	link;
2811		2707
2812	for (link = ob->key_values; link != NULL; link = link->next)	2708	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2709	if (link->key == key)
2815	{
2816	return link;	2710	return link;
2817	}
2818	}
2819		2711
2820	return NULL;	2712	return NULL;
2821	}	2713	}
2822		2714
2823	/*	2715	/*
…		…
2828	* The returned string is shared.	2720	* The returned string is shared.
2829	*/	2721	*/
2830	const char *	2722	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2723	get_ob_key_value (const object *op, const char *const key)
2832	{	2724	{
2833	key_value *	2725	key_value *link;
2834	link;	2726	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2727
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2728	if (!canonical_key)
2841	{	2729	{
2842	/* 1. There being a field named key on any object	2730	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2731	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2732	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2733	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2734	*/
2847	return NULL;	2735	return 0;
2848	}	2736	}
2849		2737
2850	/* This is copied from get_ob_key_link() above -	2738	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2739	* only 4 lines, and saves the function call overhead.
2852	*/	2740	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2741	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2742	if (link->key == canonical_key)
2856	{
2857	return link->value;	2743	return link->value;
2858	}	2744
2859	}
2860	return NULL;	2745	return 0;
2861	}	2746	}
2862		2747
2863		2748
2864	/*	2749	/*
2865	* Updates the canonical_key in op to value.	2750	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2786	if (last)
2902	last->next = field->next;	2787	last->next = field->next;
2903	else	2788	else
2904	op->key_values = field->next;	2789	op->key_values = field->next;
2905		2790
2906	delete
2907	field;	2791	delete field;
2908	}	2792	}
2909	}	2793	}
2910	return TRUE;	2794	return TRUE;
2911	}	2795	}
2912	/* IF we get here, key doesn't exist */	2796	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2831	* Returns TRUE on success.
2948	*/	2832	*/
2949	int	2833	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2834	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2835	{
2952	shstr
2953	key_ (key);	2836	shstr key_ (key);
2954		2837
2955	return set_ob_key_value_s (op, key_, value, add_key);	2838	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2839	}
		2840
		2841	object::depth_iterator::depth_iterator (object *container)
		2842	: iterator_base (container)
		2843	{
		2844	while (item->inv)
		2845	item = item->inv;
		2846	}
		2847
		2848	void
		2849	object::depth_iterator::next ()
		2850	{
		2851	if (item->below)
		2852	{
		2853	item = item->below;
		2854
		2855	while (item->inv)
		2856	item = item->inv;
		2857	}
		2858	else
		2859	item = item->env;
		2860	}
		2861
		2862	// return a suitable string describing an objetc in enough detail to find it
		2863	const char *
		2864	object::debug_desc (char *info) const
		2865	{
		2866	char info2[256 * 3];
		2867	char *p = info;
		2868
		2869	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2870	count,
		2871	&name,
		2872	title ? " " : "",
		2873	title ? (const char *)title : "");
		2874
		2875	if (env)
		2876	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2877
		2878	if (map)
		2879	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2880
		2881	return info;
		2882	}
		2883
		2884	const char *
		2885	object::debug_desc () const
		2886	{
		2887	static char info[256 * 3];
		2888	return debug_desc (info);
		2889	}
		2890

Diff Legend

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