[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.44 by root, Thu Sep 14 17:29:27 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 root Exp $";
5	*/
6		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	34	#include <loader.h>
		35
43	int nrofallocobjects = 0;	36	int nrofallocobjects = 0;
		37	static UUID uuid;
		38	const uint64 UUID_SKIP = 1<<19;
44		39
45	object objects; / Pointer to the list of used objects */	40	object objects; / Pointer to the list of used objects */
46	object active_objects; / List of active objects that need to be processed */	41	object active_objects; / List of active objects that need to be processed */
47		42
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	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,
…		…
56	};	51	};
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	55	};
		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %lld\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
61		133
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object wants, const object has)	136	compare_ob_value_lists_one (const object wants, const object has)
65	{	137	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	286	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	287	return 0;
216		288
217	switch (ob1->type)	289	switch (ob1->type)
218	{	290	{
219	case SCROLL:	291	case SCROLL:
220	if (ob1->level != ob2->level)	292	if (ob1->level != ob2->level)
221	return 0;	293	return 0;
222	break;	294	break;
223	}	295	}
224		296
225	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	297	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)
226	{	298	{
227	/* At least one of these has key_values. */	299	/* At least one of these has key_values. */
…		…
249	/*	321	/*
250	* sum_weight() is a recursive function which calculates the weight	322	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	323	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	324	* containers are carrying, and sums it up.
253	*/	325	*/
254	signed long	326	long
255	sum_weight (object *op)	327	sum_weight (object *op)
256	{	328	{
257	signed long sum;	329	long sum;
258	object *inv;	330	object *inv;
259		331
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	332	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	333	{
262	if (inv->inv)	334	if (inv->inv)
263	sum_weight (inv);	335	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	337	}
		338
266	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
268	if (op->carrying != sum)	342	if (op->carrying != sum)
269	op->carrying = sum;	343	op->carrying = sum;
		344
270	return sum;	345	return sum;
271	}	346	}
272		347
273	/**	348	/**
274	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
423	*/	498	*/
424		499
425	object *	500	object *
426	find_object_name (const char *str)	501	find_object_name (const char *str)
427	{	502	{
428	const char *name = shstr::find (str);	503	shstr_cmp str_ (str);
429	object *op;	504	object *op;
430		505
431	for (op = objects; op != NULL; op = op->next)	506	for (op = objects; op != NULL; op = op->next)
432	if (&op->name == name)	507	if (op->name == str_)
433	break;	508	break;
434		509
435	return op;	510	return op;
436	}	511	}
437		512
…		…
440	{	515	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	516	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	517	}
443		518
444	/*	519	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	520	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	521	* skill and experience objects.
485	*/	522	*/
486	void	523	void
487	set_owner (object op, object owner)	524	object::set_owner (object *owner)
488	{	525	{
489	if (owner == NULL \|\| op == NULL)	526	if (!owner)
490	return;	527	return;
491		528
492	/* next line added to allow objects which own objects */	529	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	530	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	531	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	532	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	533	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	534	* didn't match, this check is valid and I believe that cause is valid.
498	*/	535	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	536	while (owner->owner)
500	owner = owner->owner;	537	owner = owner->owner;
501		538
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	539	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object op, object clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	540	}
542		541
543	/* Zero the key_values on op, decrementing the shared-string	542	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	543	* refcounts and freeing the links.
545	*/	544	*/
…		…
561	{	560	{
562	attachable_base::clear ();	561	attachable_base::clear ();
563		562
564	free_key_values (this);	563	free_key_values (this);
565		564
566	clear_owner (this);	565	owner = 0;
567
568	name = 0;	566	name = 0;
569	name_pl = 0;	567	name_pl = 0;
570	title = 0;	568	title = 0;
571	race = 0;	569	race = 0;
572	slaying = 0;	570	slaying = 0;
573	skill = 0;	571	skill = 0;
574	msg = 0;	572	msg = 0;
575	lore = 0;	573	lore = 0;
576	custom_name = 0;	574	custom_name = 0;
577	materialname = 0;	575	materialname = 0;
		576	contr = 0;
		577	below = 0;
		578	above = 0;
		579	inv = 0;
		580	container = 0;
		581	env = 0;
		582	more = 0;
		583	head = 0;
		584	map = 0;
		585	active_next = 0;
		586	active_prev = 0;
578		587
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	588	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		589
581	SET_FLAG (this, FLAG_REMOVED);	590	SET_FLAG (this, FLAG_REMOVED);
		591
		592	/* What is not cleared is next, prev, and count */
		593
		594	expmul = 1.0;
		595	face = blank_face;
		596
		597	if (settings.casting_time)
		598	casting_time = -1;
582	}	599	}
583		600
584	void object::clone (object *destination)	601	void object::clone (object *destination)
585	{	602	{
586	(object_copy ) destination = *this;	603	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	604	(object_pod )destination = *this;
588		605
589	if (self \|\| cb)	606	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	607	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	608	}
624		609
625	/*	610	/*
626	* copy object first frees everything allocated by the second object,	611	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	612	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	613	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	615	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	616	* will point at garbage.
632	*/	617	*/
633
634	void	618	void
635	copy_object (object op2, object op)	619	copy_object (object op2, object op)
636	{	620	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	621	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	622	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	682	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	683	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	684	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	685	* This function needs to be called whenever the speed of an object changes.
702	*/	686	*/
703
704	void	687	void
705	update_ob_speed (object *op)	688	update_ob_speed (object *op)
706	{	689	{
707	extern int arch_init;	690	extern int arch_init;
708		691
…		…
717	abort ();	700	abort ();
718	#else	701	#else
719	op->speed = 0;	702	op->speed = 0;
720	#endif	703	#endif
721	}	704	}
		705
722	if (arch_init)	706	if (arch_init)
723	{
724	return;	707	return;
725	}	708
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	709	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	710	{
728	/* If already on active list, don't do anything */	711	/* If already on active list, don't do anything */
729	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	712	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
730	return;	713	return;
731		714
732	/* process_events() expects us to insert the object at the beginning	715	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	716	* of the list. */
734	op->active_next = active_objects;	717	op->active_next = active_objects;
		718
735	if (op->active_next != NULL)	719	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	720	op->active_next->active_prev = op;
		721
737	active_objects = op;	722	active_objects = op;
738	}	723	}
739	else	724	else
740	{	725	{
741	/* If not on the active list, nothing needs to be done */	726	/* If not on the active list, nothing needs to be done */
…		…
743	return;	728	return;
744		729
745	if (op->active_prev == NULL)	730	if (op->active_prev == NULL)
746	{	731	{
747	active_objects = op->active_next;	732	active_objects = op->active_next;
		733
748	if (op->active_next != NULL)	734	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	735	op->active_next->active_prev = NULL;
750	}	736	}
751	else	737	else
752	{	738	{
753	op->active_prev->active_next = op->active_next;	739	op->active_prev->active_next = op->active_next;
		740
754	if (op->active_next)	741	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	742	op->active_next->active_prev = op->active_prev;
756	}	743	}
		744
757	op->active_next = NULL;	745	op->active_next = NULL;
758	op->active_prev = NULL;	746	op->active_prev = NULL;
759	}	747	}
760	}	748	}
761		749
…		…
893	* that is being removed.	881	* that is being removed.
894	*/	882	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	883	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	update_now = 1;	884	update_now = 1;
897	else if (action == UP_OBJ_FACE)	885	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	886	/* Nothing to do for that case */ ;
899	else	887	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	888	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		889
902	if (update_now)	890	if (update_now)
903	{	891	{
…		…
908	if (op->more != NULL)	896	if (op->more != NULL)
909	update_object (op->more, action);	897	update_object (op->more, action);
910	}	898	}
911		899
912	static unordered_vector<object *> mortals;	900	static unordered_vector<object *> mortals;
913	static std::vector<object *> freed;
914		901
915	void object::free_mortals ()	902	void object::free_mortals ()
916	{	903	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	904	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
918	if (!(*i)->refcount)	905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
919	{	908	{
920	freed.push_back (*i);	909	delete *i;
921	mortals.erase (i);	910	mortals.erase (i);
922	}	911	}
923	else	912
924	++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	}
925	}	920	}
926		921
927	object::object ()	922	object::object ()
928	{	923	{
929	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
930		925
931	expmul = 1.0;	926	expmul = 1.0;
932	face = blank_face;	927	face = blank_face;
933	attacked_by_count = -1;
934	}	928	}
935		929
936	object::~object ()	930	object::~object ()
937	{	931	{
938	free_key_values (this);	932	free_key_values (this);
939	}	933	}
940		934
941	void object::link ()	935	void object::link ()
942	{	936	{
943	count = ++ob_count;	937	count = ++ob_count;
		938	uuid = gen_uuid ();
944		939
945	prev = 0;	940	prev = 0;
946	next = objects;	941	next = objects;
947		942
948	if (objects)	943	if (objects)
…		…
951	objects = this;	946	objects = this;
952	}	947	}
953		948
954	void object::unlink ()	949	void object::unlink ()
955	{	950	{
956	count = 0;	951	//count = 0;//D
957		952	if (!prev && !next) return;//D
958	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;
962	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;
969	}
970		953
971	if (this == objects)	954	if (this == objects)
972	objects = next;	955	objects = next;
		956
		957	/* Remove this object from the list of used objects */
		958	if (prev) prev->next = next;
		959	if (next) next->prev = prev;
		960
		961	prev = 0;
		962	next = 0;
973	}	963	}
974		964
975	object *object::create ()	965	object *object::create ()
976	{	966	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	967	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	968	op->link ();
990	return op;	969	return op;
991	}	970	}
992		971
993	/*	972	/*
…		…
1000	* 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
1001	* inventory to the ground.	980	* inventory to the ground.
1002	*/	981	*/
1003	void object::free (bool free_inventory)	982	void object::free (bool free_inventory)
1004	{	983	{
		984	if (QUERY_FLAG (this, FLAG_FREED))
		985	return;
		986
		987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		988	remove_friendly_object (this);
		989
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	991	remove_ob (this);
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		992
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);
1018	}
1019
1020	if (QUERY_FLAG (this, FLAG_FREED))	993	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		994
1027	if (more)	995	if (more)
1028	{	996	{
1029	more->free (free_inventory);	997	more->free (free_inventory);
1030	more = 0;	998	more = 0;
…		…
1034	{	1002	{
1035	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	1004	* if some form of movement is allowed, let objects
1037	* drop on that space.	1005	* drop on that space.
1038	*/	1006	*/
1039	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)
1040	{	1008	{
1041	object *	1009	object *op = inv;
1042	op = inv;
1043		1010
1044	while (op)	1011	while (op)
1045	{	1012	{
1046	object *
1047	tmp = op->below;	1013	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	1014	op->free (free_inventory);
1051	op = tmp;	1015	op = tmp;
1052	}	1016	}
1053	}	1017	}
1054	else	1018	else
1055	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
1056	object *	1020	object *op = inv;
1057	op = inv;
1058		1021
1059	while (op)	1022	while (op)
1060	{	1023	{
1061	object *
1062	tmp = op->below;	1024	object *tmp = op->below;
1063		1025
1064	remove_ob (op);	1026	remove_ob (op);
1065		1027
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	\|\| 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))
…		…
1076	op = tmp;	1038	op = tmp;
1077	}	1039	}
1078	}	1040	}
1079	}	1041	}
1080		1042
1081	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;
1082		1047
1083	/* Remove object from the active list */	1048	/* Remove object from the active list */
1084	speed = 0;	1049	speed = 0;
1085	update_ob_speed (this);	1050	update_ob_speed (this);
1086		1051
1087	unlink ();	1052	unlink ();
1088
1089	SET_FLAG (this, FLAG_FREED);
1090		1053
1091	mortals.push_back (this);	1054	mortals.push_back (this);
1092	}	1055	}
1093		1056
1094	/*	1057	/*
…		…
1120	*/	1083	*/
1121		1084
1122	void	1085	void
1123	remove_ob (object *op)	1086	remove_ob (object *op)
1124	{	1087	{
1125	object tmp, last = NULL;
1126	object *otmp;	1088	object *
		1089	tmp, *
		1090	last = NULL;
		1091	object *
		1092	otmp;
1127		1093
1128	tag_t tag;	1094	tag_t
		1095	tag;
		1096	int
1129	int check_walk_off;	1097	check_walk_off;
1130	mapstruct *m;	1098	mapstruct *
		1099	m;
1131		1100
1132	sint16 x, y;	1101	sint16
		1102	x,
		1103	y;
1133		1104
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1105	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1106	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1107
1139	/* Changed it to always dump core in this case. As has been learned	1108	SET_FLAG (op, FLAG_REMOVED);
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151		1109
1152	if (op->more != NULL)	1110	if (op->more != NULL)
1153	remove_ob (op->more);	1111	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1112
1157	/*	1113	/*
1158	* In this case, the object to be removed is in someones	1114	* In this case, the object to be removed is in someones
1159	* inventory.	1115	* inventory.
1160	*/	1116	*/
…		…
1186	*/	1142	*/
1187	op->x = op->env->x, op->y = op->env->y;	1143	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1144	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1145	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1146	op->env = NULL;
1191	return;	1147	}
		1148	else if (op->map)
1192	}	1149	{
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;	1150	x = op->x;
1199	y = op->y;	1151	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1152	m = get_map_from_coord (op->map, &x, &y);
1201		1153
1202	if (!m)	1154	if (!m)
1203	{	1155	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1156	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1205	op->map->path, op->x, op->y);	1157	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1158	/* in old days, we used to set x and y to 0 and continue.
1207	* it seems if we get into this case, something is probablye	1159	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1160	* screwed up and should be fixed.
		1161	*/
		1162	abort ();
		1163	}
		1164
		1165	if (op->map != m)
		1166	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1167	op->map->path, m->path, op->x, op->y, x, y);
		1168
		1169	/* Re did the following section of code - it looks like it had
		1170	* lots of logic for things we no longer care about
1209	*/	1171	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1172
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1173	/* link the object above us */
1223	if (op->above)	1174	if (op->above)
1224	op->above->below = op->below;	1175	op->above->below = op->below;
1225	else	1176	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1177	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1178
1228	/* Relink the object below us, if there is one */	1179	/* Relink the object below us, if there is one */
1229	if (op->below)	1180	if (op->below)
1230	op->below->above = op->above;	1181	op->below->above = op->above;
1231	else	1182	else
1232	{	1183	{
1233	/* Nothing below, which means we need to relink map object for this space	1184	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1185	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1186	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	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",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1187	*/
1270	if (tmp->container == op)	1188	if (GET_MAP_OB (m, x, y) != op)
1271	{	1189	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1190	dump_object (op);
1273	tmp->container = NULL;	1191	LOG (llevError,
		1192	"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);
		1193	dump_object (GET_MAP_OB (m, x, y));
		1194	LOG (llevError, "%s\n", errmsg);
1274	}	1195	}
1275		1196
1276	tmp->contr->socket.update_look = 1;	1197	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1198	}
1281	move_apply (tmp, op, NULL);
1282		1199
1283	if (was_destroyed (op, tag))	1200	op->above = 0;
		1201	op->below = 0;
		1202
		1203	if (op->map->in_memory == MAP_SAVING)
		1204	return;
		1205
		1206	tag = op->count;
		1207	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1208
		1209	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1210	{
		1211	/* No point updating the players look faces if he is the object
		1212	* being removed.
		1213	*/
		1214
		1215	if (tmp->type == PLAYER && tmp != op)
1284	{	1216	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1217	/* If a container that the player is currently using somehow gets
		1218	* removed (most likely destroyed), update the player view
		1219	* appropriately.
		1220	*/
		1221	if (tmp->container == op)
		1222	{
		1223	CLEAR_FLAG (op, FLAG_APPLIED);
		1224	tmp->container = NULL;
		1225	}
		1226
		1227	tmp->contr->socket.update_look = 1;
1286	}	1228	}
		1229
		1230	/* See if player moving off should effect something */
		1231	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1232	{
		1233	move_apply (tmp, op, NULL);
		1234
		1235	if (was_destroyed (op, tag))
		1236	{
		1237	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1238	}
1287	}	1239	}
1288		1240
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1241	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1242
1291	if (tmp->above == tmp)	1243	if (tmp->above == tmp)
1292	tmp->above = NULL;	1244	tmp->above = NULL;
1293		1245
1294	last = tmp;	1246	last = tmp;
1295	}	1247	}
1296		1248
1297	/* last == NULL of there are no objects on this space */	1249	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1250	if (last == NULL)
1299	{	1251	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1252	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1253	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1254	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1255	* be correct anyways.
1304	*/	1256	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1257	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1258	update_position (op->map, op->x, op->y);
1307	}	1259	}
1308	else	1260	else
1309	update_object (last, UP_OBJ_REMOVE);	1261	update_object (last, UP_OBJ_REMOVE);
1310		1262
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1263	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1264	update_all_los (op->map, op->x, op->y);
		1265	}
1313	}	1266	}
1314		1267
1315	/*	1268	/*
1316	* merge_ob(op,top):	1269	* merge_ob(op,top):
1317	*	1270	*
1318	* This function goes through all objects below and including top, and	1271	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1272	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1273	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1274	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1275	*/
1323
1324	object *	1276	object *
1325	merge_ob (object op, object top)	1277	merge_ob (object op, object top)
1326	{	1278	{
1327	if (!op->nrof)	1279	if (!op->nrof)
1328	return 0;	1280	return 0;
		1281
1329	if (top == NULL)	1282	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1283	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1284
1331	for (; top != NULL; top = top->below)	1285	for (; top != NULL; top = top->below)
1332	{	1286	{
1333	if (top == op)	1287	if (top == op)
1334	continue;	1288	continue;
1335	if (CAN_MERGE (op, top))	1289	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1295	remove_ob (op);
1342	free_object (op);	1296	free_object (op);
1343	return top;	1297	return top;
1344	}	1298	}
1345	}	1299	}
		1300
1346	return NULL;	1301	return NULL;
1347	}	1302	}
1348		1303
1349	/*	1304	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1305	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1306	* job preparing multi-part monsters
1352	*/	1307	*/
1353	object *	1308	object *
1354	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1309	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1355	{	1310	{
1356	object *	1311	object *tmp;
1357	tmp;
1358		1312
1359	if (op->head)	1313	if (op->head)
1360	op = op->head;	1314	op = op->head;
		1315
1361	for (tmp = op; tmp; tmp = tmp->more)	1316	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1317	{
1363	tmp->x = x + tmp->arch->clone.x;	1318	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1319	tmp->y = y + tmp->arch->clone.y;
1365	}	1320	}
		1321
1366	return insert_ob_in_map (op, m, originator, flag);	1322	return insert_ob_in_map (op, m, originator, flag);
1367	}	1323	}
1368		1324
1369	/*	1325	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1326	* insert_ob_in_map (op, map, originator, flag):
…		…
1661	* op is the object to insert it under: supplies x and the map.	1617	* op is the object to insert it under: supplies x and the map.
1662	*/	1618	*/
1663	void	1619	void
1664	replace_insert_ob_in_map (const char arch_string, object op)	1620	replace_insert_ob_in_map (const char arch_string, object op)
1665	{	1621	{
1666	object *tmp;	1622	object *
		1623	tmp;
1667	object *tmp1;	1624	object *
		1625	tmp1;
1668		1626
1669	/* first search for itself and remove any old instances */	1627	/* first search for itself and remove any old instances */
1670		1628
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1629	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1630	{
…		…
1703	if (orig_ob->nrof < nr)	1661	if (orig_ob->nrof < nr)
1704	{	1662	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1663	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1664	return NULL;
1707	}	1665	}
		1666
1708	newob = object_create_clone (orig_ob);	1667	newob = object_create_clone (orig_ob);
		1668
1709	if ((orig_ob->nrof -= nr) < 1)	1669	if ((orig_ob->nrof -= nr) < 1)
1710	{	1670	{
1711	if (!is_removed)	1671	if (!is_removed)
1712	remove_ob (orig_ob);	1672	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1673	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1681	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1682	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1683	return NULL;
1724	}	1684	}
1725	}	1685	}
		1686
1726	newob->nrof = nr;	1687	newob->nrof = nr;
1727		1688
1728	return newob;	1689	return newob;
1729	}	1690	}
1730		1691
…		…
1737	*/	1698	*/
1738		1699
1739	object *	1700	object *
1740	decrease_ob_nr (object *op, uint32 i)	1701	decrease_ob_nr (object *op, uint32 i)
1741	{	1702	{
1742	object *	1703	object *tmp;
1743	tmp;
1744	player *	1704	player *pl;
1745	pl;
1746		1705
1747	if (i == 0) /* objects with op->nrof require this check */	1706	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1707	return op;
1749		1708
1750	if (i > op->nrof)	1709	if (i > op->nrof)
1751	i = op->nrof;	1710	i = op->nrof;
1752		1711
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1712	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1713	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1714	else if (op->env != NULL)
1758	{	1715	{
1759	/* is this object in the players inventory, or sub container	1716	/* is this object in the players inventory, or sub container
1760	* therein?	1717	* therein?
1761	*/	1718	*/
…		…
1796	}	1753	}
1797	}	1754	}
1798	}	1755	}
1799	else	1756	else
1800	{	1757	{
1801	object *
1802	above = op->above;	1758	object *above = op->above;
1803		1759
1804	if (i < op->nrof)	1760	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1761	op->nrof -= i;
1807	}
1808	else	1762	else
1809	{	1763	{
1810	remove_ob (op);	1764	remove_ob (op);
1811	op->nrof = 0;	1765	op->nrof = 0;
1812	}	1766	}
		1767
1813	/* Since we just removed op, op->above is null */	1768	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1769	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1770	if (tmp->type == PLAYER)
1816	{	1771	{
1817	if (op->nrof)	1772	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1775	esrv_del_item (tmp->contr, op->count);
1821	}	1776	}
1822	}	1777	}
1823		1778
1824	if (op->nrof)	1779	if (op->nrof)
1825	{
1826	return op;	1780	return op;
1827	}
1828	else	1781	else
1829	{	1782	{
1830	free_object (op);	1783	free_object (op);
1831	return NULL;	1784	return NULL;
1832	}	1785	}
…		…
1841	add_weight (object *op, signed long weight)	1794	add_weight (object *op, signed long weight)
1842	{	1795	{
1843	while (op != NULL)	1796	while (op != NULL)
1844	{	1797	{
1845	if (op->type == CONTAINER)	1798	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1799	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1800
1849	op->carrying += weight;	1801	op->carrying += weight;
1850	op = op->env;	1802	op = op->env;
1851	}	1803	}
1852	}	1804	}
1853		1805
…		…
1876	{	1828	{
1877	dump_object (op);	1829	dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1830	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;	1831	return op;
1880	}	1832	}
		1833
1881	if (where == NULL)	1834	if (where == NULL)
1882	{	1835	{
1883	dump_object (op);	1836	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1837	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;	1838	return op;
1886	}	1839	}
		1840
1887	if (where->head)	1841	if (where->head)
1888	{	1842	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1843	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1844	where = where->head;
1891	}	1845	}
		1846
1892	if (op->more)	1847	if (op->more)
1893	{	1848	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1849	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1850	return op;
1896	}	1851	}
		1852
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1853	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1854	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1855	if (op->nrof)
1900	{	1856	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1857	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1986	*/	1942	*/
1987		1943
1988	int	1944	int
1989	check_move_on (object op, object originator)	1945	check_move_on (object op, object originator)
1990	{	1946	{
1991	object *tmp;	1947	object *
1992	tag_t tag;	1948	tmp;
1993	mapstruct *m = op->map;	1949	tag_t
		1950	tag;
		1951	mapstruct *
		1952	m = op->map;
		1953	int
1994	int x = op->x, y = op->y;	1954	x = op->x, y = op->y;
1995		1955
1996	MoveType move_on, move_slow, move_block;	1956	MoveType
		1957	move_on,
		1958	move_slow,
		1959	move_block;
1997		1960
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1961	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1962	return 0;
2000		1963
2001	tag = op->count;	1964	tag = op->count;
…		…
2049	{	2012	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2013	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	2014	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	2015	{
2053		2016
		2017	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	2018	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		2019
2056	if (op->type == PLAYER)	2020	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2021	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2022	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	2023	diff /= 4.0;
…		…
2378	find_dir (mapstruct m, int x, int y, object exclude)	2342	find_dir (mapstruct m, int x, int y, object exclude)
2379	{	2343	{
2380	int	2344	int
2381	i,	2345	i,
2382	max = SIZEOFFREE, mflags;	2346	max = SIZEOFFREE, mflags;
2383	sint16	2347
2384	nx,	2348	sint16 nx, ny;
2385	ny;
2386	object *	2349	object *
2387	tmp;	2350	tmp;
2388	mapstruct *	2351	mapstruct *
2389	mp;	2352	mp;
2390	MoveType	2353
2391	blocked,	2354	MoveType blocked, move_type;
2392	move_type;
2393		2355
2394	if (exclude && exclude->head)	2356	if (exclude && exclude->head)
2395	{	2357	{
2396	exclude = exclude->head;	2358	exclude = exclude->head;
2397	move_type = exclude->move_type;	2359	move_type = exclude->move_type;
…		…
2604		2566
2605		2567
2606	int	2568	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2569	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2608	{	2570	{
2609	sint16	2571	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2572	int
2613	mflags;	2573	mflags;
2614		2574
2615	if (dir < 0)	2575	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2576	return 0; /* exit condition: invalid direction */
…		…
2741		2701
2742	if (tempfile == NULL)	2702	if (tempfile == NULL)
2743	{	2703	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2704	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2705	return NULL;
2746	};	2706	}
		2707
2747	fprintf (tempfile, obstr);	2708	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2709	fclose (tempfile);
2749		2710
2750	op = get_object ();	2711	op = get_object ();
2751		2712
2752	object_thawer	2713	object_thawer thawer (filename);
2753	thawer (filename);
2754		2714
2755	if (thawer)	2715	if (thawer)
2756	load_object (thawer, op, 0);	2716	load_object (thawer, op, 0);
2757		2717
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2718	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2809	* The returned string is shared.	2769	* The returned string is shared.
2810	*/	2770	*/
2811	const char *	2771	const char *
2812	get_ob_key_value (const object op, const char const key)	2772	get_ob_key_value (const object op, const char const key)
2813	{	2773	{
2814	key_value *	2774	key_value *link;
2815	link;	2775	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2776
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2777	if (!canonical_key)
2822	{	2778	{
2823	/* 1. There being a field named key on any object	2779	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2780	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2781	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, this object doesn't have this field.	2782	* 3. Therefore, this object doesn't have this field.
2827	*/	2783	*/
2828	return NULL;	2784	return 0;
2829	}	2785	}
2830		2786
2831	/* This is copied from get_ob_key_link() above -	2787	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2788	* only 4 lines, and saves the function call overhead.
2833	*/	2789	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2790	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2791	if (link->key == canonical_key)
2837	{
2838	return link->value;	2792	return link->value;
2839	}	2793
2840	}
2841	return NULL;	2794	return 0;
2842	}	2795	}
2843		2796
2844		2797
2845	/*	2798	/*
2846	* Updates the canonical_key in op to value.	2799	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2835	if (last)
2883	last->next = field->next;	2836	last->next = field->next;
2884	else	2837	else
2885	op->key_values = field->next;	2838	op->key_values = field->next;
2886		2839
2887	delete
2888	field;	2840	delete field;
2889	}	2841	}
2890	}	2842	}
2891	return TRUE;	2843	return TRUE;
2892	}	2844	}
2893	/* IF we get here, key doesn't exist */	2845	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2880	* Returns TRUE on success.
2929	*/	2881	*/
2930	int	2882	int
2931	set_ob_key_value (object op, const char key, const char *value, int add_key)	2883	set_ob_key_value (object op, const char key, const char *value, int add_key)
2932	{	2884	{
2933	shstr
2934	key_ (key);	2885	shstr key_ (key);
2935		2886
2936	return set_ob_key_value_s (op, key_, value, add_key);	2887	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2888	}
		2889
		2890	object::depth_iterator::depth_iterator (object *container)
		2891	: iterator_base (container)
		2892	{
		2893	while (item->inv)
		2894	item = item->inv;
		2895	}
		2896
		2897	void
		2898	object::depth_iterator::next ()
		2899	{
		2900	if (item->below)
		2901	{
		2902	item = item->below;
		2903
		2904	while (item->inv)
		2905	item = item->inv;
		2906	}
		2907	else
		2908	item = item->env;
		2909	}
		2910
		2911	// return a suitable string describing an objetc in enough detail to find it
		2912	const char *
		2913	object::debug_desc (char *info) const
		2914	{
		2915	char info2[256 * 3];
		2916	char *p = info;
		2917
		2918	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2919	count,
		2920	&name,
		2921	title ? " " : "",
		2922	title ? (const char *)title : "");
		2923
		2924	if (env)
		2925	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2926
		2927	if (map)
		2928	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2929
		2930	return info;
		2931	}
		2932
		2933	const char *
		2934	object::debug_desc () const
		2935	{
		2936	static char info[256 * 3];
		2937	return debug_desc (info);
		2938	}
		2939

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs. Revision 1.44 by root, Thu Sep 14 17:29:27 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.44 by root, Thu Sep 14 17:29:27 2006 UTC