aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2010-03-22 17:47:38 +0100
committerXTZGZoReX <none@none>2010-03-22 17:47:38 +0100
commitf6e516d8194defae8d36d62e9596bdf26d094b14 (patch)
treef271d6777248e93b98777f827f36fedac5419af8 /src
parentd4c3620557384b78035a6fc6b8dc2c909958d189 (diff)
* Fix CRLF.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Object.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 9c073219d7b..dd8b808b920 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -560,10 +560,10 @@ class WorldObject : public Object, public WorldLocation
bool IsInMap(const WorldObject* obj) const
{
- if (obj)
- return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
- else
- return false;
+ if (obj)
+ return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
+ else
+ return false;
}
bool IsWithinDist3d(float x, float y, float z, float dist) const
{ return IsInDist(x, y, z, dist + GetObjectSize()); }