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

[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:
c128365068 MADS: Rex - Fix a bug related to "TAKE" "NOTE" action in scene 603.


Commit: c128365068660af764b4fdfc9e5256a7caed3839
    https://github.com/scummvm/scummvm/commit/c128365068660af764b4fdfc9e5256a7caed3839
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-10T07:36:42+02:00

Commit Message:
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.

Changed paths:
    engines/mads/nebular/nebular_scenes6.cpp



diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index d33675c..13ee1a3 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);