GRIFFON: Simplified main engine function

3 files changed, 12 insertions, 23 deletions

diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index 5d64bfb54a..9967d8b9d9 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -96,16 +96,6 @@ enum {
 
 */
 
-void GriffonEngine::griffon_main() {
-	sys_initialize();
-	game_showlogos();
-
-	if (_shouldQuit)
-		return;
-
-	game_main();
-}
-
 // element tile locations
 const int elementmap[15][20] = {
 	{  2, 2, 2, 2, -1, -1, -1, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1 },
@@ -4363,15 +4353,6 @@ void GriffonEngine::game_loadmap(int mapnum) {
 	_clipbg2->copyRectToSurface(_clipbg->getPixels(), _clipbg->pitch, 0, 0, _clipbg->w, _clipbg->h);
 }
 
-void GriffonEngine::game_main() {
-	game_title(0);
-
-	if (_shouldQuit)
-		return;
-
-	game_saveloadnew();
-}
-
 void GriffonEngine::newGame() {
 	float xofs = 0;
 	float ld = 0, add;
diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp
index f7f852cdab..5487ce7514 100644
--- a/engines/griffon/griffon.cpp
+++ b/engines/griffon/griffon.cpp
@@ -66,7 +66,18 @@ Common::Error GriffonEngine::run() {
 
 	_console = new Console();
 
-	griffon_main();
+	sys_initialize();
+	game_showlogos();
+
+	if (_shouldQuit)
+		return Common::kNoError;
+
+	game_title(0);
+
+	if (_shouldQuit)
+		return Common::kNoError;
+
+	game_saveloadnew();
 
 	return Common::kNoError;
 }
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index 88372fef88..12ca51ce3c 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -255,8 +255,6 @@ private:
 	Console *_console;
 
 private:
-	void griffon_main();
-
 	float RND();
 
 	void game_addFloatIcon(int ico, float xloc, float yloc);
@@ -279,7 +277,6 @@ private:
 	void game_eventtext(const char *stri);
 	void game_handlewalking();
 	void game_loadmap(int mapnum);
-	void game_main();
 	void newGame();
 	void game_playgame();
 	void game_processtrigger(int trignum);