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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.283 by root, Sat Feb 21 06:25:46 2009 UTC vs.
Revision 1.299 by root, Sun Nov 8 20:55:39 2009 UTC

…		…
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
37	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
		42
		43	//+GPL
41		44
42	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
43	0,	46	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
49	0,	52	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};	56	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
61	0,	58	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
65	};	69	};
66		70
67	static void	71	static void
68	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
69	{	73	{
…		…
182	bool object::can_merge_slow (object ob1, object ob2)	186	bool object::can_merge_slow (object ob1, object ob2)
183	{	187	{
184	/* A couple quicksanity checks */	188	/* A couple quicksanity checks */
185	if (ob1 == ob2	189	if (ob1 == ob2
186	\|\| ob1->type != ob2->type	190	\|\| ob1->type != ob2->type
187	\|\| ob1->speed != ob2->speed	191	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
188	\|\| ob1->value != ob2->value	192	\|\| ob1->value != ob2->value
189	\|\| ob1->name != ob2->name)	193	\|\| ob1->name != ob2->name)
190	return 0;	194	return 0;
191		195
192	/* Do not merge objects if nrof would overflow, assume nrof	196	/* Do not merge objects if nrof would overflow, assume nrof
…		…
226	\|\| ob1->move_block != ob2->move_block	230	\|\| ob1->move_block != ob2->move_block
227	\|\| ob1->move_allow != ob2->move_allow	231	\|\| ob1->move_allow != ob2->move_allow
228	\|\| ob1->move_on != ob2->move_on	232	\|\| ob1->move_on != ob2->move_on
229	\|\| ob1->move_off != ob2->move_off	233	\|\| ob1->move_off != ob2->move_off
230	\|\| ob1->move_slow != ob2->move_slow	234	\|\| ob1->move_slow != ob2->move_slow
231	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	235	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	236	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	237	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234	return 0;	238	return 0;
235		239
236	if ((ob1->flag ^ ob2->flag)	240	if ((ob1->flag ^ ob2->flag)
…		…
328	// the player inventory itself is always visible	332	// the player inventory itself is always visible
329	if (env->is_player ())	333	if (env->is_player ())
330	return env;	334	return env;
331		335
332	// else a player could have our env open	336	// else a player could have our env open
333	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
334		338
335	// the player itself is always on a map, so we will find him here	339	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	340	// even if our inv is in a player.
337	if (envest->is_on_map ())	341	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	343	if (pl->container_ () == env)
340	return pl;	344	return pl;
341	}	345	}
342	else	346	else
343	{	347	{
344	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	352	\|\| pl->container_ () == this)
349	return pl;	353	return pl;
350	}	354	}
351	}	355	}
352		356
353	return 0;	357	return 0;
…		…
431	object_freezer freezer;	435	object_freezer freezer;
432	op->write (freezer);	436	op->write (freezer);
433	return freezer.as_string ();	437	return freezer.as_string ();
434	}	438	}
435		439
436	/*	440	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
438	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.
440	*/
441	object *
442	get_nearest_part (object op, const object pl)
443	{	442	{
444	object tmp, closest;	443	return dump_object (this);
445	int last_dist, i;
446
447	if (!op->more)
448	return op;
449
450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451	tmp;
452	tmp = tmp->more)
453	if ((i = distance (tmp, pl)) < last_dist)
454	closest = tmp, last_dist = i;
455
456	return closest;
457	}	444	}
458		445
459	/*	446	/*
460	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
461	* VERRRY slow.	448	* VERRRY slow.
…		…
555	update_stats ();	542	update_stats ();
556		543
557	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
560	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
561	return false;	549	return false;
562	}	550	}
563		551
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}	553	}
…		…
691	* This function needs to be called whenever the speed of an object changes.	679	* This function needs to be called whenever the speed of an object changes.
692	*/	680	*/
693	void	681	void
694	object::set_speed (float speed)	682	object::set_speed (float speed)
695	{	683	{
696	if (flag [FLAG_FREED] && speed)
697	{
698	LOG (llevError, "Object %s is freed but has speed.\n", &name);
699	speed = 0;
700	}
701
702	this->speed = speed;	684	this->speed = speed;
703		685
704	if (has_active_speed ())	686	if (has_active_speed ())
705	activate ();	687	activate ();
706	else	688	else
…		…
756		738
757	if (!(m.flags_ & P_UPTODATE))	739	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	740	/* nop */;
759	else if (action == UP_OBJ_INSERT)	741	else if (action == UP_OBJ_INSERT)
760	{	742	{
		743	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	744	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	746	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	747	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	748	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
…		…
770	\|\| (m.move_slow \| op->move_slow) != m.move_slow	753	\|\| (m.move_slow \| op->move_slow) != m.move_slow
771	/* This isn't perfect, but I don't expect a lot of objects to	754	/* This isn't perfect, but I don't expect a lot of objects to
772	* have move_allow right now.	755	* have move_allow right now.
773	*/	756	*/
774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	757	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	m.invalidate ();	758	m.invalidate ();
		759	#else
		760	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		761	m.invalidate ();
		762	#endif
777	}	763	}
778	/* if the object is being removed, we can't make intelligent	764	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	765	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	766	* that is being removed.
781	*/	767	*/
…		…
792		778
793	object::object ()	779	object::object ()
794	{	780	{
795	SET_FLAG (this, FLAG_REMOVED);	781	SET_FLAG (this, FLAG_REMOVED);
796		782
797	expmul = 1.0;	783	//expmul = 1.0; declared const for the time being
798	face = blank_face;	784	face = blank_face;
799	}	785	}
800		786
801	object::~object ()	787	object::~object ()
802	{	788	{
…		…
831	{	817	{
832	/* If already on active list, don't do anything */	818	/* If already on active list, don't do anything */
833	if (active)	819	if (active)
834	return;	820	return;
835		821
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	if (has_active_speed ())	822	if (has_active_speed ())
		823	{
		824	if (flag [FLAG_FREED])
		825	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		826
840	actives.insert (this);	827	actives.insert (this);
		828	}
841	}	829	}
842		830
843	void	831	void
844	object::activate_recursive ()	832	object::activate_recursive ()
845	{	833	{
…		…
1031	* the previous environment.	1019	* the previous environment.
1032	*/	1020	*/
1033	void	1021	void
1034	object::do_remove ()	1022	object::do_remove ()
1035	{	1023	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1024	if (flag [FLAG_REMOVED])
1040	return;	1025	return;
1041		1026
1042	INVOKE_OBJECT (REMOVE, this);	1027	INVOKE_OBJECT (REMOVE, this);
1043		1028
…		…
1109	close_container ();	1094	close_container ();
1110		1095
1111	--map->players;	1096	--map->players;
1112	map->touch ();	1097	map->touch ();
1113	}	1098	}
1114	else if (pl->container == this)	1099	else if (pl->container_ () == this)
1115	{	1100	{
1116	// removing a container should close it	1101	// removing a container should close it
1117	close_container ();	1102	close_container ();
1118	}	1103	}
1119		1104
…		…
1135		1120
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1122
1138	if (object *pl = ms.player ())	1123	if (object *pl = ms.player ())
1139	{	1124	{
1140	if (pl->container == this)	1125	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1126	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1143	* appropriately.	1128	* appropriately.
1144	*/	1129	*/
1145	pl->close_container ();	1130	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1134	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1135	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1136	pl->contr->ns->floorbox_update ();
1152	}	1137	}
1153		1138
		1139	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (object above, tmp = ms.bot; tmp; tmp = above)
1155	{	1141	{
		1142	above = tmp->above;
		1143
1156	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
1157	* being removed.	1145	* being removed.
1158	*/	1146	*/
1159		1147
1160	/* See if object moving off should effect something */	1148	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1149	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1151	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1152	}
1170
1171	last = tmp;
1172	}
1173		1153
1174	if (affects_los ())	1154	if (affects_los ())
1175	update_all_los (map, x, y);	1155	update_all_los (map, x, y);
1176	}	1156	}
1177	}	1157	}
…		…
1477	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1478	* update_object().	1458	* update_object().
1479	*/	1459	*/
1480		1460
1481	/* if this is not the head or flag has been passed, don't check walk on status */	1461	/* if this is not the head or flag has been passed, don't check walk on status */
1482	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1462	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1483	{	1463	{
1484	if (check_move_on (op, originator))	1464	if (check_move_on (op, originator))
1485	return 0;	1465	return 0;
1486		1466
1487	/* If we are a multi part object, lets work our way through the check	1467	/* If we are a multi part object, lets work our way through the check
…		…
1521	{	1501	{
1522	if (where->env)	1502	if (where->env)
1523	return where->env->insert (this);	1503	return where->env->insert (this);
1524	else	1504	else
1525	return where->map->insert (this, where->x, where->y, originator, flags);	1505	return where->map->insert (this, where->x, where->y, originator, flags);
		1506	}
		1507
		1508	// check whether we can put this into the map, respect max_nrof, max_volume, max_items
		1509	bool
		1510	object::can_drop_at (maptile m, int x, int y, object originator)
		1511	{
		1512	mapspace &ms = m->at (x, y);
		1513
		1514	int items = ms.items ();
		1515
		1516	if (!items // testing !items ensures we can drop at least one item
		1517	\|\| (items < m->max_items
		1518	&& ms.volume () < m->max_volume
		1519	&& nrof <= m->max_nrof))
		1520	return true;
		1521
		1522	if (originator && originator->is_player ())
		1523	originator->contr->failmsg (format (
		1524	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1525	query_name ()
		1526	));
		1527
		1528	return false;
1526	}	1529	}
1527		1530
1528	/*	1531	/*
1529	* decrease(object, number) decreases a specified number from	1532	* decrease(object, number) decreases a specified number from
1530	* the amount of an object. If the amount reaches 0, the object	1533	* the amount of an object. If the amount reaches 0, the object
…		…
1702	* on top.	1705	* on top.
1703	*/	1706	*/
1704	int	1707	int
1705	check_move_on (object op, object originator)	1708	check_move_on (object op, object originator)
1706	{	1709	{
		1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1711	return 0;
		1712
1707	object *tmp;	1713	object *tmp;
1708	maptile *m = op->map;	1714	maptile *m = op->map;
1709	int x = op->x, y = op->y;	1715	int x = op->x, y = op->y;
1710		1716
1711	MoveType move_on, move_slow, move_block;	1717	mapspace &ms = m->at (x, y);
1712		1718
1713	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1719	ms.update ();
1714	return 0;
1715		1720
1716	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1721	MoveType move_on = ms.move_on;
1717	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1722	MoveType move_slow = ms.move_slow;
1718	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1723	MoveType move_block = ms.move_block;
1719		1724
1720	/* if nothing on this space will slow op down or be applied,	1725	/* if nothing on this space will slow op down or be applied,
1721	* no need to do checking below. have to make sure move_type	1726	* no need to do checking below. have to make sure move_type
1722	* is set, as lots of objects don't have it set - we treat that	1727	* is set, as lots of objects don't have it set - we treat that
1723	* as walking.	1728	* as walking.
…		…
1734	return 0;	1739	return 0;
1735		1740
1736	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1737	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1738	*/	1743	*/
1739		1744	for (object next, tmp = ms.top; tmp; tmp = next)
1740	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1741	{
1742	/* Trim the search when we find the first other spell effect
1743	* this helps performance so that if a space has 50 spell objects,
1744	* we don't need to check all of them.
1745	*/
1746	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1747	break;
1748	}	1745	{
		1746	next = tmp->below;
1749		1747
1750	for (; tmp; tmp = tmp->below)
1751	{
1752	if (tmp == op)	1748	if (tmp == op)
1753	continue; /* Can't apply yourself */	1749	continue; /* Can't apply yourself */
1754		1750
1755	/* Check to see if one of the movement types should be slowed down.	1751	/* Check to see if one of the movement types should be slowed down.
1756	* Second check makes sure that the movement types not being slowed	1752	* Second check makes sure that the movement types not being slowed
…		…
1761	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1762	{	1758	{
1763	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1764	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1765	{	1761	{
1766
1767	float
1768	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	float diff = tmp->move_slow_penalty * fabs (op->speed);
1769		1763
1770	if (op->is_player ())	1764	if (op->is_player ())
1771	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1765	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1772	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1766	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1773	diff /= 4.0;	1767	diff /= 4.0;
1774		1768
1775	op->speed_left -= diff;	1769	op->speed_left -= diff;
1776	}	1770	}
1777	}	1771	}
…		…
2178	* This basically means that if direction is 15, then it could either go	2172	* This basically means that if direction is 15, then it could either go
2179	* direction 4, 14, or 16 to get back to where we are.	2173	* direction 4, 14, or 16 to get back to where we are.
2180	* Moved from spell_util.c to object.c with the other related direction	2174	* Moved from spell_util.c to object.c with the other related direction
2181	* functions.	2175	* functions.
2182	*/	2176	*/
2183	const int reduction_dir[SIZEOFFREE][3] = {	2177	static const int reduction_dir[SIZEOFFREE][3] = {
2184	{0, 0, 0}, /* 0 */	2178	{0, 0, 0}, /* 0 */
2185	{0, 0, 0}, /* 1 */	2179	{0, 0, 0}, /* 1 */
2186	{0, 0, 0}, /* 2 */	2180	{0, 0, 0}, /* 2 */
2187	{0, 0, 0}, /* 3 */	2181	{0, 0, 0}, /* 3 */
2188	{0, 0, 0}, /* 4 */	2182	{0, 0, 0}, /* 4 */
…		…
2547	return splay (tmp);	2541	return splay (tmp);
2548		2542
2549	return 0;	2543	return 0;
2550	}	2544	}
2551		2545
		2546	//-GPL
		2547
		2548	void
		2549	object::force_set_timer (int duration)
		2550	{
		2551	this->duration = 1;
		2552	this->speed_left = -1.f;
		2553
		2554	this->set_speed (duration ? 1.f / duration : 0.f);
		2555	}
		2556
2552	object *	2557	object *
2553	object::force_add (shstr_tmp name, int duration)	2558	object::force_add (shstr_tmp name, int duration)
2554	{	2559	{
2555	if (object *force = force_find (name))	2560	if (object *force = force_find (name))
2556	force->destroy ();	2561	force->destroy ();
2557		2562
2558	object *force = get_archetype (FORCE_NAME);	2563	object *force = get_archetype (FORCE_NAME);
2559		2564
2560	force->slaying = name;	2565	force->slaying = name;
2561	force->stats.food = 1;	2566	force->force_set_timer (duration);
2562	force->speed_left = -1.f;
2563
2564	force->set_speed (duration ? 1.f / duration : 0.f);
2565	force->flag [FLAG_IS_USED_UP] = true;
2566	force->flag [FLAG_APPLIED] = true;	2567	force->flag [FLAG_APPLIED] = true;
2567		2568
2568	return insert (force);	2569	return insert (force);
2569	}	2570	}
2570		2571
2571	void	2572	void

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.283 by root, Sat Feb 21 06:25:46 2009 UTC vs. Revision 1.299 by root, Sun Nov 8 20:55:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.283 by root, Sat Feb 21 06:25:46 2009 UTC vs.
Revision 1.299 by root, Sun Nov 8 20:55:39 2009 UTC