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, 8 insertions, 2 deletions

diff --git a/src/app/app.h b/src/app/app.h
index 4aa97ce..f3f5601 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -194,6 +194,11 @@ public:
     //! Destructor
     ~CApplication();
 
+    //! Returns the application's event queue
+    CEventQueue* GetEventQueue();
+    //! Returns the sound subsystem
+    CSoundInterface* GetSound();
+
 public:
     //! Parses commandline arguments
     ParseArgsStatus ParseArguments(int argc, char *argv[]);
@@ -363,10 +368,11 @@ protected:
     void UpdatePerformanceCountersData();
 
 protected:
-    //! Instance manager
-    CInstanceManager*       m_iMan;
     //! Private (SDL-dependent data)
     ApplicationPrivate*     m_private;
+    //! Instance manager
+    // TODO: to be removed
+    CInstanceManager*       m_iMan;
     //! Global event queue
     CEventQueue*            m_eventQueue;
     //! Graphics engine