thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Make _music a member of LabEngine instead of a global

Browse source
This commit is contained in:
Strangerke 2015-11-30 01:03:14 +01:00 • committed by Willem Jan Palenstijn
parent 771e558d90
commit 05f54b7fe0
11 changed files with 89 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/lab/lab.cpp
View file

@ -76,6 +76,7 @@ LabEngine::LabEngine(OSystem *syst, const ADGameDescription *gameDesc)
_event = nullptr;
_resource = nullptr;
g_music = nullptr;
//const Common::FSNode gameDataDir(ConfMan.get("path"));
//SearchMan.addSubDirectoryMatching(gameDataDir, "game");
@ -100,8 +101,7 @@ Common::Error LabEngine::run() {
_event = new EventManager(this);
_resource = new Resource(this);
g_music = new Music();
g_music = new Music(this);
if (getPlatform() == Common::kPlatformWindows) {
// Check if this is the Wyrmkeep trial