[Scummvm-cvs-logs] scummvm master -> d175d58ce1e534c77a1d8f4f4abd1fd17f26faff

[Strangerke]

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:
d175d58ce1 TSAGE: R2R - Fix a bug when trying to exit the ship console after playing Outpost Alpha


Commit: d175d58ce1e534c77a1d8f4f4abd1fd17f26faff
    https://github.com/scummvm/scummvm/commit/d175d58ce1e534c77a1d8f4f4abd1fd17f26faff
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-14T17:57:02+02:00

Commit Message:
TSAGE: R2R - Fix a bug when trying to exit the ship console after playing Outpost Alpha

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b825653..573cbbb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -627,7 +627,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	_palette.loadPalette(0);
 
-	if (R2_GLOBALS._sceneManager._previousScene != 125)
+	if ((R2_GLOBALS._sceneManager._previousScene != 125) && (R2_GLOBALS._sceneManager._previousScene != 1337) && (R2_GLOBALS._sceneManager._previousScene != 1330))
 		// Save the prior scene to return to when the console is turned off
 		R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = R2_GLOBALS._sceneManager._previousScene;