diff options
| author | Max Horn | 2009-03-01 04:42:46 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-01 04:42:46 +0000 |
| commit | dd98126423d915c19baf43184ba40fb0d9a68b64 (patch) | |
| tree | dc6c65d5ca3d7c5c69f54e9dc980067980a2ae9a /engines/gob/gob.cpp | |
| parent | 3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (diff) | |
| download | scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.tar.gz scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.tar.bz2 scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.zip | |
Engines: Fused several init&go methods into a single run method
svn-id: r39003
Diffstat (limited to 'engines/gob/gob.cpp')
| -rw-r--r-- | engines/gob/gob.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index dc11d29f55..51b7d30fbe 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -110,12 +110,6 @@ GobEngine::~GobEngine() { delete[] _startTot0; } -Common::Error GobEngine::go() { - _init->initGame(0); - - return Common::kNoError; -} - const char *GobEngine::getLangDesc(int16 language) const { if ((language < 0) || (language > 10)) language = 2; @@ -177,7 +171,7 @@ bool GobEngine::hasAdlib() const { return (_features & kFeaturesAdlib) != 0; } -Common::Error GobEngine::init() { +Common::Error GobEngine::run() { if (!initGameParts()) { GUIErrorMessage("GobEngine::init(): Unknown version of game engine"); return Common::kUnknownError; @@ -255,6 +249,8 @@ Common::Error GobEngine::init() { } _global->_languageWanted = _global->_language; + _init->initGame(0); + return Common::kNoError; } |