aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-10-10 07:36:42 +0200
committerStrangerke2014-10-10 07:36:42 +0200
commitc128365068660af764b4fdfc9e5256a7caed3839 (patch)
tree98d088e0ac92914e5d553ac5f8a5c4a5b6165091 /engines
parent1d3e5f86f06d4171a885a64f042eebbb2fd7aae7 (diff)
downloadscummvm-rg350-c128365068660af764b4fdfc9e5256a7caed3839.tar.gz
scummvm-rg350-c128365068660af764b4fdfc9e5256a7caed3839.tar.bz2
scummvm-rg350-c128365068660af764b4fdfc9e5256a7caed3839.zip
MADS: Rex - Fix a bug related to "TAKE" "NOTE" action in scene 603.
The second check was never reached. Using the 'else' block of the previous check fixes the issue.
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/nebular/nebular_scenes6.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index d33675c578..13ee1a3dc1 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -643,7 +643,8 @@ void Scene603::actions() {
_game._player._visible = true;
_game._player._stepEnabled = true;
}
- }
+ } else
+ _vm->_dialogs->show(60323);
} else if (_action._lookFlag)
_vm->_dialogs->show(60310);
else if (_action.isAction(VERB_LOOK, NOUN_BED))
@@ -670,8 +671,6 @@ void Scene603::actions() {
_vm->_dialogs->show(60321);
else if (_action.isAction(VERB_TAKE, NOUN_PERFUME))
_vm->_dialogs->show(60322);
- else if (_action.isAction(VERB_TAKE, NOUN_NOTE))
- _vm->_dialogs->show(60323);
else if (_action.isAction(VERB_LOOK, NOUN_NOTE)) {
if (_game._objects[OBJ_NOTE]._roomNumber == _scene->_currentSceneId)
_vm->_dialogs->show(60324);