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

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d2bf99b941 MADS: Fix for getting fishing line
f372a1ca4c MADS: Fix for getting Id card


Commit: d2bf99b9419786008c9c808fe958c95a5dacd7c3
    https://github.com/scummvm/scummvm/commit/d2bf99b9419786008c9c808fe958c95a5dacd7c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T23:03:48-04:00

Commit Message:
MADS: Fix for getting fishing line

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



diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index fd5e244..5a67d15 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2452,7 +2452,7 @@ void Scene512::actions() {
 			_vm->_dialogs->show(51229);
 		else
 			_vm->_dialogs->show(51230);
-	} if (_action.isAction(VERB_LOOK, NOUN_CHAIR))
+	} else if (_action.isAction(VERB_LOOK, NOUN_CHAIR))
 		_vm->_dialogs->show(51231);
 	else if (_action.isAction(VERB_LOOK, NOUN_ROPE))
 		_vm->_dialogs->show(51232);


Commit: f372a1ca4c66596103b5fd758d49a89abeb0437a
    https://github.com/scummvm/scummvm/commit/f372a1ca4c66596103b5fd758d49a89abeb0437a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T23:04:02-04:00

Commit Message:
MADS: Fix for getting Id card

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



diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 1e01ce0..f64f1a9 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -2607,7 +2607,7 @@ void Scene752::actions() {
 			_scene->_sequences.remove(_globals._sequenceIndexes[13]);
 			_game._objects.addToInventory(OBJ_ID_CARD);
 			_scene->_dynamicHotspots.remove(_cardId);
-			_vm->_dialogs->show(OBJ_ID_CARD, 830);
+			_vm->_dialogs->showItem(OBJ_ID_CARD, 830);
 			break;
 		case 2:
 			_game._player._visible = true;
@@ -2631,7 +2631,7 @@ void Scene752::actions() {
 			if (_game._objects.isInInventory(OBJ_BONE))
 				_game._objects.setRoom(OBJ_BONE, 1);
 			_game._objects.addToInventory(OBJ_BONES);
-			_vm->_dialogs->show(OBJ_BONES, 75221);
+			_vm->_dialogs->showItem(OBJ_BONES, 75221);
 			break;
 		case 2:
 			_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[12]);