diff options
author | megamage <none@none> | 2008-10-27 10:57:53 -0500 |
---|---|---|
committer | megamage <none@none> | 2008-10-27 10:57:53 -0500 |
commit | 4cbc6f830a833719b7586b333aa8151dab563b60 (patch) | |
tree | 52f783f0c0e4007ec7effdcba91da36dd9ee8a6f /src/game/Object.cpp | |
parent | 1bb16035923b0675b0c239379cd5d64c8310f28b (diff) |
[svn] Fix a compile error about M_PI_2.
Update Felmyst script to test new setActive function.
Fix the bug that priest's fear is unbreakable (dirty hack before find the correct way).
(some unfinished unused content included, just ignore them, will finish them later)
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r-- | src/game/Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 4486b03d80f..2d6a5786471 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1537,5 +1537,5 @@ void WorldObject::GetRandomContactPoint( const WorldObject* obj, float &x, float float angle_offset_ratio = 1 - object_size/12.0f; if (angle_offset_ratio < 0.05) angle_offset_ratio = 0.05; // angle to face `obj` to `this`plus a random angle offset(from -90 degree to 90 degree)*angle_offset_ratio using distance from distance2dMin to distance2dMax includes size of `obj` - GetNearPoint(obj,x,y,z,object_size,distance2dMin+(distance2dMax-distance2dMin)*rand_norm(), GetAngle( obj ) + (M_PI_2 - M_PI * rand_norm()) * angle_offset_ratio); + GetNearPoint(obj,x,y,z,object_size,distance2dMin+(distance2dMax-distance2dMin)*rand_norm(), GetAngle( obj ) + (M_PI/2 - M_PI * rand_norm()) * angle_offset_ratio); } |