diff options
| author | Strangerke | 2015-11-30 01:03:14 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:44 +0100 |
| commit | 05f54b7fe0a0fbdfc731404b77b149f10ad5679b (patch) | |
| tree | 210044ed8679bb7c2b575941c5f908b07c2af3ea /engines/lab/lab.cpp | |
| parent | 771e558d905ee467280482d62697dc66d969ed2b (diff) | |
| download | scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.tar.gz scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.tar.bz2 scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.zip | |
LAB: Make _music a member of LabEngine instead of a global
Diffstat (limited to 'engines/lab/lab.cpp')
| -rw-r--r-- | engines/lab/lab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp index 3792f2b0d3..745bb74f94 100644 --- a/engines/lab/lab.cpp +++ b/engines/lab/lab.cpp @@ -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 |