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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 root Exp $";
5	*/
6		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>	34	#include <skills.h>
42	#include <loader.h>	35	#include <loader.h>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
44		38
45	object objects; / Pointer to the list of used objects */	39	object objects; / Pointer to the list of used objects */
46	object active_objects; / List of active objects that need to be processed */	40	object active_objects; / List of active objects that need to be processed */
47		41
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	208	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	209	return 0;
216		210
217	switch (ob1->type)	211	switch (ob1->type)
218	{	212	{
219	case SCROLL:	213	case SCROLL:
220	if (ob1->level != ob2->level)	214	if (ob1->level != ob2->level)
221	return 0;	215	return 0;
222	break;	216	break;
223	}	217	}
224		218
225	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	219	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)
226	{	220	{
227	/* At least one of these has key_values. */	221	/* At least one of these has key_values. */
…		…
249	/*	243	/*
250	* sum_weight() is a recursive function which calculates the weight	244	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	245	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	246	* containers are carrying, and sums it up.
253	*/	247	*/
254	signed long	248	long
255	sum_weight (object *op)	249	sum_weight (object *op)
256	{	250	{
257	signed long sum;	251	long sum;
258	object *inv;	252	object *inv;
259		253
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	254	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	255	{
262	if (inv->inv)	256	if (inv->inv)
…		…
449	* Changed 2004-02-12 - if the player is setting at the play again	443	* 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	444	* 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	445	* 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.	446	* anything - once an object is removed, it is basically dead anyways.
453	*/	447	*/
454
455	object *	448	object *
456	get_owner (object *op)	449	object::get_owner ()
457	{	450	{
458	if (op->owner == NULL)	451	if (!owner
459	return NULL;	452	\|\| QUERY_FLAG (owner, FLAG_FREED)
		453	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
		454	owner = 0;
460		455
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;	456	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	}	457	}
481		458
482	/*	459	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	460	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	461	* skill and experience objects.
485	*/	462	*/
486	void	463	void
487	set_owner (object op, object owner)	464	object::set_owner (object *owner)
488	{	465	{
489	if (owner == NULL \|\| op == NULL)	466	if (!owner)
490	return;	467	return;
491		468
492	/* next line added to allow objects which own objects */	469	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	470	/* 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	471	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	472	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	473	* 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.	474	* didn't match, this check is valid and I believe that cause is valid.
498	*/	475	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	476	while (owner->owner)
500	owner = owner->owner;	477	owner = owner->owner;
501		478
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;	479	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	}	480	}
542		481
543	/* Zero the key_values on op, decrementing the shared-string	482	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	483	* refcounts and freeing the links.
545	*/	484	*/
…		…
561	{	500	{
562	attachable_base::clear ();	501	attachable_base::clear ();
563		502
564	free_key_values (this);	503	free_key_values (this);
565		504
566	clear_owner (this);	505	owner = 0;
567
568	name = 0;	506	name = 0;
569	name_pl = 0;	507	name_pl = 0;
570	title = 0;	508	title = 0;
571	race = 0;	509	race = 0;
572	slaying = 0;	510	slaying = 0;
573	skill = 0;	511	skill = 0;
574	msg = 0;	512	msg = 0;
575	lore = 0;	513	lore = 0;
576	custom_name = 0;	514	custom_name = 0;
577	materialname = 0;	515	materialname = 0;
		516	contr = 0;
		517	below = 0;
		518	above = 0;
		519	inv = 0;
		520	container = 0;
		521	env = 0;
		522	more = 0;
		523	head = 0;
		524	map = 0;
		525	active_next = 0;
		526	active_prev = 0;
578		527
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	528	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		529
581	SET_FLAG (this, FLAG_REMOVED);	530	SET_FLAG (this, FLAG_REMOVED);
		531
		532	/* What is not cleared is next, prev, and count */
		533
		534	expmul = 1.0;
		535	face = blank_face;
		536	attacked_by_count = -1;
		537
		538	if (settings.casting_time)
		539	casting_time = -1;
582	}	540	}
583		541
584	void object::clone (object *destination)	542	void object::clone (object *destination)
585	{	543	{
586	(object_copy ) destination = *this;	544	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	545	(object_pod )destination = *this;
588		546
589	if (self \|\| cb)	547	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	548	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	}	549	}
624		550
625	/*	551	/*
626	* copy object first frees everything allocated by the second object,	552	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	553	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	554	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	555	* 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	556	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	557	* will point at garbage.
632	*/	558	*/
633
634	void	559	void
635	copy_object (object op2, object op)	560	copy_object (object op2, object op)
636	{	561	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	623	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	624	* 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.	625	* 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.	626	* This function needs to be called whenever the speed of an object changes.
702	*/	627	*/
703
704	void	628	void
705	update_ob_speed (object *op)	629	update_ob_speed (object *op)
706	{	630	{
707	extern int arch_init;	631	extern int arch_init;
708		632
…		…
717	abort ();	641	abort ();
718	#else	642	#else
719	op->speed = 0;	643	op->speed = 0;
720	#endif	644	#endif
721	}	645	}
		646
722	if (arch_init)	647	if (arch_init)
723	{
724	return;	648	return;
725	}	649
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	650	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	651	{
728	/* If already on active list, don't do anything */	652	/* If already on active list, don't do anything */
729	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	653	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
730	return;	654	return;
731		655
732	/* process_events() expects us to insert the object at the beginning	656	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	657	* of the list. */
734	op->active_next = active_objects;	658	op->active_next = active_objects;
		659
735	if (op->active_next != NULL)	660	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	661	op->active_next->active_prev = op;
		662
737	active_objects = op;	663	active_objects = op;
738	}	664	}
739	else	665	else
740	{	666	{
741	/* If not on the active list, nothing needs to be done */	667	/* If not on the active list, nothing needs to be done */
…		…
743	return;	669	return;
744		670
745	if (op->active_prev == NULL)	671	if (op->active_prev == NULL)
746	{	672	{
747	active_objects = op->active_next;	673	active_objects = op->active_next;
		674
748	if (op->active_next != NULL)	675	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	676	op->active_next->active_prev = NULL;
750	}	677	}
751	else	678	else
752	{	679	{
753	op->active_prev->active_next = op->active_next;	680	op->active_prev->active_next = op->active_next;
		681
754	if (op->active_next)	682	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	683	op->active_next->active_prev = op->active_prev;
756	}	684	}
		685
757	op->active_next = NULL;	686	op->active_next = NULL;
758	op->active_prev = NULL;	687	op->active_prev = NULL;
759	}	688	}
760	}	689	}
761		690
…		…
893	* that is being removed.	822	* that is being removed.
894	*/	823	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	824	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	update_now = 1;	825	update_now = 1;
897	else if (action == UP_OBJ_FACE)	826	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	827	/* Nothing to do for that case */ ;
899	else	828	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	829	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		830
902	if (update_now)	831	if (update_now)
903	{	832	{
…		…
912	static unordered_vector<object *> mortals;	841	static unordered_vector<object *> mortals;
913	static std::vector<object *> freed;	842	static std::vector<object *> freed;
914		843
915	void object::free_mortals ()	844	void object::free_mortals ()
916	{	845	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
918	if (!(*i)->refcount)	847	if ((*i)->refcnt)
		848	++i; // further delay freeing
		849	else
919	{	850	{
920	freed.push_back (*i);	851	freed.push_back (*i);//D
		852	//delete *i;
921	mortals.erase (i);	853	mortals.erase (i);
922	}	854	}
923	else	855
924	++i;	856	if (mortals.size())//D
		857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
925	}	858	}
926		859
927	object::object ()	860	object::object ()
928	{	861	{
929	SET_FLAG (this, FLAG_REMOVED);	862	SET_FLAG (this, FLAG_REMOVED);
…		…
972	objects = next;	905	objects = next;
973	}	906	}
974		907
975	object *object::create ()	908	object *object::create ()
976	{	909	{
977	object *op;	910	object *
		911	op;
978		912
979	if (freed.empty ())	913	if (freed.empty ())
980	op = new object;	914	op = new object;
981	else	915	else
982	{	916	{
983	// highly annoying, but the only way to get it stable right now	917	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();	918	op = freed.back ();
		919	freed.pop_back ();
985	op->~object ();	920	op->~object ();
986	new ((void *)op) object;	921	new ((void *) op) object;
987	}	922	}
988		923
989	op->link ();	924	op->link ();
990	return op;	925	return op;
991	}	926	}
…		…
1000	* If free_inventory is set, free inventory as well. Else drop items in	935	* If free_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	936	* inventory to the ground.
1002	*/	937	*/
1003	void object::free (bool free_inventory)	938	void object::free (bool free_inventory)
1004	{	939	{
		940	if (QUERY_FLAG (this, FLAG_FREED))
		941	return;
		942
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	943	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	944	remove_ob (this);
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		945
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))	946	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);	947	remove_friendly_object (this);
1018	}
1019		948
1020	if (QUERY_FLAG (this, FLAG_FREED))	949	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		950
1027	if (more)	951	if (more)
1028	{	952	{
1029	more->free (free_inventory);	953	more->free (free_inventory);
1030	more = 0;	954	more = 0;
…		…
1036	* if some form of movement is allowed, let objects	960	* if some form of movement is allowed, let objects
1037	* drop on that space.	961	* drop on that space.
1038	*/	962	*/
1039	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	963	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1040	{	964	{
1041	object *	965	object *op = inv;
1042	op = inv;
1043		966
1044	while (op)	967	while (op)
1045	{	968	{
1046	object *
1047	tmp = op->below;	969	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	970	op->free (free_inventory);
1051	op = tmp;	971	op = tmp;
1052	}	972	}
1053	}	973	}
1054	else	974	else
1055	{ /* Put objects in inventory onto this space */	975	{ /* Put objects in inventory onto this space */
1056	object *	976	object *op = inv;
1057	op = inv;
1058		977
1059	while (op)	978	while (op)
1060	{	979	{
1061	object *
1062	tmp = op->below;	980	object *tmp = op->below;
1063		981
1064	remove_ob (op);	982	remove_ob (op);
1065		983
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	984	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	985	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	994	op = tmp;
1077	}	995	}
1078	}	996	}
1079	}	997	}
1080		998
1081	clear_owner (this);	999	owner = 0;
1082		1000
1083	/* Remove object from the active list */	1001	/* Remove object from the active list */
1084	speed = 0;	1002	speed = 0;
1085	update_ob_speed (this);	1003	update_ob_speed (this);
1086		1004
1087	unlink ();	1005	unlink ();
1088
1089	SET_FLAG (this, FLAG_FREED);
1090		1006
1091	mortals.push_back (this);	1007	mortals.push_back (this);
1092	}	1008	}
1093		1009
1094	/*	1010	/*
…		…
1120	*/	1036	*/
1121		1037
1122	void	1038	void
1123	remove_ob (object *op)	1039	remove_ob (object *op)
1124	{	1040	{
1125	object tmp, last = NULL;
1126	object *otmp;	1041	object *
		1042	tmp, *
		1043	last = NULL;
		1044	object *
		1045	otmp;
1127		1046
1128	tag_t tag;	1047	tag_t
		1048	tag;
		1049	int
1129	int check_walk_off;	1050	check_walk_off;
1130	mapstruct *m;	1051	mapstruct *
		1052	m;
1131		1053
1132	sint16 x, y;	1054	sint16
		1055	x,
		1056	y;
1133		1057
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1058	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1059	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1060
1139	/* Changed it to always dump core in this case. As has been learned	1061	SET_FLAG (op, FLAG_REMOVED);
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151		1062
1152	if (op->more != NULL)	1063	if (op->more != NULL)
1153	remove_ob (op->more);	1064	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1065
1157	/*	1066	/*
1158	* In this case, the object to be removed is in someones	1067	* In this case, the object to be removed is in someones
1159	* inventory.	1068	* inventory.
1160	*/	1069	*/
…		…
1186	*/	1095	*/
1187	op->x = op->env->x, op->y = op->env->y;	1096	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1097	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1098	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1099	op->env = NULL;
1191	return;	1100	}
		1101	else if (op->map)
1192	}	1102	{
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;	1103	x = op->x;
1199	y = op->y;	1104	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1105	m = get_map_from_coord (op->map, &x, &y);
1201		1106
1202	if (!m)	1107	if (!m)
1203	{	1108	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1109	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1205	op->map->path, op->x, op->y);	1110	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1111	/* in old days, we used to set x and y to 0 and continue.
1207	* it seems if we get into this case, something is probablye	1112	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1113	* screwed up and should be fixed.
		1114	*/
		1115	abort ();
		1116	}
		1117
		1118	if (op->map != m)
		1119	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1120	op->map->path, m->path, op->x, op->y, x, y);
		1121
		1122	/* Re did the following section of code - it looks like it had
		1123	* lots of logic for things we no longer care about
1209	*/	1124	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1125
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1126	/* link the object above us */
1223	if (op->above)	1127	if (op->above)
1224	op->above->below = op->below;	1128	op->above->below = op->below;
1225	else	1129	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1130	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1131
1228	/* Relink the object below us, if there is one */	1132	/* Relink the object below us, if there is one */
1229	if (op->below)	1133	if (op->below)
1230	op->below->above = op->above;	1134	op->below->above = op->above;
1231	else	1135	else
1232	{	1136	{
1233	/* Nothing below, which means we need to relink map object for this space	1137	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1138	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1139	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1140	*/
1270	if (tmp->container == op)	1141	if (GET_MAP_OB (m, x, y) != op)
1271	{	1142	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1143	dump_object (op);
1273	tmp->container = NULL;	1144	LOG (llevError,
		1145	"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);
		1146	dump_object (GET_MAP_OB (m, x, y));
		1147	LOG (llevError, "%s\n", errmsg);
1274	}	1148	}
1275		1149
1276	tmp->contr->socket.update_look = 1;	1150	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1151	}
1281	move_apply (tmp, op, NULL);
1282		1152
1283	if (was_destroyed (op, tag))	1153	op->above = 0;
		1154	op->below = 0;
		1155
		1156	if (op->map->in_memory == MAP_SAVING)
		1157	return;
		1158
		1159	tag = op->count;
		1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1161
		1162	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1163	{
		1164	/* No point updating the players look faces if he is the object
		1165	* being removed.
		1166	*/
		1167
		1168	if (tmp->type == PLAYER && tmp != op)
1284	{	1169	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1170	/* If a container that the player is currently using somehow gets
		1171	* removed (most likely destroyed), update the player view
		1172	* appropriately.
		1173	*/
		1174	if (tmp->container == op)
		1175	{
		1176	CLEAR_FLAG (op, FLAG_APPLIED);
		1177	tmp->container = NULL;
		1178	}
		1179
		1180	tmp->contr->socket.update_look = 1;
1286	}	1181	}
		1182
		1183	/* See if player moving off should effect something */
		1184	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1185	{
		1186	move_apply (tmp, op, NULL);
		1187
		1188	if (was_destroyed (op, tag))
		1189	{
		1190	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1191	}
1287	}	1192	}
1288		1193
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1195
1291	if (tmp->above == tmp)	1196	if (tmp->above == tmp)
1292	tmp->above = NULL;	1197	tmp->above = NULL;
1293		1198
1294	last = tmp;	1199	last = tmp;
1295	}	1200	}
1296		1201
1297	/* last == NULL of there are no objects on this space */	1202	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1203	if (last == NULL)
1299	{	1204	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1205	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1206	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1207	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1208	* be correct anyways.
1304	*/	1209	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1210	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1211	update_position (op->map, op->x, op->y);
1307	}	1212	}
1308	else	1213	else
1309	update_object (last, UP_OBJ_REMOVE);	1214	update_object (last, UP_OBJ_REMOVE);
1310		1215
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1216	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1217	update_all_los (op->map, op->x, op->y);
		1218	}
1313	}	1219	}
1314		1220
1315	/*	1221	/*
1316	* merge_ob(op,top):	1222	* merge_ob(op,top):
1317	*	1223	*
…		…
1324	object *	1230	object *
1325	merge_ob (object op, object top)	1231	merge_ob (object op, object top)
1326	{	1232	{
1327	if (!op->nrof)	1233	if (!op->nrof)
1328	return 0;	1234	return 0;
		1235
1329	if (top == NULL)	1236	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1237	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1238
1331	for (; top != NULL; top = top->below)	1239	for (; top != NULL; top = top->below)
1332	{	1240	{
1333	if (top == op)	1241	if (top == op)
1334	continue;	1242	continue;
1335	if (CAN_MERGE (op, top))	1243	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1249	remove_ob (op);
1342	free_object (op);	1250	free_object (op);
1343	return top;	1251	return top;
1344	}	1252	}
1345	}	1253	}
		1254
1346	return NULL;	1255	return NULL;
1347	}	1256	}
1348		1257
1349	/*	1258	/*
1350	* 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
1351	* job preparing multi-part monsters	1260	* job preparing multi-part monsters
1352	*/	1261	*/
1353	object *	1262	object *
1354	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)
1355	{	1264	{
1356	object *	1265	object *tmp;
1357	tmp;
1358		1266
1359	if (op->head)	1267	if (op->head)
1360	op = op->head;	1268	op = op->head;
		1269
1361	for (tmp = op; tmp; tmp = tmp->more)	1270	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1271	{
1363	tmp->x = x + tmp->arch->clone.x;	1272	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1273	tmp->y = y + tmp->arch->clone.y;
1365	}	1274	}
		1275
1366	return insert_ob_in_map (op, m, originator, flag);	1276	return insert_ob_in_map (op, m, originator, flag);
1367	}	1277	}
1368		1278
1369	/*	1279	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1280	* insert_ob_in_map (op, map, originator, flag):
…		…
1661	* op is the object to insert it under: supplies x and the map.	1571	* op is the object to insert it under: supplies x and the map.
1662	*/	1572	*/
1663	void	1573	void
1664	replace_insert_ob_in_map (const char arch_string, object op)	1574	replace_insert_ob_in_map (const char arch_string, object op)
1665	{	1575	{
1666	object *tmp;	1576	object *
		1577	tmp;
1667	object *tmp1;	1578	object *
		1579	tmp1;
1668		1580
1669	/* first search for itself and remove any old instances */	1581	/* first search for itself and remove any old instances */
1670		1582
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1584	{
…		…
1703	if (orig_ob->nrof < nr)	1615	if (orig_ob->nrof < nr)
1704	{	1616	{
1705	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);
1706	return NULL;	1618	return NULL;
1707	}	1619	}
		1620
1708	newob = object_create_clone (orig_ob);	1621	newob = object_create_clone (orig_ob);
		1622
1709	if ((orig_ob->nrof -= nr) < 1)	1623	if ((orig_ob->nrof -= nr) < 1)
1710	{	1624	{
1711	if (!is_removed)	1625	if (!is_removed)
1712	remove_ob (orig_ob);	1626	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1627	free_object2 (orig_ob, 1);
…		…
1721	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.");
1722	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");
1723	return NULL;	1637	return NULL;
1724	}	1638	}
1725	}	1639	}
		1640
1726	newob->nrof = nr;	1641	newob->nrof = nr;
1727		1642
1728	return newob;	1643	return newob;
1729	}	1644	}
1730		1645
…		…
1737	*/	1652	*/
1738		1653
1739	object *	1654	object *
1740	decrease_ob_nr (object *op, uint32 i)	1655	decrease_ob_nr (object *op, uint32 i)
1741	{	1656	{
1742	object *	1657	object *tmp;
1743	tmp;
1744	player *	1658	player *pl;
1745	pl;
1746		1659
1747	if (i == 0) /* objects with op->nrof require this check */	1660	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1661	return op;
1749		1662
1750	if (i > op->nrof)	1663	if (i > op->nrof)
1751	i = op->nrof;	1664	i = op->nrof;
1752		1665
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1666	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1667	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1668	else if (op->env != NULL)
1758	{	1669	{
1759	/* is this object in the players inventory, or sub container	1670	/* is this object in the players inventory, or sub container
1760	* therein?	1671	* therein?
1761	*/	1672	*/
…		…
1796	}	1707	}
1797	}	1708	}
1798	}	1709	}
1799	else	1710	else
1800	{	1711	{
1801	object *
1802	above = op->above;	1712	object *above = op->above;
1803		1713
1804	if (i < op->nrof)	1714	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1715	op->nrof -= i;
1807	}
1808	else	1716	else
1809	{	1717	{
1810	remove_ob (op);	1718	remove_ob (op);
1811	op->nrof = 0;	1719	op->nrof = 0;
1812	}	1720	}
		1721
1813	/* Since we just removed op, op->above is null */	1722	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1723	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1724	if (tmp->type == PLAYER)
1816	{	1725	{
1817	if (op->nrof)	1726	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1729	esrv_del_item (tmp->contr, op->count);
1821	}	1730	}
1822	}	1731	}
1823		1732
1824	if (op->nrof)	1733	if (op->nrof)
1825	{
1826	return op;	1734	return op;
1827	}
1828	else	1735	else
1829	{	1736	{
1830	free_object (op);	1737	free_object (op);
1831	return NULL;	1738	return NULL;
1832	}	1739	}
…		…
1841	add_weight (object *op, signed long weight)	1748	add_weight (object *op, signed long weight)
1842	{	1749	{
1843	while (op != NULL)	1750	while (op != NULL)
1844	{	1751	{
1845	if (op->type == CONTAINER)	1752	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1753	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1754
1849	op->carrying += weight;	1755	op->carrying += weight;
1850	op = op->env;	1756	op = op->env;
1851	}	1757	}
1852	}	1758	}
1853		1759
…		…
1876	{	1782	{
1877	dump_object (op);	1783	dump_object (op);
1878	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);
1879	return op;	1785	return op;
1880	}	1786	}
		1787
1881	if (where == NULL)	1788	if (where == NULL)
1882	{	1789	{
1883	dump_object (op);	1790	dump_object (op);
1884	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);
1885	return op;	1792	return op;
1886	}	1793	}
		1794
1887	if (where->head)	1795	if (where->head)
1888	{	1796	{
1889	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");
1890	where = where->head;	1798	where = where->head;
1891	}	1799	}
		1800
1892	if (op->more)	1801	if (op->more)
1893	{	1802	{
1894	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);
1895	return op;	1804	return op;
1896	}	1805	}
		1806
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1808	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1809	if (op->nrof)
1900	{	1810	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1986	*/	1896	*/
1987		1897
1988	int	1898	int
1989	check_move_on (object op, object originator)	1899	check_move_on (object op, object originator)
1990	{	1900	{
1991	object *tmp;	1901	object *
1992	tag_t tag;	1902	tmp;
1993	mapstruct *m = op->map;	1903	tag_t
		1904	tag;
		1905	mapstruct *
		1906	m = op->map;
		1907	int
1994	int x = op->x, y = op->y;	1908	x = op->x, y = op->y;
1995		1909
1996	MoveType move_on, move_slow, move_block;	1910	MoveType
		1911	move_on,
		1912	move_slow,
		1913	move_block;
1997		1914
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1916	return 0;
2000		1917
2001	tag = op->count;	1918	tag = op->count;
…		…
2049	{	1966	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1967	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1968	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1969	{
2053		1970
		1971	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1972	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1973
2056	if (op->type == PLAYER)	1974	if (op->type == PLAYER)
2057	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)) \|\|
2058	(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)))
2059	diff /= 4.0;	1977	diff /= 4.0;
…		…
2378	find_dir (mapstruct m, int x, int y, object exclude)	2296	find_dir (mapstruct m, int x, int y, object exclude)
2379	{	2297	{
2380	int	2298	int
2381	i,	2299	i,
2382	max = SIZEOFFREE, mflags;	2300	max = SIZEOFFREE, mflags;
2383	sint16	2301
2384	nx,	2302	sint16 nx, ny;
2385	ny;
2386	object *	2303	object *
2387	tmp;	2304	tmp;
2388	mapstruct *	2305	mapstruct *
2389	mp;	2306	mp;
2390	MoveType	2307
2391	blocked,	2308	MoveType blocked, move_type;
2392	move_type;
2393		2309
2394	if (exclude && exclude->head)	2310	if (exclude && exclude->head)
2395	{	2311	{
2396	exclude = exclude->head;	2312	exclude = exclude->head;
2397	move_type = exclude->move_type;	2313	move_type = exclude->move_type;
…		…
2604		2520
2605		2521
2606	int	2522	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2608	{	2524	{
2609	sint16	2525	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2526	int
2613	mflags;	2527	mflags;
2614		2528
2615	if (dir < 0)	2529	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2530	return 0; /* exit condition: invalid direction */
…		…
2747	fprintf (tempfile, obstr);	2661	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2662	fclose (tempfile);
2749		2663
2750	op = get_object ();	2664	op = get_object ();
2751		2665
2752	object_thawer	2666	object_thawer thawer (filename);
2753	thawer (filename);
2754		2667
2755	if (thawer)	2668	if (thawer)
2756	load_object (thawer, op, 0);	2669	load_object (thawer, op, 0);
2757		2670
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2671	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2882	if (last)	2795	if (last)
2883	last->next = field->next;	2796	last->next = field->next;
2884	else	2797	else
2885	op->key_values = field->next;	2798	op->key_values = field->next;
2886		2799
2887	delete
2888	field;	2800	delete field;
2889	}	2801	}
2890	}	2802	}
2891	return TRUE;	2803	return TRUE;
2892	}	2804	}
2893	/* IF we get here, key doesn't exist */	2805	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2840	* Returns TRUE on success.
2929	*/	2841	*/
2930	int	2842	int
2931	set_ob_key_value (object op, const char key, const char *value, int add_key)	2843	set_ob_key_value (object op, const char key, const char *value, int add_key)
2932	{	2844	{
2933	shstr
2934	key_ (key);	2845	shstr key_ (key);
2935		2846
2936	return set_ob_key_value_s (op, key_, value, add_key);	2847	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2848	}
		2849
		2850	void
		2851	object::deep_iterator::next ()
		2852	{
		2853	if (item->inv)
		2854	item = item->inv;
		2855	else if (item->below)
		2856	item = item->below;
		2857	else
		2858	item = item->env->below;
		2859	}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs. Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC