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

[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:
d42d523ca2 MADS: Fix walking to dynamic hotspots


Commit: d42d523ca2971f3f370476c210edf74ce2b48c5c
    https://github.com/scummvm/scummvm/commit/d42d523ca2971f3f370476c210edf74ce2b48c5c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-26T11:29:03-04:00

Commit Message:
MADS: Fix walking to dynamic hotspots

Changed paths:
    engines/mads/action.cpp



diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 1db143a..0b853e1 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -341,7 +341,7 @@ void MADSAction::startAction() {
 				startWalkingDirectly(hs._feetPos.x);
 			} else if (hs._feetPos.x == 0) {
 				player._prepareWalkFacing = hs._facing;
-			} else if (_savedFields._commandSource == CAT_NONE || hs._cursor >= CURSOR_WAIT) {
+			} else if (_savedFields._commandSource == CAT_NONE || hs._cursor < CURSOR_WAIT) {
 				player._needToWalk = true;
 				player._prepareWalkPos = hs._feetPos;
 			}
@@ -351,7 +351,7 @@ void MADSAction::startAction() {
 		}
 	}
 
-	if (hotspotId >= 0 && hotspotId < (int)hotspots.size()) {
+	if (hotspotId >= 0) {
 		Hotspot &hs = hotspots[hotspotId];
 
 		if (hs._feetPos.x == -1 || hs._feetPos.x == -3) {