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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.52 by root, Wed Sep 27 00:36:08 2006 UTC

…		…
16		16
17	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
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	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>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <skills.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
53	};	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	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	135	{
…		…
207	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)
208	return 0;	285	return 0;
209		286
210	switch (ob1->type)	287	switch (ob1->type)
211	{	288	{
212	case SCROLL:	289	case SCROLL:
213	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
214	return 0;	291	return 0;
215	break;	292	break;
216	}	293	}
217		294
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	296	{
220	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
365	void	445	void
366	dump_all_objects (void)	446	dump_all_objects (void)
367	{	447	{
368	object *op;	448	object *op;
369		449
370	for (op = objects; op != NULL; op = op->next)	450	for (op = object::first; op != NULL; op = op->next)
371	{	451	{
372	dump_object (op);	452	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
374	}	454	}
375	}	455	}
376		456
377	/*	457	/*
378	* 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
…		…
401	object *	481	object *
402	find_object (tag_t i)	482	find_object (tag_t i)
403	{	483	{
404	object *op;	484	object *op;
405		485
406	for (op = objects; op != NULL; op = op->next)	486	for (op = object::first; op != NULL; op = op->next)
407	if (op->count == i)	487	if (op->count == i)
408	break;	488	break;
		489
409	return op;	490	return op;
410	}	491	}
411		492
412	/*	493	/*
413	* 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.
…		…
416	*/	497	*/
417		498
418	object *	499	object *
419	find_object_name (const char *str)	500	find_object_name (const char *str)
420	{	501	{
421	const char *name = shstr::find (str);	502	shstr_cmp str_ (str);
422	object *op;	503	object *op;
423		504
424	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	506	if (op->name == str_)
426	break;	507	break;
427		508
428	return op;	509	return op;
429	}	510	}
430		511
…		…
433	{	514	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	516	}
436		517
437	/*	518	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* 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
477	* skill and experience objects.	520	* skill and experience objects.
478	*/	521	*/
479	void	522	void
480	set_owner (object *op, object *owner)	523	object::set_owner (object *owner)
481	{	524	{
482	if (owner == NULL || op == NULL)	525	if (!owner)
483	return;	526	return;
484		527
485	/* next line added to allow objects which own objects */	528	/* next line added to allow objects which own objects */
486	/* 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
487	* with the fireball owning a poison cloud which then owned the	530	* with the fireball owning a poison cloud which then owned the
488	* 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
489	* freed and then another object replacing it. Since the ownercounts	532	* freed and then another object replacing it. Since the ownercounts
490	* 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.
491	*/	534	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	535	while (owner->owner)
493	owner = owner->owner;	536	owner = owner->owner;
494		537
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	538	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	539	}
535		540
536	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	542	* refcounts and freeing the links.
538	*/	543	*/
…		…
554	{	559	{
555	attachable_base::clear ();	560	attachable_base::clear ();
556		561
557	free_key_values (this);	562	free_key_values (this);
558		563
559	clear_owner (this);	564	owner = 0;
560
561	name = 0;	565	name = 0;
562	name_pl = 0;	566	name_pl = 0;
563	title = 0;	567	title = 0;
564	race = 0;	568	race = 0;
565	slaying = 0;	569	slaying = 0;
566	skill = 0;	570	skill = 0;
567	msg = 0;	571	msg = 0;
568	lore = 0;	572	lore = 0;
569	custom_name = 0;	573	custom_name = 0;
570	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;
571		586
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		588
574	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;
575	}	598	}
576		599
577	void object::clone (object *destination)	600	void object::clone (object *destination)
578	{	601	{
579	*(object_copy *) destination = *this;	602	*(object_copy *)destination = *this;
580	*(object_pod *) destination = *this;	603	*(object_pod *)destination = *this;
581		604
582	if (self || cb)	605	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */
609
610	op->expmul = 1.0;
611	op->face = blank_face;
612	op->attacked_by_count = -1;
613
614	if (settings.casting_time)
615	op->casting_time = -1;
616	}	607	}
617		608
618	/*	609	/*
619	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
620	* 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
621	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
622	* 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,
623	* 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
624	* will point at garbage.	615	* will point at garbage.
625	*/	616	*/
626
627	void	617	void
628	copy_object (object *op2, object *op)	618	copy_object (object *op2, object *op)
629	{	619	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
691	/*	681	/*
692	* 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
693	* 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.
694	* 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.
695	*/	685	*/
696
697	void	686	void
698	update_ob_speed (object *op)	687	update_ob_speed (object *op)
699	{	688	{
700	extern int arch_init;	689	extern int arch_init;
701		690
…		…
710	abort ();	699	abort ();
711	#else	700	#else
712	op->speed = 0;	701	op->speed = 0;
713	#endif	702	#endif
714	}	703	}
		704
715	if (arch_init)	705	if (arch_init)
716	{
717	return;	706	return;
718	}	707
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	709	{
721	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	711	if (op->active_next || op->active_prev || op == active_objects)
723	return;	712	return;
724		713
725	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	715	* of the list. */
727	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
728	if (op->active_next != NULL)	718	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
730	active_objects = op;	721	active_objects = op;
731	}	722	}
732	else	723	else
733	{	724	{
734	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
736	return;	727	return;
737		728
738	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
739	{	730	{
740	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
741	if (op->active_next != NULL)	733	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
743	}	735	}
744	else	736	else
745	{	737	{
746	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
747	if (op->active_next)	740	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
749	}	742	}
		743
750	op->active_next = NULL;	744	op->active_next = NULL;
751	op->active_prev = NULL;	745	op->active_prev = NULL;
752	}	746	}
753	}	747	}
754		748
…		…
886	* that is being removed.	880	* that is being removed.
887	*/	881	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	883	update_now = 1;
890	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	885	/* Nothing to do for that case */ ;
892	else	886	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		888
895	if (update_now)	889	if (update_now)
896	{	890	{
…		…
900		894
901	if (op->more != NULL)	895	if (op->more != NULL)
902	update_object (op->more, action);	896	update_object (op->more, action);
903	}	897	}
904		898
905	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
906	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
907		902
908	void object::free_mortals ()	903	void object::free_mortals ()
909	{	904	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
912	{	909	{
913	freed.push_back (*i);	910	delete *i;
914	mortals.erase (i);	911	mortals.erase (i);
915	}	912	}
916	else	913
917	++i;	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals && lastmortals > 100)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
918	}	921	}
919		922
920	object::object ()	923	object::object ()
921	{	924	{
922	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
923		926
924	expmul = 1.0;	927	expmul = 1.0;
925	face = blank_face;	928	face = blank_face;
926	attacked_by_count = -1;
927	}	929	}
928		930
929	object::~object ()	931	object::~object ()
930	{	932	{
931	free_key_values (this);	933	free_key_values (this);
932	}	934	}
933		935
934	void object::link ()	936	void object::link ()
935	{	937	{
936	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
937		940
938	prev = 0;	941	prev = 0;
939	next = objects;	942	next = object::first;
940		943
941	if (objects)	944	if (object::first)
942	objects->prev = this;	945	object::first->prev = this;
943		946
944	objects = this;	947	object::first = this;
945	}	948	}
946		949
947	void object::unlink ()	950	void object::unlink ()
948	{	951	{
949	count = 0;	952	if (this == object::first)
		953	object::first = next;
950		954
951	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
955	prev = 0;	959	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	960	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	961	}
967		962
968	object *object::create ()	963	object *object::create ()
969	{	964	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	965	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	966	op->link ();
983	return op;	967	return op;
984	}	968	}
985		969
986	/*	970	/*
…		…
988	* it from the list of used objects, and puts it on the list of	972	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.	973	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	974	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	975	* this function to succeed.
992	*	976	*
993	* If free_inventory is set, free inventory as well. Else drop items in	977	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	978	* inventory to the ground.
995	*/	979	*/
996	void object::free (bool free_inventory)	980	void object::destroy (bool destroy_inventory)
997	{	981	{
		982	if (QUERY_FLAG (this, FLAG_FREED))
		983	return;
		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	989	remove_ob (this);
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		990
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008	{
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010	remove_friendly_object (this);
1011	}
1012
1013	if (QUERY_FLAG (this, FLAG_FREED))	991	SET_FLAG (this, FLAG_FREED);
1014	{
1015	dump_object (this);
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017	return;
1018	}
1019		992
1020	if (more)	993	if (more)
1021	{	994	{
1022	more->free (free_inventory);	995	more->destroy (destroy_inventory);
1023	more = 0;	996	more = 0;
1024	}	997	}
1025		998
1026	if (inv)	999	if (inv)
1027	{	1000	{
1028	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
1030	* drop on that space.	1003	* drop on that space.
1031	*/	1004	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	1006	{
1034	object *	1007	object *op = inv;
1035	op = inv;
1036		1008
1037	while (op)	1009	while (op)
1038	{	1010	{
1039	object *
1040	tmp = op->below;	1011	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	1012	op->destroy (destroy_inventory);
1044	op = tmp;	1013	op = tmp;
1045	}	1014	}
1046	}	1015	}
1047	else	1016	else
1048	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
1049	object *	1018	object *op = inv;
1050	op = inv;
1051		1019
1052	while (op)	1020	while (op)
1053	{	1021	{
1054	object *
1055	tmp = op->below;	1022	object *tmp = op->below;
1056		1023
1057	remove_ob (op);	1024	remove_ob (op);
1058		1025
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| 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))
…		…
1069	op = tmp;	1036	op = tmp;
1070	}	1037	}
1071	}	1038	}
1072	}	1039	}
1073		1040
1074	clear_owner (this);	1041	// clear those pointers that likely might have circular references to us
		1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
		1045
		1046	// only relevant for players(?), but make sure of it anyways
		1047	contr = 0;
1075		1048
1076	/* Remove object from the active list */	1049	/* Remove object from the active list */
1077	speed = 0;	1050	speed = 0;
1078	update_ob_speed (this);	1051	update_ob_speed (this);
1079		1052
1080	unlink ();	1053	unlink ();
1081		1054
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1055	mortals.push_back (this);
1085	}	1056	}
1086		1057
1087	/*	1058	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1059	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1093	sub_weight (object *op, signed long weight)	1064	sub_weight (object *op, signed long weight)
1094	{	1065	{
1095	while (op != NULL)	1066	while (op != NULL)
1096	{	1067	{
1097	if (op->type == CONTAINER)	1068	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1070
1101	op->carrying -= weight;	1071	op->carrying -= weight;
1102	op = op->env;	1072	op = op->env;
1103	}	1073	}
1104	}	1074	}
1105		1075
…		…
1113	*/	1083	*/
1114		1084
1115	void	1085	void
1116	remove_ob (object *op)	1086	remove_ob (object *op)
1117	{	1087	{
1118	object *tmp, *last = NULL;	1088	object *tmp, *last = 0;
1119	object *otmp;	1089	object *otmp;
1120		1090
1121	tag_t tag;
1122	int check_walk_off;	1091	int check_walk_off;
1123	mapstruct *m;	1092	maptile *m;
1124		1093
1125	sint16 x, y;	1094	sint16 x, y;
1126		1095
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1096	if (QUERY_FLAG (op, FLAG_REMOVED))
1128	{	1097	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1098
1132	/* Changed it to always dump core in this case. As has been learned	1099	SET_FLAG (op, FLAG_REMOVED);
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144		1100
1145	if (op->more != NULL)	1101	if (op->more != NULL)
1146	remove_ob (op->more);	1102	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);
1149		1103
1150	/*	1104	/*
1151	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1152	* inventory.	1106	* inventory.
1153	*/	1107	*/
…		…
1179	*/	1133	*/
1180	op->x = op->env->x, op->y = op->env->y;	1134	op->x = op->env->x, op->y = op->env->y;
1181	op->map = op->env->map;	1135	op->map = op->env->map;
1182	op->above = NULL, op->below = NULL;	1136	op->above = NULL, op->below = NULL;
1183	op->env = NULL;	1137	op->env = NULL;
1184	return;	1138	}
		1139	else if (op->map)
1185	}	1140	{
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;	1141	x = op->x;
1192	y = op->y;	1142	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);	1143	m = get_map_from_coord (op->map, &x, &y);
1194		1144
1195	if (!m)	1145	if (!m)
1196	{	1146	{
1197	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",
1198	op->map->path, op->x, op->y);	1148	op->map->path, op->x, op->y);
1199	/* 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.
1200	* it seems if we get into this case, something is probablye	1150	* it seems if we get into this case, something is probablye
1201	* 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
1202	*/	1162	*/
1203	abort ();
1204	}
1205	if (op->map != m)
1206	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208	op->map->path, m->path, op->x, op->y, x, y);
1209	}
1210		1163
1211	/* Re did the following section of code - it looks like it had
1212	* lots of logic for things we no longer care about
1213	*/
1214
1215	/* link the object above us */	1164	/* link the object above us */
1216	if (op->above)	1165	if (op->above)
1217	op->above->below = op->below;	1166	op->above->below = op->below;
1218	else	1167	else
1219	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 */
1220		1169
1221	/* Relink the object below us, if there is one */	1170	/* Relink the object below us, if there is one */
1222	if (op->below)	1171	if (op->below)
1223	op->below->above = op->above;	1172	op->below->above = op->above;
1224	else	1173	else
1225	{	1174	{
1226	/* 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
1227	* use translated coordinates in case some oddness with map tiling is	1176	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1177	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{
1232	dump_object (op);
1233	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",
1234	errmsg);
1235	dump_object (GET_MAP_OB (m, x, y));
1236	LOG (llevError, "%s\n", errmsg);
1237	}
1238
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240	}
1241
1242	op->above = NULL;
1243	op->below = NULL;
1244
1245	if (op->map->in_memory == MAP_SAVING)
1246	return;
1247
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{
1259	/* If a container that the player is currently using somehow gets
1260	* removed (most likely destroyed), update the player view
1261	* appropriately.
1262	*/	1178	*/
1263	if (tmp->container == op)	1179	if (GET_MAP_OB (m, x, y) != op)
1264	{	1180	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1181	dump_object (op);
1266	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);
1267	}	1186	}
1268		1187
1269	tmp->contr->socket.update_look = 1;	1188	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1270	}
1271	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273	{	1189	}
1274	move_apply (tmp, op, NULL);
1275		1190
1276	if (was_destroyed (op, tag))	1191	op->above = 0;
		1192	op->below = 0;
		1193
		1194	if (op->map->in_memory == MAP_SAVING)
		1195	return;
		1196
		1197	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1198
		1199	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1200	{
		1201	/* No point updating the players look faces if he is the object
		1202	* being removed.
		1203	*/
		1204
		1205	if (tmp->type == PLAYER && tmp != op)
1277	{	1206	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1207	/* If a container that the player is currently using somehow gets
		1208	* removed (most likely destroyed), update the player view
		1209	* appropriately.
		1210	*/
		1211	if (tmp->container == op)
		1212	{
		1213	CLEAR_FLAG (op, FLAG_APPLIED);
		1214	tmp->container = NULL;
		1215	}
		1216
		1217	tmp->contr->socket.update_look = 1;
1279	}	1218	}
		1219
		1220	/* See if player moving off should effect something */
		1221	if (check_walk_off
		1222	&& ((op->move_type & tmp->move_off)
		1223	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1224	{
		1225	move_apply (tmp, op, NULL);
		1226
		1227	if (op->destroyed ())
		1228	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1229	}
1281		1230
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1231	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1232
1284	if (tmp->above == tmp)	1233	if (tmp->above == tmp)
1285	tmp->above = NULL;	1234	tmp->above = NULL;
1286		1235
1287	last = tmp;	1236	last = tmp;
1288	}	1237	}
1289		1238
1290	/* last == NULL of there are no objects on this space */	1239	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1240	if (last == NULL)
1292	{	1241	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1242	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1243	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't	1244	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1245	* be correct anyways.
1297	*/	1246	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1247	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1248	update_position (op->map, op->x, op->y);
1300	}	1249	}
1301	else	1250	else
1302	update_object (last, UP_OBJ_REMOVE);	1251	update_object (last, UP_OBJ_REMOVE);
1303		1252
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1253	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305	update_all_los (op->map, op->x, op->y);	1254	update_all_los (op->map, op->x, op->y);
		1255	}
1306	}	1256	}
1307		1257
1308	/*	1258	/*
1309	* merge_ob(op,top):	1259	* merge_ob(op,top):
1310	*	1260	*
1311	* This function goes through all objects below and including top, and	1261	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1262	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1263	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1264	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1265	*/
1316
1317	object *	1266	object *
1318	merge_ob (object *op, object *top)	1267	merge_ob (object *op, object *top)
1319	{	1268	{
1320	if (!op->nrof)	1269	if (!op->nrof)
1321	return 0;	1270	return 0;
		1271
1322	if (top == NULL)	1272	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1273	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1274
1324	for (; top != NULL; top = top->below)	1275	for (; top != NULL; top = top->below)
1325	{	1276	{
1326	if (top == op)	1277	if (top == op)
1327	continue;	1278	continue;
1328	if (CAN_MERGE (op, top))	1279	if (CAN_MERGE (op, top))
…		…
1334	remove_ob (op);	1285	remove_ob (op);
1335	free_object (op);	1286	free_object (op);
1336	return top;	1287	return top;
1337	}	1288	}
1338	}	1289	}
		1290
1339	return NULL;	1291	return 0;
1340	}	1292	}
1341		1293
1342	/*	1294	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1295	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1296	* job preparing multi-part monsters
1345	*/	1297	*/
1346	object *	1298	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1299	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1300	{
1349	object *	1301	object *tmp;
1350	tmp;
1351		1302
1352	if (op->head)	1303	if (op->head)
1353	op = op->head;	1304	op = op->head;
		1305
1354	for (tmp = op; tmp; tmp = tmp->more)	1306	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1307	{
1356	tmp->x = x + tmp->arch->clone.x;	1308	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1309	tmp->y = y + tmp->arch->clone.y;
1358	}	1310	}
		1311
1359	return insert_ob_in_map (op, m, originator, flag);	1312	return insert_ob_in_map (op, m, originator, flag);
1360	}	1313	}
1361		1314
1362	/*	1315	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1316	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1332	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1333	* just 'op' otherwise
1381	*/	1334	*/
1382		1335
1383	object *	1336	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1337	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1338	{
1386	object *tmp, *top, *floor = NULL;	1339	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1340	sint16 x, y;
1388		1341
1389	if (QUERY_FLAG (op, FLAG_FREED))	1342	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1654	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1655	*/	1608	*/
1656	void	1609	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1611	{
1659	object *tmp;	1612	object *
		1613	tmp;
1660	object *tmp1;	1614	object *
		1615	tmp1;
1661		1616
1662	/* first search for itself and remove any old instances */	1617	/* first search for itself and remove any old instances */
1663		1618
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1619	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{	1620	{
…		…
1668	remove_ob (tmp);	1623	remove_ob (tmp);
1669	free_object (tmp);	1624	free_object (tmp);
1670	}	1625	}
1671	}	1626	}
1672		1627
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1628	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1629
1675	tmp1->x = op->x;	1630	tmp1->x = op->x;
1676	tmp1->y = op->y;	1631	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1632	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1633	}
…		…
1696	if (orig_ob->nrof < nr)	1651	if (orig_ob->nrof < nr)
1697	{	1652	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1653	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1654	return NULL;
1700	}	1655	}
		1656
1701	newob = object_create_clone (orig_ob);	1657	newob = object_create_clone (orig_ob);
		1658
1702	if ((orig_ob->nrof -= nr) < 1)	1659	if ((orig_ob->nrof -= nr) < 1)
1703	{	1660	{
1704	if (!is_removed)	1661	if (!is_removed)
1705	remove_ob (orig_ob);	1662	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);	1663	free_object2 (orig_ob, 1);
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1671	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1672	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1673	return NULL;
1717	}	1674	}
1718	}	1675	}
		1676
1719	newob->nrof = nr;	1677	newob->nrof = nr;
1720		1678
1721	return newob;	1679	return newob;
1722	}	1680	}
1723		1681
…		…
1730	*/	1688	*/
1731		1689
1732	object *	1690	object *
1733	decrease_ob_nr (object *op, uint32 i)	1691	decrease_ob_nr (object *op, uint32 i)
1734	{	1692	{
1735	object *	1693	object *tmp;
1736	tmp;
1737	player *	1694	player *pl;
1738	pl;
1739		1695
1740	if (i == 0) /* objects with op->nrof require this check */	1696	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1697	return op;
1742		1698
1743	if (i > op->nrof)	1699	if (i > op->nrof)
1744	i = op->nrof;	1700	i = op->nrof;
1745		1701
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1702	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1703	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1704	else if (op->env != NULL)
1751	{	1705	{
1752	/* is this object in the players inventory, or sub container	1706	/* is this object in the players inventory, or sub container
1753	* therein?	1707	* therein?
1754	*/	1708	*/
…		…
1789	}	1743	}
1790	}	1744	}
1791	}	1745	}
1792	else	1746	else
1793	{	1747	{
1794	object *
1795	above = op->above;	1748	object *above = op->above;
1796		1749
1797	if (i < op->nrof)	1750	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1751	op->nrof -= i;
1800	}
1801	else	1752	else
1802	{	1753	{
1803	remove_ob (op);	1754	remove_ob (op);
1804	op->nrof = 0;	1755	op->nrof = 0;
1805	}	1756	}
		1757
1806	/* Since we just removed op, op->above is null */	1758	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1759	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1760	if (tmp->type == PLAYER)
1809	{	1761	{
1810	if (op->nrof)	1762	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1765	esrv_del_item (tmp->contr, op->count);
1814	}	1766	}
1815	}	1767	}
1816		1768
1817	if (op->nrof)	1769	if (op->nrof)
1818	{
1819	return op;	1770	return op;
1820	}
1821	else	1771	else
1822	{	1772	{
1823	free_object (op);	1773	free_object (op);
1824	return NULL;	1774	return NULL;
1825	}	1775	}
…		…
1834	add_weight (object *op, signed long weight)	1784	add_weight (object *op, signed long weight)
1835	{	1785	{
1836	while (op != NULL)	1786	while (op != NULL)
1837	{	1787	{
1838	if (op->type == CONTAINER)	1788	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1789	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1790
1842	op->carrying += weight;	1791	op->carrying += weight;
1843	op = op->env;	1792	op = op->env;
1844	}	1793	}
1845	}	1794	}
1846		1795
…		…
1869	{	1818	{
1870	dump_object (op);	1819	dump_object (op);
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1820	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;	1821	return op;
1873	}	1822	}
		1823
1874	if (where == NULL)	1824	if (where == NULL)
1875	{	1825	{
1876	dump_object (op);	1826	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1827	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;	1828	return op;
1879	}	1829	}
		1830
1880	if (where->head)	1831	if (where->head)
1881	{	1832	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1833	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;	1834	where = where->head;
1884	}	1835	}
		1836
1885	if (op->more)	1837	if (op->more)
1886	{	1838	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1839	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1840	return op;
1889	}	1841	}
		1842
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1843	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1844	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1845	if (op->nrof)
1893	{	1846	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1847	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1980		1933
1981	int	1934	int
1982	check_move_on (object *op, object *originator)	1935	check_move_on (object *op, object *originator)
1983	{	1936	{
1984	object *tmp;	1937	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1938	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1939	int x = op->x, y = op->y;
1988		1940
1989	MoveType move_on, move_slow, move_block;	1941	MoveType move_on, move_slow, move_block;
1990		1942
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1943	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1944	return 0;
1993
1994	tag = op->count;
1995		1945
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1946	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1947	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1948	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1949
…		…
2042	{	1992	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1993	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1994	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1995	{
2046		1996
		1997	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1998	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1999
2049	if (op->type == PLAYER)	2000	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	2001	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)))	2002	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	2003	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2010	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2011	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	2012	{
2062	move_apply (tmp, op, originator);	2013	move_apply (tmp, op, originator);
2063		2014
2064	if (was_destroyed (op, tag))	2015	if (op->destroyed ())
2065	return 1;	2016	return 1;
2066		2017
2067	/* what the person/creature stepped onto has moved the object	2018	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	2019	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	2020	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	2032	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	2033	* The first matching object is returned, or NULL if none.
2083	*/	2034	*/
2084		2035
2085	object *	2036	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	2037	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	2038	{
2088	object *	2039	object *
2089	tmp;	2040	tmp;
2090		2041
2091	if (m == NULL || out_of_map (m, x, y))	2042	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	2055	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	2056	* The first matching object is returned, or NULL if none.
2106	*/	2057	*/
2107		2058
2108	object *	2059	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	2060	present (unsigned char type, maptile *m, int x, int y)
2110	{	2061	{
2111	object *	2062	object *
2112	tmp;	2063	tmp;
2113		2064
2114	if (out_of_map (m, x, y))	2065	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2205	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2206	* customized, changed states, etc.
2256	*/	2207	*/
2257		2208
2258	int	2209	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2210	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2211	{
2261	int	2212	int
2262	i,	2213	i,
2263	index = 0, flag;	2214	index = 0, flag;
2264	static int	2215	static int
…		…
2285	return -1;	2236	return -1;
2286	return altern[RANDOM () % index];	2237	return altern[RANDOM () % index];
2287	}	2238	}
2288		2239
2289	/*	2240	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2241	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2242	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2243	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2244	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2245	*/
2295		2246
2296	int	2247	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2248	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2249	{
2299	int	2250	int
2300	i;	2251	i;
2301		2252
2302	for (i = 0; i < SIZEOFFREE; i++)	2253	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2317	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2318	* there is capable of.
2368	*/	2319	*/
2369		2320
2370	int	2321	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2322	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2323	{
2373	int	2324	int
2374	i,	2325	i,
2375	max = SIZEOFFREE, mflags;	2326	max = SIZEOFFREE, mflags;
2376	sint16	2327
2377	nx,	2328	sint16 nx, ny;
2378	ny;
2379	object *	2329	object *
2380	tmp;	2330	tmp;
2381	mapstruct *	2331	maptile *
2382	mp;	2332	mp;
2383	MoveType	2333
2384	blocked,	2334	MoveType blocked, move_type;
2385	move_type;
2386		2335
2387	if (exclude && exclude->head)	2336	if (exclude && exclude->head)
2388	{	2337	{
2389	exclude = exclude->head;	2338	exclude = exclude->head;
2390	move_type = exclude->move_type;	2339	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2544	* Modified to be map tile aware -.MSW
2596	*/	2545	*/
2597		2546
2598		2547
2599	int	2548	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2549	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2550	{
2602	sint16	2551	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2552	int
2606	mflags;	2553	mflags;
2607		2554
2608	if (dir < 0)	2555	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2556	return 0; /* exit condition: invalid direction */
…		…
2687	if (prev)	2634	if (prev)
2688	prev->more = tmp;	2635	prev->more = tmp;
2689	prev = tmp;	2636	prev = tmp;
2690	}	2637	}
2691		2638
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2639	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2640	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2641
2698	return dst;	2642	return dst;
2699	}	2643	}
2700		2644
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2645	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* Basically, we save the content of the string to a temp file, then call */	2646	/* Basically, we save the content of the string to a temp file, then call */
2713
2714	/* load_object on it. I admit it is a highly inefficient way to make things, */	2647	/* load_object on it. I admit it is a highly inefficient way to make things, */
2715
2716	/* but it was simple to make and allows reusing the load_object function. */	2648	/* but it was simple to make and allows reusing the load_object function. */
2717
2718	/* Remember not to use load_object_str in a time-critical situation. */	2649	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2650	/* Also remember that multiparts objects are not supported for now. */
2721		2651
2722	object *	2652	object *
2723	load_object_str (const char *obstr)	2653	load_object_str (const char *obstr)
2724	{	2654	{
2725	object *	2655	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2656	char filename[MAX_BUF];
2729		2657
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2658	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2659
2732	FILE *
2733	tempfile = fopen (filename, "w");	2660	FILE *tempfile = fopen (filename, "w");
2734		2661
2735	if (tempfile == NULL)	2662	if (tempfile == NULL)
2736	{	2663	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2664	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2665	return NULL;
2739	};	2666	}
		2667
2740	fprintf (tempfile, obstr);	2668	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2669	fclose (tempfile);
2742		2670
2743	op = get_object ();	2671	op = get_object ();
2744		2672
2745	object_thawer	2673	object_thawer thawer (filename);
2746	thawer (filename);
2747		2674
2748	if (thawer)	2675	if (thawer)
2749	load_object (thawer, op, 0);	2676	load_object (thawer, op, 0);
2750		2677
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2678	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2686	* returns NULL if no match.
2760	*/	2687	*/
2761	object *	2688	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2689	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2690	{
2764	object *	2691	object *tmp;
2765	tmp;
2766		2692
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2693	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2694	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2695	return tmp;
2770		2696
…		…
2778	* do the desired thing.	2704	* do the desired thing.
2779	*/	2705	*/
2780	key_value *	2706	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2707	get_ob_key_link (const object *ob, const char *key)
2782	{	2708	{
2783	key_value *	2709	key_value *link;
2784	link;
2785		2710
2786	for (link = ob->key_values; link != NULL; link = link->next)	2711	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2712	if (link->key == key)
2789	{
2790	return link;	2713	return link;
2791	}
2792	}
2793		2714
2794	return NULL;	2715	return NULL;
2795	}	2716	}
2796		2717
2797	/*	2718	/*
…		…
2802	* The returned string is shared.	2723	* The returned string is shared.
2803	*/	2724	*/
2804	const char *	2725	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2726	get_ob_key_value (const object *op, const char *const key)
2806	{	2727	{
2807	key_value *	2728	key_value *link;
2808	link;	2729	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2730
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2731	if (!canonical_key)
2815	{	2732	{
2816	/* 1. There being a field named key on any object	2733	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2734	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2735	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2736	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2737	*/
2821	return NULL;	2738	return 0;
2822	}	2739	}
2823		2740
2824	/* This is copied from get_ob_key_link() above -	2741	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2742	* only 4 lines, and saves the function call overhead.
2826	*/	2743	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2744	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2745	if (link->key == canonical_key)
2830	{
2831	return link->value;	2746	return link->value;
2832	}	2747
2833	}
2834	return NULL;	2748	return 0;
2835	}	2749	}
2836		2750
2837		2751
2838	/*	2752	/*
2839	* Updates the canonical_key in op to value.	2753	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2789	if (last)
2876	last->next = field->next;	2790	last->next = field->next;
2877	else	2791	else
2878	op->key_values = field->next;	2792	op->key_values = field->next;
2879		2793
2880	delete
2881	field;	2794	delete field;
2882	}	2795	}
2883	}	2796	}
2884	return TRUE;	2797	return TRUE;
2885	}	2798	}
2886	/* IF we get here, key doesn't exist */	2799	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2834	* Returns TRUE on success.
2922	*/	2835	*/
2923	int	2836	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2837	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2838	{
2926	shstr
2927	key_ (key);	2839	shstr key_ (key);
2928		2840
2929	return set_ob_key_value_s (op, key_, value, add_key);	2841	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2842	}
		2843
		2844	object::depth_iterator::depth_iterator (object *container)
		2845	: iterator_base (container)
		2846	{
		2847	while (item->inv)
		2848	item = item->inv;
		2849	}
		2850
		2851	void
		2852	object::depth_iterator::next ()
		2853	{
		2854	if (item->below)
		2855	{
		2856	item = item->below;
		2857
		2858	while (item->inv)
		2859	item = item->inv;
		2860	}
		2861	else
		2862	item = item->env;
		2863	}
		2864
		2865	// return a suitable string describing an objetc in enough detail to find it
		2866	const char *
		2867	object::debug_desc (char *info) const
		2868	{
		2869	char info2[256 * 3];
		2870	char *p = info;
		2871
		2872	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2873	count,
		2874	&name,
		2875	title ? " " : "",
		2876	title ? (const char *)title : "");
		2877
		2878	if (env)
		2879	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2880
		2881	if (map)
		2882	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2883
		2884	return info;
		2885	}
		2886
		2887	const char *
		2888	object::debug_desc () const
		2889	{
		2890	static char info[256 * 3];
		2891	return debug_desc (info);
		2892	}
		2893

Diff Legend

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