ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 root Exp $";
5	*/
6		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;
44		37
45	object *objects; /* Pointer to the list of used objects */	38	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
47		40
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	207	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	208	return 0;
216		209
217	switch (ob1->type)	210	switch (ob1->type)
218	{	211	{
219	case SCROLL:	212	case SCROLL:
220	if (ob1->level != ob2->level)	213	if (ob1->level != ob2->level)
221	return 0;	214	return 0;
222	break;	215	break;
223	}	216	}
224		217
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	218	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	219	{
227	/* At least one of these has key_values. */	220	/* At least one of these has key_values. */
…		…
249	/*	242	/*
250	* sum_weight() is a recursive function which calculates the weight	243	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	244	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	245	* containers are carrying, and sums it up.
253	*/	246	*/
254	signed long	247	long
255	sum_weight (object *op)	248	sum_weight (object *op)
256	{	249	{
257	signed long sum;	250	long sum;
258	object *inv;	251	object *inv;
259		252
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	253	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	254	{
262	if (inv->inv)	255	if (inv->inv)
263	sum_weight (inv);	256	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	258	}
		259
266	if (op->type == CONTAINER && op->stats.Str)	260	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	261	sum = (sum * (100 - op->stats.Str)) / 100;
		262
268	if (op->carrying != sum)	263	if (op->carrying != sum)
269	op->carrying = sum;	264	op->carrying = sum;
		265
270	return sum;	266	return sum;
271	}	267	}
272		268
273	/**	269	/**
274	* Return the outermost environment object for a given object.	270	* Return the outermost environment object for a given object.
…		…
423	*/	419	*/
424		420
425	object *	421	object *
426	find_object_name (const char *str)	422	find_object_name (const char *str)
427	{	423	{
428	const char *name = shstr::find (str);	424	shstr_cmp str_ (str);
429	object *op;	425	object *op;
430		426
431	for (op = objects; op != NULL; op = op->next)	427	for (op = objects; op != NULL; op = op->next)
432	if (&op->name == name)	428	if (op->name == str_)
433	break;	429	break;
434		430
435	return op;	431	return op;
436	}	432	}
437		433
…		…
449	* Changed 2004-02-12 - if the player is setting at the play again	445	* 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	446	* 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	447	* 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.	448	* anything - once an object is removed, it is basically dead anyways.
453	*/	449	*/
454
455	object *	450	object *
456	get_owner (object *op)	451	object::get_owner ()
457	{	452	{
458	if (op->owner == NULL)	453	if (!owner
459	return NULL;	454	|| QUERY_FLAG (owner, FLAG_FREED)
		455	|| QUERY_FLAG (owner, FLAG_REMOVED))
		456	owner = 0;
460		457
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;	458	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	}	459	}
481		460
482	/*	461	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	462	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	463	* skill and experience objects.
485	*/	464	*/
486	void	465	void
487	set_owner (object *op, object *owner)	466	object::set_owner (object *owner)
488	{	467	{
489	if (owner == NULL || op == NULL)	468	if (!owner)
490	return;	469	return;
491		470
492	/* next line added to allow objects which own objects */	471	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	472	/* 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	473	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	474	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	475	* 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.	476	* didn't match, this check is valid and I believe that cause is valid.
498	*/	477	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	478	while (owner->owner)
500	owner = owner->owner;	479	owner = owner->owner;
501		480
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;	481	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	482	}
543		483
544	/* Zero the key_values on op, decrementing the shared-string	484	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	485	* refcounts and freeing the links.
546	*/	486	*/
…		…
562	{	502	{
563	attachable_base::clear ();	503	attachable_base::clear ();
564		504
565	free_key_values (this);	505	free_key_values (this);
566		506
		507	owner = 0;
567	name = 0;	508	name = 0;
568	name_pl = 0;	509	name_pl = 0;
569	title = 0;	510	title = 0;
570	race = 0;	511	race = 0;
571	slaying = 0;	512	slaying = 0;
572	skill = 0;	513	skill = 0;
573	msg = 0;	514	msg = 0;
574	lore = 0;	515	lore = 0;
575	custom_name = 0;	516	custom_name = 0;
576	materialname = 0;	517	materialname = 0;
		518	contr = 0;
		519	below = 0;
		520	above = 0;
		521	inv = 0;
		522	container = 0;
		523	env = 0;
		524	more = 0;
		525	head = 0;
		526	map = 0;
		527	active_next = 0;
		528	active_prev = 0;
577		529
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	530	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		531
580	SET_FLAG (this, FLAG_REMOVED);	532	SET_FLAG (this, FLAG_REMOVED);
		533
		534	/* What is not cleared is next, prev, and count */
		535
		536	expmul = 1.0;
		537	face = blank_face;
		538	attacked_by_count = -1;
		539
		540	if (settings.casting_time)
		541	casting_time = -1;
581	}	542	}
582		543
583	void object::clone (object *destination)	544	void object::clone (object *destination)
584	{	545	{
585	*(object_copy *) destination = *this;	546	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	547	*(object_pod *)destination = *this;
587		548
588	if (self || cb)	549	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	550	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}	551	}
623		552
624	/*	553	/*
625	* copy object first frees everything allocated by the second object,	554	* copy object first frees everything allocated by the second object,
626	* and then copies the contends of the first object into the second	555	* and then copies the contends of the first object into the second
627	* object, allocating what needs to be allocated. Basically, any	556	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	558	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	559	* will point at garbage.
631	*/	560	*/
632
633	void	561	void
634	copy_object (object *op2, object *op)	562	copy_object (object *op2, object *op)
635	{	563	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	564	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	565	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	625	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	626	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	627	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	628	* This function needs to be called whenever the speed of an object changes.
701	*/	629	*/
702
703	void	630	void
704	update_ob_speed (object *op)	631	update_ob_speed (object *op)
705	{	632	{
706	extern int arch_init;	633	extern int arch_init;
707		634
…		…
716	abort ();	643	abort ();
717	#else	644	#else
718	op->speed = 0;	645	op->speed = 0;
719	#endif	646	#endif
720	}	647	}
		648
721	if (arch_init)	649	if (arch_init)
722	{
723	return;	650	return;
724	}	651
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	652	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	653	{
727	/* If already on active list, don't do anything */	654	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	655	if (op->active_next || op->active_prev || op == active_objects)
729	return;	656	return;
730		657
731	/* process_events() expects us to insert the object at the beginning	658	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	659	* of the list. */
733	op->active_next = active_objects;	660	op->active_next = active_objects;
		661
734	if (op->active_next != NULL)	662	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	663	op->active_next->active_prev = op;
		664
736	active_objects = op;	665	active_objects = op;
737	}	666	}
738	else	667	else
739	{	668	{
740	/* If not on the active list, nothing needs to be done */	669	/* If not on the active list, nothing needs to be done */
…		…
742	return;	671	return;
743		672
744	if (op->active_prev == NULL)	673	if (op->active_prev == NULL)
745	{	674	{
746	active_objects = op->active_next;	675	active_objects = op->active_next;
		676
747	if (op->active_next != NULL)	677	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	678	op->active_next->active_prev = NULL;
749	}	679	}
750	else	680	else
751	{	681	{
752	op->active_prev->active_next = op->active_next;	682	op->active_prev->active_next = op->active_next;
		683
753	if (op->active_next)	684	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	685	op->active_next->active_prev = op->active_prev;
755	}	686	}
		687
756	op->active_next = NULL;	688	op->active_next = NULL;
757	op->active_prev = NULL;	689	op->active_prev = NULL;
758	}	690	}
759	}	691	}
760		692
…		…
890	/* if the object is being removed, we can't make intelligent	822	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	823	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	824	* that is being removed.
893	*/	825	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	827	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	828	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	829	/* Nothing to do for that case */ ;
901	}
902	else	830	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	831	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		832
907	if (update_now)	833	if (update_now)
908	{	834	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	835	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);	836	update_position (op->map, op->x, op->y);
…		…
912		838
913	if (op->more != NULL)	839	if (op->more != NULL)
914	update_object (op->more, action);	840	update_object (op->more, action);
915	}	841	}
916		842
917	static	843	static unordered_vector<object *> mortals;
918	std::vector < object *>	844	static std::vector<object *, slice_allocator <object *> > freed;
919	mortals;
920		845
921	void object::free_mortals ()	846	void object::free_mortals ()
922	{	847	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	delete *	849	if ((*i)->refcnt)
		850	++i; // further delay freeing
		851	else
925	i;	852	{
		853	freed.push_back (*i);//D
		854	//delete *i;
		855	mortals.erase (i);
		856	}
926		857
927	mortals.clear ();	858	if (mortals.size() && 0)//D
		859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
928	}	860	}
929		861
930	object::object ()	862	object::object ()
931	{	863	{
932	SET_FLAG (this, FLAG_REMOVED);	864	SET_FLAG (this, FLAG_REMOVED);
…		…
958	{	890	{
959	count = 0;	891	count = 0;
960		892
961	/* Remove this object from the list of used objects */	893	/* Remove this object from the list of used objects */
962	if (prev)	894	if (prev)
		895	{
963	prev->next = next;	896	prev->next = next;
		897	prev = 0;
		898	}
		899
964	if (next)	900	if (next)
		901	{
965	next->prev = prev;	902	next->prev = prev;
		903	next = 0;
		904	}
		905
966	if (this == objects)	906	if (this == objects)
967	objects = next;	907	objects = next;
968	}	908	}
969		909
970	object *object::create ()	910	object *object::create ()
971	{	911	{
972	object *	912	object *op;
		913
		914	if (freed.empty ())
973	op = new object;	915	op = new object;
		916	else
		917	{
		918	// highly annoying, but the only way to get it stable right now
		919	op = freed.back ();
		920	freed.pop_back ();
		921	op->~object ();
		922	new ((void *) op) object;
		923	}
974		924
975	op->link ();	925	op->link ();
976	return op;	926	return op;
977	}	927	}
978		928
…		…
986	* If free_inventory is set, free inventory as well. Else drop items in	936	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	937	* inventory to the ground.
988	*/	938	*/
989	void object::free (bool free_inventory)	939	void object::free (bool free_inventory)
990	{	940	{
		941	if (QUERY_FLAG (this, FLAG_FREED))
		942	return;
		943
		944	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		945	remove_friendly_object (this);
		946
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	947	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	948	remove_ob (this);
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		949
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	950	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		951
1013	if (more)	952	if (more)
1014	{	953	{
1015	more->free (free_inventory);	954	more->free (free_inventory);
1016	more = 0;	955	more = 0;
…		…
1020	{	959	{
1021	/* Only if the space blocks everything do we not process -	960	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	961	* if some form of movement is allowed, let objects
1023	* drop on that space.	962	* drop on that space.
1024	*/	963	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	965	{
1027	object *	966	object *op = inv;
1028	op = inv;
1029		967
1030	while (op)	968	while (op)
1031	{	969	{
1032	object *
1033	tmp = op->below;	970	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	971	op->free (free_inventory);
1037	op = tmp;	972	op = tmp;
1038	}	973	}
1039	}	974	}
1040	else	975	else
1041	{ /* Put objects in inventory onto this space */	976	{ /* Put objects in inventory onto this space */
1042	object *	977	object *op = inv;
1043	op = inv;
1044		978
1045	while (op)	979	while (op)
1046	{	980	{
1047	object *
1048	tmp = op->below;	981	object *tmp = op->below;
1049		982
1050	remove_ob (op);	983	remove_ob (op);
1051		984
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	986	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	995	op = tmp;
1063	}	996	}
1064	}	997	}
1065	}	998	}
1066		999
		1000	owner = 0;
		1001
1067	/* Remove object from the active list */	1002	/* Remove object from the active list */
1068	speed = 0;	1003	speed = 0;
1069	update_ob_speed (this);	1004	update_ob_speed (this);
1070		1005
1071	unlink ();	1006	unlink ();
1072
1073	SET_FLAG (this, FLAG_FREED);
1074		1007
1075	mortals.push_back (this);	1008	mortals.push_back (this);
1076	}	1009	}
1077		1010
1078	/*	1011	/*
…		…
1109	object *	1042	object *
1110	tmp, *	1043	tmp, *
1111	last = NULL;	1044	last = NULL;
1112	object *	1045	object *
1113	otmp;	1046	otmp;
		1047
1114	tag_t	1048	tag_t
1115	tag;	1049	tag;
1116	int	1050	int
1117	check_walk_off;	1051	check_walk_off;
1118	mapstruct *	1052	mapstruct *
1119	m;	1053	m;
		1054
1120	sint16	1055	sint16
1121	x,	1056	x,
1122	y;	1057	y;
1123		1058
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1059	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1060	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1061
1130	/* Changed it to always dump core in this case. As has been learned	1062	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1063
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)	1064	if (op->more != NULL)
1143	remove_ob (op->more);	1065	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1066
1147	/*	1067	/*
1148	* In this case, the object to be removed is in someones	1068	* In this case, the object to be removed is in someones
1149	* inventory.	1069	* inventory.
1150	*/	1070	*/
…		…
1176	*/	1096	*/
1177	op->x = op->env->x, op->y = op->env->y;	1097	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1098	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1099	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1100	op->env = NULL;
1181	return;	1101	}
		1102	else if (op->map)
1182	}	1103	{
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;	1104	x = op->x;
1189	y = op->y;	1105	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1106	m = get_map_from_coord (op->map, &x, &y);
1191		1107
1192	if (!m)	1108	if (!m)
1193	{	1109	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1110	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1195	op->map->path, op->x, op->y);	1111	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.	1112	/* in old days, we used to set x and y to 0 and continue.
1197	* it seems if we get into this case, something is probablye	1113	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.	1114	* screwed up and should be fixed.
		1115	*/
		1116	abort ();
		1117	}
		1118
		1119	if (op->map != m)
		1120	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1121	op->map->path, m->path, op->x, op->y, x, y);
		1122
		1123	/* Re did the following section of code - it looks like it had
		1124	* lots of logic for things we no longer care about
1199	*/	1125	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1126
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1127	/* link the object above us */
1213	if (op->above)	1128	if (op->above)
1214	op->above->below = op->below;	1129	op->above->below = op->below;
1215	else	1130	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217		1132
1218	/* Relink the object below us, if there is one */	1133	/* Relink the object below us, if there is one */
1219	if (op->below)	1134	if (op->below)
1220	{
1221	op->below->above = op->above;	1135	op->below->above = op->above;
1222	}
1223	else	1136	else
1224	{	1137	{
1225	/* Nothing below, which means we need to relink map object for this space	1138	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	1139	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1140	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1141	*/
1259	if (tmp->container == op)	1142	if (GET_MAP_OB (m, x, y) != op)
1260	{	1143	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1144	dump_object (op);
1262	tmp->container = NULL;	1145	LOG (llevError,
		1146	"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);
		1147	dump_object (GET_MAP_OB (m, x, y));
		1148	LOG (llevError, "%s\n", errmsg);
1263	}	1149	}
1264	tmp->contr->socket.update_look = 1;	1150
1265	}	1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1152	}
1269		1153
1270	move_apply (tmp, op, NULL);	1154	op->above = 0;
1271	if (was_destroyed (op, tag))	1155	op->below = 0;
		1156
		1157	if (op->map->in_memory == MAP_SAVING)
		1158	return;
		1159
		1160	tag = op->count;
		1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1162
		1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1164	{
		1165	/* No point updating the players look faces if he is the object
		1166	* being removed.
		1167	*/
		1168
		1169	if (tmp->type == PLAYER && tmp != op)
1272	{	1170	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1171	/* If a container that the player is currently using somehow gets
		1172	* removed (most likely destroyed), update the player view
		1173	* appropriately.
		1174	*/
		1175	if (tmp->container == op)
		1176	{
		1177	CLEAR_FLAG (op, FLAG_APPLIED);
		1178	tmp->container = NULL;
		1179	}
		1180
		1181	tmp->contr->socket.update_look = 1;
1274	}	1182	}
		1183
		1184	/* See if player moving off should effect something */
		1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1186	{
		1187	move_apply (tmp, op, NULL);
		1188
		1189	if (was_destroyed (op, tag))
		1190	{
		1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1192	}
1275	}	1193	}
1276		1194
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1196
1279	if (tmp->above == tmp)	1197	if (tmp->above == tmp)
1280	tmp->above = NULL;	1198	tmp->above = NULL;
		1199
1281	last = tmp;	1200	last = tmp;
1282	}	1201	}
		1202
1283	/* last == NULL of there are no objects on this space */	1203	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1204	if (last == NULL)
1285	{	1205	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1206	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1207	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1208	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1209	* be correct anyways.
1290	*/	1210	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1211	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1212	update_position (op->map, op->x, op->y);
1293	}	1213	}
1294	else	1214	else
1295	update_object (last, UP_OBJ_REMOVE);	1215	update_object (last, UP_OBJ_REMOVE);
1296		1216
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1218	update_all_los (op->map, op->x, op->y);
1299		1219	}
1300	}	1220	}
1301		1221
1302	/*	1222	/*
1303	* merge_ob(op,top):	1223	* merge_ob(op,top):
1304	*	1224	*
1305	* This function goes through all objects below and including top, and	1225	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1226	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1227	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1228	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1229	*/
1310
1311	object *	1230	object *
1312	merge_ob (object *op, object *top)	1231	merge_ob (object *op, object *top)
1313	{	1232	{
1314	if (!op->nrof)	1233	if (!op->nrof)
1315	return 0;	1234	return 0;
		1235
1316	if (top == NULL)	1236	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1237	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1238
1318	for (; top != NULL; top = top->below)	1239	for (; top != NULL; top = top->below)
1319	{	1240	{
1320	if (top == op)	1241	if (top == op)
1321	continue;	1242	continue;
1322	if (CAN_MERGE (op, top))	1243	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1249	remove_ob (op);
1329	free_object (op);	1250	free_object (op);
1330	return top;	1251	return top;
1331	}	1252	}
1332	}	1253	}
		1254
1333	return NULL;	1255	return NULL;
1334	}	1256	}
1335		1257
1336	/*	1258	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1260	* job preparing multi-part monsters
1339	*/	1261	*/
1340	object *	1262	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1342	{	1264	{
1343	object *	1265	object *tmp;
1344	tmp;
1345		1266
1346	if (op->head)	1267	if (op->head)
1347	op = op->head;	1268	op = op->head;
		1269
1348	for (tmp = op; tmp; tmp = tmp->more)	1270	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1271	{
1350	tmp->x = x + tmp->arch->clone.x;	1272	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1273	tmp->y = y + tmp->arch->clone.y;
1352	}	1274	}
		1275
1353	return insert_ob_in_map (op, m, originator, flag);	1276	return insert_ob_in_map (op, m, originator, flag);
1354	}	1277	}
1355		1278
1356	/*	1279	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1280	* insert_ob_in_map (op, map, originator, flag):
…		…
1375	*/	1298	*/
1376		1299
1377	object *	1300	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1379	{	1302	{
1380	object *	1303	object *tmp, *top, *floor = NULL;
1381	tmp, *	1304	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1305
1388	if (QUERY_FLAG (op, FLAG_FREED))	1306	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1307	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1308	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1309	return NULL;
1392	}	1310	}
		1311
1393	if (m == NULL)	1312	if (m == NULL)
1394	{	1313	{
1395	dump_object (op);	1314	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;	1316	return op;
1398	}	1317	}
		1318
1399	if (out_of_map (m, op->x, op->y))	1319	if (out_of_map (m, op->x, op->y))
1400	{	1320	{
1401	dump_object (op);	1321	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES	1323	#ifdef MANY_CORES
…		…
1407	*/	1327	*/
1408	abort ();	1328	abort ();
1409	#endif	1329	#endif
1410	return op;	1330	return op;
1411	}	1331	}
		1332
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1333	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1334	{
1414	dump_object (op);	1335	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;	1337	return op;
1417	}	1338	}
		1339
1418	if (op->more != NULL)	1340	if (op->more != NULL)
1419	{	1341	{
1420	/* The part may be on a different map. */	1342	/* The part may be on a different map. */
1421		1343
1422	object *
1423	more = op->more;	1344	object *more = op->more;
1424		1345
1425	/* We really need the caller to normalize coordinates - if	1346	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1347	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1348	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1349	* is clear wrong do we normalize it.
1429	*/	1350	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1351	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1352	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1353	else if (!more->map)
1435	{	1354	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1355	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1356	* more->map should always point to the parent.
1438	*/	1357	*/
…		…
1441		1360
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1361	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1362	{
1444	if (!op->head)	1363	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1364	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1365
1446	return NULL;	1366	return NULL;
1447	}	1367	}
1448	}	1368	}
		1369
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1370	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1371
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1372	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1373	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1374	* need extra work
…		…
1457	y = op->y;	1378	y = op->y;
1458		1379
1459	/* this has to be done after we translate the coordinates.	1380	/* this has to be done after we translate the coordinates.
1460	*/	1381	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1382	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1384	if (CAN_MERGE (op, tmp))
1465	{	1385	{
1466	op->nrof += tmp->nrof;	1386	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1387	remove_ob (tmp);
1468	free_object (tmp);	1388	free_object (tmp);
1469	}	1389	}
1470	}
1471		1390
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1393
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1394	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1395	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1396
1477	if (flag & INS_BELOW_ORIGINATOR)	1397	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1398	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1399	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1400	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1401	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1402	abort ();
1483	}	1403	}
		1404
1484	op->above = originator;	1405	op->above = originator;
1485	op->below = originator->below;	1406	op->below = originator->below;
		1407
1486	if (op->below)	1408	if (op->below)
1487	op->below->above = op;	1409	op->below->above = op;
1488	else	1410	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1411	SET_MAP_OB (op->map, op->x, op->y, op);
		1412
1490	/* since *below* originator, no need to update top */	1413	/* since *below* originator, no need to update top */
1491	originator->below = op;	1414	originator->below = op;
1492	}	1415	}
1493	else	1416	else
1494	{	1417	{
1495	/* If there are other objects, then */	1418	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1419	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1420	{
1498	object *
1499	last = NULL;	1421	object *last = NULL;
1500		1422
1501	/*	1423	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1424	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1425	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1426	* Generally, we want to put the new object on top. But if
…		…
1513		1435
1514	while (top != NULL)	1436	while (top != NULL)
1515	{	1437	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1438	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1439	floor = top;
		1440
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1441	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1442	{
1520	/* We insert above top, so we want this object below this */	1443	/* We insert above top, so we want this object below this */
1521	top = top->below;	1444	top = top->below;
1522	break;	1445	break;
1523	}	1446	}
		1447
1524	last = top;	1448	last = top;
1525	top = top->above;	1449	top = top->above;
1526	}	1450	}
		1451
1527	/* Don't want top to be NULL, so set it to the last valid object */	1452	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1453	top = last;
1529		1454
1530	/* We let update_position deal with figuring out what the space	1455	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1456	* looks like instead of lots of conditions here.
…		…
1551	*/	1476	*/
1552	if (last && last->below && last != floor)	1477	if (last && last->below && last != floor)
1553	top = last->below;	1478	top = last->below;
1554	}	1479	}
1555	} /* If objects on this space */	1480	} /* If objects on this space */
		1481
1556	if (flag & INS_MAP_LOAD)	1482	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1483	top = GET_MAP_TOP (op->map, op->x, op->y);
		1484
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1485	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1486	top = floor;
1560		1487
1561	/* Top is the object that our object (op) is going to get inserted above.	1488	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1489	*/
1563		1490
1564	/* First object on this space */	1491	/* First object on this space */
1565	if (!top)	1492	if (!top)
1566	{	1493	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1494	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1495
1568	if (op->above)	1496	if (op->above)
1569	op->above->below = op;	1497	op->above->below = op;
		1498
1570	op->below = NULL;	1499	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1500	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1501	}
1573	else	1502	else
1574	{ /* get inserted into the stack above top */	1503	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1504	op->above = top->above;
		1505
1576	if (op->above)	1506	if (op->above)
1577	op->above->below = op;	1507	op->above->below = op;
		1508
1578	op->below = top;	1509	op->below = top;
1579	top->above = op;	1510	top->above = op;
1580	}	1511	}
		1512
1581	if (op->above == NULL)	1513	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1514	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1515	} /* else not INS_BELOW_ORIGINATOR */
1584		1516
1585	if (op->type == PLAYER)	1517	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1520	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1521	* it, so save a few ticks and start from there.
1590	*/	1522	*/
1591	if (!(flag & INS_MAP_LOAD))	1523	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1525	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1526	tmp->contr->socket.update_look = 1;
1596	}
1597		1527
1598	/* If this object glows, it may affect lighting conditions that are	1528	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1529	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1530	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1531	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1535	* of effect may be sufficient.
1606	*/	1536	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1537	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1538	update_all_los (op->map, op->x, op->y);
1609		1539
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1540	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1541	update_object (op, UP_OBJ_INSERT);
1613
1614		1542
1615	/* Don't know if moving this to the end will break anything. However,	1543	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1544	* we want to have update_look set above before calling this.
1617	*	1545	*
1618	* check_move_on() must be after this because code called from	1546	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1548	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1549	* update_object().
1622	*/	1550	*/
1623		1551
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1552	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1553	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1554	{
1628	if (check_move_on (op, originator))	1555	if (check_move_on (op, originator))
1629	return NULL;	1556	return NULL;
1630		1557
…		…
1633	*/	1560	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1561	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1562	if (check_move_on (tmp, originator))
1636	return NULL;	1563	return NULL;
1637	}	1564	}
		1565
1638	return op;	1566	return op;
1639	}	1567	}
1640		1568
1641	/* this function inserts an object in the map, but if it	1569	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1570	* finds an object of its own type, it'll remove that one first.
…		…
1660	free_object (tmp);	1588	free_object (tmp);
1661	}	1589	}
1662	}	1590	}
1663		1591
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1592	tmp1 = arch_to_object (find_archetype (arch_string));
1665
1666		1593
1667	tmp1->x = op->x;	1594	tmp1->x = op->x;
1668	tmp1->y = op->y;	1595	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1596	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1597	}
…		…
1688	if (orig_ob->nrof < nr)	1615	if (orig_ob->nrof < nr)
1689	{	1616	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1618	return NULL;
1692	}	1619	}
		1620
1693	newob = object_create_clone (orig_ob);	1621	newob = object_create_clone (orig_ob);
		1622
1694	if ((orig_ob->nrof -= nr) < 1)	1623	if ((orig_ob->nrof -= nr) < 1)
1695	{	1624	{
1696	if (!is_removed)	1625	if (!is_removed)
1697	remove_ob (orig_ob);	1626	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1627	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1635	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1636	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1637	return NULL;
1709	}	1638	}
1710	}	1639	}
		1640
1711	newob->nrof = nr;	1641	newob->nrof = nr;
1712		1642
1713	return newob;	1643	return newob;
1714	}	1644	}
1715		1645
…		…
1722	*/	1652	*/
1723		1653
1724	object *	1654	object *
1725	decrease_ob_nr (object *op, uint32 i)	1655	decrease_ob_nr (object *op, uint32 i)
1726	{	1656	{
1727	object *	1657	object *tmp;
1728	tmp;
1729	player *	1658	player *pl;
1730	pl;
1731		1659
1732	if (i == 0) /* objects with op->nrof require this check */	1660	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1661	return op;
1734		1662
1735	if (i > op->nrof)	1663	if (i > op->nrof)
1736	i = op->nrof;	1664	i = op->nrof;
1737		1665
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1666	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1667	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1668	else if (op->env != NULL)
1743	{	1669	{
1744	/* is this object in the players inventory, or sub container	1670	/* is this object in the players inventory, or sub container
1745	* therein?	1671	* therein?
1746	*/	1672	*/
…		…
1781	}	1707	}
1782	}	1708	}
1783	}	1709	}
1784	else	1710	else
1785	{	1711	{
1786	object *
1787	above = op->above;	1712	object *above = op->above;
1788		1713
1789	if (i < op->nrof)	1714	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1715	op->nrof -= i;
1792	}
1793	else	1716	else
1794	{	1717	{
1795	remove_ob (op);	1718	remove_ob (op);
1796	op->nrof = 0;	1719	op->nrof = 0;
1797	}	1720	}
		1721
1798	/* Since we just removed op, op->above is null */	1722	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1723	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1724	if (tmp->type == PLAYER)
1801	{	1725	{
1802	if (op->nrof)	1726	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1729	esrv_del_item (tmp->contr, op->count);
1806	}	1730	}
1807	}	1731	}
1808		1732
1809	if (op->nrof)	1733	if (op->nrof)
1810	{
1811	return op;	1734	return op;
1812	}
1813	else	1735	else
1814	{	1736	{
1815	free_object (op);	1737	free_object (op);
1816	return NULL;	1738	return NULL;
1817	}	1739	}
…		…
1826	add_weight (object *op, signed long weight)	1748	add_weight (object *op, signed long weight)
1827	{	1749	{
1828	while (op != NULL)	1750	while (op != NULL)
1829	{	1751	{
1830	if (op->type == CONTAINER)	1752	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1753	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1754
1834	op->carrying += weight;	1755	op->carrying += weight;
1835	op = op->env;	1756	op = op->env;
1836	}	1757	}
1837	}	1758	}
1838		1759
…		…
1861	{	1782	{
1862	dump_object (op);	1783	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;	1785	return op;
1865	}	1786	}
		1787
1866	if (where == NULL)	1788	if (where == NULL)
1867	{	1789	{
1868	dump_object (op);	1790	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;	1792	return op;
1871	}	1793	}
		1794
1872	if (where->head)	1795	if (where->head)
1873	{	1796	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1798	where = where->head;
1876	}	1799	}
		1800
1877	if (op->more)	1801	if (op->more)
1878	{	1802	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1804	return op;
1881	}	1805	}
		1806
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1808	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1809	if (op->nrof)
1885	{	1810	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1979	tag;	1904	tag;
1980	mapstruct *	1905	mapstruct *
1981	m = op->map;	1906	m = op->map;
1982	int	1907	int
1983	x = op->x, y = op->y;	1908	x = op->x, y = op->y;
		1909
1984	MoveType	1910	MoveType
1985	move_on,	1911	move_on,
1986	move_slow,	1912	move_slow,
1987	move_block;	1913	move_block;
1988		1914
…		…
2022	* we don't need to check all of them.	1948	* we don't need to check all of them.
2023	*/	1949	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1950	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1951	break;
2026	}	1952	}
		1953
2027	for (; tmp != NULL; tmp = tmp->below)	1954	for (; tmp; tmp = tmp->below)
2028	{	1955	{
2029	if (tmp == op)	1956	if (tmp == op)
2030	continue; /* Can't apply yourself */	1957	continue; /* Can't apply yourself */
2031		1958
2032	/* Check to see if one of the movement types should be slowed down.	1959	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1967	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1968	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1969	{
2043		1970
2044	float	1971	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1972	diff = tmp->move_slow_penalty * FABS (op->speed);
		1973
2048	if (op->type == PLAYER)	1974	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1975	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1976	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1977	diff /= 4.0;
2054	}	1978
2055	}
2056	op->speed_left -= diff;	1979	op->speed_left -= diff;
2057	}	1980	}
2058	}	1981	}
2059		1982
2060	/* Basically same logic as above, except now for actual apply. */	1983	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1986	{
2064
2065	move_apply (tmp, op, originator);	1987	move_apply (tmp, op, originator);
		1988
2066	if (was_destroyed (op, tag))	1989	if (was_destroyed (op, tag))
2067	return 1;	1990	return 1;
2068		1991
2069	/* what the person/creature stepped onto has moved the object	1992	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1993	* someplace new. Don't process any further - if we did,
…		…
2072	*/	1995	*/
2073	if (op->map != m || op->x != x || op->y != y)	1996	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1997	return 0;
2075	}	1998	}
2076	}	1999	}
		2000
2077	return 0;	2001	return 0;
2078	}	2002	}
2079		2003
2080	/*	2004	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	2005	* present_arch(arch, map, x, y) searches for any objects with
…		…
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2296	find_dir (mapstruct *m, int x, int y, object *exclude)
2373	{	2297	{
2374	int	2298	int
2375	i,	2299	i,
2376	max = SIZEOFFREE, mflags;	2300	max = SIZEOFFREE, mflags;
2377	sint16	2301
2378	nx,	2302	sint16 nx, ny;
2379	ny;
2380	object *	2303	object *
2381	tmp;	2304	tmp;
2382	mapstruct *	2305	mapstruct *
2383	mp;	2306	mp;
2384	MoveType	2307
2385	blocked,	2308	MoveType blocked, move_type;
2386	move_type;
2387		2309
2388	if (exclude && exclude->head)	2310	if (exclude && exclude->head)
2389	{	2311	{
2390	exclude = exclude->head;	2312	exclude = exclude->head;
2391	move_type = exclude->move_type;	2313	move_type = exclude->move_type;
…		…
2598		2520
2599		2521
2600	int	2522	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2602	{	2524	{
2603	sint16	2525	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2526	int
2607	mflags;	2527	mflags;
2608		2528
2609	if (dir < 0)	2529	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2530	return 0; /* exit condition: invalid direction */
…		…
2741	fprintf (tempfile, obstr);	2661	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2662	fclose (tempfile);
2743		2663
2744	op = get_object ();	2664	op = get_object ();
2745		2665
2746	object_thawer	2666	object_thawer thawer (filename);
2747	thawer (filename);
2748		2667
2749	if (thawer)	2668	if (thawer)
2750	load_object (thawer, op, 0);	2669	load_object (thawer, op, 0);
2751		2670
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2671	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2803	* The returned string is shared.	2722	* The returned string is shared.
2804	*/	2723	*/
2805	const char *	2724	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2725	get_ob_key_value (const object *op, const char *const key)
2807	{	2726	{
2808	key_value *	2727	key_value *link;
2809	link;	2728	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2729
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2730	if (!canonical_key)
2816	{	2731	{
2817	/* 1. There being a field named key on any object	2732	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2733	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2734	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2735	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2736	*/
2822	return NULL;	2737	return 0;
2823	}	2738	}
2824		2739
2825	/* This is copied from get_ob_key_link() above -	2740	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2741	* only 4 lines, and saves the function call overhead.
2827	*/	2742	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2743	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2744	if (link->key == canonical_key)
2831	{
2832	return link->value;	2745	return link->value;
2833	}	2746
2834	}
2835	return NULL;	2747	return 0;
2836	}	2748	}
2837		2749
2838		2750
2839	/*	2751	/*
2840	* Updates the canonical_key in op to value.	2752	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2788	if (last)
2877	last->next = field->next;	2789	last->next = field->next;
2878	else	2790	else
2879	op->key_values = field->next;	2791	op->key_values = field->next;
2880		2792
2881	delete
2882	field;	2793	delete field;
2883	}	2794	}
2884	}	2795	}
2885	return TRUE;	2796	return TRUE;
2886	}	2797	}
2887	/* IF we get here, key doesn't exist */	2798	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2833	* Returns TRUE on success.
2923	*/	2834	*/
2924	int	2835	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2836	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2837	{
2927	shstr
2928	key_ (key);	2838	shstr key_ (key);
2929		2839
2930	return set_ob_key_value_s (op, key_, value, add_key);	2840	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2841	}
		2842
		2843	object::depth_iterator::depth_iterator (object *container)
		2844	: iterator_base (container)
		2845	{
		2846	while (item->inv)
		2847	item = item->inv;
		2848	}
		2849
		2850	void
		2851	object::depth_iterator::next ()
		2852	{
		2853	if (item->below)
		2854	{
		2855	item = item->below;
		2856
		2857	while (item->inv)
		2858	item = item->inv;
		2859	}
		2860	else
		2861	item = item->env;
		2862	}
		2863
		2864	// return a suitable string describing an objetc in enough detail to find it
		2865	const char *
		2866	object::debug_desc (char *info) const
		2867	{
		2868	char info2[256 * 3];
		2869	char *p = info;
		2870
		2871	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2872	count,
		2873	&name,
		2874	title ? " " : "",
		2875	title ? (const char *)title : "");
		2876
		2877	if (env)
		2878	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2879
		2880	if (map)
		2881	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2882
		2883	return info;
		2884	}
		2885
		2886	const char *
		2887	object::debug_desc () const
		2888	{
		2889	static char info[256 * 3];
		2890	return debug_desc (info);
		2891	}
		2892

Diff Legend

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