diff options
author | Max Horn | 2004-11-23 00:03:25 +0000 |
---|---|---|
committer | Max Horn | 2004-11-23 00:03:25 +0000 |
commit | aad9f122c0c37b152e70a01da48dc86a441ef819 (patch) | |
tree | a8dbee1f4e1e57de1ee5088e707f295df4986d12 /kyra | |
parent | 8ac347fd952a3811e6a948dfca3dec081882c335 (diff) | |
download | scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.tar.gz scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.tar.bz2 scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.zip |
Added Engine::init() method; added return value to Engine::go()
svn-id: r15865
Diffstat (limited to 'kyra')
-rw-r--r-- | kyra/kyra.cpp | 9 | ||||
-rw-r--r-- | kyra/kyra.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 440c1bced1..485bb4409b 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -121,6 +121,9 @@ KyraEngine::KyraEngine(GameDetector *detector, OSystem *syst) } else { error("unknown game"); } +} + +int KyraEngine::init() { // Initialize backen syst->initSize(320, 200); @@ -169,6 +172,8 @@ KyraEngine::KyraEngine(GameDetector *detector, OSystem *syst) assert(_npcScript); assert(_currentScript); + + return 0; } KyraEngine::~KyraEngine() { @@ -185,7 +190,7 @@ void KyraEngine::errorString(const char *buf1, char *buf2) { strcpy(buf2, buf1); } -void KyraEngine::go() { +int KyraEngine::go() { warning("Kyrandia Engine ::go()"); // starts the init script /* if (!_currentScript->startScript(kSetupScene)) { @@ -259,6 +264,8 @@ void KyraEngine::go() { delete movie; delete image; delete [] _buffer; + + return 0; } void KyraEngine::shutdown() { diff --git a/kyra/kyra.h b/kyra/kyra.h index 15564bffee..e269ad71d2 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -67,7 +67,8 @@ public: uint8 game(void) { return _game; } protected: - void go(); + int go(); + int init(); void shutdown(); Resourcemanager* _resMgr; MusicPlayer* _midiDriver; |