aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap/grid.cpp
diff options
context:
space:
mode:
authorStrangerke2016-04-01 07:52:25 +0200
committerEugene Sandulenko2016-05-10 09:54:21 +0200
commit2d63d769ebcb720507602b165eb042ff69e28c24 (patch)
treec2398dbae593b80ea5959ae9b3036b75e8fdb5c0 /engines/gnap/grid.cpp
parentc0369a421b361a5e4ccfab3e7857d1c7ecd27cf7 (diff)
downloadscummvm-rg350-2d63d769ebcb720507602b165eb042ff69e28c24.tar.gz
scummvm-rg350-2d63d769ebcb720507602b165eb042ff69e28c24.tar.bz2
scummvm-rg350-2d63d769ebcb720507602b165eb042ff69e28c24.zip
GNAP: Refactoring - Use enum for beaver facing
Diffstat (limited to 'engines/gnap/grid.cpp')
-rw-r--r--engines/gnap/grid.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/gnap/grid.cpp b/engines/gnap/grid.cpp
index 136e8d429e..bfe0a0f89d 100644
--- a/engines/gnap/grid.cpp
+++ b/engines/gnap/grid.cpp
@@ -1295,13 +1295,13 @@ bool GnapEngine::platypusWalkTo(int gridX, int gridY, int animationIndex, int se
_beaverSequenceDatNum = datNum;
// CHECKME Not sure if this is correct...
if (_platWalkNodes[_platWalkNodesCount - 1].deltaX > 0)
- _beaverFacing = 0;
+ _beaverFacing = kDirNone;
else if (_platWalkNodes[_platWalkNodesCount - 1].deltaX < 0)
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
else if (_platWalkNodes[_platWalkNodesCount - 1].gridX1 % 2)
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
else
- _beaverFacing = 0;
+ _beaverFacing = kDirNone;
if (animationIndex >= 0)
_gameSys->setAnimation(makeRid(_beaverSequenceDatNum, _beaverSequenceId), _beaverId, animationIndex);
} else if (animationIndex >= 0) {
@@ -1313,27 +1313,27 @@ bool GnapEngine::platypusWalkTo(int gridX, int gridY, int animationIndex, int se
_beaverSequenceId = ridToEntryIndex(sequenceId);
_beaverSequenceDatNum = ridToDatIndex(sequenceId);
if (_beaverSequenceId == 0x7C2) {
- _beaverFacing = 0;
+ _beaverFacing = kDirNone;
} else if (_beaverSequenceId == 0x7D2) {
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
}
} else {
if (_platWalkNodesCount > 0) {
if (_platWalkNodes[_platWalkNodesCount - 1].deltaX > 0) {
_beaverSequenceId = 0x7C2;
- _beaverFacing = 0;
+ _beaverFacing = kDirNone;
} else if (_platWalkNodes[_platWalkNodesCount - 1].deltaX < 0) {
_beaverSequenceId = 0x7D2;
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
} else if (_platWalkNodes[0].deltaX > 0) {
_beaverSequenceId = 0x7C2;
- _beaverFacing = 0;
+ _beaverFacing = kDirNone;
} else if (_platWalkNodes[0].deltaX < 0) {
_beaverSequenceId = 0x7D2;
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
} else {
_beaverSequenceId = 0x7D2;
- _beaverFacing = 4;
+ _beaverFacing = kDirUnk4;
}
} else if (_beaverFacing > 0) {
_beaverSequenceId = 0x7D2;