diff options
Diffstat (limited to 'engines/kyra/kyra_v3.cpp')
| -rw-r--r-- | engines/kyra/kyra_v3.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index eee901598e..32754ecf2f 100644 --- a/engines/kyra/kyra_v3.cpp +++ b/engines/kyra/kyra_v3.cpp @@ -38,7 +38,7 @@ #include "graphics/cursorman.h" namespace Kyra { -KyraEngine_v3::KyraEngine_v3(OSystem *system, const GameFlags &flags) : KyraEngine(system, flags) { +KyraEngine_v3::KyraEngine_v3(OSystem *system, const GameFlags &flags) : KyraEngine_v2(system, flags) { _soundDigital = 0; _musicSoundChannel = -1; _menuAudioFile = "TITLE1.AUD"; @@ -87,10 +87,6 @@ KyraEngine_v3::~KyraEngine_v3() { delete [] _scenesList; } -Movie *KyraEngine_v3::createWSAMovie() { - return new WSAMovieV2(this); -} - int KyraEngine_v3::init() { KyraEngine::init(); @@ -294,14 +290,14 @@ void KyraEngine_v3::stopMusicTrack() { int KyraEngine_v3::musicUpdate(int forceRestart) { debugC(9, kDebugLevelMain, "KyraEngine::unkUpdate(%d)", forceRestart); - static uint32 timer = 0; + static uint32 mTimer = 0; static uint16 lock = 0; - if (ABS<int>(_system->getMillis() - timer) > (int)(0x0F * _tickLength)) { - timer = _system->getMillis(); + if (ABS<int>(_system->getMillis() - mTimer) > (int)(0x0F * _tickLength)) { + mTimer = _system->getMillis(); } - if (_system->getMillis() < timer && !forceRestart) { + if (_system->getMillis() < mTimer && !forceRestart) { return 1; } @@ -315,7 +311,7 @@ int KyraEngine_v3::musicUpdate(int forceRestart) { } } lock = 0; - timer = _system->getMillis() + 0x0F * _tickLength; + mTimer = _system->getMillis() + 0x0F * _tickLength; } return 1; @@ -324,7 +320,7 @@ int KyraEngine_v3::musicUpdate(int forceRestart) { #pragma mark - void KyraEngine_v3::gui_initMainMenu() { - KyraEngine::gui_initMainMenu(); + KyraEngine_v2::gui_initMainMenu(); _mainMenuFrame = 29; _mainMenuFrameAdd = 1; } |