CInstanceManager refactoring

 * removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions

1 files changed, 5 insertions, 4 deletions

diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp
index 7e097bf..98d9730 100644
--- a/src/object/task/taskreset.cpp
+++ b/src/object/task/taskreset.cpp
@@ -14,11 +14,11 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// taskreset.cpp
 
 #include "object/task/taskreset.h"
 
 #include "common/iman.h"
+
 #include "object/brain.h"
 #include "object/robotmain.h"
 
@@ -32,8 +32,7 @@ const float RESET_DELAY_MOVE = 0.7f;
 
 // Object's constructor.
 
-CTaskReset::CTaskReset(CInstanceManager* iMan, CObject* object)
-                     : CTask(iMan, object)
+CTaskReset::CTaskReset(CObject* object) : CTask(object)
 {
 }
 
@@ -273,9 +272,11 @@ bool CTaskReset::SearchVehicle()
     float       oRadius, dist;
     int         i;
 
+    CInstanceManager* iMan = CInstanceManager::GetInstancePointer();
+
     for ( i=0 ; i<1000000 ; i++ )
     {
-        pObj = static_cast<CObject*>(m_iMan->SearchInstance(CLASS_OBJECT, i));
+        pObj = static_cast<CObject*>(iMan->SearchInstance(CLASS_OBJECT, i));
         if ( pObj == 0 )  break;
 
         if ( pObj == m_object )  continue;