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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC

…		…
323	{	323	{
324	// see if we are in a container of sorts	324	// see if we are in a container of sorts
325	if (env)	325	if (env)
326	{	326	{
327	// the player inventory itself is always visible	327	// the player inventory itself is always visible
328	if (env->type == PLAYER)	328	if (env->is_player ())
329	return env;	329	return env;
330		330
331	// else a player could have our env open	331	// else a player could have our env open
332	object *envest = env->outer_env ();	332	object *envest = env->outer_env ();
333		333
…		…
636	}	636	}
637		637
638	if (speed < 0)	638	if (speed < 0)
639	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
640		640
641	dst->set_speed (dst->speed);	641	dst->activate ();
642	}	642	}
643		643
644	void	644	void
645	object::instantiate ()	645	object::instantiate ()
646	{	646	{
…		…
758	else if (action == UP_OBJ_INSERT)	758	else if (action == UP_OBJ_INSERT)
759	{	759	{
760	// this is likely overkill, TODO: revisit (schmorp)	760	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	763	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
768	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
…		…
770	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	771	* have move_allow right now.
772	*/	772	*/
773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775	m.flags_ = 0;	775	m.invalidate ();
776	}	776	}
777	/* if the object is being removed, we can't make intelligent	777	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	778	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	779	* that is being removed.
780	*/	780	*/
781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
782	m.flags_ = 0;	782	m.invalidate ();
783	else if (action == UP_OBJ_FACE)	783	else if (action == UP_OBJ_FACE)
784	/* Nothing to do for that case */ ;	784	/* Nothing to do for that case */ ;
785	else	785	else
786	LOG (llevError, "update_object called with invalid action: %d\n", action);	786	LOG (llevError, "update_object called with invalid action: %d\n", action);
787		787
…		…
829	object::activate ()	829	object::activate ()
830	{	830	{
831	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
832	if (active)	832	if (active)
833	return;	833	return;
		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
834		837
835	if (has_active_speed ())	838	if (has_active_speed ())
836	actives.insert (this);	839	actives.insert (this);
837	}	840	}
838		841
…		…
906	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
907	\|\| map->no_drop	910	\|\| map->no_drop
908	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
909	{	912	{
910	while (inv)	913	while (inv)
911	inv->destroy (true);	914	inv->destroy ();
912	}	915	}
913	else	916	else
914	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
915	while (inv)	918	while (inv)
916	{	919	{
…		…
920	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
921	\|\| op->type == RUNE	924	\|\| op->type == RUNE
922	\|\| op->type == TRAP	925	\|\| op->type == TRAP
923	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
924	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
925	op->destroy (true);	928	op->destroy ();
926	else	929	else
927	map->insert (op, x, y);	930	map->insert (op, x, y);
928	}	931	}
929	}	932	}
930	}	933	}
…		…
994	attacked_by = 0;	997	attacked_by = 0;
995	current_weapon = 0;	998	current_weapon = 0;
996	}	999	}
997		1000
998	void	1001	void
999	object::destroy (bool destroy_inventory)	1002	object::destroy ()
1000	{	1003	{
1001	if (destroyed ())	1004	if (destroyed ())
1002	return;	1005	return;
1003		1006
1004	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1005	{	1008	{
1006	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1007	head->destroy (destroy_inventory);	1010	head->destroy ();
1008	return;	1011	return;
1009	}	1012	}
1010		1013
1011	destroy_inv (!destroy_inventory);	1014	destroy_inv (false);
1012		1015
1013	if (is_head ())	1016	if (is_head ())
1014	if (sound_destroy)	1017	if (sound_destroy)
1015	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1016	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1052	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1053	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1054	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1055		1058
1056	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
		1060
		1061	object *pl = in_player ();
1057		1062
1058	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1059	* the map, but we don't actually do that - it is up	1064	* the map, but we don't actually do that - it is up
1060	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1061	*/	1066	*/
…		…
1073		1078
1074	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
1075	* made to players inventory. If set, avoiding the call	1080	* made to players inventory. If set, avoiding the call
1076	* to save cpu time.	1081	* to save cpu time.
1077	*/	1082	*/
1078	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if (pl)
		1084	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1085	{
1079	otmp->update_stats ();	1086	pl->update_stats ();
		1087
		1088	if (glow_radius && pl->is_on_map ())
		1089	update_all_los (pl->map, pl->x, pl->y);
		1090	}
1080	}	1091	}
1081	else if (map)	1092	else if (map)
1082	{	1093	{
1083	map->dirty = true;	1094	map->dirty = true;
1084	mapspace &ms = this->ms ();	1095	mapspace &ms = this->ms ();
1085		1096
1086	if (object *pl = ms.player ())	1097	if (object *pl = ms.player ())
1087	{	1098	{
1088	if (type == PLAYER) // this == pl(!)	1099	if (is_player ())
1089	{	1100	{
		1101	ms.smell = pticks; // remember the smell of the player
		1102
1090	// leaving a spot always closes any open container on the ground	1103	// leaving a spot always closes any open container on the ground
1091	if (container && !container->env)	1104	if (container && !container->env)
1092	// this causes spurious floorbox updates, but it ensures	1105	// this causes spurious floorbox updates, but it ensures
1093	// that the CLOSE event is being sent.	1106	// that the CLOSE event is being sent.
1094	close_container ();	1107	close_container ();
…		…
1111	*(below ? &below->above : &ms.bot) = above;	1124	*(below ? &below->above : &ms.bot) = above;
1112		1125
1113	above = 0;	1126	above = 0;
1114	below = 0;	1127	below = 0;
1115		1128
1116	ms.flags_ = 0;	1129	ms.invalidate ();
1117		1130
1118	if (map->in_memory == MAP_SAVING)	1131	if (map->in_memory == MAP_SAVING)
1119	return;	1132	return;
1120		1133
1121	int check_walk_off = !flag [FLAG_NO_APPLY];	1134	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1154	}	1167	}
1155		1168
1156	last = tmp;	1169	last = tmp;
1157	}	1170	}
1158		1171
1159	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1172	if (affects_los ())
1160	update_all_los (map, x, y);	1173	update_all_los (map, x, y);
1161	}	1174	}
1162	}	1175	}
1163		1176
1164	/*	1177	/*
…		…
1188	esrv_update_item (UPD_NROF, pl, top);	1201	esrv_update_item (UPD_NROF, pl, top);
1189		1202
1190	op->weight = 0; // cancel the addition above	1203	op->weight = 0; // cancel the addition above
1191	op->carrying = 0; // must be 0 already	1204	op->carrying = 0; // must be 0 already
1192		1205
1193	op->destroy (1);	1206	op->destroy ();
1194		1207
1195	return top;	1208	return top;
1196	}	1209	}
1197		1210
1198	return 0;	1211	return 0;
…		…
1260	* just 'op' otherwise	1273	* just 'op' otherwise
1261	*/	1274	*/
1262	object *	1275	object *
1263	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1276	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1264	{	1277	{
1265	if (op->is_on_map ())
1266	{
1267	LOG (llevError, "insert_ob_in_map called for object already on map");
1268	abort ();
1269	}
1270
1271	if (op->env)
1272	{
1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1274	op->remove ();	1278	op->remove ();
1275	}
1276		1279
1277	if (op->face && !face_info (op->face))//D TODO: remove soon	1280	if (m == &freed_map)//D TODO: remove soon
1278	{//D	1281	{//D
1279	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1280	op->face = 1;//D
1281	}//D	1283	}//D
1282		1284
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* of areas of callers (eg, anything that uses find_free_spot would now	1286	* of areas of callers (eg, anything that uses find_free_spot would now
1285	* need extra work	1287	* need extra work
1286	*/	1288	*/
1287	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1288	{	1290	{
1289	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290	return 0;	1292	return 0;
1291	}	1293	}
1292		1294
1293	if (object *more = op->more)	1295	if (object *more = op->more)
1294	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1307	{	1309	{
1308	// TODO: we actually want to update tmp, not op,	1310	// TODO: we actually want to update tmp, not op,
1309	// but some caller surely breaks when we return tmp	1311	// but some caller surely breaks when we return tmp
1310	// from here :/	1312	// from here :/
1311	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1312	tmp->destroy (1);	1314	tmp->destroy ();
1313	}	1315	}
1314		1316
1315	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1316	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1317		1319
…		…
1422	op->below = top;	1424	op->below = top;
1423	*(op->above ? &op->above->below : &ms.top) = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1424	}	1426	}
1425	}	1427	}
1426		1428
1427	if (op->type == PLAYER)	1429	if (op->is_player ())
1428	{	1430	{
1429	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1430	++op->map->players;	1432	++op->map->players;
1431	op->map->touch ();	1433	op->map->touch ();
1432	}	1434	}
…		…
1447	* be far away from this change and not affected in any way -	1449	* be far away from this change and not affected in any way -
1448	* this should get redone to only look for players within range,	1450	* this should get redone to only look for players within range,
1449	* or just updating the P_UPTODATE for spaces within this area	1451	* or just updating the P_UPTODATE for spaces within this area
1450	* of effect may be sufficient.	1452	* of effect may be sufficient.
1451	*/	1453	*/
1452	if (op->map->darkness && (op->glow_radius != 0))	1454	if (op->affects_los ())
		1455	{
		1456	op->ms ().invalidate ();
1453	update_all_los (op->map, op->x, op->y);	1457	update_all_los (op->map, op->x, op->y);
		1458	}
1454		1459
1455	/* updates flags (blocked, alive, no magic, etc) for this map space */	1460	/* updates flags (blocked, alive, no magic, etc) for this map space */
1456	update_object (op, UP_OBJ_INSERT);	1461	update_object (op, UP_OBJ_INSERT);
1457		1462
1458	INVOKE_OBJECT (INSERT, op);	1463	INVOKE_OBJECT (INSERT, op);
…		…
1492	{	1497	{
1493	/* first search for itself and remove any old instances */	1498	/* first search for itself and remove any old instances */
1494		1499
1495	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1500	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1496	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1501	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1497	tmp->destroy (1);	1502	tmp->destroy ();
1498		1503
1499	object *tmp = arch_to_object (archetype::find (arch_string));	1504	object *tmp = arch_to_object (archetype::find (arch_string));
1500		1505
1501	tmp->x = op->x;	1506	tmp->x = op->x;
1502	tmp->y = op->y;	1507	tmp->y = op->y;
…		…
1625	if (object *pl = tmp->visible_to ())	1630	if (object *pl = tmp->visible_to ())
1626	esrv_update_item (UPD_NROF, pl, tmp);	1631	esrv_update_item (UPD_NROF, pl, tmp);
1627		1632
1628	adjust_weight (this, op->total_weight ());	1633	adjust_weight (this, op->total_weight ());
1629		1634
1630	op->destroy (1);	1635	op->destroy ();
1631	op = tmp;	1636	op = tmp;
1632	goto inserted;	1637	goto inserted;
1633	}	1638	}
1634		1639
1635	op->owner = 0; // it's his/hers now. period.	1640	op->owner = 0; // it's his/hers now. period.
…		…
1653		1658
1654	adjust_weight (this, op->total_weight ());	1659	adjust_weight (this, op->total_weight ());
1655		1660
1656	inserted:	1661	inserted:
1657	/* reset the light list and los of the players on the map */	1662	/* reset the light list and los of the players on the map */
1658	if (op->glow_radius && map && map->darkness)	1663	if (op->glow_radius && is_on_map ())
		1664	{
		1665	update_stats ();
1659	update_all_los (map, x, y);	1666	update_all_los (map, x, y);
1660		1667	}
		1668	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1661	// if this is a player's inventory, update stats	1669	// if this is a player's inventory, update stats
1662	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1663	update_stats ();	1670	update_stats ();
1664		1671
1665	INVOKE_OBJECT (INSERT, this);	1672	INVOKE_OBJECT (INSERT, this);
1666		1673
1667	return op;	1674	return op;
…		…
1751	{	1758	{
1752		1759
1753	float	1760	float
1754	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	diff = tmp->move_slow_penalty * fabs (op->speed);
1755		1762
1756	if (op->type == PLAYER)	1763	if (op->is_player ())
1757	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1764	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1758	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1765	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1759	diff /= 4.0;	1766	diff /= 4.0;
1760		1767
1761	op->speed_left -= diff;	1768	op->speed_left -= diff;
…		…
1969	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
1970	*/	1977	*/
1971	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1972	continue;	1979	continue;
1973		1980
1974	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
1975	continue;	1982	continue;
1976		1983
1977	altern [index++] = i;	1984	altern [index++] = i;
1978	}	1985	}
1979		1986
…		…
2087	if ((move_type & blocked) == move_type)	2094	if ((move_type & blocked) == move_type)
2088	max = maxfree[i];	2095	max = maxfree[i];
2089	else if (mflags & P_IS_ALIVE)	2096	else if (mflags & P_IS_ALIVE)
2090	{	2097	{
2091	for (tmp = ms.bot; tmp; tmp = tmp->above)	2098	for (tmp = ms.bot; tmp; tmp = tmp->above)
2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2099	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2100	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2094	break;	2101	break;
2095		2102
2096	if (tmp)	2103	if (tmp)
2097	return freedir[i];	2104	return freedir[i];
…		…
2283	int	2290	int
2284	can_pick (const object who, const object item)	2291	can_pick (const object who, const object item)
2285	{	2292	{
2286	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2293	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2287	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2294	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2288	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2295	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2289	}	2296	}
2290		2297
2291	/*	2298	/*
2292	* create clone from object to another	2299	* create clone from object to another
2293	*/	2300	*/
…		…
2546	return splay (tmp);	2553	return splay (tmp);
2547		2554
2548	return 0;	2555	return 0;
2549	}	2556	}
2550		2557
2551	void	2558	object *
2552	object::force_add (const shstr name, int duration)	2559	object::force_add (const shstr name, int duration)
2553	{	2560	{
2554	if (object *force = force_find (name))	2561	if (object *force = force_find (name))
2555	force->destroy ();	2562	force->destroy ();
2556		2563
…		…
2562		2569
2563	force->set_speed (duration ? 1.f / duration : 0.f);	2570	force->set_speed (duration ? 1.f / duration : 0.f);
2564	force->flag [FLAG_IS_USED_UP] = true;	2571	force->flag [FLAG_IS_USED_UP] = true;
2565	force->flag [FLAG_APPLIED] = true;	2572	force->flag [FLAG_APPLIED] = true;
2566		2573
2567	insert (force);	2574	return insert (force);
2568	}	2575	}
2569		2576
2570	void	2577	void
2571	object::play_sound (faceidx sound)	2578	object::play_sound (faceidx sound)
2572	{	2579	{
…		…
2583	}	2590	}
2584	else	2591	else
2585	map->play_sound (sound, x, y);	2592	map->play_sound (sound, x, y);
2586	}	2593	}
2587		2594
		2595	void
		2596	object::make_noise ()
		2597	{
		2598	// we do not model noise in the map, so instead put
		2599	// a temporary light into the noise source
		2600	// could use the map instead, but that's less reliable for our
		2601	// goal, which is to make invisibility a bit harder to exploit
		2602
		2603	// currently only works sensibly for players
		2604	if (!is_player ())
		2605	return;
		2606
		2607	// find old force, or create new one
		2608	object *force = force_find (shstr_noise_force);
		2609
		2610	if (force)
		2611	force->speed_left = -1.f; // patch old speed up
		2612	else
		2613	{
		2614	force = archetype::get (shstr_noise_force);
		2615
		2616	force->slaying = shstr_noise_force;
		2617	force->stats.food = 1;
		2618	force->speed_left = -1.f;
		2619
		2620	force->set_speed (1.f / 4.f);
		2621	force->flag [FLAG_IS_USED_UP] = true;
		2622	force->flag [FLAG_APPLIED] = true;
		2623
		2624	insert (force);
		2625	}
		2626	}
		2627

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs. Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC