diff options
| author | Filippos Karapetis | 2015-12-23 22:59:59 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-12-23 22:59:59 +0200 |
| commit | 70ec11d260d2adcfaaaa12d19213a6f705dde773 (patch) | |
| tree | 3bb24e8bbafc1792e21467efae8f26472cf70acd /engines/lab/engine.cpp | |
| parent | 10d9d8dee5104736da53a2807f3367b13731ad8f (diff) | |
| download | scummvm-rg350-70ec11d260d2adcfaaaa12d19213a6f705dde773.tar.gz scummvm-rg350-70ec11d260d2adcfaaaa12d19213a6f705dde773.tar.bz2 scummvm-rg350-70ec11d260d2adcfaaaa12d19213a6f705dde773.zip | |
LAB: Change the direction and map door defines into enums
Diffstat (limited to 'engines/lab/engine.cpp')
| -rw-r--r-- | engines/lab/engine.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index cbac66e855..0b6ac9cc3e 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -401,7 +401,7 @@ void LabEngine::mainGameLoop() { _closeDataPtr = nullptr; _roomNum = 1; - _direction = NORTH; + _direction = kDirectionNorth; _resource->readRoomData("LAB:Doors"); if (!(_inventory = _resource->readInventory("LAB:Inventor"))) @@ -1105,7 +1105,7 @@ void LabEngine::go() { } int LabEngine::followCrumbs() { - // NORTH, SOUTH, EAST, WEST + // kDirectionNorth, kDirectionSouth, kDirectionEast, kDirectionWest int movement[4][4] = { { VKEY_UPARROW, VKEY_RTARROW, VKEY_RTARROW, VKEY_LTARROW }, { VKEY_RTARROW, VKEY_UPARROW, VKEY_LTARROW, VKEY_RTARROW }, @@ -1134,14 +1134,14 @@ int LabEngine::followCrumbs() { int exitDir; // which direction is last crumb - if (_breadCrumbs[_numCrumbs]._direction == EAST) - exitDir = WEST; - else if (_breadCrumbs[_numCrumbs]._direction == WEST) - exitDir = EAST; - else if (_breadCrumbs[_numCrumbs]._direction == NORTH) - exitDir = SOUTH; + if (_breadCrumbs[_numCrumbs]._direction == kDirectionEast) + exitDir = kDirectionWest; + else if (_breadCrumbs[_numCrumbs]._direction == kDirectionWest) + exitDir = kDirectionEast; + else if (_breadCrumbs[_numCrumbs]._direction == kDirectionNorth) + exitDir = kDirectionSouth; else - exitDir = NORTH; + exitDir = kDirectionNorth; int moveDir = movement[_direction][exitDir]; |