ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

PRINCE: Cursor fix for inventory - check if voice is playing

Browse Source
This commit is contained in:
lukaslw
2014-06-22 20:09:09 +02:00
parent 85108d6fb2
commit 7bc4599dad
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/prince/prince.cpp
+23 -19
View File
@@ -1857,7 +1857,28 @@ void PrinceEngine::displayInventory() {
while (!shouldQuit()) {
// cursor check !
if (_textSlots[0]._str != nullptr) {
changeCursor(0);
} else {
changeCursor(_currentPointerNumber);
Common::Rect inventoryRect;
inventoryRect.left = _invX1;
inventoryRect.top = _invY1;
inventoryRect.right = _invX1 + _invWidth;
inventoryRect.bottom = _invY1 + _invHeight;
Common::Point mousePos = _system->getEventManager()->getMousePos();
if (!_invCurInside && inventoryRect.contains(mousePos)) {
_invCurInside = true;
}
if (_invCurInside && !inventoryRect.contains(mousePos)) {
inventoryFlagChange(false);
_invCurInside = false;
break;
}
}
rememberScreenInv();
@@ -1868,24 +1889,7 @@ void PrinceEngine::displayInventory() {
showTexts(_graph->_screenForInventory);
Common::Rect inventoryRect;
inventoryRect.left = _invX1;
inventoryRect.top = _invY1;
inventoryRect.right = _invX1 + _invWidth;
inventoryRect.bottom = _invY1 + _invHeight;
Common::Point mousePos = _system->getEventManager()->getMousePos();
if (!_invCurInside && inventoryRect.contains(mousePos)) {
_invCurInside = true;
}
if (_invCurInside && !inventoryRect.contains(mousePos)) {
inventoryFlagChange(false);
_invCurInside = false;
break;
}
if (!_optionsFlag) {
if (!_optionsFlag && _textSlots[0]._str == nullptr) {
_selectedMob = hotspot(_graph->_screenForInventory, _invMobList);
}