[Scummvm-cvs-logs] scummvm master -> 552f2a52bddbaacdf67929414b796e8f5f093d49

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
552f2a52bd TSAGE: Fix R2R shading map not being setup if you restarted game whilst in-game


Commit: 552f2a52bddbaacdf67929414b796e8f5f093d49
    https://github.com/scummvm/scummvm/commit/552f2a52bddbaacdf67929414b796e8f5f093d49
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-24T07:58:32-08:00

Commit Message:
TSAGE: Fix R2R shading map not being setup if you restarted game whilst in-game

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4e0ca91..e735f4f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -371,12 +371,13 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 	_field12 = 0;
 	_sceneMode = 0;
 
+	static_cast<SceneHandlerExt *>(R2_GLOBALS._sceneHandler)->setupPaletteMaps();
+
 	int prevScene = R2_GLOBALS._sceneManager._previousScene;
 	int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
 	if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
 			|| (sceneNumber == 50)
 			|| ((sceneNumber == 100) && (prevScene == 0 || prevScene == 180 || prevScene == 205))) {
-		static_cast<SceneHandlerExt *>(R2_GLOBALS._sceneHandler)->setupPaletteMaps();
 		R2_GLOBALS._uiElements._active = true;
 		R2_GLOBALS._uiElements.show();
 	} else {