From 15bf98da40083e5771da00219c2a5cb1b26228b5 Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 12 Aug 2015 17:48:58 +0200
Subject: [PATCH] Removed SetShowLimitRadius

---
 src/object/object_factory.cpp | 10 ----------
 src/object/old_object.cpp     | 12 +++++-------
 src/object/old_object.h       | 12 ++++--------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp
index 920ba387..7e06889f 100644
--- a/src/object/object_factory.cpp
+++ b/src/object/object_factory.cpp
@@ -485,7 +485,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
         obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 45.0f, 0.0f), 10.0f));
 
         obj->CreateShadowCircle(60.0f, 1.0f);
-        obj->SetShowLimitRadius(200.0f);
 
         m_terrain->AddBuildingLevel(pos, 28.6f, 73.4f, 30.0f, 0.4f);
     }
@@ -852,7 +851,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
         obj->GetCharacter()->posPower = Math::Vector(5.0f, 3.0f, 0.0f);
 
         obj->CreateShadowCircle(6.0f, 1.0f);
-        obj->SetShowLimitRadius(Gfx::LTNG_PROTECTION_RADIUS);
     }
 
     if ( type == OBJECT_NUCLEAR )
@@ -902,7 +900,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
         obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 20.0f));
 
         obj->CreateShadowCircle(21.0f, 1.0f);
-        obj->SetShowLimitRadius(Gfx::LTNG_PROTECTION_RADIUS);
     }
 
     if ( type == OBJECT_SAFE )
@@ -2572,13 +2569,6 @@ CObjectUPtr CObjectFactory::CreateVehicle(const ObjectCreateParams& params)
 
     obj->SetToy(toy);
 
-    float showLimitRadius = 0.0f;
-    if ( type == OBJECT_MOBILErt )  // robot thumper?
-    {
-        showLimitRadius = 400.0f;
-    }
-    obj->SetShowLimitRadius(showLimitRadius);
-
     auto physics = MakeUnique<CPhysics>(obj.get());
 
     std::unique_ptr<CMotion> motion;
diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp
index fa458cee..24c437c2 100644
--- a/src/object/old_object.cpp
+++ b/src/object/old_object.cpp
@@ -126,7 +126,6 @@ COldObject::COldObject(int id)
     m_bToy = false;
     m_bManual = false;
     m_bFixed = false;
-    m_showLimitRadius = 0.0f;
     m_aTime = 0.0f;
     m_shotTime = 0.0f;
     m_bVirusMode = false;
@@ -2585,14 +2584,13 @@ float COldObject::GetGunGoalH()
     return m_gunGoalH;
 }
 
-void COldObject::SetShowLimitRadius(float radius)
-{
-    m_showLimitRadius = radius;
-}
-
 float COldObject::GetShowLimitRadius()
 {
-    return m_showLimitRadius;
+    if ( m_type == OBJECT_BASE     ) return 200.0f; // SpaceShip
+    if ( m_type == OBJECT_MOBILErt ) return 400.0f; // Thumper
+    if ( m_type == OBJECT_TOWER    ) return Gfx::LTNG_PROTECTION_RADIUS; // DefenseTower
+    if ( m_type == OBJECT_PARA     ) return Gfx::LTNG_PROTECTION_RADIUS; // PowerCaptor
+    return 0.0f;
 }
 
 
diff --git a/src/object/old_object.h b/src/object/old_object.h
index 23bd193b..ed1c979e 100644
--- a/src/object/old_object.h
+++ b/src/object/old_object.h
@@ -89,7 +89,6 @@ protected:
     void        SetProgrammable(bool programmable);
     void        SetMotion(std::unique_ptr<CMotion> motion);
     void        SetAuto(std::unique_ptr<CAuto> automat);
-    void        SetShowLimitRadius(float radius);
     void        SetOption(int option);
     void        SetJostlingSphere(const Math::Sphere& sphere);
 
@@ -368,8 +367,6 @@ protected:
     bool        m_bToy;             // toy key
     bool        m_bManual;          // manual control (Scribbler)
     bool        m_bFixed;
-    bool        m_bClip;
-    float       m_showLimitRadius;
     float       m_gunGoalV;
     float       m_gunGoalH;
     Gfx::CameraType  m_cameraType;
@@ -378,7 +375,6 @@ protected:
     int         m_defRank;
     float       m_magnifyDamage;
     float       m_param;
-    int         m_team;
 
     Math::Sphere m_jostlingSphere;
     float       m_shieldRadius;
@@ -388,10 +384,10 @@ protected:
 
     int         m_partiSel[4];
 
-    float m_infoReturn;
+    float       m_infoReturn;
 
-    EventType           m_buttonAxe;
+    EventType   m_buttonAxe;
 
-    float               m_time;
-    float               m_burnTime;
+    float       m_time;
+    float       m_burnTime;
 };