summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2012-12-20 21:57:57 +0100
committererihel <erihel@gmail.com>2012-12-20 21:57:57 +0100
commitf0e76ad446e58ea9b1564517fc3a823e61fd7410 (patch)
treeeddefe26b736243946ac1ce962aa9a45e800c9b7 /src/app
parenta6ff654ae37ca372d785c1e155fbfe67a3a25fed (diff)
downloadcolobot-f0e76ad446e58ea9b1564517fc3a823e61fd7410.tar.gz
colobot-f0e76ad446e58ea9b1564517fc3a823e61fd7410.tar.bz2
colobot-f0e76ad446e58ea9b1564517fc3a823e61fd7410.zip
sound fix
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app.cpp7
-rw-r--r--src/app/app.h4
2 files changed, 2 insertions, 9 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 3073d77..924ec74 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -89,7 +89,6 @@ CApplication::CApplication()
m_private = new ApplicationPrivate();
m_iMan = new CInstanceManager();
m_eventQueue = new CEventQueue(m_iMan);
- m_pluginManager = new CPluginManager();
m_profile = new CProfile();
m_engine = nullptr;
@@ -158,9 +157,6 @@ CApplication::~CApplication()
delete m_eventQueue;
m_eventQueue = nullptr;
- delete m_pluginManager;
- m_pluginManager = nullptr;
-
delete m_profile;
m_profile = nullptr;
@@ -336,8 +332,7 @@ bool CApplication::Create()
if (GetProfile().GetLocalProfileString("Resources", "Data", path))
m_dataPath = path;
- m_pluginManager->LoadFromProfile();
- m_sound = static_cast<CSoundInterface*>(CInstanceManager::GetInstancePointer()->SearchInstance(CLASS_SOUND));
+ m_sound = static_cast<CSoundInterface*>(CInstanceManager::GetInstancePointer()->SearchInstance(CLASS_SOUND));
if (!m_sound) {
GetLogger()->Error("Sound not loaded, falling back to fake sound!\n");
diff --git a/src/app/app.h b/src/app/app.h
index 32f03f8..5bf6867 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -25,13 +25,12 @@
#include "common/global.h"
#include "common/singleton.h"
+#include "common/profile.h"
#include "graphics/core/device.h"
#include "graphics/engine/engine.h"
#include "graphics/opengl/gldevice.h"
-#include "plugins/pluginmanager.h"
-
#include <string>
#include <vector>
@@ -337,7 +336,6 @@ protected:
CSoundInterface* m_sound;
//! Main class of the proper game engine
CRobotMain* m_robotMain;
- CPluginManager* m_pluginManager;
CProfile* m_profile;
//! Code to return at exit