aboutsummaryrefslogtreecommitdiff
path: root/queen/queen.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-11-15 19:38:57 +0000
committerGregory Montoir2004-11-15 19:38:57 +0000
commita1867735a341e2e76082b6e26963dff626e1cbd6 (patch)
tree3992a9f35f5200f5df72b6bfc00cc6781c7574a4 /queen/queen.cpp
parentf08482d0ce88424f6bb4b4844aa6888f699ef705 (diff)
downloadscummvm-rg350-a1867735a341e2e76082b6e26963dff626e1cbd6.tar.gz
scummvm-rg350-a1867735a341e2e76082b6e26963dff626e1cbd6.tar.bz2
scummvm-rg350-a1867735a341e2e76082b6e26963dff626e1cbd6.zip
change engine initialization as suggested on -devel
svn-id: r15822
Diffstat (limited to 'queen/queen.cpp')
-rw-r--r--queen/queen.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 038755043e..93f2e70e35 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -91,13 +91,6 @@ namespace Queen {
QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
: Engine(syst) {
-
- if (!_mixer->isReady())
- warning("Sound initialisation failed.");
-
- _mixer->setVolume(ConfMan.getInt("sfx_volume"));
-
- _system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
}
QueenEngine::~QueenEngine() {
@@ -329,6 +322,8 @@ void QueenEngine::go() {
}
void QueenEngine::initialise(void) {
+ _system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
+
_bam = new BamScene(this);
_resource = new Resource();
_bankMan = new BankManager(_resource);
@@ -347,6 +342,10 @@ void QueenEngine::initialise(void) {
_logic = new LogicGame(this);
}
+ if (!_mixer->isReady())
+ warning("Sound initialisation failed.");
+ _mixer->setVolume(ConfMan.getInt("sfx_volume"));
+
int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
MidiDriver *driver = GameDetector::createMidi(midiDriver);
if (!driver)