[Scummvm-cvs-logs] scummvm master -> 233512fe10670984dca3e05efe01c8309e055bd3

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
233512fe10 MADE: Create MusicPlayer in run() instead of MadeEngine's constructor.


Commit: 233512fe10670984dca3e05efe01c8309e055bd3
    https://github.com/scummvm/scummvm/commit/233512fe10670984dca3e05efe01c8309e055bd3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-03T10:17:13-08:00

Commit Message:
MADE: Create MusicPlayer in run() instead of MadeEngine's constructor.

This fixes MT-32 emulator initialization. When the constructor is run the
paths like extrapath etc. are not yet set up. Thus, the MT-32 emulator would
not be able to find the necessary roms in case they are in the extrapath.

Changed paths:
    engines/made/made.cpp



diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 3843040..3e192cb 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -85,7 +85,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 
 	_script = new ScriptInterpreter(this);
 
-	_music = new MusicPlayer();
+	_music = nullptr;
 
 	// Set default sound frequency
 	switch (getGameID()) {
@@ -102,8 +102,6 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 		// Return to Zork sets it itself via a script funtion
 		break;
 	}
-
-	syncSoundSettings();
 }
 
 MadeEngine::~MadeEngine() {
@@ -277,6 +275,8 @@ void MadeEngine::handleEvents() {
 }
 
 Common::Error MadeEngine::run() {
+	_music = new MusicPlayer();
+	syncSoundSettings();
 
 	// Initialize backend
 	initGraphics(320, 200, false);