aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukaslw2014-08-01 18:25:02 +0200
committerlukaslw2014-08-01 18:25:02 +0200
commita1ffdcbc46f9a8e3c88224ac721f7176725b9343 (patch)
tree64027bc72c9ab252fb0b31f667af935803468081
parent0a49ba7487abd91c267e2ea37a8075d63c64f80b (diff)
downloadscummvm-rg350-a1ffdcbc46f9a8e3c88224ac721f7176725b9343.tar.gz
scummvm-rg350-a1ffdcbc46f9a8e3c88224ac721f7176725b9343.tar.bz2
scummvm-rg350-a1ffdcbc46f9a8e3c88224ac721f7176725b9343.zip
PRINCE: Inventory opening - update
-rw-r--r--engines/prince/prince.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 67d3722c27..257e84ab4e 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -4431,19 +4431,21 @@ void PrinceEngine::mainLoop() {
_frameNr++;
// inventory turning on:
- if (!_optionsFlag && _mouseFlag == 1) {
- if (_mainHero->_visible) {
- if (!_flags->getFlagValue(Flags::INVALLOWED)) {
- // 29 - Basement, 50 - Map
- if (_locationNr != 29 && _locationNr != 50) {
- Common::Point mousePos = _system->getEventManager()->getMousePos();
- if (mousePos.y < 4 && !_showInventoryFlag) {
- _invCounter++;
- } else {
- _invCounter = 0;
- }
- if (_invCounter >= _invMaxCount) {
- inventoryFlagChange(true);
+ if (!_optionsFlag) {
+ if (_mouseFlag == 1 || _mouseFlag == 2) {
+ if (_mainHero->_visible) {
+ if (!_flags->getFlagValue(Flags::INVALLOWED)) {
+ // 29 - Basement, 50 - Map
+ if (_locationNr != 29 && _locationNr != 50) {
+ Common::Point mousePos = _system->getEventManager()->getMousePos();
+ if (mousePos.y < 4 && !_showInventoryFlag) {
+ _invCounter++;
+ } else {
+ _invCounter = 0;
+ }
+ if (_invCounter >= _invMaxCount) {
+ inventoryFlagChange(true);
+ }
}
}
}