move sound_manager new/delete into main

This commit is contained in:
milek7
2017-08-20 17:37:05 +02:00
parent a4ef017eab
commit 4918fea2ba
2 changed files with 7 additions and 10 deletions

View File

@@ -346,6 +346,12 @@ int main(int argc, char *argv[])
|| (false == UILayer.init(window)))
return -1;
if (!(sound_man = new sound_manager()))
{
ErrorLog("Sound subsystem setup failed");
return -1;
}
input::Keyboard.init();
input::Mouse.init();
input::Gamepad.init();
@@ -409,6 +415,7 @@ int main(int argc, char *argv[])
#endif
}
delete sound_man;
TPythonInterpreter::killInstance();
#ifdef _WIN32
delete pConsole;

View File

@@ -218,7 +218,6 @@ TWorld::~TWorld()
Global::bManageNodes = false; // Ra: wyłączenie wyrejestrowania, bo się sypie
TrainDelete();
// Ground.Free(); //Ra: usunięcie obiektów przed usunięciem dźwięków - sypie się
delete sound_man;
}
void TWorld::TrainDelete(TDynamicObject *d)
@@ -302,15 +301,6 @@ bool TWorld::Init( GLFWwindow *Window ) {
UILayer.set_background( "logo" );
sound_man = new sound_manager();
if (!sound_man)
{
ErrorLog( "Sound subsystem setup failed" );
return false;
}
WriteLog("SoundAL Init OK");
glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii
UILayer.set_progress(0.01);
UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" );