aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2015-12-27 13:34:50 +0100
committerWillem Jan Palenstijn2015-12-27 13:34:50 +0100
commit86a593af091381663520f422727b8c0b7b66b6e3 (patch)
tree5dfe06c60e240310fc53228b97e5a7add28c94db
parente06252cda5662e7d78f7884ddf5bca099eff93f9 (diff)
downloadscummvm-rg350-86a593af091381663520f422727b8c0b7b66b6e3.tar.gz
scummvm-rg350-86a593af091381663520f422727b8c0b7b66b6e3.tar.bz2
scummvm-rg350-86a593af091381663520f422727b8c0b7b66b6e3.zip
LAB: Simplify check order
-rw-r--r--engines/lab/engine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 2d45ab6ac0..95dcc71923 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -553,15 +553,15 @@ bool LabEngine::processEvent(MessageClass tmpClass, uint16 code, uint16 qualifie
if (shouldQuit())
return false;
- if (msgClass == kMessageRawKey && !_graphics->_longWinInFront) {
- return processKey(curMsg, msgClass, qualifier, curPos, curInv, forceDraw, code);
- } else if (_graphics->_longWinInFront) {
+ if (_graphics->_longWinInFront) {
if (msgClass == kMessageRawKey || leftButtonClick || rightButtonClick) {
_graphics->_longWinInFront = false;
_graphics->drawPanel();
drawRoomMessage(curInv, _closeDataPtr);
_graphics->screenUpdate();
}
+ } else if (msgClass == kMessageRawKey) {
+ return processKey(curMsg, msgClass, qualifier, curPos, curInv, forceDraw, code);
} else if (msgClass == kMessageButtonUp) {
if (!_alternate)
processMainButton(curInv, lastInv, oldDirection, forceDraw, buttonId, actionMode);