diff options
| author | lukaslw | 2014-07-20 16:30:20 +0200 |
|---|---|---|
| committer | lukaslw | 2014-07-20 16:30:20 +0200 |
| commit | 8b9d3bedf24dffed7b65edcefe142addca70ee35 (patch) | |
| tree | 17f11abe20fc2b1419c7a2e905d71cd5a25ede1f /engines | |
| parent | e241b6ea71c0caa073d58b3775a1e8e01aa60519 (diff) | |
| download | scummvm-rg350-8b9d3bedf24dffed7b65edcefe142addca70ee35.tar.gz scummvm-rg350-8b9d3bedf24dffed7b65edcefe142addca70ee35.tar.bz2 scummvm-rg350-8b9d3bedf24dffed7b65edcefe142addca70ee35.zip | |
PRINCE: Inventory opening - fix during talking and options menu
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/prince/prince.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index b57cba979e..771741f60e 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -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); + } } } } |