From f6e516d8194defae8d36d62e9596bdf26d094b14 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 22 Mar 2010 17:47:38 +0100 Subject: * Fix CRLF. --HG-- branch : trunk --- src/game/Object.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game') 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()); } -- cgit v1.2.3