From d8d32812c8c1d4045622e63eaecb5805c7504004 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 19 Dec 2006 13:50:34 +0000
Subject: Merged SagaEngine::postInitGame() into SagaEngine::initGame()

svn-id: r24887
---
 engines/saga/game.cpp | 18 ++++++------------
 engines/saga/saga.h   |  1 -
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index 5e180d595f..2fce0bd59b 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -60,17 +60,6 @@ using Common::ADGameDescription;
 
 #include "sagagame.cpp"
 
-bool SagaEngine::postInitGame() {
-	_gameDisplayInfo = *_gameDescription->gameDisplayInfo;
-	_displayClip.right = _gameDisplayInfo.logicalWidth;
-	_displayClip.bottom = _gameDisplayInfo.logicalHeight;
-
-	if (!_resource->createContexts()) {
-		return false;
-	}
-	return true;
-}
-
 bool SagaEngine::initGame() {
 	int i = Common::real_ADVANCED_DETECTOR_DETECT_INIT_GAME(
 		(const byte *)gameDescriptions,
@@ -79,7 +68,12 @@ bool SagaEngine::initGame() {
 		saga_games
 		);
 	_gameDescription = &gameDescriptions[i];
-	return postInitGame();
+
+	_gameDisplayInfo = *_gameDescription->gameDisplayInfo;
+	_displayClip.right = _gameDisplayInfo.logicalWidth;
+	_displayClip.bottom = _gameDisplayInfo.logicalHeight;
+
+	return _resource->createContexts();
 }
 
 DetectedGameList GAME_detectGames(const FSList &fslist) {
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 0cefe76caf..4d26c960d7 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -372,7 +372,6 @@ public:
 
 public:
 	bool initGame(void);
-	bool postInitGame(void);
 public:
 	const SAGAGameDescription *getGameDescription() const { return _gameDescription; }
 	const bool isBigEndian() const { return (_gameDescription->features & GF_BIG_ENDIAN_DATA) != 0; }
-- 
cgit v1.2.3