[ViewVC] Diff of: 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.47 by root, Thu Sep 14 22:33:59 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 %d\n:%s\n", op->count, errmsg);
374	}	454	}
375	}	455	}
…		…
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;
409	return op;	489	return op;
410	}	490	}
411		491
…		…
416	*/	496	*/
417		497
418	object *	498	object *
419	find_object_name (const char *str)	499	find_object_name (const char *str)
420	{	500	{
421	const char *name = shstr::find (str);	501	shstr_cmp str_ (str);
422	object *op;	502	object *op;
423		503
424	for (op = objects; op != NULL; op = op->next)	504	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	505	if (op->name == str_)
426	break;	506	break;
427		507
428	return op;	508	return op;
429	}	509	}
430		510
…		…
433	{	513	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	514	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	515	}
436		516
437	/*	517	/*
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	518	* Sets the owner and sets the skill and exp pointers to owner's current
477	* skill and experience objects.	519	* skill and experience objects.
478	*/	520	*/
479	void	521	void
480	set_owner (object op, object owner)	522	object::set_owner (object *owner)
481	{	523	{
482	if (owner == NULL \|\| op == NULL)	524	if (!owner)
483	return;	525	return;
484		526
485	/* next line added to allow objects which own objects */	527	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	528	/* Add a check for ownercounts in here, as I got into an endless loop
487	* with the fireball owning a poison cloud which then owned the	529	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	530	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	531	* 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.	532	* didn't match, this check is valid and I believe that cause is valid.
491	*/	533	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	534	while (owner->owner)
493	owner = owner->owner;	535	owner = owner->owner;
494		536
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;	537	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	}	538	}
535		539
536	/* Zero the key_values on op, decrementing the shared-string	540	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	541	* refcounts and freeing the links.
538	*/	542	*/
…		…
554	{	558	{
555	attachable_base::clear ();	559	attachable_base::clear ();
556		560
557	free_key_values (this);	561	free_key_values (this);
558		562
559	clear_owner (this);	563	owner = 0;
560
561	name = 0;	564	name = 0;
562	name_pl = 0;	565	name_pl = 0;
563	title = 0;	566	title = 0;
564	race = 0;	567	race = 0;
565	slaying = 0;	568	slaying = 0;
566	skill = 0;	569	skill = 0;
567	msg = 0;	570	msg = 0;
568	lore = 0;	571	lore = 0;
569	custom_name = 0;	572	custom_name = 0;
570	materialname = 0;	573	materialname = 0;
		574	contr = 0;
		575	below = 0;
		576	above = 0;
		577	inv = 0;
		578	container = 0;
		579	env = 0;
		580	more = 0;
		581	head = 0;
		582	map = 0;
		583	active_next = 0;
		584	active_prev = 0;
571		585
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	586	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		587
574	SET_FLAG (this, FLAG_REMOVED);	588	SET_FLAG (this, FLAG_REMOVED);
		589
		590	/* What is not cleared is next, prev, and count */
		591
		592	expmul = 1.0;
		593	face = blank_face;
		594
		595	if (settings.casting_time)
		596	casting_time = -1;
575	}	597	}
576		598
577	void object::clone (object *destination)	599	void object::clone (object *destination)
578	{	600	{
579	(object_copy ) destination = *this;	601	(object_copy )destination = *this;
580	(object_pod ) destination = *this;	602	(object_pod )destination = *this;
581		603
582	if (self \|\| cb)	604	if (self \|\| cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	605	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	}	606	}
617		607
618	/*	608	/*
619	* copy object first frees everything allocated by the second object,	609	* copy object first frees everything allocated by the second object,
620	* and then copies the contends of the first object into the second	610	* and then copies the contends of the first object into the second
621	* object, allocating what needs to be allocated. Basically, any	611	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	612	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
623	* if the first object is freed, the pointers in the new object	613	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	614	* will point at garbage.
625	*/	615	*/
626
627	void	616	void
628	copy_object (object op2, object op)	617	copy_object (object op2, object op)
629	{	618	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	619	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	620	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
691	/*	680	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	681	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	682	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	683	* This function needs to be called whenever the speed of an object changes.
695	*/	684	*/
696
697	void	685	void
698	update_ob_speed (object *op)	686	update_ob_speed (object *op)
699	{	687	{
700	extern int arch_init;	688	extern int arch_init;
701		689
…		…
710	abort ();	698	abort ();
711	#else	699	#else
712	op->speed = 0;	700	op->speed = 0;
713	#endif	701	#endif
714	}	702	}
		703
715	if (arch_init)	704	if (arch_init)
716	{
717	return;	705	return;
718	}	706
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	707	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	708	{
721	/* If already on active list, don't do anything */	709	/* If already on active list, don't do anything */
722	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	710	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
723	return;	711	return;
724		712
725	/* process_events() expects us to insert the object at the beginning	713	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	714	* of the list. */
727	op->active_next = active_objects;	715	op->active_next = active_objects;
		716
728	if (op->active_next != NULL)	717	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	718	op->active_next->active_prev = op;
		719
730	active_objects = op;	720	active_objects = op;
731	}	721	}
732	else	722	else
733	{	723	{
734	/* If not on the active list, nothing needs to be done */	724	/* If not on the active list, nothing needs to be done */
…		…
736	return;	726	return;
737		727
738	if (op->active_prev == NULL)	728	if (op->active_prev == NULL)
739	{	729	{
740	active_objects = op->active_next;	730	active_objects = op->active_next;
		731
741	if (op->active_next != NULL)	732	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	733	op->active_next->active_prev = NULL;
743	}	734	}
744	else	735	else
745	{	736	{
746	op->active_prev->active_next = op->active_next;	737	op->active_prev->active_next = op->active_next;
		738
747	if (op->active_next)	739	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	740	op->active_next->active_prev = op->active_prev;
749	}	741	}
		742
750	op->active_next = NULL;	743	op->active_next = NULL;
751	op->active_prev = NULL;	744	op->active_prev = NULL;
752	}	745	}
753	}	746	}
754		747
…		…
886	* that is being removed.	879	* that is being removed.
887	*/	880	*/
888	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	881	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
889	update_now = 1;	882	update_now = 1;
890	else if (action == UP_OBJ_FACE)	883	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	884	/* Nothing to do for that case */ ;
892	else	885	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	886	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		887
895	if (update_now)	888	if (update_now)
896	{	889	{
…		…
900		893
901	if (op->more != NULL)	894	if (op->more != NULL)
902	update_object (op->more, action);	895	update_object (op->more, action);
903	}	896	}
904		897
905	static unordered_vector<object *> mortals;	898	object::vector object::mortals;
906	static std::vector<object *> freed;	899	object::vector object::objects; // not yet used
		900	object *object::first;
907		901
908	void object::free_mortals ()	902	void object::free_mortals ()
909	{	903	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	904	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
912	{	908	{
913	freed.push_back (*i);	909	delete *i;
914	mortals.erase (i);	910	mortals.erase (i);
915	}	911	}
916	else	912
917	++i;	913	static int lastmortals = 0;//D
		914
		915	if (mortals.size() != lastmortals)//D
		916	{
		917	lastmortals = mortals.size ();//D
		918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		919	}
918	}	920	}
919		921
920	object::object ()	922	object::object ()
921	{	923	{
922	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
923		925
924	expmul = 1.0;	926	expmul = 1.0;
925	face = blank_face;	927	face = blank_face;
926	attacked_by_count = -1;
927	}	928	}
928		929
929	object::~object ()	930	object::~object ()
930	{	931	{
931	free_key_values (this);	932	free_key_values (this);
932	}	933	}
933		934
934	void object::link ()	935	void object::link ()
935	{	936	{
936	count = ++ob_count;	937	count = ++ob_count;
		938	uuid = gen_uuid ();
937		939
938	prev = 0;	940	prev = 0;
939	next = objects;	941	next = object::first;
940		942
941	if (objects)	943	if (object::first)
942	objects->prev = this;	944	object::first->prev = this;
943		945
944	objects = this;	946	object::first = this;
945	}	947	}
946		948
947	void object::unlink ()	949	void object::unlink ()
948	{	950	{
949	count = 0;	951	//count = 0;//D
		952	if (!prev && !next) return;//D
		953
		954	if (this == object::first)
		955	object::first = next;
950		956
951	/* Remove this object from the list of used objects */	957	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	958	if (prev) prev->next = next;
		959	if (next) next->prev = prev;
		960
955	prev = 0;	961	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	962	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	963	}
967		964
968	object *object::create ()	965	object *object::create ()
969	{	966	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	967	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 ();	968	op->link ();
983	return op;	969	return op;
984	}	970	}
985		971
986	/*	972	/*
…		…
993	* If free_inventory is set, free inventory as well. Else drop items in	979	* If free_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	980	* inventory to the ground.
995	*/	981	*/
996	void object::free (bool free_inventory)	982	void object::free (bool free_inventory)
997	{	983	{
		984	if (QUERY_FLAG (this, FLAG_FREED))
		985	return;
		986
		987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		988	remove_friendly_object (this);
		989
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	991	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		992
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))	993	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		994
1020	if (more)	995	if (more)
1021	{	996	{
1022	more->free (free_inventory);	997	more->free (free_inventory);
1023	more = 0;	998	more = 0;
…		…
1027	{	1002	{
1028	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	1004	* if some form of movement is allowed, let objects
1030	* drop on that space.	1005	* drop on that space.
1031	*/	1006	*/
1032	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1007	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	1008	{
1034	object *	1009	object *op = inv;
1035	op = inv;
1036		1010
1037	while (op)	1011	while (op)
1038	{	1012	{
1039	object *
1040	tmp = op->below;	1013	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	1014	op->free (free_inventory);
1044	op = tmp;	1015	op = tmp;
1045	}	1016	}
1046	}	1017	}
1047	else	1018	else
1048	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
1049	object *	1020	object *op = inv;
1050	op = inv;
1051		1021
1052	while (op)	1022	while (op)
1053	{	1023	{
1054	object *
1055	tmp = op->below;	1024	object *tmp = op->below;
1056		1025
1057	remove_ob (op);	1026	remove_ob (op);
1058		1027
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	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))	1029	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1069	op = tmp;	1038	op = tmp;
1070	}	1039	}
1071	}	1040	}
1072	}	1041	}
1073		1042
1074	clear_owner (this);	1043	// clear those pointers that likely might have circular references to us
		1044	owner = 0;
		1045	enemy = 0;
		1046	attacked_by = 0;
1075		1047
1076	/* Remove object from the active list */	1048	/* Remove object from the active list */
1077	speed = 0;	1049	speed = 0;
1078	update_ob_speed (this);	1050	update_ob_speed (this);
1079		1051
1080	unlink ();	1052	unlink ();
1081		1053
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1054	mortals.push_back (this);
1085	}	1055	}
1086		1056
1087	/*	1057	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1058	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1093	sub_weight (object *op, signed long weight)	1063	sub_weight (object *op, signed long weight)
1094	{	1064	{
1095	while (op != NULL)	1065	while (op != NULL)
1096	{	1066	{
1097	if (op->type == CONTAINER)	1067	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1068	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1069
1101	op->carrying -= weight;	1070	op->carrying -= weight;
1102	op = op->env;	1071	op = op->env;
1103	}	1072	}
1104	}	1073	}
1105		1074
…		…
1113	*/	1082	*/
1114		1083
1115	void	1084	void
1116	remove_ob (object *op)	1085	remove_ob (object *op)
1117	{	1086	{
1118	object tmp, last = NULL;	1087	object tmp, last = 0;
1119	object *otmp;	1088	object *otmp;
1120		1089
1121	tag_t tag;	1090	tag_t tag;
1122	int check_walk_off;	1091	int check_walk_off;
1123	mapstruct *m;	1092	mapstruct *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	tag = op->count;
		1198	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1199
		1200	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1201	{
		1202	/* No point updating the players look faces if he is the object
		1203	* being removed.
		1204	*/
		1205
		1206	if (tmp->type == PLAYER && tmp != op)
1277	{	1207	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1208	/* If a container that the player is currently using somehow gets
		1209	* removed (most likely destroyed), update the player view
		1210	* appropriately.
		1211	*/
		1212	if (tmp->container == op)
		1213	{
		1214	CLEAR_FLAG (op, FLAG_APPLIED);
		1215	tmp->container = NULL;
		1216	}
		1217
		1218	tmp->contr->socket.update_look = 1;
1279	}	1219	}
		1220
		1221	/* See if player moving off should effect something */
		1222	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1223	{
		1224	move_apply (tmp, op, NULL);
		1225
		1226	if (was_destroyed (op, tag))
		1227	{
		1228	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1229	}
1280	}	1230	}
1281		1231
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1232	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1233
1284	if (tmp->above == tmp)	1234	if (tmp->above == tmp)
1285	tmp->above = NULL;	1235	tmp->above = NULL;
1286		1236
1287	last = tmp;	1237	last = tmp;
1288	}	1238	}
1289		1239
1290	/* last == NULL of there are no objects on this space */	1240	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1241	if (last == NULL)
1292	{	1242	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1243	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1244	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't	1245	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1246	* be correct anyways.
1297	*/	1247	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1248	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1249	update_position (op->map, op->x, op->y);
1300	}	1250	}
1301	else	1251	else
1302	update_object (last, UP_OBJ_REMOVE);	1252	update_object (last, UP_OBJ_REMOVE);
1303		1253
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1254	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1305	update_all_los (op->map, op->x, op->y);	1255	update_all_los (op->map, op->x, op->y);
		1256	}
1306	}	1257	}
1307		1258
1308	/*	1259	/*
1309	* merge_ob(op,top):	1260	* merge_ob(op,top):
1310	*	1261	*
1311	* This function goes through all objects below and including top, and	1262	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1263	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1264	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1265	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1266	*/
1316
1317	object *	1267	object *
1318	merge_ob (object op, object top)	1268	merge_ob (object op, object top)
1319	{	1269	{
1320	if (!op->nrof)	1270	if (!op->nrof)
1321	return 0;	1271	return 0;
		1272
1322	if (top == NULL)	1273	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1274	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1275
1324	for (; top != NULL; top = top->below)	1276	for (; top != NULL; top = top->below)
1325	{	1277	{
1326	if (top == op)	1278	if (top == op)
1327	continue;	1279	continue;
1328	if (CAN_MERGE (op, top))	1280	if (CAN_MERGE (op, top))
…		…
1334	remove_ob (op);	1286	remove_ob (op);
1335	free_object (op);	1287	free_object (op);
1336	return top;	1288	return top;
1337	}	1289	}
1338	}	1290	}
		1291
1339	return NULL;	1292	return 0;
1340	}	1293	}
1341		1294
1342	/*	1295	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1296	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1297	* job preparing multi-part monsters
1345	*/	1298	*/
1346	object *	1299	object *
1347	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1300	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1348	{	1301	{
1349	object *	1302	object *tmp;
1350	tmp;
1351		1303
1352	if (op->head)	1304	if (op->head)
1353	op = op->head;	1305	op = op->head;
		1306
1354	for (tmp = op; tmp; tmp = tmp->more)	1307	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1308	{
1356	tmp->x = x + tmp->arch->clone.x;	1309	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1310	tmp->y = y + tmp->arch->clone.y;
1358	}	1311	}
		1312
1359	return insert_ob_in_map (op, m, originator, flag);	1313	return insert_ob_in_map (op, m, originator, flag);
1360	}	1314	}
1361		1315
1362	/*	1316	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1317	* insert_ob_in_map (op, map, originator, flag):
…		…
1654	* op is the object to insert it under: supplies x and the map.	1608	* op is the object to insert it under: supplies x and the map.
1655	*/	1609	*/
1656	void	1610	void
1657	replace_insert_ob_in_map (const char arch_string, object op)	1611	replace_insert_ob_in_map (const char arch_string, object op)
1658	{	1612	{
1659	object *tmp;	1613	object *
		1614	tmp;
1660	object *tmp1;	1615	object *
		1616	tmp1;
1661		1617
1662	/* first search for itself and remove any old instances */	1618	/* first search for itself and remove any old instances */
1663		1619
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1620	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{	1621	{
…		…
1668	remove_ob (tmp);	1624	remove_ob (tmp);
1669	free_object (tmp);	1625	free_object (tmp);
1670	}	1626	}
1671	}	1627	}
1672		1628
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1629	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1630
1675	tmp1->x = op->x;	1631	tmp1->x = op->x;
1676	tmp1->y = op->y;	1632	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1633	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1634	}
…		…
1696	if (orig_ob->nrof < nr)	1652	if (orig_ob->nrof < nr)
1697	{	1653	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1654	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1655	return NULL;
1700	}	1656	}
		1657
1701	newob = object_create_clone (orig_ob);	1658	newob = object_create_clone (orig_ob);
		1659
1702	if ((orig_ob->nrof -= nr) < 1)	1660	if ((orig_ob->nrof -= nr) < 1)
1703	{	1661	{
1704	if (!is_removed)	1662	if (!is_removed)
1705	remove_ob (orig_ob);	1663	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);	1664	free_object2 (orig_ob, 1);
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1672	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1673	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1674	return NULL;
1717	}	1675	}
1718	}	1676	}
		1677
1719	newob->nrof = nr;	1678	newob->nrof = nr;
1720		1679
1721	return newob;	1680	return newob;
1722	}	1681	}
1723		1682
…		…
1730	*/	1689	*/
1731		1690
1732	object *	1691	object *
1733	decrease_ob_nr (object *op, uint32 i)	1692	decrease_ob_nr (object *op, uint32 i)
1734	{	1693	{
1735	object *	1694	object *tmp;
1736	tmp;
1737	player *	1695	player *pl;
1738	pl;
1739		1696
1740	if (i == 0) /* objects with op->nrof require this check */	1697	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1698	return op;
1742		1699
1743	if (i > op->nrof)	1700	if (i > op->nrof)
1744	i = op->nrof;	1701	i = op->nrof;
1745		1702
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1703	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1704	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1705	else if (op->env != NULL)
1751	{	1706	{
1752	/* is this object in the players inventory, or sub container	1707	/* is this object in the players inventory, or sub container
1753	* therein?	1708	* therein?
1754	*/	1709	*/
…		…
1789	}	1744	}
1790	}	1745	}
1791	}	1746	}
1792	else	1747	else
1793	{	1748	{
1794	object *
1795	above = op->above;	1749	object *above = op->above;
1796		1750
1797	if (i < op->nrof)	1751	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1752	op->nrof -= i;
1800	}
1801	else	1753	else
1802	{	1754	{
1803	remove_ob (op);	1755	remove_ob (op);
1804	op->nrof = 0;	1756	op->nrof = 0;
1805	}	1757	}
		1758
1806	/* Since we just removed op, op->above is null */	1759	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1760	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1761	if (tmp->type == PLAYER)
1809	{	1762	{
1810	if (op->nrof)	1763	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1766	esrv_del_item (tmp->contr, op->count);
1814	}	1767	}
1815	}	1768	}
1816		1769
1817	if (op->nrof)	1770	if (op->nrof)
1818	{
1819	return op;	1771	return op;
1820	}
1821	else	1772	else
1822	{	1773	{
1823	free_object (op);	1774	free_object (op);
1824	return NULL;	1775	return NULL;
1825	}	1776	}
…		…
1834	add_weight (object *op, signed long weight)	1785	add_weight (object *op, signed long weight)
1835	{	1786	{
1836	while (op != NULL)	1787	while (op != NULL)
1837	{	1788	{
1838	if (op->type == CONTAINER)	1789	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1790	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1791
1842	op->carrying += weight;	1792	op->carrying += weight;
1843	op = op->env;	1793	op = op->env;
1844	}	1794	}
1845	}	1795	}
1846		1796
…		…
1869	{	1819	{
1870	dump_object (op);	1820	dump_object (op);
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1821	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;	1822	return op;
1873	}	1823	}
		1824
1874	if (where == NULL)	1825	if (where == NULL)
1875	{	1826	{
1876	dump_object (op);	1827	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1828	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;	1829	return op;
1879	}	1830	}
		1831
1880	if (where->head)	1832	if (where->head)
1881	{	1833	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1834	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;	1835	where = where->head;
1884	}	1836	}
		1837
1885	if (op->more)	1838	if (op->more)
1886	{	1839	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1840	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1841	return op;
1889	}	1842	}
		1843
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1844	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1845	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1846	if (op->nrof)
1893	{	1847	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1848	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1979	*/	1933	*/
1980		1934
1981	int	1935	int
1982	check_move_on (object op, object originator)	1936	check_move_on (object op, object originator)
1983	{	1937	{
1984	object *tmp;	1938	object *
1985	tag_t tag;	1939	tmp;
1986	mapstruct *m = op->map;	1940	tag_t
		1941	tag;
		1942	mapstruct *
		1943	m = op->map;
		1944	int
1987	int x = op->x, y = op->y;	1945	x = op->x, y = op->y;
1988		1946
1989	MoveType move_on, move_slow, move_block;	1947	MoveType
		1948	move_on,
		1949	move_slow,
		1950	move_block;
1990		1951
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1952	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1953	return 0;
1993		1954
1994	tag = op->count;	1955	tag = op->count;
…		…
2042	{	2003	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2004	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))	2005	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	2006	{
2046		2007
		2008	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	2009	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		2010
2049	if (op->type == PLAYER)	2011	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2012	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2013	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	2014	diff /= 4.0;
…		…
2371	find_dir (mapstruct m, int x, int y, object exclude)	2333	find_dir (mapstruct m, int x, int y, object exclude)
2372	{	2334	{
2373	int	2335	int
2374	i,	2336	i,
2375	max = SIZEOFFREE, mflags;	2337	max = SIZEOFFREE, mflags;
2376	sint16	2338
2377	nx,	2339	sint16 nx, ny;
2378	ny;
2379	object *	2340	object *
2380	tmp;	2341	tmp;
2381	mapstruct *	2342	mapstruct *
2382	mp;	2343	mp;
2383	MoveType	2344
2384	blocked,	2345	MoveType blocked, move_type;
2385	move_type;
2386		2346
2387	if (exclude && exclude->head)	2347	if (exclude && exclude->head)
2388	{	2348	{
2389	exclude = exclude->head;	2349	exclude = exclude->head;
2390	move_type = exclude->move_type;	2350	move_type = exclude->move_type;
…		…
2597		2557
2598		2558
2599	int	2559	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2560	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2601	{	2561	{
2602	sint16	2562	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2563	int
2606	mflags;	2564	mflags;
2607		2565
2608	if (dir < 0)	2566	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2567	return 0; /* exit condition: invalid direction */
…		…
2734		2692
2735	if (tempfile == NULL)	2693	if (tempfile == NULL)
2736	{	2694	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2695	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2696	return NULL;
2739	};	2697	}
		2698
2740	fprintf (tempfile, obstr);	2699	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2700	fclose (tempfile);
2742		2701
2743	op = get_object ();	2702	op = get_object ();
2744		2703
2745	object_thawer	2704	object_thawer thawer (filename);
2746	thawer (filename);
2747		2705
2748	if (thawer)	2706	if (thawer)
2749	load_object (thawer, op, 0);	2707	load_object (thawer, op, 0);
2750		2708
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2709	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2802	* The returned string is shared.	2760	* The returned string is shared.
2803	*/	2761	*/
2804	const char *	2762	const char *
2805	get_ob_key_value (const object op, const char const key)	2763	get_ob_key_value (const object op, const char const key)
2806	{	2764	{
2807	key_value *	2765	key_value *link;
2808	link;	2766	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2767
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2768	if (!canonical_key)
2815	{	2769	{
2816	/* 1. There being a field named key on any object	2770	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2771	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2772	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, this object doesn't have this field.	2773	* 3. Therefore, this object doesn't have this field.
2820	*/	2774	*/
2821	return NULL;	2775	return 0;
2822	}	2776	}
2823		2777
2824	/* This is copied from get_ob_key_link() above -	2778	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2779	* only 4 lines, and saves the function call overhead.
2826	*/	2780	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2781	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2782	if (link->key == canonical_key)
2830	{
2831	return link->value;	2783	return link->value;
2832	}	2784
2833	}
2834	return NULL;	2785	return 0;
2835	}	2786	}
2836		2787
2837		2788
2838	/*	2789	/*
2839	* Updates the canonical_key in op to value.	2790	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2826	if (last)
2876	last->next = field->next;	2827	last->next = field->next;
2877	else	2828	else
2878	op->key_values = field->next;	2829	op->key_values = field->next;
2879		2830
2880	delete
2881	field;	2831	delete field;
2882	}	2832	}
2883	}	2833	}
2884	return TRUE;	2834	return TRUE;
2885	}	2835	}
2886	/* IF we get here, key doesn't exist */	2836	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2871	* Returns TRUE on success.
2922	*/	2872	*/
2923	int	2873	int
2924	set_ob_key_value (object op, const char key, const char *value, int add_key)	2874	set_ob_key_value (object op, const char key, const char *value, int add_key)
2925	{	2875	{
2926	shstr
2927	key_ (key);	2876	shstr key_ (key);
2928		2877
2929	return set_ob_key_value_s (op, key_, value, add_key);	2878	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2879	}
		2880
		2881	object::depth_iterator::depth_iterator (object *container)
		2882	: iterator_base (container)
		2883	{
		2884	while (item->inv)
		2885	item = item->inv;
		2886	}
		2887
		2888	void
		2889	object::depth_iterator::next ()
		2890	{
		2891	if (item->below)
		2892	{
		2893	item = item->below;
		2894
		2895	while (item->inv)
		2896	item = item->inv;
		2897	}
		2898	else
		2899	item = item->env;
		2900	}
		2901
		2902	// return a suitable string describing an objetc in enough detail to find it
		2903	const char *
		2904	object::debug_desc (char *info) const
		2905	{
		2906	char info2[256 * 3];
		2907	char *p = info;
		2908
		2909	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2910	count,
		2911	&name,
		2912	title ? " " : "",
		2913	title ? (const char *)title : "");
		2914
		2915	if (env)
		2916	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2917
		2918	if (map)
		2919	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2920
		2921	return info;
		2922	}
		2923
		2924	const char *
		2925	object::debug_desc () const
		2926	{
		2927	static char info[256 * 3];
		2928	return debug_desc (info);
		2929	}
		2930

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC vs. Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC