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/m4/m4.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/m4/m4.cpp')
-rw-r--r-- | engines/m4/m4.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp index 0c1256bce4..37f6599037 100644 --- a/engines/m4/m4.cpp +++ b/engines/m4/m4.cpp @@ -141,7 +141,7 @@ M4Engine::~M4Engine() { delete _resourceManager; } -Common::Error M4Engine::init() { +Common::Error M4Engine::run() { // Initialize backend if (isM4()) initGraphics(640, 480, true); @@ -194,7 +194,10 @@ Common::Error M4Engine::init() { _random = new Common::RandomSource(); g_system->getEventManager()->registerRandomSource(*_random, "m4"); - return Common::kNoError; + if (isM4()) + return goM4(); + else + return goMADS(); } void M4Engine::eventHandler() { @@ -269,13 +272,6 @@ void M4Engine::loadMenu(MenuType menuType, bool loadSaveFromHotkey, bool calledF _viewManager->moveToFront(view); } -Common::Error M4Engine::go() { - if (isM4()) - return goM4(); - else - return goMADS(); -} - Common::Error M4Engine::goMADS() { _palette->setMadsSystemPalette(); |