aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/cge.cpp
diff options
context:
space:
mode:
authorStrangerke2011-09-17 10:54:50 +0200
committerStrangerke2011-09-17 10:54:50 +0200
commit4778ff720c3e7c6527dde90c9eba7ccab7646cbb (patch)
treec2a603d9691287ed2a3232657c68ff1522d84f80 /engines/cge/cge.cpp
parentf5eca796580f5e16a2389d980b8330b2ab6b0980 (diff)
downloadscummvm-rg350-4778ff720c3e7c6527dde90c9eba7ccab7646cbb.tar.gz
scummvm-rg350-4778ff720c3e7c6527dde90c9eba7ccab7646cbb.tar.bz2
scummvm-rg350-4778ff720c3e7c6527dde90c9eba7ccab7646cbb.zip
CGE: Move some more globals to CGEEngine
Diffstat (limited to 'engines/cge/cge.cpp')
-rw-r--r--engines/cge/cge.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 349bf3f31c..68b07c8fb2 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -102,11 +102,11 @@ void CGEEngine::init() {
_debugLine = new InfoLine(this, kScrWidth);
_snail = new Snail(this, false);
_snail_ = new Snail(this, true);
-
+ _midiPlayer = new MusicPlayer(this);
_mouse = new Mouse(this);
_keyboard = new Keyboard(this);
_eventManager = new EventManager(this);
- _fx = new Fx(16); // must precede SOUND!!
+ _fx = new Fx(this, 16); // must precede SOUND!!
_sound = new Sound(this);
_offUseCount = atoi(_text->getText(kOffUseCount));
@@ -148,7 +148,7 @@ void CGEEngine::deinit() {
DebugMan.clearAllDebugChannels();
delete _console;
- _midiPlayer.killMidi();
+ _midiPlayer->killMidi();
// Delete engine objects
delete _vga;