diff options
| author | Johannes Schickel | 2007-07-29 16:31:29 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-07-29 16:31:29 +0000 |
| commit | 076d6b1bc1c4f62732ff46a0931c6bc28ef9a08f (patch) | |
| tree | 830715c57e5786762b2794071c6e5431c008e4c4 /engines/kyra/kyra_v3.cpp | |
| parent | b01232f08ad34ac16e36a83e32ca741fc8fc2169 (diff) | |
| download | scummvm-rg350-076d6b1bc1c4f62732ff46a0931c6bc28ef9a08f.tar.gz scummvm-rg350-076d6b1bc1c4f62732ff46a0931c6bc28ef9a08f.tar.bz2 scummvm-rg350-076d6b1bc1c4f62732ff46a0931c6bc28ef9a08f.zip | |
Restructure Kyrandia sourcecode (part 2, compiling works again)
svn-id: r28296
Diffstat (limited to 'engines/kyra/kyra_v3.cpp')
| -rw-r--r-- | engines/kyra/kyra_v3.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index f035158892..b49635ab2d 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(); @@ -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; } |