aboutsummaryrefslogtreecommitdiff
path: root/engines/lab
diff options
context:
space:
mode:
authorStrangerke2015-12-16 02:02:58 +0100
committerWillem Jan Palenstijn2015-12-23 21:34:06 +0100
commitdd06c8328079f296153e4ceb444d1b1760c414ff (patch)
treef207bac2d79a45d9c9670512030120129466c94b /engines/lab
parentde6de51e8be6d79c7649796d91f2e4d4efce83cc (diff)
downloadscummvm-rg350-dd06c8328079f296153e4ceb444d1b1760c414ff.tar.gz
scummvm-rg350-dd06c8328079f296153e4ceb444d1b1760c414ff.tar.bz2
scummvm-rg350-dd06c8328079f296153e4ceb444d1b1760c414ff.zip
LAB: Make more use of kButton enum
Diffstat (limited to 'engines/lab')
-rw-r--r--engines/lab/engine.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index f9533e9385..3c632d2295 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -546,13 +546,13 @@ void LabEngine::mainGameLoop() {
uint16 code = 0;
switch (result) {
case VKEY_UPARROW:
- code = 7;
+ code = kButtonForward;
break;
case VKEY_LTARROW:
- code = 6;
+ code = kButtonLeft;
break;
case VKEY_RTARROW:
- code = 8;
+ code = kButtonRight;
break;
default:
break;
@@ -900,7 +900,7 @@ void LabEngine::processMainButton(CloseDataPtr wrkClosePtr, uint16 &curInv, uint
case kButtonOpen:
case kButtonClose:
case kButtonLook:
- if ((actionMode == 4) && (buttonId == 4) && _closeDataPtr) {
+ if ((actionMode == 4) && (buttonId == kButtonLook) && _closeDataPtr) {
doMainView(&_closeDataPtr);
_anim->_doBlack = true;
@@ -944,13 +944,12 @@ void LabEngine::processMainButton(CloseDataPtr wrkClosePtr, uint16 &curInv, uint
case kButtonRight:
_closeDataPtr = nullptr;
wrkClosePtr = nullptr;
- if (buttonId == 6)
+ if (buttonId == kButtonLeft)
drawStaticMessage(kTextTurnLeft);
else
drawStaticMessage(kTextTurnRight);
_curFileName = " ";
-
oldDirection = _direction;
newDir = processArrow(_direction, buttonId - 6);
@@ -958,7 +957,6 @@ void LabEngine::processMainButton(CloseDataPtr wrkClosePtr, uint16 &curInv, uint
_anim->_doBlack = true;
_direction = newDir;
forceDraw = true;
-
mayShowCrumbIndicator();
break;