libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 14:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Show correct article when using items on items

Browse Source
This commit is contained in:
Paul Gilbert 2014-06-01 18:21:29 -04:00
parent c0b8a94a8c
commit f69a1fe2d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/mads/action.cpp
View File

@ -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];