diff options
| author | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
|---|---|---|
| committer | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
| commit | 674477ddf8678d81d116df88b33160fa6be303cb (patch) | |
| tree | 8dd3bac5ab94ee39d7b72588ce8fef231c70ddb0 /src/game/Object.cpp | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
* Huge merge with original branch
--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 3900ab0527d..7310c1ad32f 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1702,7 +1702,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle ) const { GetNearPoint2D(x,y,distance2d+searcher_size,absAngle); - + z = GetPositionZ(); UpdateGroundPositionZ(x,y,z); |