Moved GetActive and GetDetectable to CObject

src/object/object.h

@@ -190,9 +190,16 @@ public:
     //! Returns tooltip text for an object
     std::string GetTooltipText();
 
+    //! Set "lock" mode of an object (for example, a robot while it's being factored, or a building while it's built)
     void SetLock(bool lock);
+    //! Return "lock" mode of an object
     bool GetLock();
 
+    //! Is this object active (not dead)?
+    virtual bool GetActive() { return true; }
+    //! Is this object detectable (not dead and not underground)?
+    virtual bool GetDetectable() { return true; }
+
 protected:
     //! Transform crash sphere by object's world matrix
     virtual void TransformCrashSphere(Math::Sphere& crashSphere) = 0;

src/object/old_object_interface.cpp

@@ -135,21 +135,6 @@ float COldObjectInterface::GetParam()
 }
 
 
-bool COldObjectInterface::GetActive()
-{
-    // TODO: temporary hack
-    return true;
-    //throw std::logic_error("GetActive: not implemented!");
-}
-
-bool COldObjectInterface::GetDetectable()
-{
-    // TODO: temporary hack
-    return true;
-    //throw std::logic_error("GetDetectable: not implemented!");
-}
-
-
 CAuto* COldObjectInterface::GetAuto()
 {
     throw std::logic_error("GetAuto: not implemented!");

src/object/old_object_interface.h

@@ -102,12 +102,6 @@ public:
     virtual float       GetParam();
     //@}
 
-    // Main CObject?
-    //! Is this object active (not dead)?
-    virtual bool        GetActive();
-    //! Is this object detectable (not dead and not underground)?
-    virtual bool        GetDetectable();
-
     // This will be eventually removed after refactoring to subclasses
     virtual CAuto*      GetAuto();