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

[dreammaster]

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:
abb3038106 MADS: Fix for getting bottle


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

Commit Message:
MADS: Fix for getting bottle

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



diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 42c528a..207fcd9 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -347,7 +347,7 @@ void MADSAction::startAction() {
 			DynamicHotspot &hs = dynHotspots.get(hotspotId - hotspots.size());
 			if ((hs._feetPos.x == -1) || (hs._feetPos.x == -3)) {
 				startWalkingDirectly(hs._feetPos.x);
-			} else if (hs._feetPos.x == 0) {
+			} else if (hs._feetPos.x < 0) {
 				player._prepareWalkFacing = hs._facing;
 			} else if (_savedFields._commandSource == CAT_NONE || hs._cursor < CURSOR_WAIT) {
 				player._needToWalk = true;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index f64f1a9..50e4233 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -1227,7 +1227,7 @@ void Scene704::enter() {
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(190, 122));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
 		}
-		int idx = _scene->_dynamicHotspots.add(NOUN_BONES, VERB_LOOK_AT, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
+		int idx = _scene->_dynamicHotspots.add(NOUN_BOTTLE, VERB_LOOK_AT, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
 		_bottleHotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(-2, 0), FACING_NONE);
 	}