From f69a1fe2d7008ffaefdd82fbec88534ff2f66ca1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 1 Jun 2014 18:21:29 -0400 Subject: MADS: Show correct article when using items on items --- engines/mads/action.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp index d0b4583d92..ca682f00a3 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]; -- cgit v1.2.3