libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 19:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PINK: fix pausing when click on panther with empty inventory

Browse Source
This commit is contained in:
whiterandrek 2018-06-13 20:30:55 +03:00 committed by Eugene Sandulenko
parent 1af15bf46b
commit 64bb3baab8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/pink/objects/actors/lead_actor.cpp
View File

@ -391,7 +391,9 @@ Actor *LeadActor::getActorByPoint(const Common::Point point) {
} }
void LeadActor::startInventory(bool paused) { void LeadActor::startInventory(bool paused) {
getInventoryMgr()->start(paused); if (!getInventoryMgr()->start(paused))
return;
if (!paused) { if (!paused) {
_isHaveItem = false; _isHaveItem = false;
_stateCopy = _state; _stateCopy = _state;

7
engines/pink/objects/inventory.cpp
View File

@ -99,11 +99,8 @@ void InventoryMgr::setItemOwner(const Common::String &owner, InventoryItem *item
} }
bool InventoryMgr::start(bool paused) { bool InventoryMgr::start(bool paused) {
if (!_item) { if (!isPinkOwnsAnyItems())
_item = findInventoryItem(_lead->getName()); return false;
if (!_item)
return false;
}
_window = _lead->getPage()->findActor(kInventoryWindowActor); _window = _lead->getPage()->findActor(kInventoryWindowActor);
_itemActor = _lead->getPage()->findActor(kInventoryItemActor); _itemActor = _lead->getPage()->findActor(kInventoryItemActor);