aboutsummaryrefslogtreecommitdiff
path: root/engines/made
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/made
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/made')
-rw-r--r--engines/made/made.cpp12
-rw-r--r--engines/made/made.h10
2 files changed, 5 insertions, 17 deletions
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 892e8b1638..10e8c5d7e9 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -135,13 +135,6 @@ MadeEngine::~MadeEngine() {
delete _music;
}
-Common::Error MadeEngine::init() {
- // Initialize backend
- initGraphics(320, 200, false);
-
- return Common::kNoError;
-}
-
void MadeEngine::syncSoundSettings() {
_music->setVolume(ConfMan.getInt("music_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("sfx_volume"));
@@ -247,7 +240,10 @@ void MadeEngine::handleEvents() {
}
-Common::Error MadeEngine::go() {
+Common::Error MadeEngine::run() {
+
+ // Initialize backend
+ initGraphics(320, 200, false);
resetAllTimers();
diff --git a/engines/made/made.h b/engines/made/made.h
index e8ea30e0c6..be369053cb 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -80,15 +80,7 @@ class MadeEngine : 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();
public:
MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc);