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

5 files changed, 4 insertions, 19 deletions

diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp
index 2e44eef..83cbeb6 100644
--- a/src/sound/oalsound/alsound.cpp
+++ b/src/sound/oalsound/alsound.cpp
@@ -15,8 +15,6 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// alsound.cpp
-
 
 #include "alsound.h"
 
@@ -29,18 +27,12 @@ ALSound::ALSound()
     mAudioVolume = 1.0f;
     mMusicVolume = 1.0f;
     mMute = false;
-    mCurrentMusic = nullptr;    
-    auto pointer = CInstanceManager::GetInstancePointer();
-    if (pointer != nullptr)
-        CInstanceManager::GetInstancePointer()->AddInstance(CLASS_SOUND, this);
+    mCurrentMusic = nullptr;
 }
 
 
 ALSound::~ALSound()
 {
-    auto pointer = CInstanceManager::GetInstancePointer();
-    if (pointer != nullptr)
-        CInstanceManager::GetInstancePointer()->DeleteInstance(CLASS_SOUND, this);
     CleanUp();
 }
 
diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h
index 530aa5e..bdf06b1 100644
--- a/src/sound/oalsound/alsound.h
+++ b/src/sound/oalsound/alsound.h
@@ -24,7 +24,6 @@
 
 #include <AL/al.h>
 
-#include "common/iman.h"
 #include "common/logger.h"
 #include "sound/sound.h"
 
diff --git a/src/sound/oalsound/buffer.cpp b/src/sound/oalsound/buffer.cpp
index d76b24a..edc3d74 100644
--- a/src/sound/oalsound/buffer.cpp
+++ b/src/sound/oalsound/buffer.cpp
@@ -14,7 +14,6 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// buffer.cpp
 
 #include "buffer.h"
 
diff --git a/src/sound/oalsound/channel.cpp b/src/sound/oalsound/channel.cpp
index 2b9af9b..3c8bc50 100644
--- a/src/sound/oalsound/channel.cpp
+++ b/src/sound/oalsound/channel.cpp
@@ -14,7 +14,6 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// channel.cpp
 
 #include "channel.h"
 
@@ -349,4 +348,4 @@ void Channel::PopEnvelope()
 
 void Channel::SetLoop(bool loop) {
     mLoop = loop;
-}
\ No newline at end of file
+}
diff --git a/src/sound/sound.h b/src/sound/sound.h
index d152f76..70139ea 100644
--- a/src/sound/sound.h
+++ b/src/sound/sound.h
@@ -26,7 +26,6 @@
 
 #include "math/vector.h"
 
-#include "common/iman.h"
 #include "common/logger.h"
 
 #include <string>
@@ -156,11 +155,8 @@ enum SoundNext
 class CSoundInterface
 {
   public:
-    inline CSoundInterface() {
-      CInstanceManager::GetInstance().AddInstance(CLASS_SOUND, this);
-      //m_iMan->AddInstance(CLASS_SOUND, this);
-    };
-    inline virtual ~CSoundInterface() {};
+    inline CSoundInterface() {}
+    inline virtual ~CSoundInterface() {}
 
     /** Function to initialize sound device
      *  \param b3D - enable support for 3D sound