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

[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:
f69a1fe2d7 MADS: Show correct article when using items on items


Commit: f69a1fe2d7008ffaefdd82fbec88534ff2f66ca1
    https://github.com/scummvm/scummvm/commit/f69a1fe2d7008ffaefdd82fbec88534ff2f66ca1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T18:21:29-04:00

Commit Message:
MADS: Show correct article when using items on items

Changed paths:
    engines/mads/action.cpp



diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index d0b4583..ca682f0 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -236,12 +236,12 @@ void MADSAction::set() {
 					int articleNum = 0;
 
 					if ((_secondObjectSource == 2) || (_secondObjectSource == 5)) {
-						InventoryObject &invObject = _vm->_game->_objects.getItem(_hotspotId);
+						InventoryObject &invObject = _vm->_game->_objects.getItem(_secondObject);
 						articleNum = invObject._article;
-					} else if (_hotspotId < (int)scene._hotspots.size()) {
-						articleNum = scene._hotspots[_hotspotId]._articleNumber;
+					} else if (_secondObject < (int)scene._hotspots.size()) {
+						articleNum = scene._hotspots[_secondObject]._articleNumber;
 					} else {
-						articleNum = scene._dynamicHotspots.get(_hotspotId - scene._hotspots.size())._articleNumber;
+						articleNum = scene._dynamicHotspots.get(_secondObject - scene._hotspots.size())._articleNumber;
 					}
 
 					_statusText += kArticleList[articleNum];