diff options
| -rwxr-xr-x | engines/pegasus/neighborhood/caldoria/caldoria.cpp | 3 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/subcontrolroom.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp index 484242371a..b7c45dc0c6 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp @@ -1284,7 +1284,7 @@ void Caldoria::activateHotspots() { switch (GameState.getCurrentRoom()) { case kCaldoriaDrawers: - if (getCurrentActivation() == kActivateRightOpen) + if (getCurrentActivation() == kActivateRightOpen) { if (GameState.isTakenItemID(kKeyCard)) { g_allHotspots.activateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID); g_allHotspots.deactivateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID); @@ -1292,6 +1292,7 @@ void Caldoria::activateHotspots() { g_allHotspots.activateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID); g_allHotspots.deactivateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID); } + } case kCaldoriaReplicator: if (GameState.getCaldoriaMadeOJ()) g_allHotspots.deactivateOneHotspot(kCaldoriaMakeOJSpotID); diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp index b0e5b98725..2b15ad4b7d 100755 --- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp +++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp @@ -804,7 +804,7 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) { } else if (clickedID == _outSpotID) { _gameState = kPuttingClawAway; - if (_currentAction == kNoActionIndex) + if (_currentAction == kNoActionIndex) { if (_clawPosition == _clawStartPosition) { GameInteraction::clickInHotspot(input, spot); } else { @@ -826,6 +826,7 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) { break; } } + } } else { GameInteraction::clickInHotspot(input, spot); } |