Engines: Fused several init&go methods into a single run method

svn-id: r39003

2 files changed, 6 insertions, 17 deletions

diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp
index 8144cc670b..0581f6ddc3 100644
--- a/engines/igor/igor.cpp
+++ b/engines/igor/igor.cpp
@@ -88,13 +88,6 @@ IgorEngine::~IgorEngine() {
 	delete _midiPlayer;
 }
 
-Common::Error IgorEngine::init() {
-	initGraphics(320, 200, false);
-
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	return Common::kNoError;
-}
-
 void IgorEngine::restart() {
 	_screenVGAVOffset = 0;
 
@@ -166,7 +159,10 @@ void IgorEngine::restart() {
 	_gameTicks = 0;
 }
 
-Common::Error IgorEngine::go() {
+Common::Error IgorEngine::run() {
+	initGraphics(320, 200, false);
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+
 	restart();
 	setupDefaultPalette();
 	_currentPart = ConfMan.getInt("boot_param");
diff --git a/engines/igor/igor.h b/engines/igor/igor.h
index 41123634fe..6d2c464efb 100644
--- a/engines/igor/igor.h
+++ b/engines/igor/igor.h
@@ -312,15 +312,8 @@ public:
 	IgorEngine(OSystem *system, const DetectedGameVersion *dgv);
 	virtual ~IgorEngine();
 
-	Common::Error init();
-	Common::Error go();
-	virtual Common::Error run() {
-		Common::Error err;
-		err = init();
-		if (err != Common::kNoError)
-			return err;
-		return go();
-	}
+	// Engine APIs
+	virtual Common::Error run();
 
 	void handleOptionsMenu_paintSave();
 	bool handleOptionsMenu_handleKeyDownSave(int key);