[Scummvm-cvs-logs] SF.net SVN: scummvm: [24887] scummvm/trunk/engines/saga

[fingolfin at users.sourceforge.net]

Revision: 24887
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24887&view=rev
Author:   fingolfin
Date:     2006-12-19 05:50:34 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
Merged SagaEngine::postInitGame() into SagaEngine::initGame()

Modified Paths:
--------------
    scummvm/trunk/engines/saga/game.cpp
    scummvm/trunk/engines/saga/saga.h

Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2006-12-19 12:24:41 UTC (rev 24886)
+++ scummvm/trunk/engines/saga/game.cpp	2006-12-19 13:50:34 UTC (rev 24887)
@@ -60,17 +60,6 @@
 
 #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 @@
 		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) {

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2006-12-19 12:24:41 UTC (rev 24886)
+++ scummvm/trunk/engines/saga/saga.h	2006-12-19 13:50:34 UTC (rev 24887)
@@ -372,7 +372,6 @@
 
 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; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.