aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage
diff options
context:
space:
mode:
authorstrangerke2011-05-28 02:08:19 +0200
committerstrangerke2011-05-28 02:08:19 +0200
commit595728c8cae665fff075bd215a8794d0ad9a9275 (patch)
treeee40bdd00fa4b10e29c9ecef19b8caabb061a0e8 /engines/tsage
parent4b01303e296e35863681ec990ae8a4812606e558 (diff)
downloadscummvm-rg350-595728c8cae665fff075bd215a8794d0ad9a9275.tar.gz
scummvm-rg350-595728c8cae665fff075bd215a8794d0ad9a9275.tar.bz2
scummvm-rg350-595728c8cae665fff075bd215a8794d0ad9a9275.zip
TSAGE: Fix several bugs in scene 5300
Diffstat (limited to 'engines/tsage')
-rw-r--r--engines/tsage/ringworld_scenes6.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index b99ff71fa4..bab9b168c0 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1883,11 +1883,17 @@ void Scene5300::Hotspot2::doAction(int action) {
_globals->_player.disableControl();
if (RING_INVENTORY._stasisBox._sceneNumber != 1) {
+ scene->_sceneMode = 5316;
scene->setAction(&scene->_sequenceManager, scene, 5316, NULL);
} else {
_globals->setFlag(60);
- scene->_sceneMode = _globals->getFlag(67) ? 5315 : 5347;
- scene->setAction(&scene->_sequenceManager, scene, 5315, this);
+ if (_globals->getFlag(67)) {
+ scene->_sceneMode = 5315;
+ scene->setAction(&scene->_sequenceManager, scene, 5315, this, NULL);
+ } else {
+ scene->_sceneMode = 5347;
+ scene->setAction(&scene->_sequenceManager, scene, 5347, NULL);
+ }
}
}
break;