GNAP: Refactoring - Use enum for beaver facing

41 files changed, 145 insertions, 145 deletions

diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index c84583905f..dc677a1889 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -1834,7 +1834,7 @@ void GnapEngine::gnapKissPlatypus(int callback) {
 			kSeqSyncWait, getSequenceTotalDuration(0x10847), 75 * _platX - _platGridX, 48 * _platY - _platGridY);
 		_beaverSequenceDatNum = 1;
 		_beaverSequenceId = 0x7CB;
-		_beaverFacing = 0;
+		_beaverFacing = kDirNone;
 		playGnapSequence(0x107B5);
 		while (_gameSys->getAnimationStatus(0) != 2) {
 			updateMouseCursor();
@@ -1864,7 +1864,7 @@ void GnapEngine::gnapUseJointOnPlatypus() {
 			kSeqSyncWait, 0, 15 * (5 * _platX - 25), 48 * (_platY - 7));
 		_beaverSequenceDatNum = 1;
 		_beaverSequenceId = 0x876;
-		_beaverFacing = 0;
+		_beaverFacing = kDirNone;
 		playGnapSequence(0x107B5);
 		gnapWalkStep();
 		while (_gameSys->getAnimationStatus(0) != 2) {
@@ -1900,17 +1900,17 @@ int GnapEngine::getBeaverSequenceId(int kind, int gridX, int gridY) {
 	if (gridX > 0 && gridY > 0) {
 		if (gridX < _platX) {
 			sequenceId = 0x7CC;
-			_beaverFacing = 4;
+			_beaverFacing = kDirUnk4;
 		} else {
 			sequenceId = 0x7CB;
-			_beaverFacing = 0;
+			_beaverFacing = kDirNone;
 		}
-	} else if (_beaverFacing != 0) {
+	} else if (_beaverFacing != kDirNone) {
 		sequenceId = 0x7CC;
-		_beaverFacing = 4;
+		_beaverFacing = kDirUnk4;
 	} else {
 		sequenceId = 0x7CB;
-		_beaverFacing = 0;
+		_beaverFacing = kDirNone;
 	}
 	return sequenceId | 0x10000;
 }
@@ -1990,20 +1990,20 @@ void GnapEngine::beaverSub426234() {
 	}
 }
 
-void GnapEngine::initBeaverPos(int gridX, int gridY, int facing) {
+void GnapEngine::initBeaverPos(int gridX, int gridY, Facing facing) {
 	_timers[0] = 50;
 	_timers[1] = 20;
 	_platX = gridX;
 	_platY = gridY;
-	if (facing <= 0)
-		_beaverFacing = 0;
+	if (facing == kDirNone)
+		_beaverFacing = kDirNone;
 	else
 		_beaverFacing = facing;
-	if (_beaverFacing == 4) {
+	if (_beaverFacing == kDirUnk4) {
 		_beaverSequenceId = 0x7D1;
 	} else {
 		_beaverSequenceId = 0x7C1;
-		_beaverFacing = 0;
+		_beaverFacing = kDirNone;
 	}
 	_beaverId = 20 * _platY;
 	_beaverSequenceDatNum = 1;
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index 2872f69f20..b96d27d4a1 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -525,14 +525,14 @@ public:
 	void gnapUseDisguiseOnPlatypus();
 	
 	// Beaver
-	int _beaverFacing;
+	Facing _beaverFacing;
 	int _beaverActionStatus;
 	int _beaverSequenceId, _beaverSequenceDatNum, _beaverId;
 	int getBeaverSequenceId(int kind, int gridX, int gridY);
 	void playBeaverSequence(int sequenceId);
 	void updateBeaverIdleSequence();
 	void beaverSub426234();
-	void initBeaverPos(int gridX, int gridY, int facing);
+	void initBeaverPos(int gridX, int gridY, Facing facing);
 	
 	// Scenes
 	
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;
diff --git a/engines/gnap/scenes/scene01.cpp b/engines/gnap/scenes/scene01.cpp
index ba906b601b..0e90e0bd5a 100644
--- a/engines/gnap/scenes/scene01.cpp
+++ b/engines/gnap/scenes/scene01.cpp
@@ -104,7 +104,7 @@ void GnapEngine::scene01_run() {
 	if (_prevSceneNum == 2) {
 		initGnapPos(11, 6, kDirBottomLeft);
 		if (isFlag(0))
-			initBeaverPos(12, 6, 4);
+			initBeaverPos(12, 6, kDirUnk4);
 		endSceneInit();
 		if (isFlag(0))
 			platypusWalkTo(9, 6, -1, 0x107C2, 1);
@@ -112,7 +112,7 @@ void GnapEngine::scene01_run() {
 	} else {
 		initGnapPos(1, 6, kDirBottomRight);
 		if (isFlag(0))
-			initBeaverPos(1, 7, 0);
+			initBeaverPos(1, 7, kDirNone);
 		endSceneInit();
 	}
 
diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp
index 5d254870da..65018e0435 100644
--- a/engines/gnap/scenes/scene02.cpp
+++ b/engines/gnap/scenes/scene02.cpp
@@ -101,7 +101,7 @@ void GnapEngine::scene02_run() {
 	case 3:
 		initGnapPos(11, 6, kDirBottomLeft);
 		if (isFlag(0))
-			initBeaverPos(12, 6, 4);
+			initBeaverPos(12, 6, kDirUnk4);
 		endSceneInit();
 		if (isFlag(0))
 			platypusWalkTo(9, 6, -1, 0x107C2, 1);
@@ -110,7 +110,7 @@ void GnapEngine::scene02_run() {
 	case 4:
 		initGnapPos(_hotspotsWalkPos[6].x, _hotspotsWalkPos[6].y, kDirBottomLeft);
 		if (isFlag(0))
-			initBeaverPos(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, 4);
+			initBeaverPos(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(7, 6, 0, 0x107B9, 1);
 		if (isFlag(0))
@@ -121,19 +121,19 @@ void GnapEngine::scene02_run() {
 	case 47:
 		clearFlag(25);
 		initGnapPos(5, 6, kDirBottomLeft);
-		initBeaverPos(6, 7, 4);
+		initBeaverPos(6, 7, kDirUnk4);
 		endSceneInit();
 		break;
 	case 49:
 		initGnapPos(5, 6, kDirBottomRight);
 		if (isFlag(0))
-			initBeaverPos(6, 7, 0);
+			initBeaverPos(6, 7, kDirNone);
 		endSceneInit();
 		break;
 	default:
 		initGnapPos(-1, 6, kDirBottomRight);
 		if (isFlag(0))
-			initBeaverPos(-1, 7, 0);
+			initBeaverPos(-1, 7, kDirNone);
 		endSceneInit();
 		if (isFlag(0))
 			platypusWalkTo(2, 7, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp
index c7600133d2..930554c3ac 100644
--- a/engines/gnap/scenes/scene03.cpp
+++ b/engines/gnap/scenes/scene03.cpp
@@ -104,7 +104,7 @@ void GnapEngine::scene03_run() {
 	_timers[5] = getRandom(100) + 200;
 	
 	if (isFlag(0)) {
-		initBeaverPos(5, 4, 0);
+		initBeaverPos(5, 4, kDirNone);
 	} else {
 		_timers[1] = getRandom(40) + 20;
 		_gameSys->setAnimation(0x1C2, 99, 1);
@@ -386,7 +386,7 @@ void GnapEngine::scene03_updateAnimations() {
 			_gnapActionStatus = -1;
 			_platX = 6;
 			_platY = 6;
-			_beaverFacing = 4;
+			_beaverFacing = kDirUnk4;
 			_beaverId = 120;
 			_gameSys->insertSequence(0x107CA, _beaverId, 0x1BC, 99,
 				kSeqSyncWait, 0, 75 * _platX - _platGridX, 48 * _platY - _platGridY);
diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp
index 164a53f35d..ec3f482ac0 100644
--- a/engines/gnap/scenes/scene04.cpp
+++ b/engines/gnap/scenes/scene04.cpp
@@ -128,7 +128,7 @@ void GnapEngine::scene04_run() {
 		clearFlag(10);
 		_beaverSequenceId = 0x20C;
 		_beaverSequenceDatNum = 0;
-		_beaverFacing = 1;
+		_beaverFacing = kDirBottomRight;
 		_gnapSequenceId = 0x7B5;
 		_gnapSequenceDatNum = 1;
 		_gameSys->waitForUpdate();
@@ -137,19 +137,19 @@ void GnapEngine::scene04_run() {
 		if (_prevSceneNum == 2) {
 			initGnapPos(5, 11, kDirUpRight);
 			if (isFlag(0))
-				initBeaverPos(6, 11, 5);
+				initBeaverPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			if (isFlag(0))
 				platypusWalkTo(5, 8, -1, 0x107C2, 1);
 			gnapWalkTo(6, 9, -1, 0x107BA, 1);
 		} else if (_prevSceneNum == 38) {
 			initGnapPos(5, 7, kDirBottomRight);
-			initBeaverPos(4, 7, 0);
+			initBeaverPos(4, 7, kDirNone);
 			endSceneInit();
 		} else {
 			initGnapPos(12, 9, kDirBottomRight);
 			if (isFlag(0))
-				initBeaverPos(12, 8, 0);
+				initBeaverPos(12, 8, kDirNone);
 			endSceneInit();
 			if (isFlag(0))
 				platypusWalkTo(9, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene05.cpp b/engines/gnap/scenes/scene05.cpp
index f13a2a358d..aebd783359 100644
--- a/engines/gnap/scenes/scene05.cpp
+++ b/engines/gnap/scenes/scene05.cpp
@@ -98,7 +98,7 @@ void GnapEngine::scene05_run() {
 	if (_prevSceneNum != 6 && _prevSceneNum != 36) {
 		initGnapPos(-1, 8, kDirBottomRight);
 		if (isFlag(0))
-			initBeaverPos(-1, 9, 0);
+			initBeaverPos(-1, 9, kDirNone);
 		endSceneInit();
 		if (isFlag(0))
 			platypusWalkTo(2, 8, -1, 0x107C2, 1);
@@ -106,7 +106,7 @@ void GnapEngine::scene05_run() {
 	} else {
 		initGnapPos(6, 8, kDirBottomRight);
 		if (isFlag(0))
-			initBeaverPos(7, 9, 0);
+			initBeaverPos(7, 9, kDirNone);
 		endSceneInit();
 	}
 	
@@ -178,7 +178,7 @@ void GnapEngine::scene05_run() {
 							gnapUseDeviceOnBeaver();
 							if (platypusWalkTo(_hotspotsWalkPos[1].x, _hotspotsWalkPos[1].y, 1, 0x107C2, 1)) {
 								_beaverActionStatus = kASPlatSearchHaystack;
-								_beaverFacing = 4;
+								_beaverFacing = kDirUnk4;
 							}
 							if (_gnapX == 4 && (_gnapY == 8 || _gnapY == 7))
 								gnapWalkStep();
diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp
index acf309cbab..459d449656 100644
--- a/engines/gnap/scenes/scene06.cpp
+++ b/engines/gnap/scenes/scene06.cpp
@@ -107,7 +107,7 @@ void GnapEngine::scene06_run() {
 	queueInsertDeviceIcon();
 	
 	initGnapPos(5, 12, kDirBottomRight);
-	initBeaverPos(6, 12, 0);
+	initBeaverPos(6, 12, kDirNone);
 	endSceneInit();
 	
 	platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -230,7 +230,7 @@ void GnapEngine::scene06_run() {
 					_hotspots[kHSWalkArea5]._flags &= ~SF_WALKABLE;
 					_gnapIdleFacing = kDirUpLeft;
 					platypusWalkTo(6, 8, 1, 0x107C2, 1);
-					_beaverFacing = 0;
+					_beaverFacing = kDirNone;
 					_gnapActionStatus = kASUseTwigOnHorse;
 					setGrabCursorSprite(-1);
 				} else if (_grabCursorSpriteIndex >= 0) {
diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp
index 1b609f8689..b6b5b91a44 100644
--- a/engines/gnap/scenes/scene07.cpp
+++ b/engines/gnap/scenes/scene07.cpp
@@ -72,7 +72,7 @@ void GnapEngine::scene07_run() {
 
 	if (_prevSceneNum == 8) {
 		initGnapPos(7, 7, kDirBottomLeft);
-		initBeaverPos(9, 7, 4);
+		initBeaverPos(9, 7, kDirUnk4);
 		endSceneInit();
 	} else {
 		_gnapX = 6;
@@ -89,7 +89,7 @@ void GnapEngine::scene07_run() {
 		_beaverId = 160;
 		_beaverSequenceId = 0x91;
 		_beaverSequenceDatNum = 0;
-		_beaverFacing = 0;
+		_beaverFacing = kDirNone;
 		_gameSys->insertSequence(0x91, 160, 0, 0, kSeqNone, 0, 0, 0);
 		endSceneInit();
 	}
diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp
index 5988114f9a..a1cbe07601 100644
--- a/engines/gnap/scenes/scene08.cpp
+++ b/engines/gnap/scenes/scene08.cpp
@@ -117,7 +117,7 @@ void GnapEngine::scene08_run() {
 		_gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
 	
 	initGnapPos(-1, 8, kDirBottomRight);
-	initBeaverPos(-1, 7, 0);
+	initBeaverPos(-1, 7, kDirNone);
 	
 	endSceneInit();
 	
@@ -218,7 +218,7 @@ void GnapEngine::scene08_run() {
 					gnapUseDeviceOnBeaver();
 					platypusWalkTo(6, 6, 1, 0x107C2, 1);
 					_beaverActionStatus = kASPlatWithMan;
-					_beaverFacing = 0;
+					_beaverFacing = kDirNone;
 					playGnapIdle(6, 6);
 					break;
 				}
@@ -254,7 +254,7 @@ void GnapEngine::scene08_run() {
 					gnapUseDeviceOnBeaver();
 					platypusWalkTo(3, 7, 1, 0x107C2, 1);
 					_beaverActionStatus = kASPlatWithDog;
-					_beaverFacing = 0;
+					_beaverFacing = kDirNone;
 					playGnapIdle(3, 7);
 					break;
 				}
@@ -500,7 +500,7 @@ void GnapEngine::scene08_updateAnimations() {
 			_platY = 8;
 			_beaverId = 160;
 			_beaverSequenceId = 0x148;
-			_beaverFacing = 4;
+			_beaverFacing = kDirUnk4;
 			_beaverSequenceDatNum = 0;
 			if (_gnapX == 1 && _gnapY == 8)
 				gnapWalkStep();
diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp
index 2cf57a9a12..d16f3bd6ce 100644
--- a/engines/gnap/scenes/scene09.cpp
+++ b/engines/gnap/scenes/scene09.cpp
@@ -68,13 +68,13 @@ void GnapEngine::scene09_run() {
 	
 	if (_prevSceneNum == 8) {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 7, 4);
+		initBeaverPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(9, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(4, 7, kDirBottomRight);
-		initBeaverPos(5, 7, 0);
+		initBeaverPos(5, 7, kDirNone);
 		endSceneInit();
 	}
 
@@ -128,7 +128,7 @@ void GnapEngine::scene09_run() {
 			gnapWalkTo(4, 7, 0, 0x107BF, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(4, 8, -1, 0x107D2, 1);
-			_beaverFacing = 4;
+			_beaverFacing = kDirUnk4;
 			break;
 
 		case kHSExitHouse:
@@ -137,7 +137,7 @@ void GnapEngine::scene09_run() {
 			gnapWalkTo(10, -1, 0, 0x107AB, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(10, -1, -1, 0x107CD, 1);
-			_beaverFacing = 4;
+			_beaverFacing = kDirUnk4;
 			break;
 
 		case kHSTrash:
diff --git a/engines/gnap/scenes/scene10.cpp b/engines/gnap/scenes/scene10.cpp
index 0a89682c00..6f5552fbea 100644
--- a/engines/gnap/scenes/scene10.cpp
+++ b/engines/gnap/scenes/scene10.cpp
@@ -85,13 +85,13 @@ void GnapEngine::scene10_run() {
 	
 	if (_prevSceneNum == 9) {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 7, 4);
+		initBeaverPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(9, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(-1, 7, kDirBottomRight);
-		initBeaverPos(-2, 8, 0);
+		initBeaverPos(-2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(1, 7, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
@@ -256,7 +256,7 @@ void GnapEngine::scene10_run() {
 						gnapUseDeviceOnBeaver();
 						platypusWalkTo(7, 6, 1, 0x107D2, 1);
 						_beaverActionStatus = kASPlatWithBox;
-						_beaverFacing = 4;
+						_beaverFacing = kDirUnk4;
 						_largeSprite = _gameSys->createSurface(0xC3);
 						playGnapIdle(7, 6);
 					}
@@ -397,7 +397,7 @@ void GnapEngine::scene10_updateAnimations() {
 			_s10_nextCookSequenceId = 0x843;
 			_beaverSequenceId = 0x7C9;
 			_beaverId = 160;
-			_beaverFacing = 0;
+			_beaverFacing = kDirNone;
 			_beaverSequenceDatNum = 1;
 			break;
 		case 0x843:
diff --git a/engines/gnap/scenes/scene11.cpp b/engines/gnap/scenes/scene11.cpp
index f3646772d3..95a8df36d9 100644
--- a/engines/gnap/scenes/scene11.cpp
+++ b/engines/gnap/scenes/scene11.cpp
@@ -94,22 +94,22 @@ void GnapEngine::scene11_run() {
 	switch (_prevSceneNum) {
 	case 13:
 		initGnapPos(8, 5, kDirBottomLeft);
-		initBeaverPos(9, 6, 4);
+		initBeaverPos(9, 6, kDirUnk4);
 		break;
 	case 47:
 		initGnapPos(8, 5, kDirBottomLeft);
-		initBeaverPos(9, 5, 4);
+		initBeaverPos(9, 5, kDirUnk4);
 		_s11_currGoggleGuySequenceId = 0x1FA;
 		_s11_currHookGuySequenceId = 0x1FF;
 		_timers[7] = 180;
 		break;
 	case 12:
 		initGnapPos(-1, 9, kDirBottomRight);
-		initBeaverPos(-2, 8, 0);
+		initBeaverPos(-2, 8, kDirNone);
 		break;
 	default:
 		initGnapPos(6, 6, kDirBottomLeft);
-		initBeaverPos(6, 5, 4);
+		initBeaverPos(6, 5, kDirUnk4);
 		break;
 	}
 	
diff --git a/engines/gnap/scenes/scene12.cpp b/engines/gnap/scenes/scene12.cpp
index fae6f83d14..c83f0bd2d9 100644
--- a/engines/gnap/scenes/scene12.cpp
+++ b/engines/gnap/scenes/scene12.cpp
@@ -112,11 +112,11 @@ void GnapEngine::scene12_run() {
 	
 	if (_prevSceneNum == 15) {
 		initGnapPos(5, 6, kDirBottomRight);
-		initBeaverPos(3, 7, 0);
+		initBeaverPos(3, 7, kDirNone);
 		endSceneInit();
 	} else {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 8, 4);
+		initBeaverPos(12, 8, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
@@ -203,7 +203,7 @@ void GnapEngine::scene12_run() {
 					gnapUseDeviceOnBeaver();
 					platypusWalkTo(3, 7, 1, 0x107D2, 1);
 					_beaverActionStatus = kASPlatWithToothGuy;
-					_beaverFacing = 4;
+					_beaverFacing = kDirUnk4;
 					playGnapIdle(2, 7);
 					break;
 				}
@@ -273,7 +273,7 @@ void GnapEngine::scene12_run() {
 					gnapUseDeviceOnBeaver();
 					platypusWalkTo(7, 6, 1, 0x107C2, 1);
 					_beaverActionStatus = kASPlatWithBeardGuy;
-					_beaverFacing = 0;
+					_beaverFacing = kDirNone;
 					playGnapIdle(7, 6);
 					break;
 				}
diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp
index c1e9bab43e..66e78e8f5b 100644
--- a/engines/gnap/scenes/scene13.cpp
+++ b/engines/gnap/scenes/scene13.cpp
@@ -108,10 +108,10 @@ void GnapEngine::scene13_run() {
 	
 	if (_prevSceneNum == 14) {
 		initGnapPos(6, 6, kDirBottomLeft);
-		initBeaverPos(9, 8, 0);
+		initBeaverPos(9, 8, kDirNone);
 	} else {
 		initGnapPos(3, 7, kDirBottomRight);
-		initBeaverPos(2, 7, 0);
+		initBeaverPos(2, 7, kDirNone);
 	}
 
 	endSceneInit();
diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp
index 04eb5f3140..fdfd1fba0f 100644
--- a/engines/gnap/scenes/scene17.cpp
+++ b/engines/gnap/scenes/scene17.cpp
@@ -178,7 +178,7 @@ void GnapEngine::scene17_run() {
 	if (_prevSceneNum == 53 || _prevSceneNum == 18 || _prevSceneNum == 20 || _prevSceneNum == 19) {
 		if (_prevSceneNum == 20) {
 			initGnapPos(4, 6, kDirBottomRight);
-			initBeaverPos(5, 6, 0);
+			initBeaverPos(5, 6, kDirNone);
 			endSceneInit();
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
@@ -203,7 +203,7 @@ void GnapEngine::scene17_run() {
 		} else if (isFlag(25)) {
 			clearFlag(15);
 			clearFlag(16);
-			initBeaverPos(7, 9, 0);
+			initBeaverPos(7, 9, kDirNone);
 			_gnapX = _hotspotsWalkPos[2].x;
 			_gnapY = _hotspotsWalkPos[2].y;
 			_gnapId = 20 * _hotspotsWalkPos[2].y;
@@ -235,18 +235,18 @@ void GnapEngine::scene17_run() {
 			scene17_updateHotspots();
 		} else if (_prevSceneNum == 18) {
 			initGnapPos(6, 6, kDirBottomRight);
-			initBeaverPos(5, 6, 0);
+			initBeaverPos(5, 6, kDirNone);
 			endSceneInit();
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
 		} else {
 			if (isFlag(15)) {
 				initGnapPos(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, kDirBottomRight);
-				initBeaverPos(1, 9, 0);
+				initBeaverPos(1, 9, kDirNone);
 				endSceneInit();
 			} else {
 				initGnapPos(3, 7, kDirBottomRight);
-				initBeaverPos(1, 7, 0);
+				initBeaverPos(1, 7, kDirNone);
 				endSceneInit();
 			}
 			clearFlag(15);
@@ -273,7 +273,7 @@ void GnapEngine::scene17_run() {
 		endSceneInit();
 		_beaverSequenceId = 0x7C1;
 		_beaverSequenceDatNum = 1;
-		_beaverFacing = 1;
+		_beaverFacing = kDirBottomRight;
 		platypusWalkTo(2, 9, -1, 0x107C2, 1);
 	}
 
@@ -388,7 +388,7 @@ void GnapEngine::scene17_run() {
 							scene17_platHangUpPhone();
 							_isLeavingScene = true;
 							gnapUseDeviceOnBeaver();
-							_beaverFacing = 5;
+							_beaverFacing = kDirUpLeft;
 							platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
 							setFlag(16);
 							_beaverActionStatus = kASPlatUsePhone;
@@ -432,7 +432,7 @@ void GnapEngine::scene17_run() {
 							scene17_platHangUpPhone();
 							_isLeavingScene = true;
 							gnapUseDeviceOnBeaver();
-							_beaverFacing = 5;
+							_beaverFacing = kDirUpLeft;
 							platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
 							setFlag(16);
 							_beaverActionStatus = kASPlatUsePhone;
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index 53a89e019a..a7883263a5 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -380,19 +380,19 @@ void GnapEngine::scene18_run() {
 		}
 		if (_prevSceneNum == 17) {
 			initGnapPos(4, 11, kDirBottomRight);
-			initBeaverPos(5, 11, 0);
+			initBeaverPos(5, 11, kDirNone);
 			endSceneInit();
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 		} else if (_prevSceneNum == 19) {
 			initGnapPos(7, 7, kDirBottomRight);
-			initBeaverPos(8, 7, 0);
+			initBeaverPos(8, 7, kDirNone);
 			endSceneInit();
 			gnapWalkTo(7, 8, -1, 0x107B9, 1);
 			platypusWalkTo(8, 8, -1, 0x107C2, 1);
 		} else {
 			initGnapPos(-1, 10, kDirBottomRight);
-			initBeaverPos(-1, 10, 0);
+			initBeaverPos(-1, 10, kDirNone);
 			endSceneInit();
 			gnapWalkTo(3, 7, -1, 0x107B9, 1);
 			platypusWalkTo(3, 8, -1, 0x107C2, 1);
@@ -736,7 +736,7 @@ void GnapEngine::scene18_run() {
 					if (!_timers[6]) {
 						_beaverActionStatus = -1;
 						_sceneWaiting = false;
-						initBeaverPos(-1, 10, 0);
+						initBeaverPos(-1, 10, kDirNone);
 						platypusWalkTo(3, 9, -1, 0x107C2, 1);
 						clearFlag(26);
 					}
diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp
index 2f588f2995..9dfd69eec5 100644
--- a/engines/gnap/scenes/scene19.cpp
+++ b/engines/gnap/scenes/scene19.cpp
@@ -127,7 +127,7 @@ void GnapEngine::scene19_run() {
 		_gameSys->insertSequence(_s19_currShopAssistantSequenceId, 20, 0, 0, kSeqNone, 0, 0, 0);
 		_timers[6] = getRandom(40) + 50;
 		initGnapPos(3, 6, kDirBottomRight);
-		initBeaverPos(4, 6, 0);
+		initBeaverPos(4, 6, kDirNone);
 		endSceneInit();
 		gnapWalkTo(4, 9, -1, 0x107B9, 1);
 		platypusWalkTo(5, 9, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp
index 990ceca499..beee17be0b 100644
--- a/engines/gnap/scenes/scene20.cpp
+++ b/engines/gnap/scenes/scene20.cpp
@@ -229,42 +229,42 @@ void GnapEngine::scene20_run() {
 			gameUpdateTick();
 		}
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(11, 9, 4);
+		initBeaverPos(11, 9, kDirUnk4);
 		gnapWalkTo(5, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 9, -1, 0x107C2, 1);
 	} else {
 		switch (_prevSceneNum) {
 		case 17:
 			initGnapPos(5, 11, kDirBottomRight);
-			initBeaverPos(6, 11, 0);
+			initBeaverPos(6, 11, kDirNone);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107B9, 1);
 			platypusWalkTo(6, 9, -1, 0x107C2, 1);
 			break;
 		case 18:
 			initGnapPos(11, 8, kDirBottomLeft);
-			initBeaverPos(11, 9, 4);
+			initBeaverPos(11, 9, kDirUnk4);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
 			platypusWalkTo(6, 9, -1, 0x107C2, 1);
 			break;
 		case 21:
 			initGnapPos(-1, 8, kDirBottomLeft);
-			initBeaverPos(-1, 9, 4);
+			initBeaverPos(-1, 9, kDirUnk4);
 			endSceneInit();
 			gnapWalkTo(3, 8, -1, 0x107B9, 1);
 			platypusWalkTo(3, 9, -1, 0x107C2, 1);
 			break;
 		case 22:
 			initGnapPos(7, 6, kDirBottomRight);
-			initBeaverPos(8, 6, 0);
+			initBeaverPos(8, 6, kDirNone);
 			endSceneInit();
 			gnapWalkTo(8, 8, -1, 0x107B9, 1);
 			platypusWalkTo(9, 9, -1, 0x107C2, 1);
 			break;
 		default:
 			initGnapPos(8, 6, kDirBottomLeft);
-			initBeaverPos(9, 6, 4);
+			initBeaverPos(9, 6, kDirUnk4);
 			endSceneInit();
 			_hotspots[kHSWalkArea2]._flags |= SF_WALKABLE;
 			gnapWalkTo(8, 8, -1, 0x107BA, 1);
@@ -329,7 +329,7 @@ void GnapEngine::scene20_run() {
 				gnapWalkTo(_hotspotsWalkPos[kHSExitParkingLot].x, _hotspotsWalkPos[kHSExitParkingLot].y, 0, 0x107AF, 1);
 				_gnapActionStatus = kASLeaveScene;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitParkingLot].x, _hotspotsWalkPos[kHSExitParkingLot].y + 1, -1, 0x107CF, 1);
-				_beaverFacing = 4;
+				_beaverFacing = kDirUnk4;
 			}
 			break;
 		
@@ -368,7 +368,7 @@ void GnapEngine::scene20_run() {
 				gnapWalkTo(_hotspotsWalkPos[kHSExitInsideGrubCity].x, _hotspotsWalkPos[kHSExitInsideGrubCity].y - 1, 0, 0x107BB, 1);
 				_gnapActionStatus = kASLeaveScene;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitInsideGrubCity].x + 1, _hotspotsWalkPos[kHSExitInsideGrubCity].y, -1, 0x107C2, 1);
-				_beaverFacing = 4;
+				_beaverFacing = kDirUnk4;
 			}
 			break;
 		
diff --git a/engines/gnap/scenes/scene21.cpp b/engines/gnap/scenes/scene21.cpp
index 415c82f893..7d8157bd07 100644
--- a/engines/gnap/scenes/scene21.cpp
+++ b/engines/gnap/scenes/scene21.cpp
@@ -78,7 +78,7 @@ void GnapEngine::scene21_run() {
 	if (isFlag(3)) {
 		if (isFlag(5)) {
 			initGnapPos(5, 8, kDirBottomRight);
-			initBeaverPos(6, 8, 0);
+			initBeaverPos(6, 8, kDirNone);
 			_gameSys->insertSequence(0x8E, 2, 0, 0, kSeqNone, 0, 0, 0);
 			if (!isFlag(4))
 				_gameSys->insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
@@ -86,7 +86,7 @@ void GnapEngine::scene21_run() {
 			clearFlag(5);
 		} else {
 			initGnapPos(5, 11, kDirBottomRight);
-			initBeaverPos(6, 11, 0);
+			initBeaverPos(6, 11, kDirNone);
 			if (!isFlag(4))
 				_gameSys->insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
 			endSceneInit();
@@ -95,7 +95,7 @@ void GnapEngine::scene21_run() {
 		}
 	} else {
 		initGnapPos(5, 11, kDirBottomRight);
-		initBeaverPos(6, 11, 0);
+		initBeaverPos(6, 11, kDirNone);
 		_s21_currOldLadySequenceId = 0x89;
 		_gameSys->setAnimation(0x89, 79, 3);
 		_gameSys->insertSequence(_s21_currOldLadySequenceId, 79, 0, 0, kSeqNone, 0, 0, 0);
diff --git a/engines/gnap/scenes/scene22.cpp b/engines/gnap/scenes/scene22.cpp
index c0e6d2b14f..01de3e8d55 100644
--- a/engines/gnap/scenes/scene22.cpp
+++ b/engines/gnap/scenes/scene22.cpp
@@ -72,11 +72,11 @@ void GnapEngine::scene22_run() {
 	
 	if (_prevSceneNum == 20) {
 		initGnapPos(2, 8, kDirBottomRight);
-		initBeaverPos(1, 8, 0);
+		initBeaverPos(1, 8, kDirNone);
 		endSceneInit();
 	} else {
 		initGnapPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y, kDirBottomRight);
-		initBeaverPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y + 1, 0);
+		initBeaverPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y + 1, kDirNone);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107B9, 1);
 		platypusWalkTo(9, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene23.cpp b/engines/gnap/scenes/scene23.cpp
index 62a3c8bcbf..ebbf46a1da 100644
--- a/engines/gnap/scenes/scene23.cpp
+++ b/engines/gnap/scenes/scene23.cpp
@@ -70,7 +70,7 @@ void GnapEngine::scene23_run() {
 	queueInsertDeviceIcon();
 	
 	initGnapPos(-1, 7, kDirBottomRight);
-	initBeaverPos(-2, 7, 0);
+	initBeaverPos(-2, 7, kDirNone);
 	_gameSys->insertSequence(0xBD, 255, 0, 0, kSeqNone, 0, 0, 0);
 	_gameSys->insertSequence(0xBF, 2, 0, 0, kSeqNone, 0, 0, 0);
 	endSceneInit();
diff --git a/engines/gnap/scenes/scene24.cpp b/engines/gnap/scenes/scene24.cpp
index 7546b45ab6..ace9043062 100644
--- a/engines/gnap/scenes/scene24.cpp
+++ b/engines/gnap/scenes/scene24.cpp
@@ -85,13 +85,13 @@ void GnapEngine::scene24_run() {
 	
 	if (_prevSceneNum == 20) {
 		initGnapPos(1, 8, kDirBottomRight);
-		initBeaverPos(2, 8, 0);
+		initBeaverPos(2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(1, 9, -1, 0x107B9, 1);
 		platypusWalkTo(2, 9, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(8, 8, 4);
+		initBeaverPos(8, 8, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107BA, 1);
 		platypusWalkTo(3, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene25.cpp b/engines/gnap/scenes/scene25.cpp
index 5a6d7d325a..c93c194b94 100644
--- a/engines/gnap/scenes/scene25.cpp
+++ b/engines/gnap/scenes/scene25.cpp
@@ -122,13 +122,13 @@ void GnapEngine::scene25_run() {
 	
 	if (_prevSceneNum == 24) {
 		initGnapPos(5, 11, kDirUpLeft);
-		initBeaverPos(6, 11, 4);
+		initBeaverPos(6, 11, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(5, 7, -1, 0x107BA, 1);
 		platypusWalkTo(6, 7, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(5, 6, kDirBottomRight);
-		initBeaverPos(6, 6, 0);
+		initBeaverPos(6, 6, kDirNone);
 		endSceneInit();
 		gnapWalkTo(5, 8, -1, 0x107B9, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene26.cpp b/engines/gnap/scenes/scene26.cpp
index bef046c2bc..fb2e0cca7e 100644
--- a/engines/gnap/scenes/scene26.cpp
+++ b/engines/gnap/scenes/scene26.cpp
@@ -82,13 +82,13 @@ void GnapEngine::scene26_run() {
 	
 	if (_prevSceneNum == 25) {
 		initGnapPos(-1, 8, kDirBottomRight);
-		initBeaverPos(-2, 8, 0);
+		initBeaverPos(-2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(2, 8, kDirBottomRight);
-		initBeaverPos(3, 8, 0);
+		initBeaverPos(3, 8, kDirNone);
 		endSceneInit();
 	}
 
diff --git a/engines/gnap/scenes/scene27.cpp b/engines/gnap/scenes/scene27.cpp
index e36098113c..02020d5211 100644
--- a/engines/gnap/scenes/scene27.cpp
+++ b/engines/gnap/scenes/scene27.cpp
@@ -93,28 +93,28 @@ void GnapEngine::scene27_run() {
 	switch (_prevSceneNum) {
 	case 26:
 		initGnapPos(7, 12, kDirBottomRight);
-		initBeaverPos(6, 12, 0);
+		initBeaverPos(6, 12, kDirNone);
 		endSceneInit();
 		gnapWalkTo(7, 8, -1, 0x107B9, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
 		break;
 	case 29:
 		initGnapPos(-1, 8, kDirBottomRight);
-		initBeaverPos(-1, 9, 0);
+		initBeaverPos(-1, 9, kDirNone);
 		endSceneInit();
 		gnapWalkTo(3, 8, -1, 0x107B9, 1);
 		platypusWalkTo(3, 9, -1, 0x107C2, 1);
 		break;
 	case 31:
 		initGnapPos(12, 8, kDirBottomLeft);
-		initBeaverPos(12, 9, 4);
+		initBeaverPos(12, 9, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(8, 9, -1, 0x107C2, 1);
 		break;
 	default:
 		initGnapPos(6, 8, kDirBottomRight);
-		initBeaverPos(5, 9, 0);
+		initBeaverPos(5, 9, kDirNone);
 		endSceneInit();
 		break;
 	}
diff --git a/engines/gnap/scenes/scene28.cpp b/engines/gnap/scenes/scene28.cpp
index 0d04e2ed0b..f7226e3a66 100644
--- a/engines/gnap/scenes/scene28.cpp
+++ b/engines/gnap/scenes/scene28.cpp
@@ -95,12 +95,12 @@ void GnapEngine::scene28_run() {
 			_timers[4] = getRandom(20) + 80;
 		}
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(9, 8, 4);
+		initBeaverPos(9, 8, kDirUnk4);
 		endSceneInit();
 	} else {
 		_gameSys->insertSequence(0x11B, 39, 0, 0, kSeqNone, 0, 0, 0);
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(9, 8, 4);
+		initBeaverPos(9, 8, kDirUnk4);
 		endSceneInit();
 		playSequences(0xF7, 0x121, 0x122, 0x123);
 		_s28_currClownSequenceId = 0x115;
diff --git a/engines/gnap/scenes/scene29.cpp b/engines/gnap/scenes/scene29.cpp
index 98215d4728..302c031eba 100644
--- a/engines/gnap/scenes/scene29.cpp
+++ b/engines/gnap/scenes/scene29.cpp
@@ -86,13 +86,13 @@ void GnapEngine::scene29_run() {
 
 	if (_prevSceneNum == 27) {
 		initGnapPos(12, 7, kDirBottomRight);
-		initBeaverPos(12, 8, 0);
+		initBeaverPos(12, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(8, 7, -1, 0x107B9, 1);
 		platypusWalkTo(8, 8, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(-1, 7, kDirBottomRight);
-		initBeaverPos(-2, 7, 0);
+		initBeaverPos(-2, 7, kDirNone);
 		endSceneInit();
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
 		platypusWalkTo(1, 7, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene30.cpp b/engines/gnap/scenes/scene30.cpp
index 9a641739b2..3e237fd46f 100644
--- a/engines/gnap/scenes/scene30.cpp
+++ b/engines/gnap/scenes/scene30.cpp
@@ -76,7 +76,7 @@ void GnapEngine::scene30_run() {
 
 	_s30_kidSequenceId = 0x101;
 	initGnapPos(7, 12, kDirBottomRight);
-	initBeaverPos(6, 12, 0);
+	initBeaverPos(6, 12, kDirNone);
 	endSceneInit();
 	gnapWalkTo(7, 8, -1, 0x107B9, 1);
 	platypusWalkTo(6, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene31.cpp b/engines/gnap/scenes/scene31.cpp
index b39b61bcdb..97c07fc0bb 100644
--- a/engines/gnap/scenes/scene31.cpp
+++ b/engines/gnap/scenes/scene31.cpp
@@ -80,13 +80,13 @@ void GnapEngine::scene31_run() {
 
 	if (_prevSceneNum == 27) {
 		initGnapPos(-1, 8, kDirBottomLeft);
-		initBeaverPos(-1, 9, 4);
+		initBeaverPos(-1, 9, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(3, 8, -1, 0x107BA, 1);
 		platypusWalkTo(3, 9, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(7, 12, kDirBottomRight);
-		initBeaverPos(6, 12, 0);
+		initBeaverPos(6, 12, kDirNone);
 		endSceneInit();
 		gnapWalkTo(7, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 8, -1, 0x107D2, 1);
diff --git a/engines/gnap/scenes/scene32.cpp b/engines/gnap/scenes/scene32.cpp
index b91e1be7ad..5f91b3f0ab 100644
--- a/engines/gnap/scenes/scene32.cpp
+++ b/engines/gnap/scenes/scene32.cpp
@@ -73,13 +73,13 @@ void GnapEngine::scene32_run() {
 
 	if (_prevSceneNum == 33) {
 		initGnapPos(11, 6, kDirBottomLeft);
-		initBeaverPos(12, 6, 4);
+		initBeaverPos(12, 6, kDirUnk4);
 		endSceneInit();
 		platypusWalkTo(9, 6, -1, 0x107D2, 1);
 		gnapWalkTo(8, 6, -1, 0x107BA, 1);
 	} else {
 		initGnapPos(1, 6, kDirBottomRight);
-		initBeaverPos(1, 7, 0);
+		initBeaverPos(1, 7, kDirNone);
 		endSceneInit();
 	}
 	
diff --git a/engines/gnap/scenes/scene33.cpp b/engines/gnap/scenes/scene33.cpp
index ed56b68613..7e9823ee60 100644
--- a/engines/gnap/scenes/scene33.cpp
+++ b/engines/gnap/scenes/scene33.cpp
@@ -78,26 +78,26 @@ void GnapEngine::scene33_run() {
 	switch (_prevSceneNum) {
 	case 34:
 		initGnapPos(11, 7, kDirBottomLeft);
-		initBeaverPos(12, 7, 4);
+		initBeaverPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 7, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 		break;
 	case 37:
 		initGnapPos(7, 7, kDirBottomRight);
-		initBeaverPos(8, 7, 0);
+		initBeaverPos(8, 7, kDirNone);
 		endSceneInit();
 		break;
 	case 32:
 		initGnapPos(-1, 6, kDirBottomRight);
-		initBeaverPos(-1, 7, 0);
+		initBeaverPos(-1, 7, kDirNone);
 		endSceneInit();
 		platypusWalkTo(2, 7, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		break;
 	default:
 		initGnapPos(3, 7, kDirBottomRight);
-		initBeaverPos(2, 7, 0);
+		initBeaverPos(2, 7, kDirNone);
 		endSceneInit();
 		break;
 	}
diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp
index f5351fe2c5..c32a0b0eca 100644
--- a/engines/gnap/scenes/scene38.cpp
+++ b/engines/gnap/scenes/scene38.cpp
@@ -98,10 +98,10 @@ void GnapEngine::scene38_run() {
 	
 	if (_prevSceneNum == 39) {
 		initGnapPos(3, 7, kDirBottomLeft);
-		initBeaverPos(4, 7, 4);
+		initBeaverPos(4, 7, kDirUnk4);
 	} else {
 		initGnapPos(3, 8, kDirBottomRight);
-		initBeaverPos(4, 8, 0);
+		initBeaverPos(4, 8, kDirNone);
 	}
 	endSceneInit();
 
diff --git a/engines/gnap/scenes/scene39.cpp b/engines/gnap/scenes/scene39.cpp
index 94bdcb5a0e..2d3ac77a07 100644
--- a/engines/gnap/scenes/scene39.cpp
+++ b/engines/gnap/scenes/scene39.cpp
@@ -71,11 +71,11 @@ void GnapEngine::scene39_run() {
 	_s39_nextGuySequenceId = -1;
 	if (_prevSceneNum == 38) {
 		initGnapPos(3, 7, kDirUpRight);
-		initBeaverPos(2, 7, 5);
+		initBeaverPos(2, 7, kDirUpLeft);
 		endSceneInit();
 	} else {
 		initGnapPos(4, 7, kDirBottomRight);
-		initBeaverPos(5, 7, 0);
+		initBeaverPos(5, 7, kDirNone);
 		endSceneInit();
 	}
 	
diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp
index ab49458cb4..efaf1d9d73 100644
--- a/engines/gnap/scenes/scene41.cpp
+++ b/engines/gnap/scenes/scene41.cpp
@@ -139,23 +139,23 @@ void GnapEngine::scene41_run() {
 		_gnapId = 140;
 		_gameSys->insertSequence(0x120, 140, 0, 0, kSeqNone, 0, 0, 0);
 		_gameSys->setAnimation(makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, 0);
-		initBeaverPos(8, 10, 3);
+		initBeaverPos(8, 10, kDirBottomLeft);
 		endSceneInit();
 	} else if (_prevSceneNum == 45) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-2, 8, 5);
+		initBeaverPos(-2, 8, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 42) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, 5);
+		initBeaverPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 8, kDirBottomRight);
-		initBeaverPos(6, 8, 3);
+		initBeaverPos(6, 8, kDirBottomLeft);
 		endSceneInit();
 	}
 
diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp
index 4ebcec6650..3aaedc8dc0 100644
--- a/engines/gnap/scenes/scene42.cpp
+++ b/engines/gnap/scenes/scene42.cpp
@@ -126,19 +126,19 @@ void GnapEngine::scene42_run() {
 			setGrabCursorSprite(-1);
 	} else if (_prevSceneNum == 41) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 9, 5);
+		initBeaverPos(-1, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 	} else if (_prevSceneNum == 43) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, 5);
+		initBeaverPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 11, kDirUpRight);
-		initBeaverPos(6, 11, 5);
+		initBeaverPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(5, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index 2484a62227..b4fe5bb751 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -114,27 +114,27 @@ void GnapEngine::scene43_run() {
 		switch (_prevSceneNum) {
 		case 42:
 			initGnapPos(-1, 8, kDirUpRight);
-			initBeaverPos(-1, 9, 5);
+			initBeaverPos(-1, 9, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(2, 8, -1, 0x107B9, 1);
 			platypusWalkTo(1, 8, -1, 0x107C2, 1);
 			break;
 		case 44:
 			initGnapPos(11, 8, kDirUpRight);
-			initBeaverPos(11, 9, 5);
+			initBeaverPos(11, 9, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(8, 8, -1, 0x107BA, 1);
 			platypusWalkTo(9, 8, -1, 0x107D2, 1);
 			break;
 		case 54:
 			initGnapPos(4, 7, kDirBottomLeft);
-			initBeaverPos(11, 8, 5);
+			initBeaverPos(11, 8, kDirUpLeft);
 			endSceneInit();
 			platypusWalkTo(9, 8, -1, 0x107D2, 1);
 			break;
 		default:
 			initGnapPos(5, 11, kDirUpRight);
-			initBeaverPos(6, 11, 5);
+			initBeaverPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
 			platypusWalkTo(6, 8, -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp
index af961ad469..f6644313c8 100644
--- a/engines/gnap/scenes/scene44.cpp
+++ b/engines/gnap/scenes/scene44.cpp
@@ -128,14 +128,14 @@ void GnapEngine::scene44_run() {
 		switch (_prevSceneNum) {
 		case 43:
 			initGnapPos(-1, 8, kDirUpRight);
-			initBeaverPos(-1, 7, 5);
+			initBeaverPos(-1, 7, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(2, 8, -1, 0x107B9, 1);
 			platypusWalkTo(1, 8, -1, 0x107C2, 1);
 			break;
 		case 46:
 			initGnapPos(11, 8, kDirUpRight);
-			initBeaverPos(11, 8, 5);
+			initBeaverPos(11, 8, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(6, 8, -1, 0x107BA, 1);
 			platypusWalkTo(7, 8, -1, 0x107D2, 1);
@@ -143,14 +143,14 @@ void GnapEngine::scene44_run() {
 		case 50:
 			initGnapPos(4, 8, kDirBottomRight);
 			if (_sceneSavegameLoaded) {
-				initBeaverPos(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 4);
+				initBeaverPos(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, kDirUnk4);
 			} else if (!isFlag(13)) {
 				_timers[0] = 50;
 				_timers[1] = 20;
 				_platX = 5;
 				_platY = 8;
 				_beaverSequenceId = 0xFD;
-				_beaverFacing = 0;
+				_beaverFacing = kDirNone;
 				_beaverId = 160;
 				_beaverSequenceDatNum = 0;
 				_gameSys->insertSequence(0xFD, 160, 0, 0, kSeqNone, 0, 0, 0);
@@ -159,7 +159,7 @@ void GnapEngine::scene44_run() {
 			break;
 		default:
 			initGnapPos(5, 11, kDirUpRight);
-			initBeaverPos(6, 11, 5);
+			initBeaverPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			platypusWalkTo(6, 8, -1, 0x107C2, 1);
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
@@ -472,7 +472,7 @@ void GnapEngine::scene44_updateAnimations() {
 	if (_gameSys->getAnimationStatus(2) == 2) {
 		if (_s44_nextKissingLadySequenceId == 0xF6) {
 			_gameSys->insertSequence(_s44_nextKissingLadySequenceId, 1, _s44_currKissingLadySequenceId, 1, kSeqSyncWait, 0, 0, 0);
-			initBeaverPos(5, 8, 0);
+			initBeaverPos(5, 8, kDirNone);
 			_s44_currKissingLadySequenceId = _s44_nextKissingLadySequenceId;
 			_s44_nextKissingLadySequenceId = -1;
 			_gameSys->setAnimation(0, 0, 2);
diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp
index 1ae51bc220..36943623d2 100644
--- a/engines/gnap/scenes/scene45.cpp
+++ b/engines/gnap/scenes/scene45.cpp
@@ -116,23 +116,23 @@ void GnapEngine::scene45_run() {
 		_gameSys->setAnimation(0x9E, 1, 0);
 		_gnapActionStatus = 1;
 		_gameSys->insertSequence(_gnapSequenceId, _gnapId, 0, 0, kSeqNone, 0, 0, 0);
-		initBeaverPos(4, 8, 0);
+		initBeaverPos(4, 8, kDirNone);
 		endSceneInit();
 	} else if (_prevSceneNum == 46) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 9, 5);
+		initBeaverPos(-1, 9, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 41) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, 5);
+		initBeaverPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107D2, 1);
 		gnapWalkTo(10, 9, -1, 0x107BA, 1);
 	} else {
 		initGnapPos(2, 11, kDirUpRight);
-		initBeaverPos(6, 11, 5);
+		initBeaverPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
diff --git a/engines/gnap/scenes/scene46.cpp b/engines/gnap/scenes/scene46.cpp
index 37a000584c..f7fdc87efd 100644
--- a/engines/gnap/scenes/scene46.cpp
+++ b/engines/gnap/scenes/scene46.cpp
@@ -102,19 +102,19 @@ void GnapEngine::scene46_run() {
 		endSceneInit();
 	} else if (_prevSceneNum == 44) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 8, 5);
+		initBeaverPos(-1, 8, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 45) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(12, 8, 5);
+		initBeaverPos(12, 8, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 11, kDirUpRight);
-		initBeaverPos(6, 11, 5);
+		initBeaverPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(5, 8, -1, 0x107C2, 1);
 		gnapWalkTo(6, 8, -1, 0x107BA, 1);