aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstrangerke2011-05-30 01:17:12 +0200
committerstrangerke2011-05-30 01:17:12 +0200
commitaa78f068986a1db7cbffd1fd563fe1d8e16eb24e (patch)
tree2cfff0ee66e8b61c242a3146a1d26421603e84f9
parent82d18d3831e338f9fe95f4dd928712c6bc9fe5e5 (diff)
downloadscummvm-rg350-aa78f068986a1db7cbffd1fd563fe1d8e16eb24e.tar.gz
scummvm-rg350-aa78f068986a1db7cbffd1fd563fe1d8e16eb24e.tar.bz2
scummvm-rg350-aa78f068986a1db7cbffd1fd563fe1d8e16eb24e.zip
TSAGE: Fix a mess in Seeker's actions in scene 2100
-rw-r--r--engines/tsage/ringworld_scenes3.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 60d35260e0..5de9efa653 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -1475,24 +1475,23 @@ void Scene2100::Object2::doAction(int action) {
case CURSOR_TALK:
if (_globals->getFlag(72)) {
_globals->_player.disableControl();
- if (!_globals->getFlag(52))
+ if (!_globals->getFlag(52)) {
+ scene->_sceneMode = 2111;
scene->setAction(&scene->_sequenceManager, scene, 2111, NULL);
- else {
+ } else {
scene->_sceneMode = _globals->getFlag(53) ? 2112 : 2110;
scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, NULL);
}
- } else {
- if (_globals->getFlag(14))
+ } else if (_globals->getFlag(13)) {
+ SceneItem::display2(2100, 31);
+ } else if (_globals->getFlag(14)) {
SceneItem::display2(2100, 32);
- else {
+ } else {
_globals->setFlag(14);
_globals->_player.disableControl();
scene->_sceneMode = 2108;
scene->setAction(&scene->_sequenceManager, scene, 2109, NULL);
- }
}
-
- scene->setAction(&scene->_action4);
break;
default:
SceneHotspot::doAction(action);