aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/m4.cpp14
-rw-r--r--engines/m4/m4.h10
2 files changed, 6 insertions, 18 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();
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index acf6b5a93b..7378dbf755 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -112,15 +112,7 @@ private:
protected:
// Engine APIs
- Common::Error init();
- Common::Error go();
- virtual Common::Error run() {
- Common::Error err;
- err = init();
- if (err != Common::kNoError)
- return err;
- return go();
- }
+ virtual Common::Error run();
void shutdown();