diff options
Diffstat (limited to 'engines/queen')
-rw-r--r-- | engines/queen/display.cpp | 4 | ||||
-rw-r--r-- | engines/queen/music.cpp | 7 | ||||
-rw-r--r-- | engines/queen/queen.cpp | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 56f1026785..83dc1a9f60 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -22,7 +22,6 @@ #include "common/system.h" -#include "common/EventRecorder.h" #include "common/events.h" #include "graphics/cursorman.h" @@ -38,7 +37,7 @@ namespace Queen { Display::Display(QueenEngine *vm, OSystem *system) : _fullscreen(true), _horizontalScroll(0), _bdWidth(0), _bdHeight(0), - _system(system), _vm(vm) { + _system(system), _vm(vm), _rnd("queenDisplay") { initFont(); @@ -73,7 +72,6 @@ Display::Display(QueenEngine *vm, OSystem *system) memset(&_dynalum, 0, sizeof(_dynalum)); setupInkColors(); - g_eventRec.registerRandomSource(_rnd, "queenDisplay"); } Display::~Display() { diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index 5d20e48c6c..858692703c 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -22,7 +22,6 @@ #include "common/config-manager.h" #include "common/events.h" -#include "common/EventRecorder.h" #include "queen/music.h" #include "queen/queen.h" @@ -37,7 +36,9 @@ namespace Queen { extern MidiDriver *C_Player_CreateAdLibMidiDriver(Audio::Mixer *); MidiMusic::MidiMusic(QueenEngine *vm) - : _isPlaying(false), _isLooping(false), _randomLoop(false), _masterVolume(192), _buf(0) { + : _isPlaying(false), _isLooping(false), + _randomLoop(false), _masterVolume(192), + _buf(0), _rnd("queenMusic") { memset(_channelsTable, 0, sizeof(_channelsTable)); _queuePos = _lastSong = _currentSong = 0; @@ -89,8 +90,6 @@ MidiMusic::MidiMusic(QueenEngine *vm) _parser = MidiParser::createParser_SMF(); _parser->setMidiDriver(this); _parser->setTimerRate(_driver->getBaseTempo()); - - g_eventRec.registerRandomSource(_rnd, "queenMusic"); } MidiMusic::~MidiMusic() { diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 1e34ba22fe..97f757c418 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -28,7 +28,6 @@ #include "common/savefile.h" #include "common/system.h" #include "common/events.h" -#include "common/EventRecorder.h" #include "common/textconsole.h" #include "engines/util.h" @@ -193,8 +192,7 @@ Common::Error QueenMetaEngine::createInstance(OSystem *syst, Engine **engine) co namespace Queen { QueenEngine::QueenEngine(OSystem *syst) - : Engine(syst), _debugger(0) { - g_eventRec.registerRandomSource(randomizer, "queen"); + : Engine(syst), _debugger(0), randomizer("queen") { } QueenEngine::~QueenEngine() { |