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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 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
…		…
449	* Changed 2004-02-12 - if the player is setting at the play again	524	* 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	525	* 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	526	* 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.	527	* anything - once an object is removed, it is basically dead anyways.
453	*/	528	*/
454
455	object *	529	object *
456	get_owner (object *op)	530	object::get_owner ()
457	{	531	{
458	if (op->owner == NULL)	532	if (!owner
459	return NULL;	533	\|\| QUERY_FLAG (owner, FLAG_FREED)
		534	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
		535	owner = 0;
460		536
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;	537	return 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	}	538	}
481		539
482	/*	540	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	541	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	542	* skill and experience objects.
485	*/	543	*/
486	void	544	void
487	set_owner (object op, object owner)	545	object::set_owner (object *owner)
488	{	546	{
489	if (owner == NULL \|\| op == NULL)	547	if (!owner)
490	return;	548	return;
491		549
492	/* next line added to allow objects which own objects */	550	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	551	/* 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	552	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	553	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	554	* 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.	555	* didn't match, this check is valid and I believe that cause is valid.
498	*/	556	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	557	while (owner->owner)
500	owner = owner->owner;	558	owner = owner->owner;
501		559
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;	560	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	}	561	}
542		562
543	/* Zero the key_values on op, decrementing the shared-string	563	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	564	* refcounts and freeing the links.
545	*/	565	*/
…		…
561	{	581	{
562	attachable_base::clear ();	582	attachable_base::clear ();
563		583
564	free_key_values (this);	584	free_key_values (this);
565		585
566	clear_owner (this);	586	owner = 0;
567
568	name = 0;	587	name = 0;
569	name_pl = 0;	588	name_pl = 0;
570	title = 0;	589	title = 0;
571	race = 0;	590	race = 0;
572	slaying = 0;	591	slaying = 0;
573	skill = 0;	592	skill = 0;
574	msg = 0;	593	msg = 0;
575	lore = 0;	594	lore = 0;
576	custom_name = 0;	595	custom_name = 0;
577	materialname = 0;	596	materialname = 0;
		597	contr = 0;
		598	below = 0;
		599	above = 0;
		600	inv = 0;
		601	container = 0;
		602	env = 0;
		603	more = 0;
		604	head = 0;
		605	map = 0;
		606	active_next = 0;
		607	active_prev = 0;
578		608
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	609	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		610
581	SET_FLAG (this, FLAG_REMOVED);	611	SET_FLAG (this, FLAG_REMOVED);
		612
		613	/* What is not cleared is next, prev, and count */
		614
		615	expmul = 1.0;
		616	face = blank_face;
		617	attacked_by_count = -1;
		618
		619	if (settings.casting_time)
		620	casting_time = -1;
582	}	621	}
583		622
584	void object::clone (object *destination)	623	void object::clone (object *destination)
585	{	624	{
586	(object_copy ) destination = *this;	625	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	626	(object_pod )destination = *this;
588		627
589	if (self \|\| cb)	628	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	629	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	}	630	}
624		631
625	/*	632	/*
626	* copy object first frees everything allocated by the second object,	633	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	634	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	635	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	636	* 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	637	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	638	* will point at garbage.
632	*/	639	*/
633
634	void	640	void
635	copy_object (object op2, object op)	641	copy_object (object op2, object op)
636	{	642	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	643	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	644	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	704	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	705	* 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.	706	* 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.	707	* This function needs to be called whenever the speed of an object changes.
702	*/	708	*/
703
704	void	709	void
705	update_ob_speed (object *op)	710	update_ob_speed (object *op)
706	{	711	{
707	extern int arch_init;	712	extern int arch_init;
708		713
…		…
717	abort ();	722	abort ();
718	#else	723	#else
719	op->speed = 0;	724	op->speed = 0;
720	#endif	725	#endif
721	}	726	}
		727
722	if (arch_init)	728	if (arch_init)
723	{
724	return;	729	return;
725	}	730
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	731	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	732	{
728	/* If already on active list, don't do anything */	733	/* If already on active list, don't do anything */
729	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	734	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
730	return;	735	return;
731		736
732	/* process_events() expects us to insert the object at the beginning	737	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	738	* of the list. */
734	op->active_next = active_objects;	739	op->active_next = active_objects;
		740
735	if (op->active_next != NULL)	741	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	742	op->active_next->active_prev = op;
		743
737	active_objects = op;	744	active_objects = op;
738	}	745	}
739	else	746	else
740	{	747	{
741	/* If not on the active list, nothing needs to be done */	748	/* If not on the active list, nothing needs to be done */
…		…
743	return;	750	return;
744		751
745	if (op->active_prev == NULL)	752	if (op->active_prev == NULL)
746	{	753	{
747	active_objects = op->active_next;	754	active_objects = op->active_next;
		755
748	if (op->active_next != NULL)	756	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	757	op->active_next->active_prev = NULL;
750	}	758	}
751	else	759	else
752	{	760	{
753	op->active_prev->active_next = op->active_next;	761	op->active_prev->active_next = op->active_next;
		762
754	if (op->active_next)	763	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	764	op->active_next->active_prev = op->active_prev;
756	}	765	}
		766
757	op->active_next = NULL;	767	op->active_next = NULL;
758	op->active_prev = NULL;	768	op->active_prev = NULL;
759	}	769	}
760	}	770	}
761		771
…		…
891	/* if the object is being removed, we can't make intelligent	901	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	902	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	903	* that is being removed.
894	*/	904	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	905	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	906	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	907	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	908	/* Nothing to do for that case */ ;
902	}
903	else	909	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	910	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		911
908	if (update_now)	912	if (update_now)
909	{	913	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);	914	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	915	update_position (op->map, op->x, op->y);
…		…
914	if (op->more != NULL)	918	if (op->more != NULL)
915	update_object (op->more, action);	919	update_object (op->more, action);
916	}	920	}
917		921
918	static unordered_vector<object *> mortals;	922	static unordered_vector<object *> mortals;
919	static std::vector<object *> freed;	923	static std::vector<object , slice_allocator <object > > freed;
920		924
921	void object::free_mortals ()	925	void object::free_mortals ()
922	{	926	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	927	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	if (!(*i)->refcount)	928	if ((*i)->refcnt)
		929	++i; // further delay freeing
		930	else
925	{	931	{
926	freed.push_back (*i);	932	//freed.push_back (*i);//D
		933	delete *i;
927	mortals.erase (i);	934	mortals.erase (i);
928	}	935	}
929	else	936
930	++i;	937	if (mortals.size() && 0)//D
		938	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
931	}	939	}
932		940
933	object::object ()	941	object::object ()
934	{	942	{
935	SET_FLAG (this, FLAG_REMOVED);	943	SET_FLAG (this, FLAG_REMOVED);
…		…
958	}	966	}
959		967
960	void object::unlink ()	968	void object::unlink ()
961	{	969	{
962	count = 0;	970	count = 0;
		971	uuid = gen_uuid ();
		972
		973	if (this == objects)
		974	objects = next;
963		975
964	/* Remove this object from the list of used objects */	976	/* Remove this object from the list of used objects */
965	if (prev)	977	if (prev)
966	{	978	{
967	prev->next = next;	979	prev->next = next;
…		…
971	if (next)	983	if (next)
972	{	984	{
973	next->prev = prev;	985	next->prev = prev;
974	next = 0;	986	next = 0;
975	}	987	}
976
977	if (this == objects)
978	objects = next;
979	}	988	}
980		989
981	object *object::create ()	990	object *object::create ()
982	{	991	{
983	object *op;	992	object *op;
…		…
985	if (freed.empty ())	994	if (freed.empty ())
986	op = new object;	995	op = new object;
987	else	996	else
988	{	997	{
989	// highly annoying, but the only way to get it stable right now	998	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();	999	op = freed.back ();
		1000	freed.pop_back ();
991	op->~object ();	1001	op->~object ();
992	new ((void *)op) object;	1002	new ((void *) op) object;
993	}	1003	}
994		1004
995	op->link ();	1005	op->link ();
996	return op;	1006	return op;
997	}	1007	}
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	1016	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	1017	* inventory to the ground.
1008	*/	1018	*/
1009	void object::free (bool free_inventory)	1019	void object::free (bool free_inventory)
1010	{	1020	{
		1021	if (QUERY_FLAG (this, FLAG_FREED))
		1022	return;
		1023
		1024	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		1025	remove_friendly_object (this);
		1026
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	1027	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	1028	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		1029
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	1030	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		1031
1033	if (more)	1032	if (more)
1034	{	1033	{
1035	more->free (free_inventory);	1034	more->free (free_inventory);
1036	more = 0;	1035	more = 0;
…		…
1040	{	1039	{
1041	/* Only if the space blocks everything do we not process -	1040	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	1041	* if some form of movement is allowed, let objects
1043	* drop on that space.	1042	* drop on that space.
1044	*/	1043	*/
1045	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1044	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	1045	{
1047	object *	1046	object *op = inv;
1048	op = inv;
1049		1047
1050	while (op)	1048	while (op)
1051	{	1049	{
1052	object *
1053	tmp = op->below;	1050	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	1051	op->free (free_inventory);
1057	op = tmp;	1052	op = tmp;
1058	}	1053	}
1059	}	1054	}
1060	else	1055	else
1061	{ /* Put objects in inventory onto this space */	1056	{ /* Put objects in inventory onto this space */
1062	object *	1057	object *op = inv;
1063	op = inv;
1064		1058
1065	while (op)	1059	while (op)
1066	{	1060	{
1067	object *
1068	tmp = op->below;	1061	object *tmp = op->below;
1069		1062
1070	remove_ob (op);	1063	remove_ob (op);
1071		1064
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1065	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1066	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	1075	op = tmp;
1083	}	1076	}
1084	}	1077	}
1085	}	1078	}
1086		1079
1087	clear_owner (this);	1080	owner = 0;
1088		1081
1089	/* Remove object from the active list */	1082	/* Remove object from the active list */
1090	speed = 0;	1083	speed = 0;
1091	update_ob_speed (this);	1084	update_ob_speed (this);
1092		1085
1093	unlink ();	1086	unlink ();
1094
1095	SET_FLAG (this, FLAG_FREED);
1096		1087
1097	mortals.push_back (this);	1088	mortals.push_back (this);
1098	}	1089	}
1099		1090
1100	/*	1091	/*
…		…
1131	object *	1122	object *
1132	tmp, *	1123	tmp, *
1133	last = NULL;	1124	last = NULL;
1134	object *	1125	object *
1135	otmp;	1126	otmp;
		1127
1136	tag_t	1128	tag_t
1137	tag;	1129	tag;
1138	int	1130	int
1139	check_walk_off;	1131	check_walk_off;
1140	mapstruct *	1132	mapstruct *
1141	m;	1133	m;
		1134
1142	sint16	1135	sint16
1143	x,	1136	x,
1144	y;	1137	y;
1145		1138
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1139	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1140	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1141
1152	/* Changed it to always dump core in this case. As has been learned	1142	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1143
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1144	if (op->more != NULL)
1165	remove_ob (op->more);	1145	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1146
1169	/*	1147	/*
1170	* In this case, the object to be removed is in someones	1148	* In this case, the object to be removed is in someones
1171	* inventory.	1149	* inventory.
1172	*/	1150	*/
…		…
1198	*/	1176	*/
1199	op->x = op->env->x, op->y = op->env->y;	1177	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1178	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1179	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1180	op->env = NULL;
1203	return;	1181	}
		1182	else if (op->map)
1204	}	1183	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1184	x = op->x;
1211	y = op->y;	1185	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1186	m = get_map_from_coord (op->map, &x, &y);
1213		1187
1214	if (!m)	1188	if (!m)
1215	{	1189	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1190	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1191	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1192	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1193	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1194	* screwed up and should be fixed.
		1195	*/
		1196	abort ();
		1197	}
		1198
		1199	if (op->map != m)
		1200	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1201	op->map->path, m->path, op->x, op->y, x, y);
		1202
		1203	/* Re did the following section of code - it looks like it had
		1204	* lots of logic for things we no longer care about
1221	*/	1205	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1206
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1207	/* link the object above us */
1235	if (op->above)	1208	if (op->above)
1236	op->above->below = op->below;	1209	op->above->below = op->below;
1237	else	1210	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1211	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1212
1240	/* Relink the object below us, if there is one */	1213	/* Relink the object below us, if there is one */
1241	if (op->below)	1214	if (op->below)
1242	{
1243	op->below->above = op->above;	1215	op->below->above = op->above;
1244	}
1245	else	1216	else
1246	{	1217	{
1247	/* Nothing below, which means we need to relink map object for this space	1218	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1219	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1220	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	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",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1221	*/
1281	if (tmp->container == op)	1222	if (GET_MAP_OB (m, x, y) != op)
1282	{	1223	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1224	dump_object (op);
1284	tmp->container = NULL;	1225	LOG (llevError,
		1226	"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);
		1227	dump_object (GET_MAP_OB (m, x, y));
		1228	LOG (llevError, "%s\n", errmsg);
1285	}	1229	}
1286	tmp->contr->socket.update_look = 1;	1230
1287	}	1231	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1232	}
1291		1233
1292	move_apply (tmp, op, NULL);	1234	op->above = 0;
1293	if (was_destroyed (op, tag))	1235	op->below = 0;
		1236
		1237	if (op->map->in_memory == MAP_SAVING)
		1238	return;
		1239
		1240	tag = op->count;
		1241	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1242
		1243	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1244	{
		1245	/* No point updating the players look faces if he is the object
		1246	* being removed.
		1247	*/
		1248
		1249	if (tmp->type == PLAYER && tmp != op)
1294	{	1250	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1251	/* If a container that the player is currently using somehow gets
		1252	* removed (most likely destroyed), update the player view
		1253	* appropriately.
		1254	*/
		1255	if (tmp->container == op)
		1256	{
		1257	CLEAR_FLAG (op, FLAG_APPLIED);
		1258	tmp->container = NULL;
		1259	}
		1260
		1261	tmp->contr->socket.update_look = 1;
1296	}	1262	}
		1263
		1264	/* See if player moving off should effect something */
		1265	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1266	{
		1267	move_apply (tmp, op, NULL);
		1268
		1269	if (was_destroyed (op, tag))
		1270	{
		1271	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1272	}
1297	}	1273	}
1298		1274
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1275	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1276
1301	if (tmp->above == tmp)	1277	if (tmp->above == tmp)
1302	tmp->above = NULL;	1278	tmp->above = NULL;
		1279
1303	last = tmp;	1280	last = tmp;
1304	}	1281	}
		1282
1305	/* last == NULL of there are no objects on this space */	1283	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1284	if (last == NULL)
1307	{	1285	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1288	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1289	* be correct anyways.
1312	*/	1290	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1292	update_position (op->map, op->x, op->y);
1315	}	1293	}
1316	else	1294	else
1317	update_object (last, UP_OBJ_REMOVE);	1295	update_object (last, UP_OBJ_REMOVE);
1318		1296
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1298	update_all_los (op->map, op->x, op->y);
1321		1299	}
1322	}	1300	}
1323		1301
1324	/*	1302	/*
1325	* merge_ob(op,top):	1303	* merge_ob(op,top):
1326	*	1304	*
1327	* This function goes through all objects below and including top, and	1305	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1306	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1307	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1308	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1309	*/
1332
1333	object *	1310	object *
1334	merge_ob (object op, object top)	1311	merge_ob (object op, object top)
1335	{	1312	{
1336	if (!op->nrof)	1313	if (!op->nrof)
1337	return 0;	1314	return 0;
		1315
1338	if (top == NULL)	1316	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1317	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1318
1340	for (; top != NULL; top = top->below)	1319	for (; top != NULL; top = top->below)
1341	{	1320	{
1342	if (top == op)	1321	if (top == op)
1343	continue;	1322	continue;
1344	if (CAN_MERGE (op, top))	1323	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1329	remove_ob (op);
1351	free_object (op);	1330	free_object (op);
1352	return top;	1331	return top;
1353	}	1332	}
1354	}	1333	}
		1334
1355	return NULL;	1335	return NULL;
1356	}	1336	}
1357		1337
1358	/*	1338	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1339	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1340	* job preparing multi-part monsters
1361	*/	1341	*/
1362	object *	1342	object *
1363	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1343	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1364	{	1344	{
1365	object *	1345	object *tmp;
1366	tmp;
1367		1346
1368	if (op->head)	1347	if (op->head)
1369	op = op->head;	1348	op = op->head;
		1349
1370	for (tmp = op; tmp; tmp = tmp->more)	1350	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1351	{
1372	tmp->x = x + tmp->arch->clone.x;	1352	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1353	tmp->y = y + tmp->arch->clone.y;
1374	}	1354	}
		1355
1375	return insert_ob_in_map (op, m, originator, flag);	1356	return insert_ob_in_map (op, m, originator, flag);
1376	}	1357	}
1377		1358
1378	/*	1359	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1360	* insert_ob_in_map (op, map, originator, flag):
…		…
1438		1419
1439	if (op->more != NULL)	1420	if (op->more != NULL)
1440	{	1421	{
1441	/* The part may be on a different map. */	1422	/* The part may be on a different map. */
1442		1423
1443	object *
1444	more = op->more;	1424	object *more = op->more;
1445		1425
1446	/* We really need the caller to normalize coordinates - if	1426	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1427	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1428	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1429	* is clear wrong do we normalize it.
1450	*/	1430	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1431	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1432	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1433	else if (!more->map)
1456	{	1434	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1435	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1436	* more->map should always point to the parent.
1459	*/	1437	*/
…		…
1462		1440
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1441	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1442	{
1465	if (!op->head)	1443	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1444	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1445
1467	return NULL;	1446	return NULL;
1468	}	1447	}
1469	}	1448	}
1470		1449
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1450	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1515
1537	while (top != NULL)	1516	while (top != NULL)
1538	{	1517	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1518	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1519	floor = top;
		1520
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1521	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1522	{
1543	/* We insert above top, so we want this object below this */	1523	/* We insert above top, so we want this object below this */
1544	top = top->below;	1524	top = top->below;
1545	break;	1525	break;
1546	}	1526	}
		1527
1547	last = top;	1528	last = top;
1548	top = top->above;	1529	top = top->above;
1549	}	1530	}
		1531
1550	/* Don't want top to be NULL, so set it to the last valid object */	1532	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1533	top = last;
1552		1534
1553	/* We let update_position deal with figuring out what the space	1535	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1536	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1615	* of effect may be sufficient.
1634	*/	1616	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1617	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1618	update_all_los (op->map, op->x, op->y);
1637		1619
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1620	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1621	update_object (op, UP_OBJ_INSERT);
1641
1642		1622
1643	/* Don't know if moving this to the end will break anything. However,	1623	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1624	* we want to have update_look set above before calling this.
1645	*	1625	*
1646	* check_move_on() must be after this because code called from	1626	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1651	* op is the object to insert it under: supplies x and the map.
1672	*/	1652	*/
1673	void	1653	void
1674	replace_insert_ob_in_map (const char arch_string, object op)	1654	replace_insert_ob_in_map (const char arch_string, object op)
1675	{	1655	{
1676	object *tmp;	1656	object *
		1657	tmp;
1677	object *tmp1;	1658	object *
		1659	tmp1;
1678		1660
1679	/* first search for itself and remove any old instances */	1661	/* first search for itself and remove any old instances */
1680		1662
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1663	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1664	{
…		…
1713	if (orig_ob->nrof < nr)	1695	if (orig_ob->nrof < nr)
1714	{	1696	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1697	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1698	return NULL;
1717	}	1699	}
		1700
1718	newob = object_create_clone (orig_ob);	1701	newob = object_create_clone (orig_ob);
		1702
1719	if ((orig_ob->nrof -= nr) < 1)	1703	if ((orig_ob->nrof -= nr) < 1)
1720	{	1704	{
1721	if (!is_removed)	1705	if (!is_removed)
1722	remove_ob (orig_ob);	1706	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1707	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1715	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1716	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1717	return NULL;
1734	}	1718	}
1735	}	1719	}
		1720
1736	newob->nrof = nr;	1721	newob->nrof = nr;
1737		1722
1738	return newob;	1723	return newob;
1739	}	1724	}
1740		1725
…		…
1747	*/	1732	*/
1748		1733
1749	object *	1734	object *
1750	decrease_ob_nr (object *op, uint32 i)	1735	decrease_ob_nr (object *op, uint32 i)
1751	{	1736	{
1752	object *	1737	object *tmp;
1753	tmp;
1754	player *	1738	player *pl;
1755	pl;
1756		1739
1757	if (i == 0) /* objects with op->nrof require this check */	1740	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1741	return op;
1759		1742
1760	if (i > op->nrof)	1743	if (i > op->nrof)
1761	i = op->nrof;	1744	i = op->nrof;
1762		1745
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1746	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1747	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1748	else if (op->env != NULL)
1768	{	1749	{
1769	/* is this object in the players inventory, or sub container	1750	/* is this object in the players inventory, or sub container
1770	* therein?	1751	* therein?
1771	*/	1752	*/
…		…
1806	}	1787	}
1807	}	1788	}
1808	}	1789	}
1809	else	1790	else
1810	{	1791	{
1811	object *
1812	above = op->above;	1792	object *above = op->above;
1813		1793
1814	if (i < op->nrof)	1794	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1795	op->nrof -= i;
1817	}
1818	else	1796	else
1819	{	1797	{
1820	remove_ob (op);	1798	remove_ob (op);
1821	op->nrof = 0;	1799	op->nrof = 0;
1822	}	1800	}
		1801
1823	/* Since we just removed op, op->above is null */	1802	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1803	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1804	if (tmp->type == PLAYER)
1826	{	1805	{
1827	if (op->nrof)	1806	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1809	esrv_del_item (tmp->contr, op->count);
1831	}	1810	}
1832	}	1811	}
1833		1812
1834	if (op->nrof)	1813	if (op->nrof)
1835	{
1836	return op;	1814	return op;
1837	}
1838	else	1815	else
1839	{	1816	{
1840	free_object (op);	1817	free_object (op);
1841	return NULL;	1818	return NULL;
1842	}	1819	}
…		…
1851	add_weight (object *op, signed long weight)	1828	add_weight (object *op, signed long weight)
1852	{	1829	{
1853	while (op != NULL)	1830	while (op != NULL)
1854	{	1831	{
1855	if (op->type == CONTAINER)	1832	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1833	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1834
1859	op->carrying += weight;	1835	op->carrying += weight;
1860	op = op->env;	1836	op = op->env;
1861	}	1837	}
1862	}	1838	}
1863		1839
…		…
1886	{	1862	{
1887	dump_object (op);	1863	dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1864	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;	1865	return op;
1890	}	1866	}
		1867
1891	if (where == NULL)	1868	if (where == NULL)
1892	{	1869	{
1893	dump_object (op);	1870	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1871	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;	1872	return op;
1896	}	1873	}
		1874
1897	if (where->head)	1875	if (where->head)
1898	{	1876	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1877	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1878	where = where->head;
1901	}	1879	}
		1880
1902	if (op->more)	1881	if (op->more)
1903	{	1882	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1883	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1884	return op;
1906	}	1885	}
		1886
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1887	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1888	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1889	if (op->nrof)
1910	{	1890	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1891	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
2004	tag;	1984	tag;
2005	mapstruct *	1985	mapstruct *
2006	m = op->map;	1986	m = op->map;
2007	int	1987	int
2008	x = op->x, y = op->y;	1988	x = op->x, y = op->y;
		1989
2009	MoveType	1990	MoveType
2010	move_on,	1991	move_on,
2011	move_slow,	1992	move_slow,
2012	move_block;	1993	move_block;
2013		1994
…		…
2047	* we don't need to check all of them.	2028	* we don't need to check all of them.
2048	*/	2029	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	2030	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	2031	break;
2051	}	2032	}
		2033
2052	for (; tmp != NULL; tmp = tmp->below)	2034	for (; tmp; tmp = tmp->below)
2053	{	2035	{
2054	if (tmp == op)	2036	if (tmp == op)
2055	continue; /* Can't apply yourself */	2037	continue; /* Can't apply yourself */
2056		2038
2057	/* Check to see if one of the movement types should be slowed down.	2039	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2047	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	2048	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	2049	{
2068		2050
2069	float	2051	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	2052	diff = tmp->move_slow_penalty * FABS (op->speed);
		2053
2073	if (op->type == PLAYER)	2054	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2055	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2056	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	2057	diff /= 4.0;
2079	}	2058
2080	}
2081	op->speed_left -= diff;	2059	op->speed_left -= diff;
2082	}	2060	}
2083	}	2061	}
2084		2062
2085	/* Basically same logic as above, except now for actual apply. */	2063	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2064	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2065	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	2066	{
2089
2090	move_apply (tmp, op, originator);	2067	move_apply (tmp, op, originator);
		2068
2091	if (was_destroyed (op, tag))	2069	if (was_destroyed (op, tag))
2092	return 1;	2070	return 1;
2093		2071
2094	/* what the person/creature stepped onto has moved the object	2072	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	2073	* someplace new. Don't process any further - if we did,
…		…
2097	*/	2075	*/
2098	if (op->map != m \|\| op->x != x \|\| op->y != y)	2076	if (op->map != m \|\| op->x != x \|\| op->y != y)
2099	return 0;	2077	return 0;
2100	}	2078	}
2101	}	2079	}
		2080
2102	return 0;	2081	return 0;
2103	}	2082	}
2104		2083
2105	/*	2084	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	2085	* present_arch(arch, map, x, y) searches for any objects with
…		…
2397	find_dir (mapstruct m, int x, int y, object exclude)	2376	find_dir (mapstruct m, int x, int y, object exclude)
2398	{	2377	{
2399	int	2378	int
2400	i,	2379	i,
2401	max = SIZEOFFREE, mflags;	2380	max = SIZEOFFREE, mflags;
2402	sint16	2381
2403	nx,	2382	sint16 nx, ny;
2404	ny;
2405	object *	2383	object *
2406	tmp;	2384	tmp;
2407	mapstruct *	2385	mapstruct *
2408	mp;	2386	mp;
2409	MoveType	2387
2410	blocked,	2388	MoveType blocked, move_type;
2411	move_type;
2412		2389
2413	if (exclude && exclude->head)	2390	if (exclude && exclude->head)
2414	{	2391	{
2415	exclude = exclude->head;	2392	exclude = exclude->head;
2416	move_type = exclude->move_type;	2393	move_type = exclude->move_type;
…		…
2623		2600
2624		2601
2625	int	2602	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2603	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2627	{	2604	{
2628	sint16	2605	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2606	int
2632	mflags;	2607	mflags;
2633		2608
2634	if (dir < 0)	2609	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2610	return 0; /* exit condition: invalid direction */
…		…
2766	fprintf (tempfile, obstr);	2741	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2742	fclose (tempfile);
2768		2743
2769	op = get_object ();	2744	op = get_object ();
2770		2745
2771	object_thawer	2746	object_thawer thawer (filename);
2772	thawer (filename);
2773		2747
2774	if (thawer)	2748	if (thawer)
2775	load_object (thawer, op, 0);	2749	load_object (thawer, op, 0);
2776		2750
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2828	* The returned string is shared.	2802	* The returned string is shared.
2829	*/	2803	*/
2830	const char *	2804	const char *
2831	get_ob_key_value (const object op, const char const key)	2805	get_ob_key_value (const object op, const char const key)
2832	{	2806	{
2833	key_value *	2807	key_value *link;
2834	link;	2808	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2809
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2810	if (!canonical_key)
2841	{	2811	{
2842	/* 1. There being a field named key on any object	2812	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2813	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2814	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, this object doesn't have this field.	2815	* 3. Therefore, this object doesn't have this field.
2846	*/	2816	*/
2847	return NULL;	2817	return 0;
2848	}	2818	}
2849		2819
2850	/* This is copied from get_ob_key_link() above -	2820	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2821	* only 4 lines, and saves the function call overhead.
2852	*/	2822	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2823	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2824	if (link->key == canonical_key)
2856	{
2857	return link->value;	2825	return link->value;
2858	}	2826
2859	}
2860	return NULL;	2827	return 0;
2861	}	2828	}
2862		2829
2863		2830
2864	/*	2831	/*
2865	* Updates the canonical_key in op to value.	2832	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2868	if (last)
2902	last->next = field->next;	2869	last->next = field->next;
2903	else	2870	else
2904	op->key_values = field->next;	2871	op->key_values = field->next;
2905		2872
2906	delete
2907	field;	2873	delete field;
2908	}	2874	}
2909	}	2875	}
2910	return TRUE;	2876	return TRUE;
2911	}	2877	}
2912	/* IF we get here, key doesn't exist */	2878	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2913	* Returns TRUE on success.
2948	*/	2914	*/
2949	int	2915	int
2950	set_ob_key_value (object op, const char key, const char *value, int add_key)	2916	set_ob_key_value (object op, const char key, const char *value, int add_key)
2951	{	2917	{
2952	shstr
2953	key_ (key);	2918	shstr key_ (key);
2954		2919
2955	return set_ob_key_value_s (op, key_, value, add_key);	2920	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2921	}
		2922
		2923	object::depth_iterator::depth_iterator (object *container)
		2924	: iterator_base (container)
		2925	{
		2926	while (item->inv)
		2927	item = item->inv;
		2928	}
		2929
		2930	void
		2931	object::depth_iterator::next ()
		2932	{
		2933	if (item->below)
		2934	{
		2935	item = item->below;
		2936
		2937	while (item->inv)
		2938	item = item->inv;
		2939	}
		2940	else
		2941	item = item->env;
		2942	}
		2943
		2944	// return a suitable string describing an objetc in enough detail to find it
		2945	const char *
		2946	object::debug_desc (char *info) const
		2947	{
		2948	char info2[256 * 3];
		2949	char *p = info;
		2950
		2951	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2952	count,
		2953	&name,
		2954	title ? " " : "",
		2955	title ? (const char *)title : "");
		2956
		2957	if (env)
		2958	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2959
		2960	if (map)
		2961	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2962
		2963	return info;
		2964	}
		2965
		2966	const char *
		2967	object::debug_desc () const
		2968	{
		2969	static char info[256 * 3];
		2970	return debug_desc (info);
		2971	}
		2972

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs. Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC