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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 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 %d\n:%s\n", op->count, errmsg);
381	}	454	}
382	}	455	}
…		…
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;
416	return op;	489	return op;
417	}	490	}
418		491
…		…
423	*/	496	*/
424		497
425	object *	498	object *
426	find_object_name (const char *str)	499	find_object_name (const char *str)
427	{	500	{
428	const char *name = shstr::find (str);	501	shstr_cmp str_ (str);
429	object *op;	502	object *op;
430		503
431	for (op = objects; op != NULL; op = op->next)	504	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	505	if (op->name == str_)
433	break;	506	break;
434		507
435	return op;	508	return op;
436	}	509	}
437		510
…		…
440	{	513	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	514	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	515	}
443		516
444	/*	517	/*
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	518	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	519	* skill and experience objects.
485	*/	520	*/
486	void	521	void
487	set_owner (object *op, object *owner)	522	object::set_owner (object *owner)
488	{	523	{
489	if (owner == NULL || op == NULL)	524	if (!owner)
490	return;	525	return;
491		526
492	/* next line added to allow objects which own objects */	527	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	528	/* 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	529	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	530	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	531	* 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.	532	* didn't match, this check is valid and I believe that cause is valid.
498	*/	533	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	534	while (owner->owner)
500	owner = owner->owner;	535	owner = owner->owner;
501		536
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;	537	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	538	}
543		539
544	/* Zero the key_values on op, decrementing the shared-string	540	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	541	* refcounts and freeing the links.
546	*/	542	*/
…		…
562	{	558	{
563	attachable_base::clear ();	559	attachable_base::clear ();
564		560
565	free_key_values (this);	561	free_key_values (this);
566		562
		563	owner = 0;
567	name = 0;	564	name = 0;
568	name_pl = 0;	565	name_pl = 0;
569	title = 0;	566	title = 0;
570	race = 0;	567	race = 0;
571	slaying = 0;	568	slaying = 0;
572	skill = 0;	569	skill = 0;
573	msg = 0;	570	msg = 0;
574	lore = 0;	571	lore = 0;
575	custom_name = 0;	572	custom_name = 0;
576	materialname = 0;	573	materialname = 0;
		574	contr = 0;
		575	below = 0;
		576	above = 0;
		577	inv = 0;
		578	container = 0;
		579	env = 0;
		580	more = 0;
		581	head = 0;
		582	map = 0;
		583	active_next = 0;
		584	active_prev = 0;
577		585
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	586	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		587
580	SET_FLAG (this, FLAG_REMOVED);	588	SET_FLAG (this, FLAG_REMOVED);
		589
		590	/* What is not cleared is next, prev, and count */
		591
		592	expmul = 1.0;
		593	face = blank_face;
		594
		595	if (settings.casting_time)
		596	casting_time = -1;
581	}	597	}
582		598
583	void object::clone (object *destination)	599	void object::clone (object *destination)
584	{	600	{
585	*(object_copy *) destination = *this;	601	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	602	*(object_pod *)destination = *this;
587		603
588	if (self || cb)	604	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	605	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}	606	}
623		607
624	/*	608	/*
625	* copy object first frees everything allocated by the second object,	609	* copy object first frees everything allocated by the second object,
626	* and then copies the contends of the first object into the second	610	* and then copies the contends of the first object into the second
627	* object, allocating what needs to be allocated. Basically, any	611	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	612	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	613	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	614	* will point at garbage.
631	*/	615	*/
632
633	void	616	void
634	copy_object (object *op2, object *op)	617	copy_object (object *op2, object *op)
635	{	618	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	619	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	620	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	680	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	681	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	682	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	683	* This function needs to be called whenever the speed of an object changes.
701	*/	684	*/
702
703	void	685	void
704	update_ob_speed (object *op)	686	update_ob_speed (object *op)
705	{	687	{
706	extern int arch_init;	688	extern int arch_init;
707		689
…		…
716	abort ();	698	abort ();
717	#else	699	#else
718	op->speed = 0;	700	op->speed = 0;
719	#endif	701	#endif
720	}	702	}
		703
721	if (arch_init)	704	if (arch_init)
722	{
723	return;	705	return;
724	}	706
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	707	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	708	{
727	/* If already on active list, don't do anything */	709	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	710	if (op->active_next || op->active_prev || op == active_objects)
729	return;	711	return;
730		712
731	/* process_events() expects us to insert the object at the beginning	713	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	714	* of the list. */
733	op->active_next = active_objects;	715	op->active_next = active_objects;
		716
734	if (op->active_next != NULL)	717	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	718	op->active_next->active_prev = op;
		719
736	active_objects = op;	720	active_objects = op;
737	}	721	}
738	else	722	else
739	{	723	{
740	/* If not on the active list, nothing needs to be done */	724	/* If not on the active list, nothing needs to be done */
…		…
742	return;	726	return;
743		727
744	if (op->active_prev == NULL)	728	if (op->active_prev == NULL)
745	{	729	{
746	active_objects = op->active_next;	730	active_objects = op->active_next;
		731
747	if (op->active_next != NULL)	732	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	733	op->active_next->active_prev = NULL;
749	}	734	}
750	else	735	else
751	{	736	{
752	op->active_prev->active_next = op->active_next;	737	op->active_prev->active_next = op->active_next;
		738
753	if (op->active_next)	739	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	740	op->active_next->active_prev = op->active_prev;
755	}	741	}
		742
756	op->active_next = NULL;	743	op->active_next = NULL;
757	op->active_prev = NULL;	744	op->active_prev = NULL;
758	}	745	}
759	}	746	}
760		747
…		…
890	/* if the object is being removed, we can't make intelligent	877	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	878	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	879	* that is being removed.
893	*/	880	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	881	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	882	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	883	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	884	/* Nothing to do for that case */ ;
901	}
902	else	885	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	886	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		887
907	if (update_now)	888	if (update_now)
908	{	889	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	890	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);	891	update_position (op->map, op->x, op->y);
…		…
912		893
913	if (op->more != NULL)	894	if (op->more != NULL)
914	update_object (op->more, action);	895	update_object (op->more, action);
915	}	896	}
916		897
917	static	898	object::vector object::mortals;
918	std::vector < object *>	899	object::vector object::objects; // not yet used
919	mortals;	900	object *object::first;
920		901
921	void object::free_mortals ()	902	void object::free_mortals ()
922	{	903	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	904	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
925	i;	908	{
		909	delete *i;
		910	mortals.erase (i);
		911	}
926		912
927	mortals.clear ();	913	static int lastmortals = 0;//D
		914
		915	if (mortals.size() != lastmortals)//D
		916	{
		917	lastmortals = mortals.size ();//D
		918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		919	}
928	}	920	}
929		921
930	object::object ()	922	object::object ()
931	{	923	{
932	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
933		925
934	expmul = 1.0;	926	expmul = 1.0;
935	face = blank_face;	927	face = blank_face;
936	attacked_by_count = -1;
937	}	928	}
938		929
939	object::~object ()	930	object::~object ()
940	{	931	{
941	free_key_values (this);	932	free_key_values (this);
942	}	933	}
943		934
944	void object::link ()	935	void object::link ()
945	{	936	{
946	count = ++ob_count;	937	count = ++ob_count;
		938	uuid = gen_uuid ();
947		939
948	prev = 0;	940	prev = 0;
949	next = objects;	941	next = object::first;
950		942
951	if (objects)	943	if (object::first)
952	objects->prev = this;	944	object::first->prev = this;
953		945
954	objects = this;	946	object::first = this;
955	}	947	}
956		948
957	void object::unlink ()	949	void object::unlink ()
958	{	950	{
959	count = 0;	951	//count = 0;//D
		952	if (!prev && !next) return;//D
		953
		954	if (this == object::first)
		955	object::first = next;
960		956
961	/* Remove this object from the list of used objects */	957	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	958	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	959	if (next) next->prev = prev;
966	if (this == objects)	960
967	objects = next;	961	prev = 0;
		962	next = 0;
968	}	963	}
969		964
970	object *object::create ()	965	object *object::create ()
971	{	966	{
972	object *
973	op = new object;	967	object *op = new object;
974
975	op->link ();	968	op->link ();
976	return op;	969	return op;
977	}	970	}
978		971
979	/*	972	/*
…		…
986	* If free_inventory is set, free inventory as well. Else drop items in	979	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	980	* inventory to the ground.
988	*/	981	*/
989	void object::free (bool free_inventory)	982	void object::free (bool free_inventory)
990	{	983	{
		984	if (QUERY_FLAG (this, FLAG_FREED))
		985	return;
		986
		987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		988	remove_friendly_object (this);
		989
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	991	remove_ob (this);
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		992
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	993	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		994
1013	if (more)	995	if (more)
1014	{	996	{
1015	more->free (free_inventory);	997	more->free (free_inventory);
1016	more = 0;	998	more = 0;
…		…
1020	{	1002	{
1021	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	1004	* if some form of movement is allowed, let objects
1023	* drop on that space.	1005	* drop on that space.
1024	*/	1006	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	1008	{
1027	object *	1009	object *op = inv;
1028	op = inv;
1029		1010
1030	while (op)	1011	while (op)
1031	{	1012	{
1032	object *
1033	tmp = op->below;	1013	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	1014	op->free (free_inventory);
1037	op = tmp;	1015	op = tmp;
1038	}	1016	}
1039	}	1017	}
1040	else	1018	else
1041	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
1042	object *	1020	object *op = inv;
1043	op = inv;
1044		1021
1045	while (op)	1022	while (op)
1046	{	1023	{
1047	object *
1048	tmp = op->below;	1024	object *tmp = op->below;
1049		1025
1050	remove_ob (op);	1026	remove_ob (op);
1051		1027
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1029	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	1038	op = tmp;
1063	}	1039	}
1064	}	1040	}
1065	}	1041	}
1066		1042
		1043	// clear those pointers that likely might have circular references to us
		1044	owner = 0;
		1045	enemy = 0;
		1046	attacked_by = 0;
		1047
1067	/* Remove object from the active list */	1048	/* Remove object from the active list */
1068	speed = 0;	1049	speed = 0;
1069	update_ob_speed (this);	1050	update_ob_speed (this);
1070		1051
1071	unlink ();	1052	unlink ();
1072		1053
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	1054	mortals.push_back (this);
1076	}	1055	}
1077		1056
1078	/*	1057	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	1058	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1084	sub_weight (object *op, signed long weight)	1063	sub_weight (object *op, signed long weight)
1085	{	1064	{
1086	while (op != NULL)	1065	while (op != NULL)
1087	{	1066	{
1088	if (op->type == CONTAINER)	1067	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1068	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1069
1092	op->carrying -= weight;	1070	op->carrying -= weight;
1093	op = op->env;	1071	op = op->env;
1094	}	1072	}
1095	}	1073	}
1096		1074
…		…
1104	*/	1082	*/
1105		1083
1106	void	1084	void
1107	remove_ob (object *op)	1085	remove_ob (object *op)
1108	{	1086	{
		1087	object *tmp, *last = 0;
1109	object *	1088	object *otmp;
1110	tmp, *	1089
1111	last = NULL;	1090	tag_t tag;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1091	int check_walk_off;
1118	mapstruct *	1092	mapstruct *m;
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1093
		1094	sint16 x, y;
1124		1095
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1096	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1097	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1098
1130	/* Changed it to always dump core in this case. As has been learned	1099	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1100
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)	1101	if (op->more != NULL)
1143	remove_ob (op->more);	1102	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1103
1147	/*	1104	/*
1148	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1149	* inventory.	1106	* inventory.
1150	*/	1107	*/
…		…
1176	*/	1133	*/
1177	op->x = op->env->x, op->y = op->env->y;	1134	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1135	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1136	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1137	op->env = NULL;
1181	return;	1138	}
		1139	else if (op->map)
1182	}	1140	{
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;	1141	x = op->x;
1189	y = op->y;	1142	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1143	m = get_map_from_coord (op->map, &x, &y);
1191		1144
1192	if (!m)	1145	if (!m)
1193	{	1146	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1147	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1195	op->map->path, op->x, op->y);	1148	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.	1149	/* in old days, we used to set x and y to 0 and continue.
1197	* it seems if we get into this case, something is probablye	1150	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.	1151	* screwed up and should be fixed.
		1152	*/
		1153	abort ();
		1154	}
		1155
		1156	if (op->map != m)
		1157	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1158	op->map->path, m->path, op->x, op->y, x, y);
		1159
		1160	/* Re did the following section of code - it looks like it had
		1161	* lots of logic for things we no longer care about
1199	*/	1162	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1163
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1164	/* link the object above us */
1213	if (op->above)	1165	if (op->above)
1214	op->above->below = op->below;	1166	op->above->below = op->below;
1215	else	1167	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1168	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217		1169
1218	/* Relink the object below us, if there is one */	1170	/* Relink the object below us, if there is one */
1219	if (op->below)	1171	if (op->below)
1220	{
1221	op->below->above = op->above;	1172	op->below->above = op->above;
1222	}
1223	else	1173	else
1224	{	1174	{
1225	/* Nothing below, which means we need to relink map object for this space	1175	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	1176	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1177	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	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",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1178	*/
1259	if (tmp->container == op)	1179	if (GET_MAP_OB (m, x, y) != op)
1260	{	1180	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1181	dump_object (op);
1262	tmp->container = NULL;	1182	LOG (llevError,
		1183	"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);
		1184	dump_object (GET_MAP_OB (m, x, y));
		1185	LOG (llevError, "%s\n", errmsg);
1263	}	1186	}
1264	tmp->contr->socket.update_look = 1;	1187
1265	}	1188	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1189	}
1269		1190
1270	move_apply (tmp, op, NULL);	1191	op->above = 0;
1271	if (was_destroyed (op, tag))	1192	op->below = 0;
		1193
		1194	if (op->map->in_memory == MAP_SAVING)
		1195	return;
		1196
		1197	tag = op->count;
		1198	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1199
		1200	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1201	{
		1202	/* No point updating the players look faces if he is the object
		1203	* being removed.
		1204	*/
		1205
		1206	if (tmp->type == PLAYER && tmp != op)
1272	{	1207	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1208	/* If a container that the player is currently using somehow gets
		1209	* removed (most likely destroyed), update the player view
		1210	* appropriately.
		1211	*/
		1212	if (tmp->container == op)
		1213	{
		1214	CLEAR_FLAG (op, FLAG_APPLIED);
		1215	tmp->container = NULL;
		1216	}
		1217
		1218	tmp->contr->socket.update_look = 1;
1274	}	1219	}
		1220
		1221	/* See if player moving off should effect something */
		1222	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1223	{
		1224	move_apply (tmp, op, NULL);
		1225
		1226	if (was_destroyed (op, tag))
		1227	{
		1228	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1229	}
1275	}	1230	}
1276		1231
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1232	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1233
1279	if (tmp->above == tmp)	1234	if (tmp->above == tmp)
1280	tmp->above = NULL;	1235	tmp->above = NULL;
		1236
1281	last = tmp;	1237	last = tmp;
1282	}	1238	}
		1239
1283	/* last == NULL of there are no objects on this space */	1240	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1241	if (last == NULL)
1285	{	1242	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1243	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1244	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1245	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1246	* be correct anyways.
1290	*/	1247	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1248	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1249	update_position (op->map, op->x, op->y);
1293	}	1250	}
1294	else	1251	else
1295	update_object (last, UP_OBJ_REMOVE);	1252	update_object (last, UP_OBJ_REMOVE);
1296		1253
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1254	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1255	update_all_los (op->map, op->x, op->y);
1299		1256	}
1300	}	1257	}
1301		1258
1302	/*	1259	/*
1303	* merge_ob(op,top):	1260	* merge_ob(op,top):
1304	*	1261	*
1305	* This function goes through all objects below and including top, and	1262	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1263	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1264	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1265	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1266	*/
1310
1311	object *	1267	object *
1312	merge_ob (object *op, object *top)	1268	merge_ob (object *op, object *top)
1313	{	1269	{
1314	if (!op->nrof)	1270	if (!op->nrof)
1315	return 0;	1271	return 0;
		1272
1316	if (top == NULL)	1273	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1274	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1275
1318	for (; top != NULL; top = top->below)	1276	for (; top != NULL; top = top->below)
1319	{	1277	{
1320	if (top == op)	1278	if (top == op)
1321	continue;	1279	continue;
1322	if (CAN_MERGE (op, top))	1280	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1286	remove_ob (op);
1329	free_object (op);	1287	free_object (op);
1330	return top;	1288	return top;
1331	}	1289	}
1332	}	1290	}
		1291
1333	return NULL;	1292	return 0;
1334	}	1293	}
1335		1294
1336	/*	1295	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1296	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1297	* job preparing multi-part monsters
1339	*/	1298	*/
1340	object *	1299	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1300	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1342	{	1301	{
1343	object *	1302	object *tmp;
1344	tmp;
1345		1303
1346	if (op->head)	1304	if (op->head)
1347	op = op->head;	1305	op = op->head;
		1306
1348	for (tmp = op; tmp; tmp = tmp->more)	1307	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1308	{
1350	tmp->x = x + tmp->arch->clone.x;	1309	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1310	tmp->y = y + tmp->arch->clone.y;
1352	}	1311	}
		1312
1353	return insert_ob_in_map (op, m, originator, flag);	1313	return insert_ob_in_map (op, m, originator, flag);
1354	}	1314	}
1355		1315
1356	/*	1316	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1317	* insert_ob_in_map (op, map, originator, flag):
…		…
1375	*/	1335	*/
1376		1336
1377	object *	1337	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1338	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1379	{	1339	{
1380	object *	1340	object *tmp, *top, *floor = NULL;
1381	tmp, *	1341	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1342
1388	if (QUERY_FLAG (op, FLAG_FREED))	1343	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1344	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1345	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1346	return NULL;
1392	}	1347	}
		1348
1393	if (m == NULL)	1349	if (m == NULL)
1394	{	1350	{
1395	dump_object (op);	1351	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1352	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;	1353	return op;
1398	}	1354	}
		1355
1399	if (out_of_map (m, op->x, op->y))	1356	if (out_of_map (m, op->x, op->y))
1400	{	1357	{
1401	dump_object (op);	1358	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1359	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES	1360	#ifdef MANY_CORES
…		…
1407	*/	1364	*/
1408	abort ();	1365	abort ();
1409	#endif	1366	#endif
1410	return op;	1367	return op;
1411	}	1368	}
		1369
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1370	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1371	{
1414	dump_object (op);	1372	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1373	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;	1374	return op;
1417	}	1375	}
		1376
1418	if (op->more != NULL)	1377	if (op->more != NULL)
1419	{	1378	{
1420	/* The part may be on a different map. */	1379	/* The part may be on a different map. */
1421		1380
1422	object *
1423	more = op->more;	1381	object *more = op->more;
1424		1382
1425	/* We really need the caller to normalize coordinates - if	1383	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1384	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1385	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1386	* is clear wrong do we normalize it.
1429	*/	1387	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1388	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1389	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1390	else if (!more->map)
1435	{	1391	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1392	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1393	* more->map should always point to the parent.
1438	*/	1394	*/
…		…
1441		1397
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1398	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1399	{
1444	if (!op->head)	1400	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1401	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1402
1446	return NULL;	1403	return NULL;
1447	}	1404	}
1448	}	1405	}
		1406
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1407	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1408
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1409	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1410	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1411	* need extra work
…		…
1457	y = op->y;	1415	y = op->y;
1458		1416
1459	/* this has to be done after we translate the coordinates.	1417	/* this has to be done after we translate the coordinates.
1460	*/	1418	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1419	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1420	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1421	if (CAN_MERGE (op, tmp))
1465	{	1422	{
1466	op->nrof += tmp->nrof;	1423	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1424	remove_ob (tmp);
1468	free_object (tmp);	1425	free_object (tmp);
1469	}	1426	}
1470	}
1471		1427
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1430
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1431	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1432	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1433
1477	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1435	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1437	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1439	abort ();
1483	}	1440	}
		1441
1484	op->above = originator;	1442	op->above = originator;
1485	op->below = originator->below;	1443	op->below = originator->below;
		1444
1486	if (op->below)	1445	if (op->below)
1487	op->below->above = op;	1446	op->below->above = op;
1488	else	1447	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1448	SET_MAP_OB (op->map, op->x, op->y, op);
		1449
1490	/* since *below* originator, no need to update top */	1450	/* since *below* originator, no need to update top */
1491	originator->below = op;	1451	originator->below = op;
1492	}	1452	}
1493	else	1453	else
1494	{	1454	{
1495	/* If there are other objects, then */	1455	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1456	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1457	{
1498	object *
1499	last = NULL;	1458	object *last = NULL;
1500		1459
1501	/*	1460	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1461	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1462	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1463	* Generally, we want to put the new object on top. But if
…		…
1513		1472
1514	while (top != NULL)	1473	while (top != NULL)
1515	{	1474	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1475	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1476	floor = top;
		1477
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1478	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1479	{
1520	/* We insert above top, so we want this object below this */	1480	/* We insert above top, so we want this object below this */
1521	top = top->below;	1481	top = top->below;
1522	break;	1482	break;
1523	}	1483	}
		1484
1524	last = top;	1485	last = top;
1525	top = top->above;	1486	top = top->above;
1526	}	1487	}
		1488
1527	/* Don't want top to be NULL, so set it to the last valid object */	1489	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1490	top = last;
1529		1491
1530	/* We let update_position deal with figuring out what the space	1492	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1493	* looks like instead of lots of conditions here.
…		…
1551	*/	1513	*/
1552	if (last && last->below && last != floor)	1514	if (last && last->below && last != floor)
1553	top = last->below;	1515	top = last->below;
1554	}	1516	}
1555	} /* If objects on this space */	1517	} /* If objects on this space */
		1518
1556	if (flag & INS_MAP_LOAD)	1519	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1520	top = GET_MAP_TOP (op->map, op->x, op->y);
		1521
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1522	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1523	top = floor;
1560		1524
1561	/* Top is the object that our object (op) is going to get inserted above.	1525	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1526	*/
1563		1527
1564	/* First object on this space */	1528	/* First object on this space */
1565	if (!top)	1529	if (!top)
1566	{	1530	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1531	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1532
1568	if (op->above)	1533	if (op->above)
1569	op->above->below = op;	1534	op->above->below = op;
		1535
1570	op->below = NULL;	1536	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1537	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1538	}
1573	else	1539	else
1574	{ /* get inserted into the stack above top */	1540	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1541	op->above = top->above;
		1542
1576	if (op->above)	1543	if (op->above)
1577	op->above->below = op;	1544	op->above->below = op;
		1545
1578	op->below = top;	1546	op->below = top;
1579	top->above = op;	1547	top->above = op;
1580	}	1548	}
		1549
1581	if (op->above == NULL)	1550	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1551	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1552	} /* else not INS_BELOW_ORIGINATOR */
1584		1553
1585	if (op->type == PLAYER)	1554	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1557	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1558	* it, so save a few ticks and start from there.
1590	*/	1559	*/
1591	if (!(flag & INS_MAP_LOAD))	1560	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1561	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1562	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1563	tmp->contr->socket.update_look = 1;
1596	}
1597		1564
1598	/* If this object glows, it may affect lighting conditions that are	1565	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1566	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1567	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1568	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1572	* of effect may be sufficient.
1606	*/	1573	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1574	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1575	update_all_los (op->map, op->x, op->y);
1609		1576
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1577	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1578	update_object (op, UP_OBJ_INSERT);
1613
1614		1579
1615	/* Don't know if moving this to the end will break anything. However,	1580	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1581	* we want to have update_look set above before calling this.
1617	*	1582	*
1618	* check_move_on() must be after this because code called from	1583	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1585	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1586	* update_object().
1622	*/	1587	*/
1623		1588
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1589	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1590	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1591	{
1628	if (check_move_on (op, originator))	1592	if (check_move_on (op, originator))
1629	return NULL;	1593	return NULL;
1630		1594
…		…
1633	*/	1597	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1598	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1599	if (check_move_on (tmp, originator))
1636	return NULL;	1600	return NULL;
1637	}	1601	}
		1602
1638	return op;	1603	return op;
1639	}	1604	}
1640		1605
1641	/* this function inserts an object in the map, but if it	1606	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1607	* finds an object of its own type, it'll remove that one first.
…		…
1659	remove_ob (tmp);	1624	remove_ob (tmp);
1660	free_object (tmp);	1625	free_object (tmp);
1661	}	1626	}
1662	}	1627	}
1663		1628
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1629	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1630
1667	tmp1->x = op->x;	1631	tmp1->x = op->x;
1668	tmp1->y = op->y;	1632	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1633	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1634	}
…		…
1688	if (orig_ob->nrof < nr)	1652	if (orig_ob->nrof < nr)
1689	{	1653	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1654	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1655	return NULL;
1692	}	1656	}
		1657
1693	newob = object_create_clone (orig_ob);	1658	newob = object_create_clone (orig_ob);
		1659
1694	if ((orig_ob->nrof -= nr) < 1)	1660	if ((orig_ob->nrof -= nr) < 1)
1695	{	1661	{
1696	if (!is_removed)	1662	if (!is_removed)
1697	remove_ob (orig_ob);	1663	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1664	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1672	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1673	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1674	return NULL;
1709	}	1675	}
1710	}	1676	}
		1677
1711	newob->nrof = nr;	1678	newob->nrof = nr;
1712		1679
1713	return newob;	1680	return newob;
1714	}	1681	}
1715		1682
…		…
1722	*/	1689	*/
1723		1690
1724	object *	1691	object *
1725	decrease_ob_nr (object *op, uint32 i)	1692	decrease_ob_nr (object *op, uint32 i)
1726	{	1693	{
1727	object *	1694	object *tmp;
1728	tmp;
1729	player *	1695	player *pl;
1730	pl;
1731		1696
1732	if (i == 0) /* objects with op->nrof require this check */	1697	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1698	return op;
1734		1699
1735	if (i > op->nrof)	1700	if (i > op->nrof)
1736	i = op->nrof;	1701	i = op->nrof;
1737		1702
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1703	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1704	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1705	else if (op->env != NULL)
1743	{	1706	{
1744	/* is this object in the players inventory, or sub container	1707	/* is this object in the players inventory, or sub container
1745	* therein?	1708	* therein?
1746	*/	1709	*/
…		…
1781	}	1744	}
1782	}	1745	}
1783	}	1746	}
1784	else	1747	else
1785	{	1748	{
1786	object *
1787	above = op->above;	1749	object *above = op->above;
1788		1750
1789	if (i < op->nrof)	1751	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1752	op->nrof -= i;
1792	}
1793	else	1753	else
1794	{	1754	{
1795	remove_ob (op);	1755	remove_ob (op);
1796	op->nrof = 0;	1756	op->nrof = 0;
1797	}	1757	}
		1758
1798	/* Since we just removed op, op->above is null */	1759	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1760	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1761	if (tmp->type == PLAYER)
1801	{	1762	{
1802	if (op->nrof)	1763	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1766	esrv_del_item (tmp->contr, op->count);
1806	}	1767	}
1807	}	1768	}
1808		1769
1809	if (op->nrof)	1770	if (op->nrof)
1810	{
1811	return op;	1771	return op;
1812	}
1813	else	1772	else
1814	{	1773	{
1815	free_object (op);	1774	free_object (op);
1816	return NULL;	1775	return NULL;
1817	}	1776	}
…		…
1826	add_weight (object *op, signed long weight)	1785	add_weight (object *op, signed long weight)
1827	{	1786	{
1828	while (op != NULL)	1787	while (op != NULL)
1829	{	1788	{
1830	if (op->type == CONTAINER)	1789	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1790	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1791
1834	op->carrying += weight;	1792	op->carrying += weight;
1835	op = op->env;	1793	op = op->env;
1836	}	1794	}
1837	}	1795	}
1838		1796
…		…
1861	{	1819	{
1862	dump_object (op);	1820	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1821	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;	1822	return op;
1865	}	1823	}
		1824
1866	if (where == NULL)	1825	if (where == NULL)
1867	{	1826	{
1868	dump_object (op);	1827	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1828	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;	1829	return op;
1871	}	1830	}
		1831
1872	if (where->head)	1832	if (where->head)
1873	{	1833	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1834	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1835	where = where->head;
1876	}	1836	}
		1837
1877	if (op->more)	1838	if (op->more)
1878	{	1839	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1840	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1841	return op;
1881	}	1842	}
		1843
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1844	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1845	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1846	if (op->nrof)
1885	{	1847	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1848	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1979	tag;	1941	tag;
1980	mapstruct *	1942	mapstruct *
1981	m = op->map;	1943	m = op->map;
1982	int	1944	int
1983	x = op->x, y = op->y;	1945	x = op->x, y = op->y;
		1946
1984	MoveType	1947	MoveType
1985	move_on,	1948	move_on,
1986	move_slow,	1949	move_slow,
1987	move_block;	1950	move_block;
1988		1951
…		…
2022	* we don't need to check all of them.	1985	* we don't need to check all of them.
2023	*/	1986	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1987	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1988	break;
2026	}	1989	}
		1990
2027	for (; tmp != NULL; tmp = tmp->below)	1991	for (; tmp; tmp = tmp->below)
2028	{	1992	{
2029	if (tmp == op)	1993	if (tmp == op)
2030	continue; /* Can't apply yourself */	1994	continue; /* Can't apply yourself */
2031		1995
2032	/* Check to see if one of the movement types should be slowed down.	1996	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2004	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	2005	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	2006	{
2043		2007
2044	float	2008	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	2009	diff = tmp->move_slow_penalty * FABS (op->speed);
		2010
2048	if (op->type == PLAYER)	2011	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	2012	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2013	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	2014	diff /= 4.0;
2054	}	2015
2055	}
2056	op->speed_left -= diff;	2016	op->speed_left -= diff;
2057	}	2017	}
2058	}	2018	}
2059		2019
2060	/* Basically same logic as above, except now for actual apply. */	2020	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2021	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2022	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	2023	{
2064
2065	move_apply (tmp, op, originator);	2024	move_apply (tmp, op, originator);
		2025
2066	if (was_destroyed (op, tag))	2026	if (was_destroyed (op, tag))
2067	return 1;	2027	return 1;
2068		2028
2069	/* what the person/creature stepped onto has moved the object	2029	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	2030	* someplace new. Don't process any further - if we did,
…		…
2072	*/	2032	*/
2073	if (op->map != m || op->x != x || op->y != y)	2033	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	2034	return 0;
2075	}	2035	}
2076	}	2036	}
		2037
2077	return 0;	2038	return 0;
2078	}	2039	}
2079		2040
2080	/*	2041	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	2042	* present_arch(arch, map, x, y) searches for any objects with
…		…
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2333	find_dir (mapstruct *m, int x, int y, object *exclude)
2373	{	2334	{
2374	int	2335	int
2375	i,	2336	i,
2376	max = SIZEOFFREE, mflags;	2337	max = SIZEOFFREE, mflags;
2377	sint16	2338
2378	nx,	2339	sint16 nx, ny;
2379	ny;
2380	object *	2340	object *
2381	tmp;	2341	tmp;
2382	mapstruct *	2342	mapstruct *
2383	mp;	2343	mp;
2384	MoveType	2344
2385	blocked,	2345	MoveType blocked, move_type;
2386	move_type;
2387		2346
2388	if (exclude && exclude->head)	2347	if (exclude && exclude->head)
2389	{	2348	{
2390	exclude = exclude->head;	2349	exclude = exclude->head;
2391	move_type = exclude->move_type;	2350	move_type = exclude->move_type;
…		…
2598		2557
2599		2558
2600	int	2559	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2560	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2602	{	2561	{
2603	sint16	2562	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2563	int
2607	mflags;	2564	mflags;
2608		2565
2609	if (dir < 0)	2566	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2567	return 0; /* exit condition: invalid direction */
…		…
2735		2692
2736	if (tempfile == NULL)	2693	if (tempfile == NULL)
2737	{	2694	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2695	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2696	return NULL;
2740	};	2697	}
		2698
2741	fprintf (tempfile, obstr);	2699	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2700	fclose (tempfile);
2743		2701
2744	op = get_object ();	2702	op = get_object ();
2745		2703
2746	object_thawer	2704	object_thawer thawer (filename);
2747	thawer (filename);
2748		2705
2749	if (thawer)	2706	if (thawer)
2750	load_object (thawer, op, 0);	2707	load_object (thawer, op, 0);
2751		2708
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2709	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2803	* The returned string is shared.	2760	* The returned string is shared.
2804	*/	2761	*/
2805	const char *	2762	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2763	get_ob_key_value (const object *op, const char *const key)
2807	{	2764	{
2808	key_value *	2765	key_value *link;
2809	link;	2766	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2767
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2768	if (!canonical_key)
2816	{	2769	{
2817	/* 1. There being a field named key on any object	2770	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2771	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2772	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2773	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2774	*/
2822	return NULL;	2775	return 0;
2823	}	2776	}
2824		2777
2825	/* This is copied from get_ob_key_link() above -	2778	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2779	* only 4 lines, and saves the function call overhead.
2827	*/	2780	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2781	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2782	if (link->key == canonical_key)
2831	{
2832	return link->value;	2783	return link->value;
2833	}	2784
2834	}
2835	return NULL;	2785	return 0;
2836	}	2786	}
2837		2787
2838		2788
2839	/*	2789	/*
2840	* Updates the canonical_key in op to value.	2790	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2826	if (last)
2877	last->next = field->next;	2827	last->next = field->next;
2878	else	2828	else
2879	op->key_values = field->next;	2829	op->key_values = field->next;
2880		2830
2881	delete
2882	field;	2831	delete field;
2883	}	2832	}
2884	}	2833	}
2885	return TRUE;	2834	return TRUE;
2886	}	2835	}
2887	/* IF we get here, key doesn't exist */	2836	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2871	* Returns TRUE on success.
2923	*/	2872	*/
2924	int	2873	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2874	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2875	{
2927	shstr
2928	key_ (key);	2876	shstr key_ (key);
2929		2877
2930	return set_ob_key_value_s (op, key_, value, add_key);	2878	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2879	}
		2880
		2881	object::depth_iterator::depth_iterator (object *container)
		2882	: iterator_base (container)
		2883	{
		2884	while (item->inv)
		2885	item = item->inv;
		2886	}
		2887
		2888	void
		2889	object::depth_iterator::next ()
		2890	{
		2891	if (item->below)
		2892	{
		2893	item = item->below;
		2894
		2895	while (item->inv)
		2896	item = item->inv;
		2897	}
		2898	else
		2899	item = item->env;
		2900	}
		2901
		2902	// return a suitable string describing an objetc in enough detail to find it
		2903	const char *
		2904	object::debug_desc (char *info) const
		2905	{
		2906	char info2[256 * 3];
		2907	char *p = info;
		2908
		2909	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2910	count,
		2911	&name,
		2912	title ? " " : "",
		2913	title ? (const char *)title : "");
		2914
		2915	if (env)
		2916	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2917
		2918	if (map)
		2919	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2920
		2921	return info;
		2922	}
		2923
		2924	const char *
		2925	object::debug_desc () const
		2926	{
		2927	static char info[256 * 3];
		2928	return debug_desc (info);
		2929	}
		2930

Diff Legend

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