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: Inventory opening - fix during talking and options menu

Browse Source
This commit is contained in:
lukaslw
2014-07-20 16:30:20 +02:00
parent e241b6ea71
commit 8b9d3bedf2
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/prince/prince.cpp
+13 -11
View File
@@ -4291,17 +4291,19 @@ void PrinceEngine::mainLoop() {
_frameNr++;
// inventory turning on:
Common::Point mousePos = _system->getEventManager()->getMousePos();
if (mousePos.y < 4 && !_showInventoryFlag) {
_invCounter++;
} else {
_invCounter = 0;
}
if (_invCounter >= _invMaxCount) {
if (_flags->getFlagValue(Flags::INVALLOWED) != 1) {
// 29 - Basement, 50 - Map, 59 - Intro
if (_locationNr != 29 && _locationNr != 50 && _locationNr != 59) {
inventoryFlagChange(true);
if (!_optionsFlag && _mouseFlag) {
Common::Point mousePos = _system->getEventManager()->getMousePos();
if (mousePos.y < 4 && !_showInventoryFlag) {
_invCounter++;
} else {
_invCounter = 0;
}
if (_invCounter >= _invMaxCount) {
if (_flags->getFlagValue(Flags::INVALLOWED) != 1) {
// 29 - Basement, 50 - Map, 59 - Intro
if (_locationNr != 29 && _locationNr != 50 && _locationNr != 59) {
inventoryFlagChange(true);
}
}
}
}