aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-10-14 17:57:02 +0200
committerStrangerke2014-10-14 17:57:02 +0200
commitd175d58ce1e534c77a1d8f4f4abd1fd17f26faff (patch)
tree310dbb9b3dc7b795a484840940d88a9df2d31169 /engines
parentb58f6f397da29454e359384f6908b403f48d990e (diff)
downloadscummvm-rg350-d175d58ce1e534c77a1d8f4f4abd1fd17f26faff.tar.gz
scummvm-rg350-d175d58ce1e534c77a1d8f4f4abd1fd17f26faff.tar.bz2
scummvm-rg350-d175d58ce1e534c77a1d8f4f4abd1fd17f26faff.zip
TSAGE: R2R - Fix a bug when trying to exit the ship console after playing Outpost Alpha
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b82565332a..573cbbb29a 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;