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/saga | |
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/saga')
-rw-r--r-- | engines/saga/saga.cpp | 6 | ||||
-rw-r--r-- | engines/saga/saga.h | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 772620e710..1fede4b662 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -147,7 +147,7 @@ SagaEngine::~SagaEngine() { delete _resource; } -Common::Error SagaEngine::init() { +Common::Error SagaEngine::run() { // Assign default values to the config manager, in case settings are missing ConfMan.registerDefault("talkspeed", "255"); ConfMan.registerDefault("subtitles", "true"); @@ -279,10 +279,6 @@ Common::Error SagaEngine::init() { _system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true); #endif - return Common::kNoError; -} - -Common::Error SagaEngine::go() { int msec = 0; _previousTicks = _system->getMillis(); diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 1e3a17bacf..dca5c38698 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -443,15 +443,7 @@ class SagaEngine : public Engine { public: // 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(); bool hasFeature(EngineFeature f) const; void syncSoundSettings(); void pauseEngineIntern(bool pause); |