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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 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);
…		…
891	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	818	* that is being removed.
894	*/	819	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	821	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	822	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	823	/* Nothing to do for that case */ ;
902	}
903	else	824	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	825	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		826
908	if (update_now)	827	if (update_now)
909	{	828	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);	829	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	830	update_position (op->map, op->x, op->y);
…		…
918	static unordered_vector<object *> mortals;	837	static unordered_vector<object *> mortals;
919	static std::vector<object *> freed;	838	static std::vector<object *> freed;
920		839
921	void object::free_mortals ()	840	void object::free_mortals ()
922	{	841	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	if (!(*i)->refcount)	843	if ((*i)->refcnt)
		844	++i; // further delay freeing
		845	else
925	{	846	{
926	freed.push_back (*i);	847	freed.push_back (*i);//D
		848	//delete *i;
927	mortals.erase (i);	849	mortals.erase (i);
928	}	850	}
929	else	851
930	++i;	852	if (mortals.size())//D
		853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
931	}	854	}
932		855
933	object::object ()	856	object::object ()
934	{	857	{
935	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
…		…
978	objects = next;	901	objects = next;
979	}	902	}
980		903
981	object *object::create ()	904	object *object::create ()
982	{	905	{
983	object *op;	906	object *
		907	op;
984		908
985	if (freed.empty ())	909	if (freed.empty ())
986	op = new object;	910	op = new object;
987	else	911	else
988	{	912	{
989	// highly annoying, but the only way to get it stable right now	913	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();	914	op = freed.back ();
		915	freed.pop_back ();
991	op->~object ();	916	op->~object ();
992	new ((void *)op) object;	917	new ((void *) op) object;
993	}	918	}
994		919
995	op->link ();	920	op->link ();
996	return op;	921	return op;
997	}	922	}
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	931	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	932	* inventory to the ground.
1008	*/	933	*/
1009	void object::free (bool free_inventory)	934	void object::free (bool free_inventory)
1010	{	935	{
		936	if (QUERY_FLAG (this, FLAG_FREED))
		937	return;
		938
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	939	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	940	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		941
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))	942	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);	943	remove_friendly_object (this);
1024	}
1025		944
1026	if (QUERY_FLAG (this, FLAG_FREED))	945	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		946
1033	if (more)	947	if (more)
1034	{	948	{
1035	more->free (free_inventory);	949	more->free (free_inventory);
1036	more = 0;	950	more = 0;
…		…
1042	* if some form of movement is allowed, let objects	956	* if some form of movement is allowed, let objects
1043	* drop on that space.	957	* drop on that space.
1044	*/	958	*/
1045	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	959	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1046	{	960	{
1047	object *	961	object *op = inv;
1048	op = inv;
1049		962
1050	while (op)	963	while (op)
1051	{	964	{
1052	object *
1053	tmp = op->below;	965	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	966	op->free (free_inventory);
1057	op = tmp;	967	op = tmp;
1058	}	968	}
1059	}	969	}
1060	else	970	else
1061	{ /* Put objects in inventory onto this space */	971	{ /* Put objects in inventory onto this space */
1062	object *	972	object *op = inv;
1063	op = inv;
1064		973
1065	while (op)	974	while (op)
1066	{	975	{
1067	object *
1068	tmp = op->below;	976	object *tmp = op->below;
1069		977
1070	remove_ob (op);	978	remove_ob (op);
1071		979
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	981	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	990	op = tmp;
1083	}	991	}
1084	}	992	}
1085	}	993	}
1086		994
1087	clear_owner (this);	995	owner = 0;
1088		996
1089	/* Remove object from the active list */	997	/* Remove object from the active list */
1090	speed = 0;	998	speed = 0;
1091	update_ob_speed (this);	999	update_ob_speed (this);
1092		1000
1093	unlink ();	1001	unlink ();
1094
1095	SET_FLAG (this, FLAG_FREED);
1096		1002
1097	mortals.push_back (this);	1003	mortals.push_back (this);
1098	}	1004	}
1099		1005
1100	/*	1006	/*
…		…
1126	*/	1032	*/
1127		1033
1128	void	1034	void
1129	remove_ob (object *op)	1035	remove_ob (object *op)
1130	{	1036	{
1131	object tmp, last = NULL;
1132	object *otmp;	1037	object *
		1038	tmp, *
		1039	last = NULL;
		1040	object *
		1041	otmp;
1133		1042
1134	tag_t tag;	1043	tag_t
		1044	tag;
		1045	int
1135	int check_walk_off;	1046	check_walk_off;
1136	mapstruct *m;	1047	mapstruct *
		1048	m;
1137		1049
1138	sint16 x, y;	1050	sint16
		1051	x,
		1052	y;
1139		1053
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1054	if (QUERY_FLAG (op, FLAG_REMOVED))
1141	{	1055	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1056
1145	/* Changed it to always dump core in this case. As has been learned	1057	SET_FLAG (op, FLAG_REMOVED);
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157		1058
1158	if (op->more != NULL)	1059	if (op->more != NULL)
1159	remove_ob (op->more);	1060	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);
1162		1061
1163	/*	1062	/*
1164	* In this case, the object to be removed is in someones	1063	* In this case, the object to be removed is in someones
1165	* inventory.	1064	* inventory.
1166	*/	1065	*/
…		…
1192	*/	1091	*/
1193	op->x = op->env->x, op->y = op->env->y;	1092	op->x = op->env->x, op->y = op->env->y;
1194	op->map = op->env->map;	1093	op->map = op->env->map;
1195	op->above = NULL, op->below = NULL;	1094	op->above = NULL, op->below = NULL;
1196	op->env = NULL;	1095	op->env = NULL;
1197	return;	1096	}
		1097	else if (op->map)
1198	}	1098	{
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;	1099	x = op->x;
1205	y = op->y;	1100	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);	1101	m = get_map_from_coord (op->map, &x, &y);
1207		1102
1208	if (!m)	1103	if (!m)
1209	{	1104	{
1210	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1211	op->map->path, op->x, op->y);	1106	op->map->path, op->x, op->y);
1212	/* in old days, we used to set x and y to 0 and continue.	1107	/* in old days, we used to set x and y to 0 and continue.
1213	* it seems if we get into this case, something is probablye	1108	* it seems if we get into this case, something is probablye
1214	* screwed up and should be fixed.	1109	* screwed up and should be fixed.
		1110	*/
		1111	abort ();
		1112	}
		1113
		1114	if (op->map != m)
		1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1116	op->map->path, m->path, op->x, op->y, x, y);
		1117
		1118	/* Re did the following section of code - it looks like it had
		1119	* lots of logic for things we no longer care about
1215	*/	1120	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1121
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1122	/* link the object above us */
1229	if (op->above)	1123	if (op->above)
1230	op->above->below = op->below;	1124	op->above->below = op->below;
1231	else	1125	else
1232	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1233		1127
1234	/* Relink the object below us, if there is one */	1128	/* Relink the object below us, if there is one */
1235	if (op->below)	1129	if (op->below)
1236	op->below->above = op->above;	1130	op->below->above = op->above;
1237	else	1131	else
1238	{	1132	{
1239	/* Nothing below, which means we need to relink map object for this space	1133	/* Nothing below, which means we need to relink map object for this space
1240	* use translated coordinates in case some oddness with map tiling is	1134	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1135	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	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",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1136	*/
1276	if (tmp->container == op)	1137	if (GET_MAP_OB (m, x, y) != op)
1277	{	1138	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1139	dump_object (op);
1279	tmp->container = NULL;	1140	LOG (llevError,
		1141	"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);
		1142	dump_object (GET_MAP_OB (m, x, y));
		1143	LOG (llevError, "%s\n", errmsg);
1280	}	1144	}
1281		1145
1282	tmp->contr->socket.update_look = 1;	1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1147	}
1287	move_apply (tmp, op, NULL);
1288		1148
1289	if (was_destroyed (op, tag))	1149	op->above = 0;
		1150	op->below = 0;
		1151
		1152	if (op->map->in_memory == MAP_SAVING)
		1153	return;
		1154
		1155	tag = op->count;
		1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1157
		1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1159	{
		1160	/* No point updating the players look faces if he is the object
		1161	* being removed.
		1162	*/
		1163
		1164	if (tmp->type == PLAYER && tmp != op)
1290	{	1165	{
1291	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1166	/* If a container that the player is currently using somehow gets
		1167	* removed (most likely destroyed), update the player view
		1168	* appropriately.
		1169	*/
		1170	if (tmp->container == op)
		1171	{
		1172	CLEAR_FLAG (op, FLAG_APPLIED);
		1173	tmp->container = NULL;
		1174	}
		1175
		1176	tmp->contr->socket.update_look = 1;
1292	}	1177	}
		1178
		1179	/* See if player moving off should effect something */
		1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1181	{
		1182	move_apply (tmp, op, NULL);
		1183
		1184	if (was_destroyed (op, tag))
		1185	{
		1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1187	}
1293	}	1188	}
1294		1189
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1191
1297	if (tmp->above == tmp)	1192	if (tmp->above == tmp)
1298	tmp->above = NULL;	1193	tmp->above = NULL;
1299		1194
1300	last = tmp;	1195	last = tmp;
1301	}	1196	}
1302		1197
1303	/* last == NULL of there are no objects on this space */	1198	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1199	if (last == NULL)
1305	{	1200	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1308	* those out anyways, and if there are any flags set right now, they won't	1203	* those out anyways, and if there are any flags set right now, they won't
1309	* be correct anyways.	1204	* be correct anyways.
1310	*/	1205	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1207	update_position (op->map, op->x, op->y);
1313	}	1208	}
1314	else	1209	else
1315	update_object (last, UP_OBJ_REMOVE);	1210	update_object (last, UP_OBJ_REMOVE);
1316		1211
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1318	update_all_los (op->map, op->x, op->y);	1213	update_all_los (op->map, op->x, op->y);
		1214	}
1319	}	1215	}
1320		1216
1321	/*	1217	/*
1322	* merge_ob(op,top):	1218	* merge_ob(op,top):
1323	*	1219	*
…		…
1330	object *	1226	object *
1331	merge_ob (object op, object top)	1227	merge_ob (object op, object top)
1332	{	1228	{
1333	if (!op->nrof)	1229	if (!op->nrof)
1334	return 0;	1230	return 0;
		1231
1335	if (top == NULL)	1232	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1233	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1234
1337	for (; top != NULL; top = top->below)	1235	for (; top != NULL; top = top->below)
1338	{	1236	{
1339	if (top == op)	1237	if (top == op)
1340	continue;	1238	continue;
1341	if (CAN_MERGE (op, top))	1239	if (CAN_MERGE (op, top))
…		…
1347	remove_ob (op);	1245	remove_ob (op);
1348	free_object (op);	1246	free_object (op);
1349	return top;	1247	return top;
1350	}	1248	}
1351	}	1249	}
		1250
1352	return NULL;	1251	return NULL;
1353	}	1252	}
1354		1253
1355	/*	1254	/*
1356	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1357	* job preparing multi-part monsters	1256	* job preparing multi-part monsters
1358	*/	1257	*/
1359	object *	1258	object *
1360	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1259	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1361	{	1260	{
1362	object *	1261	object *tmp;
1363	tmp;
1364		1262
1365	if (op->head)	1263	if (op->head)
1366	op = op->head;	1264	op = op->head;
		1265
1367	for (tmp = op; tmp; tmp = tmp->more)	1266	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1267	{
1369	tmp->x = x + tmp->arch->clone.x;	1268	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1269	tmp->y = y + tmp->arch->clone.y;
1371	}	1270	}
		1271
1372	return insert_ob_in_map (op, m, originator, flag);	1272	return insert_ob_in_map (op, m, originator, flag);
1373	}	1273	}
1374		1274
1375	/*	1275	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1276	* insert_ob_in_map (op, map, originator, flag):
…		…
1667	* op is the object to insert it under: supplies x and the map.	1567	* op is the object to insert it under: supplies x and the map.
1668	*/	1568	*/
1669	void	1569	void
1670	replace_insert_ob_in_map (const char arch_string, object op)	1570	replace_insert_ob_in_map (const char arch_string, object op)
1671	{	1571	{
1672	object *tmp;	1572	object *
		1573	tmp;
1673	object *tmp1;	1574	object *
		1575	tmp1;
1674		1576
1675	/* first search for itself and remove any old instances */	1577	/* first search for itself and remove any old instances */
1676		1578
1677	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1678	{	1580	{
…		…
1709	if (orig_ob->nrof < nr)	1611	if (orig_ob->nrof < nr)
1710	{	1612	{
1711	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1613	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1712	return NULL;	1614	return NULL;
1713	}	1615	}
		1616
1714	newob = object_create_clone (orig_ob);	1617	newob = object_create_clone (orig_ob);
		1618
1715	if ((orig_ob->nrof -= nr) < 1)	1619	if ((orig_ob->nrof -= nr) < 1)
1716	{	1620	{
1717	if (!is_removed)	1621	if (!is_removed)
1718	remove_ob (orig_ob);	1622	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);	1623	free_object2 (orig_ob, 1);
…		…
1727	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1631	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1728	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1632	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1729	return NULL;	1633	return NULL;
1730	}	1634	}
1731	}	1635	}
		1636
1732	newob->nrof = nr;	1637	newob->nrof = nr;
1733		1638
1734	return newob;	1639	return newob;
1735	}	1640	}
1736		1641
…		…
1743	*/	1648	*/
1744		1649
1745	object *	1650	object *
1746	decrease_ob_nr (object *op, uint32 i)	1651	decrease_ob_nr (object *op, uint32 i)
1747	{	1652	{
1748	object *	1653	object *tmp;
1749	tmp;
1750	player *	1654	player *pl;
1751	pl;
1752		1655
1753	if (i == 0) /* objects with op->nrof require this check */	1656	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1657	return op;
1755		1658
1756	if (i > op->nrof)	1659	if (i > op->nrof)
1757	i = op->nrof;	1660	i = op->nrof;
1758		1661
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1662	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1663	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1664	else if (op->env != NULL)
1764	{	1665	{
1765	/* is this object in the players inventory, or sub container	1666	/* is this object in the players inventory, or sub container
1766	* therein?	1667	* therein?
1767	*/	1668	*/
…		…
1802	}	1703	}
1803	}	1704	}
1804	}	1705	}
1805	else	1706	else
1806	{	1707	{
1807	object *
1808	above = op->above;	1708	object *above = op->above;
1809		1709
1810	if (i < op->nrof)	1710	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1711	op->nrof -= i;
1813	}
1814	else	1712	else
1815	{	1713	{
1816	remove_ob (op);	1714	remove_ob (op);
1817	op->nrof = 0;	1715	op->nrof = 0;
1818	}	1716	}
		1717
1819	/* Since we just removed op, op->above is null */	1718	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1719	for (tmp = above; tmp != NULL; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1720	if (tmp->type == PLAYER)
1822	{	1721	{
1823	if (op->nrof)	1722	if (op->nrof)
…		…
1826	esrv_del_item (tmp->contr, op->count);	1725	esrv_del_item (tmp->contr, op->count);
1827	}	1726	}
1828	}	1727	}
1829		1728
1830	if (op->nrof)	1729	if (op->nrof)
1831	{
1832	return op;	1730	return op;
1833	}
1834	else	1731	else
1835	{	1732	{
1836	free_object (op);	1733	free_object (op);
1837	return NULL;	1734	return NULL;
1838	}	1735	}
…		…
1847	add_weight (object *op, signed long weight)	1744	add_weight (object *op, signed long weight)
1848	{	1745	{
1849	while (op != NULL)	1746	while (op != NULL)
1850	{	1747	{
1851	if (op->type == CONTAINER)	1748	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1749	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1750
1855	op->carrying += weight;	1751	op->carrying += weight;
1856	op = op->env;	1752	op = op->env;
1857	}	1753	}
1858	}	1754	}
1859		1755
…		…
1882	{	1778	{
1883	dump_object (op);	1779	dump_object (op);
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1885	return op;	1781	return op;
1886	}	1782	}
		1783
1887	if (where == NULL)	1784	if (where == NULL)
1888	{	1785	{
1889	dump_object (op);	1786	dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1891	return op;	1788	return op;
1892	}	1789	}
		1790
1893	if (where->head)	1791	if (where->head)
1894	{	1792	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;	1794	where = where->head;
1897	}	1795	}
		1796
1898	if (op->more)	1797	if (op->more)
1899	{	1798	{
1900	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1901	return op;	1800	return op;
1902	}	1801	}
		1802
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1804	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1805	if (op->nrof)
1906	{	1806	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1992	*/	1892	*/
1993		1893
1994	int	1894	int
1995	check_move_on (object op, object originator)	1895	check_move_on (object op, object originator)
1996	{	1896	{
1997	object *tmp;	1897	object *
1998	tag_t tag;	1898	tmp;
1999	mapstruct *m = op->map;	1899	tag_t
		1900	tag;
		1901	mapstruct *
		1902	m = op->map;
		1903	int
2000	int x = op->x, y = op->y;	1904	x = op->x, y = op->y;
2001		1905
2002	MoveType move_on, move_slow, move_block;	1906	MoveType
		1907	move_on,
		1908	move_slow,
		1909	move_block;
2003		1910
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1912	return 0;
2006		1913
2007	tag = op->count;	1914	tag = op->count;
…		…
2055	{	1962	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1963	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1964	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1965	{
2059		1966
		1967	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1968	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1969
2062	if (op->type == PLAYER)	1970	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1971	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1972	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1973	diff /= 4.0;
…		…
2384	find_dir (mapstruct m, int x, int y, object exclude)	2292	find_dir (mapstruct m, int x, int y, object exclude)
2385	{	2293	{
2386	int	2294	int
2387	i,	2295	i,
2388	max = SIZEOFFREE, mflags;	2296	max = SIZEOFFREE, mflags;
2389	sint16	2297
2390	nx,	2298	sint16 nx, ny;
2391	ny;
2392	object *	2299	object *
2393	tmp;	2300	tmp;
2394	mapstruct *	2301	mapstruct *
2395	mp;	2302	mp;
2396	MoveType	2303
2397	blocked,	2304	MoveType blocked, move_type;
2398	move_type;
2399		2305
2400	if (exclude && exclude->head)	2306	if (exclude && exclude->head)
2401	{	2307	{
2402	exclude = exclude->head;	2308	exclude = exclude->head;
2403	move_type = exclude->move_type;	2309	move_type = exclude->move_type;
…		…
2610		2516
2611		2517
2612	int	2518	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2614	{	2520	{
2615	sint16	2521	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2522	int
2619	mflags;	2523	mflags;
2620		2524
2621	if (dir < 0)	2525	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2526	return 0; /* exit condition: invalid direction */
…		…
2753	fprintf (tempfile, obstr);	2657	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2658	fclose (tempfile);
2755		2659
2756	op = get_object ();	2660	op = get_object ();
2757		2661
2758	object_thawer	2662	object_thawer thawer (filename);
2759	thawer (filename);
2760		2663
2761	if (thawer)	2664	if (thawer)
2762	load_object (thawer, op, 0);	2665	load_object (thawer, op, 0);
2763		2666
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2667	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2888	if (last)	2791	if (last)
2889	last->next = field->next;	2792	last->next = field->next;
2890	else	2793	else
2891	op->key_values = field->next;	2794	op->key_values = field->next;
2892		2795
2893	delete
2894	field;	2796	delete field;
2895	}	2797	}
2896	}	2798	}
2897	return TRUE;	2799	return TRUE;
2898	}	2800	}
2899	/* IF we get here, key doesn't exist */	2801	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2836	* Returns TRUE on success.
2935	*/	2837	*/
2936	int	2838	int
2937	set_ob_key_value (object op, const char key, const char *value, int add_key)	2839	set_ob_key_value (object op, const char key, const char *value, int add_key)
2938	{	2840	{
2939	shstr
2940	key_ (key);	2841	shstr key_ (key);
2941		2842
2942	return set_ob_key_value_s (op, key_, value, add_key);	2843	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2844	}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC vs. Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC