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.49 by root, Sat Sep 16 22:24:12 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 %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
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	}	539	}
543		540
544	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	542	* refcounts and freeing the links.
546	*/	543	*/
…		…
562	{	559	{
563	attachable_base::clear ();	560	attachable_base::clear ();
564		561
565	free_key_values (this);	562	free_key_values (this);
566		563
		564	owner = 0;
567	name = 0;	565	name = 0;
568	name_pl = 0;	566	name_pl = 0;
569	title = 0;	567	title = 0;
570	race = 0;	568	race = 0;
571	slaying = 0;	569	slaying = 0;
572	skill = 0;	570	skill = 0;
573	msg = 0;	571	msg = 0;
574	lore = 0;	572	lore = 0;
575	custom_name = 0;	573	custom_name = 0;
576	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;
577		586
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		588
580	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;
581	}	598	}
582		599
583	void object::clone (object *destination)	600	void object::clone (object *destination)
584	{	601	{
585	*(object_copy *) destination = *this;	602	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	603	*(object_pod *)destination = *this;
587		604
588	if (self || cb)	605	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	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	}	607	}
623		608
624	/*	609	/*
625	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
626	* 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
627	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
628	* 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,
629	* 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
630	* will point at garbage.	615	* will point at garbage.
631	*/	616	*/
632
633	void	617	void
634	copy_object (object *op2, object *op)	618	copy_object (object *op2, object *op)
635	{	619	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	681	/*
698	* 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
699	* 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.
700	* 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.
701	*/	685	*/
702
703	void	686	void
704	update_ob_speed (object *op)	687	update_ob_speed (object *op)
705	{	688	{
706	extern int arch_init;	689	extern int arch_init;
707		690
…		…
716	abort ();	699	abort ();
717	#else	700	#else
718	op->speed = 0;	701	op->speed = 0;
719	#endif	702	#endif
720	}	703	}
		704
721	if (arch_init)	705	if (arch_init)
722	{
723	return;	706	return;
724	}	707
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	709	{
727	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	711	if (op->active_next || op->active_prev || op == active_objects)
729	return;	712	return;
730		713
731	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	715	* of the list. */
733	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
734	if (op->active_next != NULL)	718	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
736	active_objects = op;	721	active_objects = op;
737	}	722	}
738	else	723	else
739	{	724	{
740	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
742	return;	727	return;
743		728
744	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
745	{	730	{
746	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
747	if (op->active_next != NULL)	733	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
749	}	735	}
750	else	736	else
751	{	737	{
752	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
753	if (op->active_next)	740	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
755	}	742	}
		743
756	op->active_next = NULL;	744	op->active_next = NULL;
757	op->active_prev = NULL;	745	op->active_prev = NULL;
758	}	746	}
759	}	747	}
760		748
…		…
890	/* if the object is being removed, we can't make intelligent	878	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	879	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	880	* that is being removed.
893	*/	881	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	883	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	885	/* Nothing to do for that case */ ;
901	}
902	else	886	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		888
907	if (update_now)	889	if (update_now)
908	{	890	{
909	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);
910	update_position (op->map, op->x, op->y);	892	update_position (op->map, op->x, op->y);
…		…
912		894
913	if (op->more != NULL)	895	if (op->more != NULL)
914	update_object (op->more, action);	896	update_object (op->more, action);
915	}	897	}
916		898
917	static	899	object::vector object::mortals;
918	std::vector < object *>	900	object::vector object::objects; // not yet used
919	mortals;	901	object *object::first;
920		902
921	void object::free_mortals ()	903	void object::free_mortals ()
922	{	904	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
925	i;	909	{
		910	delete *i;
		911	mortals.erase (i);
		912	}
926		913
927	mortals.clear ();	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	}
928	}	921	}
929		922
930	object::object ()	923	object::object ()
931	{	924	{
932	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
933		926
934	expmul = 1.0;	927	expmul = 1.0;
935	face = blank_face;	928	face = blank_face;
936	attacked_by_count = -1;
937	}	929	}
938		930
939	object::~object ()	931	object::~object ()
940	{	932	{
941	free_key_values (this);	933	free_key_values (this);
942	}	934	}
943		935
944	void object::link ()	936	void object::link ()
945	{	937	{
946	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
947		940
948	prev = 0;	941	prev = 0;
949	next = objects;	942	next = object::first;
950		943
951	if (objects)	944	if (object::first)
952	objects->prev = this;	945	object::first->prev = this;
953		946
954	objects = this;	947	object::first = this;
955	}	948	}
956		949
957	void object::unlink ()	950	void object::unlink ()
958	{	951	{
959	count = 0;	952	if (this == object::first)
		953	object::first = next;
960		954
961	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	956	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	957	if (next) next->prev = prev;
966	if (this == objects)	958
967	objects = next;	959	prev = 0;
		960	next = 0;
968	}	961	}
969		962
970	object *object::create ()	963	object *object::create ()
971	{	964	{
972	object *
973	op = new object;	965	object *op = new object;
974
975	op->link ();	966	op->link ();
976	return op;	967	return op;
977	}	968	}
978		969
979	/*	970	/*
…		…
986	* 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
987	* inventory to the ground.	978	* inventory to the ground.
988	*/	979	*/
989	void object::free (bool free_inventory)	980	void object::free (bool free_inventory)
990	{	981	{
		982	if (QUERY_FLAG (this, FLAG_FREED))
		983	return;
		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	989	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		990
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))	991	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		992
1013	if (more)	993	if (more)
1014	{	994	{
1015	more->free (free_inventory);	995	more->free (free_inventory);
1016	more = 0;	996	more = 0;
…		…
1020	{	1000	{
1021	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
1023	* drop on that space.	1003	* drop on that space.
1024	*/	1004	*/
1025	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)
1026	{	1006	{
1027	object *	1007	object *op = inv;
1028	op = inv;
1029		1008
1030	while (op)	1009	while (op)
1031	{	1010	{
1032	object *
1033	tmp = op->below;	1011	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	1012	op->free (free_inventory);
1037	op = tmp;	1013	op = tmp;
1038	}	1014	}
1039	}	1015	}
1040	else	1016	else
1041	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
1042	object *	1018	object *op = inv;
1043	op = inv;
1044		1019
1045	while (op)	1020	while (op)
1046	{	1021	{
1047	object *
1048	tmp = op->below;	1022	object *tmp = op->below;
1049		1023
1050	remove_ob (op);	1024	remove_ob (op);
1051		1025
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	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))	1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	1036	op = tmp;
1063	}	1037	}
1064	}	1038	}
1065	}	1039	}
1066		1040
		1041	// clear those pointers that likely might have circular references to us
		1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
		1045
1067	/* Remove object from the active list */	1046	/* Remove object from the active list */
1068	speed = 0;	1047	speed = 0;
1069	update_ob_speed (this);	1048	update_ob_speed (this);
1070		1049
1071	unlink ();	1050	unlink ();
1072		1051
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	1052	mortals.push_back (this);
1076	}	1053	}
1077		1054
1078	/*	1055	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	1056	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1084	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1085	{	1062	{
1086	while (op != NULL)	1063	while (op != NULL)
1087	{	1064	{
1088	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1067
1092	op->carrying -= weight;	1068	op->carrying -= weight;
1093	op = op->env;	1069	op = op->env;
1094	}	1070	}
1095	}	1071	}
1096		1072
…		…
1104	*/	1080	*/
1105		1081
1106	void	1082	void
1107	remove_ob (object *op)	1083	remove_ob (object *op)
1108	{	1084	{
		1085	object *tmp, *last = 0;
1109	object *	1086	object *otmp;
1110	tmp, *	1087
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1088	int check_walk_off;
1118	mapstruct *	1089	maptile *m;
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1090
		1091	sint16 x, y;
1124		1092
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1094	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1095
1130	/* Changed it to always dump core in this case. As has been learned	1096	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1097
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)	1098	if (op->more != NULL)
1143	remove_ob (op->more);	1099	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1100
1147	/*	1101	/*
1148	* In this case, the object to be removed is in someones	1102	* In this case, the object to be removed is in someones
1149	* inventory.	1103	* inventory.
1150	*/	1104	*/
…		…
1176	*/	1130	*/
1177	op->x = op->env->x, op->y = op->env->y;	1131	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1132	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1133	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1134	op->env = NULL;
1181	return;	1135	}
		1136	else if (op->map)
1182	}	1137	{
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;	1138	x = op->x;
1189	y = op->y;	1139	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1140	m = get_map_from_coord (op->map, &x, &y);
1191		1141
1192	if (!m)	1142	if (!m)
1193	{	1143	{
1194	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",
1195	op->map->path, op->x, op->y);	1145	op->map->path, op->x, op->y);
1196	/* 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.
1197	* it seems if we get into this case, something is probablye	1147	* it seems if we get into this case, something is probablye
1198	* 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
1199	*/	1159	*/
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		1160
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 */	1161	/* link the object above us */
1213	if (op->above)	1162	if (op->above)
1214	op->above->below = op->below;	1163	op->above->below = op->below;
1215	else	1164	else
1216	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 */
1217		1166
1218	/* Relink the object below us, if there is one */	1167	/* Relink the object below us, if there is one */
1219	if (op->below)	1168	if (op->below)
1220	{
1221	op->below->above = op->above;	1169	op->below->above = op->above;
1222	}
1223	else	1170	else
1224	{	1171	{
1225	/* 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
1226	* use translated coordinates in case some oddness with map tiling is	1173	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1174	* 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	*/	1175	*/
1259	if (tmp->container == op)	1176	if (GET_MAP_OB (m, x, y) != op)
1260	{	1177	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1178	dump_object (op);
1262	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);
1263	}	1183	}
1264	tmp->contr->socket.update_look = 1;	1184
1265	}	1185	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	{	1186	}
1269		1187
1270	move_apply (tmp, op, NULL);	1188	op->above = 0;
1271	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)
1272	{	1203	{
1273	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;
1274	}	1215	}
		1216
		1217	/* See if player moving off should effect something */
		1218	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1219	{
		1220	move_apply (tmp, op, NULL);
		1221
		1222	if (op->destroyed ());
		1223	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1275	}	1224	}
1276		1225
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1226	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1227
1279	if (tmp->above == tmp)	1228	if (tmp->above == tmp)
1280	tmp->above = NULL;	1229	tmp->above = NULL;
		1230
1281	last = tmp;	1231	last = tmp;
1282	}	1232	}
		1233
1283	/* last == NULL of there are no objects on this space */	1234	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1235	if (last == NULL)
1285	{	1236	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1237	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1238	* 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	1239	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1240	* be correct anyways.
1290	*/	1241	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1242	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1243	update_position (op->map, op->x, op->y);
1293	}	1244	}
1294	else	1245	else
1295	update_object (last, UP_OBJ_REMOVE);	1246	update_object (last, UP_OBJ_REMOVE);
1296		1247
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1248	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1249	update_all_los (op->map, op->x, op->y);
1299		1250	}
1300	}	1251	}
1301		1252
1302	/*	1253	/*
1303	* merge_ob(op,top):	1254	* merge_ob(op,top):
1304	*	1255	*
1305	* This function goes through all objects below and including top, and	1256	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1257	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1258	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1259	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1260	*/
1310
1311	object *	1261	object *
1312	merge_ob (object *op, object *top)	1262	merge_ob (object *op, object *top)
1313	{	1263	{
1314	if (!op->nrof)	1264	if (!op->nrof)
1315	return 0;	1265	return 0;
		1266
1316	if (top == NULL)	1267	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1268	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1269
1318	for (; top != NULL; top = top->below)	1270	for (; top != NULL; top = top->below)
1319	{	1271	{
1320	if (top == op)	1272	if (top == op)
1321	continue;	1273	continue;
1322	if (CAN_MERGE (op, top))	1274	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1280	remove_ob (op);
1329	free_object (op);	1281	free_object (op);
1330	return top;	1282	return top;
1331	}	1283	}
1332	}	1284	}
		1285
1333	return NULL;	1286	return 0;
1334	}	1287	}
1335		1288
1336	/*	1289	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1290	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1291	* job preparing multi-part monsters
1339	*/	1292	*/
1340	object *	1293	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1294	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1295	{
1343	object *	1296	object *tmp;
1344	tmp;
1345		1297
1346	if (op->head)	1298	if (op->head)
1347	op = op->head;	1299	op = op->head;
		1300
1348	for (tmp = op; tmp; tmp = tmp->more)	1301	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1302	{
1350	tmp->x = x + tmp->arch->clone.x;	1303	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1304	tmp->y = y + tmp->arch->clone.y;
1352	}	1305	}
		1306
1353	return insert_ob_in_map (op, m, originator, flag);	1307	return insert_ob_in_map (op, m, originator, flag);
1354	}	1308	}
1355		1309
1356	/*	1310	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1311	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1327	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1328	* just 'op' otherwise
1375	*/	1329	*/
1376		1330
1377	object *	1331	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1332	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1333	{
1380	object *	1334	object *tmp, *top, *floor = NULL;
1381	tmp, *	1335	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1336
1388	if (QUERY_FLAG (op, FLAG_FREED))	1337	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1338	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1339	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1340	return NULL;
1392	}	1341	}
		1342
1393	if (m == NULL)	1343	if (m == NULL)
1394	{	1344	{
1395	dump_object (op);	1345	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1346	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;	1347	return op;
1398	}	1348	}
		1349
1399	if (out_of_map (m, op->x, op->y))	1350	if (out_of_map (m, op->x, op->y))
1400	{	1351	{
1401	dump_object (op);	1352	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1353	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES	1354	#ifdef MANY_CORES
…		…
1407	*/	1358	*/
1408	abort ();	1359	abort ();
1409	#endif	1360	#endif
1410	return op;	1361	return op;
1411	}	1362	}
		1363
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1364	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1365	{
1414	dump_object (op);	1366	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1367	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;	1368	return op;
1417	}	1369	}
		1370
1418	if (op->more != NULL)	1371	if (op->more != NULL)
1419	{	1372	{
1420	/* The part may be on a different map. */	1373	/* The part may be on a different map. */
1421		1374
1422	object *
1423	more = op->more;	1375	object *more = op->more;
1424		1376
1425	/* We really need the caller to normalize coordinates - if	1377	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1378	* 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	1379	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1380	* is clear wrong do we normalize it.
1429	*/	1381	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1382	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1383	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1384	else if (!more->map)
1435	{	1385	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1386	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1387	* more->map should always point to the parent.
1438	*/	1388	*/
…		…
1441		1391
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1392	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1393	{
1444	if (!op->head)	1394	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1395	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1396
1446	return NULL;	1397	return NULL;
1447	}	1398	}
1448	}	1399	}
		1400
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1401	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1402
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1403	/* 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	1404	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1405	* need extra work
…		…
1457	y = op->y;	1409	y = op->y;
1458		1410
1459	/* this has to be done after we translate the coordinates.	1411	/* this has to be done after we translate the coordinates.
1460	*/	1412	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1413	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1414	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1415	if (CAN_MERGE (op, tmp))
1465	{	1416	{
1466	op->nrof += tmp->nrof;	1417	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1418	remove_ob (tmp);
1468	free_object (tmp);	1419	free_object (tmp);
1469	}	1420	}
1470	}
1471		1421
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1422	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1423	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1424
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1425	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1426	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1427
1477	if (flag & INS_BELOW_ORIGINATOR)	1428	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1429	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1430	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1431	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1432	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1433	abort ();
1483	}	1434	}
		1435
1484	op->above = originator;	1436	op->above = originator;
1485	op->below = originator->below;	1437	op->below = originator->below;
		1438
1486	if (op->below)	1439	if (op->below)
1487	op->below->above = op;	1440	op->below->above = op;
1488	else	1441	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1442	SET_MAP_OB (op->map, op->x, op->y, op);
		1443
1490	/* since *below* originator, no need to update top */	1444	/* since *below* originator, no need to update top */
1491	originator->below = op;	1445	originator->below = op;
1492	}	1446	}
1493	else	1447	else
1494	{	1448	{
1495	/* If there are other objects, then */	1449	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1450	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1451	{
1498	object *
1499	last = NULL;	1452	object *last = NULL;
1500		1453
1501	/*	1454	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1455	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1456	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1457	* Generally, we want to put the new object on top. But if
…		…
1513		1466
1514	while (top != NULL)	1467	while (top != NULL)
1515	{	1468	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1469	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1470	floor = top;
		1471
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1472	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1473	{
1520	/* We insert above top, so we want this object below this */	1474	/* We insert above top, so we want this object below this */
1521	top = top->below;	1475	top = top->below;
1522	break;	1476	break;
1523	}	1477	}
		1478
1524	last = top;	1479	last = top;
1525	top = top->above;	1480	top = top->above;
1526	}	1481	}
		1482
1527	/* Don't want top to be NULL, so set it to the last valid object */	1483	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1484	top = last;
1529		1485
1530	/* We let update_position deal with figuring out what the space	1486	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1487	* looks like instead of lots of conditions here.
…		…
1551	*/	1507	*/
1552	if (last && last->below && last != floor)	1508	if (last && last->below && last != floor)
1553	top = last->below;	1509	top = last->below;
1554	}	1510	}
1555	} /* If objects on this space */	1511	} /* If objects on this space */
		1512
1556	if (flag & INS_MAP_LOAD)	1513	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1514	top = GET_MAP_TOP (op->map, op->x, op->y);
		1515
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1516	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1517	top = floor;
1560		1518
1561	/* Top is the object that our object (op) is going to get inserted above.	1519	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1520	*/
1563		1521
1564	/* First object on this space */	1522	/* First object on this space */
1565	if (!top)	1523	if (!top)
1566	{	1524	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1525	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1526
1568	if (op->above)	1527	if (op->above)
1569	op->above->below = op;	1528	op->above->below = op;
		1529
1570	op->below = NULL;	1530	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1531	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1532	}
1573	else	1533	else
1574	{ /* get inserted into the stack above top */	1534	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1535	op->above = top->above;
		1536
1576	if (op->above)	1537	if (op->above)
1577	op->above->below = op;	1538	op->above->below = op;
		1539
1578	op->below = top;	1540	op->below = top;
1579	top->above = op;	1541	top->above = op;
1580	}	1542	}
		1543
1581	if (op->above == NULL)	1544	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1545	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1546	} /* else not INS_BELOW_ORIGINATOR */
1584		1547
1585	if (op->type == PLAYER)	1548	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1551	/* 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.	1552	* it, so save a few ticks and start from there.
1590	*/	1553	*/
1591	if (!(flag & INS_MAP_LOAD))	1554	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1555	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1556	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1557	tmp->contr->socket.update_look = 1;
1596	}
1597		1558
1598	/* If this object glows, it may affect lighting conditions that are	1559	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1560	* 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	1561	* 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	1562	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1566	* of effect may be sufficient.
1606	*/	1567	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1568	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1569	update_all_los (op->map, op->x, op->y);
1609		1570
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1571	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1572	update_object (op, UP_OBJ_INSERT);
1613
1614		1573
1615	/* Don't know if moving this to the end will break anything. However,	1574	/* 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.	1575	* we want to have update_look set above before calling this.
1617	*	1576	*
1618	* check_move_on() must be after this because code called from	1577	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1579	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1580	* update_object().
1622	*/	1581	*/
1623		1582
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1583	/* 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)	1584	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1585	{
1628	if (check_move_on (op, originator))	1586	if (check_move_on (op, originator))
1629	return NULL;	1587	return NULL;
1630		1588
…		…
1633	*/	1591	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1592	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1593	if (check_move_on (tmp, originator))
1636	return NULL;	1594	return NULL;
1637	}	1595	}
		1596
1638	return op;	1597	return op;
1639	}	1598	}
1640		1599
1641	/* this function inserts an object in the map, but if it	1600	/* 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.	1601	* finds an object of its own type, it'll remove that one first.
…		…
1659	remove_ob (tmp);	1618	remove_ob (tmp);
1660	free_object (tmp);	1619	free_object (tmp);
1661	}	1620	}
1662	}	1621	}
1663		1622
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1623	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1624
1667	tmp1->x = op->x;	1625	tmp1->x = op->x;
1668	tmp1->y = op->y;	1626	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1627	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1628	}
…		…
1688	if (orig_ob->nrof < nr)	1646	if (orig_ob->nrof < nr)
1689	{	1647	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1648	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1649	return NULL;
1692	}	1650	}
		1651
1693	newob = object_create_clone (orig_ob);	1652	newob = object_create_clone (orig_ob);
		1653
1694	if ((orig_ob->nrof -= nr) < 1)	1654	if ((orig_ob->nrof -= nr) < 1)
1695	{	1655	{
1696	if (!is_removed)	1656	if (!is_removed)
1697	remove_ob (orig_ob);	1657	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1658	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1666	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");	1667	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1668	return NULL;
1709	}	1669	}
1710	}	1670	}
		1671
1711	newob->nrof = nr;	1672	newob->nrof = nr;
1712		1673
1713	return newob;	1674	return newob;
1714	}	1675	}
1715		1676
…		…
1722	*/	1683	*/
1723		1684
1724	object *	1685	object *
1725	decrease_ob_nr (object *op, uint32 i)	1686	decrease_ob_nr (object *op, uint32 i)
1726	{	1687	{
1727	object *	1688	object *tmp;
1728	tmp;
1729	player *	1689	player *pl;
1730	pl;
1731		1690
1732	if (i == 0) /* objects with op->nrof require this check */	1691	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1692	return op;
1734		1693
1735	if (i > op->nrof)	1694	if (i > op->nrof)
1736	i = op->nrof;	1695	i = op->nrof;
1737		1696
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1697	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1698	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1699	else if (op->env != NULL)
1743	{	1700	{
1744	/* is this object in the players inventory, or sub container	1701	/* is this object in the players inventory, or sub container
1745	* therein?	1702	* therein?
1746	*/	1703	*/
…		…
1781	}	1738	}
1782	}	1739	}
1783	}	1740	}
1784	else	1741	else
1785	{	1742	{
1786	object *
1787	above = op->above;	1743	object *above = op->above;
1788		1744
1789	if (i < op->nrof)	1745	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1746	op->nrof -= i;
1792	}
1793	else	1747	else
1794	{	1748	{
1795	remove_ob (op);	1749	remove_ob (op);
1796	op->nrof = 0;	1750	op->nrof = 0;
1797	}	1751	}
		1752
1798	/* Since we just removed op, op->above is null */	1753	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1754	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1755	if (tmp->type == PLAYER)
1801	{	1756	{
1802	if (op->nrof)	1757	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1760	esrv_del_item (tmp->contr, op->count);
1806	}	1761	}
1807	}	1762	}
1808		1763
1809	if (op->nrof)	1764	if (op->nrof)
1810	{
1811	return op;	1765	return op;
1812	}
1813	else	1766	else
1814	{	1767	{
1815	free_object (op);	1768	free_object (op);
1816	return NULL;	1769	return NULL;
1817	}	1770	}
…		…
1826	add_weight (object *op, signed long weight)	1779	add_weight (object *op, signed long weight)
1827	{	1780	{
1828	while (op != NULL)	1781	while (op != NULL)
1829	{	1782	{
1830	if (op->type == CONTAINER)	1783	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1784	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1785
1834	op->carrying += weight;	1786	op->carrying += weight;
1835	op = op->env;	1787	op = op->env;
1836	}	1788	}
1837	}	1789	}
1838		1790
…		…
1861	{	1813	{
1862	dump_object (op);	1814	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1815	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;	1816	return op;
1865	}	1817	}
		1818
1866	if (where == NULL)	1819	if (where == NULL)
1867	{	1820	{
1868	dump_object (op);	1821	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1822	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;	1823	return op;
1871	}	1824	}
		1825
1872	if (where->head)	1826	if (where->head)
1873	{	1827	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1828	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1829	where = where->head;
1876	}	1830	}
		1831
1877	if (op->more)	1832	if (op->more)
1878	{	1833	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1834	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1835	return op;
1881	}	1836	}
		1837
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1838	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1839	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1840	if (op->nrof)
1885	{	1841	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1842	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1971	*/	1927	*/
1972		1928
1973	int	1929	int
1974	check_move_on (object *op, object *originator)	1930	check_move_on (object *op, object *originator)
1975	{	1931	{
1976	object *	1932	object *tmp;
1977	tmp;	1933	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1934	int x = op->x, y = op->y;
1984	MoveType	1935
1985	move_on,	1936	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1937
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1938	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1939	return 0;
1991
1992	tag = op->count;
1993		1940
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1941	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1942	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1943	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1944
…		…
2022	* we don't need to check all of them.	1969	* we don't need to check all of them.
2023	*/	1970	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1971	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1972	break;
2026	}	1973	}
		1974
2027	for (; tmp != NULL; tmp = tmp->below)	1975	for (; tmp; tmp = tmp->below)
2028	{	1976	{
2029	if (tmp == op)	1977	if (tmp == op)
2030	continue; /* Can't apply yourself */	1978	continue; /* Can't apply yourself */
2031		1979
2032	/* Check to see if one of the movement types should be slowed down.	1980	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1988	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))	1989	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1990	{
2043		1991
2044	float	1992	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1993	diff = tmp->move_slow_penalty * FABS (op->speed);
		1994
2048	if (op->type == PLAYER)	1995	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1996	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)))	1997	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1998	diff /= 4.0;
2054	}	1999
2055	}
2056	op->speed_left -= diff;	2000	op->speed_left -= diff;
2057	}	2001	}
2058	}	2002	}
2059		2003
2060	/* Basically same logic as above, except now for actual apply. */	2004	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2005	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))	2006	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	2007	{
2064
2065	move_apply (tmp, op, originator);	2008	move_apply (tmp, op, originator);
		2009
2066	if (was_destroyed (op, tag))	2010	if (op->destroyed ())
2067	return 1;	2011	return 1;
2068		2012
2069	/* what the person/creature stepped onto has moved the object	2013	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	2014	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	2015	* have a feeling strange problems would result.
2072	*/	2016	*/
2073	if (op->map != m || op->x != x || op->y != y)	2017	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	2018	return 0;
2075	}	2019	}
2076	}	2020	}
		2021
2077	return 0;	2022	return 0;
2078	}	2023	}
2079		2024
2080	/*	2025	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	2026	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	2027	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	2028	* The first matching object is returned, or NULL if none.
2084	*/	2029	*/
2085		2030
2086	object *	2031	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	2032	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	2033	{
2089	object *	2034	object *
2090	tmp;	2035	tmp;
2091		2036
2092	if (m == NULL || out_of_map (m, x, y))	2037	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	2050	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	2051	* The first matching object is returned, or NULL if none.
2107	*/	2052	*/
2108		2053
2109	object *	2054	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	2055	present (unsigned char type, maptile *m, int x, int y)
2111	{	2056	{
2112	object *	2057	object *
2113	tmp;	2058	tmp;
2114		2059
2115	if (out_of_map (m, x, y))	2060	if (out_of_map (m, x, y))
…		…
2255	* the archetype because that isn't correct if the monster has been	2200	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2201	* customized, changed states, etc.
2257	*/	2202	*/
2258		2203
2259	int	2204	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2205	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2206	{
2262	int	2207	int
2263	i,	2208	i,
2264	index = 0, flag;	2209	index = 0, flag;
2265	static int	2210	static int
…		…
2286	return -1;	2231	return -1;
2287	return altern[RANDOM () % index];	2232	return altern[RANDOM () % index];
2288	}	2233	}
2289		2234
2290	/*	2235	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2236	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2237	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2238	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2239	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2240	*/
2296		2241
2297	int	2242	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2243	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2244	{
2300	int	2245	int
2301	i;	2246	i;
2302		2247
2303	for (i = 0; i < SIZEOFFREE; i++)	2248	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* because we have to know what movement the thing looking to move	2312	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2313	* there is capable of.
2369	*/	2314	*/
2370		2315
2371	int	2316	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2317	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2318	{
2374	int	2319	int
2375	i,	2320	i,
2376	max = SIZEOFFREE, mflags;	2321	max = SIZEOFFREE, mflags;
2377	sint16	2322
2378	nx,	2323	sint16 nx, ny;
2379	ny;
2380	object *	2324	object *
2381	tmp;	2325	tmp;
2382	mapstruct *	2326	maptile *
2383	mp;	2327	mp;
2384	MoveType	2328
2385	blocked,	2329	MoveType blocked, move_type;
2386	move_type;
2387		2330
2388	if (exclude && exclude->head)	2331	if (exclude && exclude->head)
2389	{	2332	{
2390	exclude = exclude->head;	2333	exclude = exclude->head;
2391	move_type = exclude->move_type;	2334	move_type = exclude->move_type;
…		…
2596	* Modified to be map tile aware -.MSW	2539	* Modified to be map tile aware -.MSW
2597	*/	2540	*/
2598		2541
2599		2542
2600	int	2543	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2544	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2545	{
2603	sint16	2546	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2547	int
2607	mflags;	2548	mflags;
2608		2549
2609	if (dir < 0)	2550	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2551	return 0; /* exit condition: invalid direction */
…		…
2688	if (prev)	2629	if (prev)
2689	prev->more = tmp;	2630	prev->more = tmp;
2690	prev = tmp;	2631	prev = tmp;
2691	}	2632	}
2692		2633
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2634	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2635	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2636
2699	return dst;	2637	return dst;
2700	}	2638	}
2701		2639
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2640	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2641	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2642	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2643	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2644	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2645	/* Also remember that multiparts objects are not supported for now. */
2722		2646
2723	object *	2647	object *
2724	load_object_str (const char *obstr)	2648	load_object_str (const char *obstr)
2725	{	2649	{
2726	object *	2650	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2651	char filename[MAX_BUF];
2730		2652
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2653	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2654
2733	FILE *
2734	tempfile = fopen (filename, "w");	2655	FILE *tempfile = fopen (filename, "w");
2735		2656
2736	if (tempfile == NULL)	2657	if (tempfile == NULL)
2737	{	2658	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2659	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2660	return NULL;
2740	};	2661	}
		2662
2741	fprintf (tempfile, obstr);	2663	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2664	fclose (tempfile);
2743		2665
2744	op = get_object ();	2666	op = get_object ();
2745		2667
2746	object_thawer	2668	object_thawer thawer (filename);
2747	thawer (filename);
2748		2669
2749	if (thawer)	2670	if (thawer)
2750	load_object (thawer, op, 0);	2671	load_object (thawer, op, 0);
2751		2672
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2673	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2681	* returns NULL if no match.
2761	*/	2682	*/
2762	object *	2683	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2684	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2685	{
2765	object *	2686	object *tmp;
2766	tmp;
2767		2687
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2688	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2689	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2690	return tmp;
2771		2691
…		…
2779	* do the desired thing.	2699	* do the desired thing.
2780	*/	2700	*/
2781	key_value *	2701	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2702	get_ob_key_link (const object *ob, const char *key)
2783	{	2703	{
2784	key_value *	2704	key_value *link;
2785	link;
2786		2705
2787	for (link = ob->key_values; link != NULL; link = link->next)	2706	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2707	if (link->key == key)
2790	{
2791	return link;	2708	return link;
2792	}
2793	}
2794		2709
2795	return NULL;	2710	return NULL;
2796	}	2711	}
2797		2712
2798	/*	2713	/*
…		…
2803	* The returned string is shared.	2718	* The returned string is shared.
2804	*/	2719	*/
2805	const char *	2720	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2721	get_ob_key_value (const object *op, const char *const key)
2807	{	2722	{
2808	key_value *	2723	key_value *link;
2809	link;	2724	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2725
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2726	if (!canonical_key)
2816	{	2727	{
2817	/* 1. There being a field named key on any object	2728	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2729	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2730	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2731	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2732	*/
2822	return NULL;	2733	return 0;
2823	}	2734	}
2824		2735
2825	/* This is copied from get_ob_key_link() above -	2736	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2737	* only 4 lines, and saves the function call overhead.
2827	*/	2738	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2739	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2740	if (link->key == canonical_key)
2831	{
2832	return link->value;	2741	return link->value;
2833	}	2742
2834	}
2835	return NULL;	2743	return 0;
2836	}	2744	}
2837		2745
2838		2746
2839	/*	2747	/*
2840	* Updates the canonical_key in op to value.	2748	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2784	if (last)
2877	last->next = field->next;	2785	last->next = field->next;
2878	else	2786	else
2879	op->key_values = field->next;	2787	op->key_values = field->next;
2880		2788
2881	delete
2882	field;	2789	delete field;
2883	}	2790	}
2884	}	2791	}
2885	return TRUE;	2792	return TRUE;
2886	}	2793	}
2887	/* IF we get here, key doesn't exist */	2794	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2829	* Returns TRUE on success.
2923	*/	2830	*/
2924	int	2831	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2832	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2833	{
2927	shstr
2928	key_ (key);	2834	shstr key_ (key);
2929		2835
2930	return set_ob_key_value_s (op, key_, value, add_key);	2836	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2837	}
		2838
		2839	object::depth_iterator::depth_iterator (object *container)
		2840	: iterator_base (container)
		2841	{
		2842	while (item->inv)
		2843	item = item->inv;
		2844	}
		2845
		2846	void
		2847	object::depth_iterator::next ()
		2848	{
		2849	if (item->below)
		2850	{
		2851	item = item->below;
		2852
		2853	while (item->inv)
		2854	item = item->inv;
		2855	}
		2856	else
		2857	item = item->env;
		2858	}
		2859
		2860	// return a suitable string describing an objetc in enough detail to find it
		2861	const char *
		2862	object::debug_desc (char *info) const
		2863	{
		2864	char info2[256 * 3];
		2865	char *p = info;
		2866
		2867	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2868	count,
		2869	&name,
		2870	title ? " " : "",
		2871	title ? (const char *)title : "");
		2872
		2873	if (env)
		2874	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2875
		2876	if (map)
		2877	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2878
		2879	return info;
		2880	}
		2881
		2882	const char *
		2883	object::debug_desc () const
		2884	{
		2885	static char info[256 * 3];
		2886	return debug_desc (info);
		2887	}
		2888

Diff Legend

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