GNAP: Some more enum changes

4 files changed, 6 insertions, 6 deletions

diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index dc677a1889..2717a7b7fc 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -1751,7 +1751,7 @@ void GnapEngine::gnapInitBrainPulseRndValue() {
 void GnapEngine::gnapUseDeviceOnBeaver() {
 	playGnapSequence(makeRid(1, getGnapSequenceId(gskPullOutDevice, _platX, _platY)));
 
-	if (_beaverFacing != 0) {
+	if (_beaverFacing != kDirNone) {
 		_gameSys->insertSequence(makeRid(1, 0x7D5), _beaverId,
 			makeRid(_beaverSequenceDatNum, _beaverSequenceId), _beaverId,
 			kSeqSyncWait, 0, 75 * _platX - _platGridX, 48 * _platY - _platGridY);
@@ -1930,7 +1930,7 @@ void GnapEngine::updateBeaverIdleSequence() {
 			if (_timers[1] == 0) {
 				_timers[1] = getRandom(20) + 30;
 				int rnd = getRandom(10);
-				if (_beaverFacing != 0) {
+				if (_beaverFacing != kDirNone) {
 					if (rnd != 0 || _beaverSequenceId != 0x7CA) {
 						if (rnd != 1 || _beaverSequenceId != 0x7CA)
 							playBeaverSequence(0x107CA);
@@ -1967,7 +1967,7 @@ void GnapEngine::beaverSub426234() {
 		if (_timers[0]) {
 			if (!_timers[1]) {
 				_timers[1] = getRandom(20) + 30;
-				if (_beaverFacing != 0) {
+				if (_beaverFacing != kDirNone) {
 					if (getRandom(10) >= 2 || _beaverSequenceId != 0x7CA)
 						playBeaverSequence(0x107CA);
 					else
diff --git a/engines/gnap/grid.cpp b/engines/gnap/grid.cpp
index bfe0a0f89d..3fce6eec99 100644
--- a/engines/gnap/grid.cpp
+++ b/engines/gnap/grid.cpp
@@ -1335,7 +1335,7 @@ bool GnapEngine::platypusWalkTo(int gridX, int gridY, int animationIndex, int se
 					_beaverSequenceId = 0x7D2;
 					_beaverFacing = kDirUnk4;
 				}
-			} else if (_beaverFacing > 0) {
+			} else if (_beaverFacing != kDirNone) {
 				_beaverSequenceId = 0x7D2;
 			} else {
 				_beaverSequenceId = 0x7C2;
diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp
index b6b5b91a44..671ad9c9c6 100644
--- a/engines/gnap/scenes/scene07.cpp
+++ b/engines/gnap/scenes/scene07.cpp
@@ -203,7 +203,7 @@ void GnapEngine::scene07_run() {
 						_timers[1] = getRandom(20) + 30;
 						int _gnapRandomValue = getRandom(20);
 						// TODO Cleanup
-						if (_beaverFacing != 0) {
+						if (_beaverFacing != kDirNone) {
 							if (_gnapRandomValue != 0 || _beaverSequenceId != 0x7CA) {
 								if (_gnapRandomValue != 1 || _beaverSequenceId != 0x7CA) {
 									if (_platY == 9)
diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp
index c32a0b0eca..eab5670cb3 100644
--- a/engines/gnap/scenes/scene38.cpp
+++ b/engines/gnap/scenes/scene38.cpp
@@ -332,7 +332,7 @@ void GnapEngine::scene38_updateAnimations() {
 			_gnapSequenceDatNum = 0;
 			_gameSys->setAnimation(0x9F, _gnapId, 0);
 			_gnapActionStatus = kASHoldingHuntingTrophy;
-			if (_beaverFacing)
+			if (_beaverFacing != kDirNone)
 				playBeaverSequence(0x107D5);
 			else
 				playBeaverSequence(0x107D4);