From 3fcbda829a2aa17cbaf6423d34f69214b91b0e6c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 1 Mar 2009 04:30:55 +0000
Subject: Merged Engine::go() and ::init() into a new run() method (currently
 implemented by calling the existing init&go methods; to be cleaned up by
 engine authors

svn-id: r39002
---
 engines/sword2/sword2.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'engines/sword2/sword2.h')

diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 8cff53ffa1..946dc3df53 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -124,8 +124,15 @@ private:
 
 protected:
 	// Engine APIs
-	virtual Common::Error init();
-	virtual Common::Error go();
+	Common::Error init();
+	Common::Error go();
+	virtual Common::Error run() {
+		Common::Error err;
+		err = init();
+		if (err != Common::kNoError)
+			return err;
+		return go();
+	}
 	virtual GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void syncSoundSettings();
-- 
cgit v1.2.3