aboutsummaryrefslogtreecommitdiff
path: root/engines/cine
diff options
context:
space:
mode:
authorMax Horn2009-03-01 04:42:46 +0000
committerMax Horn2009-03-01 04:42:46 +0000
commitdd98126423d915c19baf43184ba40fb0d9a68b64 (patch)
treedc6c65d5ca3d7c5c69f54e9dc980067980a2ae9a /engines/cine
parent3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (diff)
downloadscummvm-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/cine')
-rw-r--r--engines/cine/cine.cpp6
-rw-r--r--engines/cine/cine.h10
2 files changed, 2 insertions, 14 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 21e83b8b8a..fde1fb6621 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -74,7 +74,7 @@ CineEngine::~CineEngine() {
Common::clearAllDebugChannels();
}
-Common::Error CineEngine::init() {
+Common::Error CineEngine::run() {
// Initialize backend
initGraphics(320, 200, false);
@@ -88,10 +88,6 @@ Common::Error CineEngine::init() {
initialize();
- return Common::kNoError;
-}
-
-Common::Error CineEngine::go() {
CursorMan.showMouse(true);
mainLoop(1);
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 4800604791..bf56e9189b 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -71,15 +71,7 @@ class CineEngine : public Engine {
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();
virtual bool hasFeature(EngineFeature f) const;
void shutdown();