GNAP: Enforce the use of boolean values for _isLeavingScene

20 files changed, 51 insertions, 52 deletions

diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp
index 6d5991fa5c..47ac5578d0 100644
--- a/engines/gnap/scenes/scene02.cpp
+++ b/engines/gnap/scenes/scene02.cpp
@@ -301,7 +301,7 @@ void Scene02::run() {
 
 		case kHSExitHouse:
 			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = 1;
+				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 0, 0x107AD, 1);
 				_vm->_gnapActionStatus = kASLeaveScene;
 				if (_vm->isFlag(kGFPlatypus))
@@ -313,7 +313,7 @@ void Scene02::run() {
 
 		case kHSExitBarn:
 			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = 1;
+				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, 0x107AD, 1);
 				_vm->_gnapActionStatus = kASLeaveScene;
 				if (_vm->isFlag(kGFPlatypus))
@@ -325,7 +325,7 @@ void Scene02::run() {
 
 		case kHSExitCreek:
 			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = 1;
+				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1);
 				_vm->_gnapActionStatus = kASLeaveScene;
 				if (_vm->isFlag(kGFPlatypus))
@@ -336,7 +336,7 @@ void Scene02::run() {
 
 		case kHSExitPigpen:
 			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = 1;
+				_vm->_isLeavingScene = true;
 				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, 0, 0x107AF, 1);
 				_vm->_gnapActionStatus = kASLeaveScene;
 				if (_vm->isFlag(kGFPlatypus))
diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp
index c5af2f3e7d..77a9adefaa 100644
--- a/engines/gnap/scenes/scene03.cpp
+++ b/engines/gnap/scenes/scene03.cpp
@@ -193,7 +193,7 @@ void GnapEngine::scene03_run() {
 
 		case kHSExitTruck:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_hotspots[kHSPlatypusWalkArea]._flags |= SF_WALKABLE;
 				gnapWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 0, 0x107AD, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp
index a233152242..cbe5d05034 100644
--- a/engines/gnap/scenes/scene04.cpp
+++ b/engines/gnap/scenes/scene04.cpp
@@ -321,7 +321,7 @@ void GnapEngine::scene04_run() {
 		
 		case kHSExitTruck:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[5].x, _hotspotsWalkPos[5].y, 0, 0x107AE, 1);
 				_gnapActionStatus = kASLeaveScene;
 				if (isFlag(kGFPlatypus))
@@ -365,7 +365,7 @@ void GnapEngine::scene04_run() {
 		
 		case kHSExitBarn:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[8].x, _hotspotsWalkPos[8].y, 0, 0x107AB, 1);
 				_gnapActionStatus = kASLeaveScene;
 				if (isFlag(kGFPlatypus))
diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp
index a07c218f00..f908b1d25a 100644
--- a/engines/gnap/scenes/scene06.cpp
+++ b/engines/gnap/scenes/scene06.cpp
@@ -262,7 +262,7 @@ void GnapEngine::scene06_run() {
 
 		case kHSExitOutsideBarn:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, 0, 0x107AE, 1);
 				_gnapActionStatus = kASLeaveScene;
 				if (_cursorValue == 1)
diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp
index 3d392d6b74..953dbeb1e0 100644
--- a/engines/gnap/scenes/scene07.cpp
+++ b/engines/gnap/scenes/scene07.cpp
@@ -59,7 +59,6 @@ void GnapEngine::scene07_updateHotspots() {
 }
 
 void GnapEngine::scene07_run() {
-	
 	queueInsertDeviceIcon();
 	_gameSys->insertSequence(0x8C, 1, 0, 0, kSeqLoop, 0, 0, 0);
 	_gameSys->insertSequence(0x90, 1, 0, 0, kSeqLoop, 0, 0, 0);
diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp
index f31c05d0c3..ca777aa11e 100644
--- a/engines/gnap/scenes/scene08.cpp
+++ b/engines/gnap/scenes/scene08.cpp
@@ -176,7 +176,7 @@ void GnapEngine::scene08_run() {
 			break;
 
 		case kHSExitBackdoor:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapActionIdle(0x14D);
 			gnapWalkTo(0, 6, 0, 0x107AF, 1);
 			_gnapActionStatus = kASLeaveScene;
@@ -185,7 +185,7 @@ void GnapEngine::scene08_run() {
 			break;
 
 		case kHSExitCrash:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapActionIdle(0x14D);
 			gnapWalkTo(3, 9, 0, 0x107AE, 1);
 			_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp
index 7d9a4a9576..4183b34738 100644
--- a/engines/gnap/scenes/scene09.cpp
+++ b/engines/gnap/scenes/scene09.cpp
@@ -123,7 +123,7 @@ void GnapEngine::scene09_run() {
 			break;
 
 		case kHSExitKitchen:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			_newSceneNum = 10;
 			gnapWalkTo(4, 7, 0, 0x107BF, 1);
 			_gnapActionStatus = kASLeaveScene;
@@ -132,7 +132,7 @@ void GnapEngine::scene09_run() {
 			break;
 
 		case kHSExitHouse:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			_newSceneNum = 8;
 			gnapWalkTo(10, -1, 0, 0x107AB, 1);
 			_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene10.cpp b/engines/gnap/scenes/scene10.cpp
index b750ea4ed4..311045db6c 100644
--- a/engines/gnap/scenes/scene10.cpp
+++ b/engines/gnap/scenes/scene10.cpp
@@ -144,7 +144,7 @@ void GnapEngine::scene10_run() {
 			break;
 
 		case kHSExitBar:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapActionIdle(0x10C);
 			gnapWalkTo(0, 7, 0, 0x107AF, 1);
 			_gnapActionStatus = kASLeaveScene;
@@ -153,7 +153,7 @@ void GnapEngine::scene10_run() {
 			break;
 
 		case kHSExitBackdoor:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapActionIdle(0x10C);
 			gnapWalkTo(2, 9, 0, 0x107AE, 1);
 			_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene12.cpp b/engines/gnap/scenes/scene12.cpp
index a60e6a2dfa..4d3958cdbf 100644
--- a/engines/gnap/scenes/scene12.cpp
+++ b/engines/gnap/scenes/scene12.cpp
@@ -160,7 +160,7 @@ void GnapEngine::scene12_run() {
 			break;
 
 		case kHSExitRight:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapWalkTo(10, -1, 0, 0x107AB, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(10, -1, -1, -1, 1);
@@ -282,7 +282,7 @@ void GnapEngine::scene12_run() {
 
 		case kHSJukebox:
 			_newSceneNum = 15;
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapWalkTo(5, 6, 0, 0x107BC, 1);
 			_gnapActionStatus = kASLeaveScene;
 			break;
diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp
index 007c3806b5..d832927978 100644
--- a/engines/gnap/scenes/scene13.cpp
+++ b/engines/gnap/scenes/scene13.cpp
@@ -161,7 +161,7 @@ void GnapEngine::scene13_run() {
 			break;
 
 		case kHSExitBar:
-			_isLeavingScene = 1;
+			_isLeavingScene = true;
 			gnapWalkTo(2, 7, 0, 0x107C0, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(2, 8, -1, -1, 1);
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index 0e8065cc33..c88f7b28f5 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -638,7 +638,7 @@ void GnapEngine::scene18_run() {
 				if (isFlag(kGFPictureTaken)) {
 					playGnapImpossible(0, 0);
 				} else {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_newSceneNum = 19;
 					gnapWalkTo(_hotspotsWalkPos[kHSExitToyStore].x, _hotspotsWalkPos[kHSExitToyStore].y, 0, 0x107C0, 1);
 					_gnapActionStatus = kASLeaveScene;
@@ -655,7 +655,7 @@ void GnapEngine::scene18_run() {
 					scene18_putDownGarbageCan(0);
 				}
 				scene18_closeHydrantValve();
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 17;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitPhoneBooth].x, _hotspotsWalkPos[kHSExitPhoneBooth].y, 0, 0x107AE, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -673,7 +673,7 @@ void GnapEngine::scene18_run() {
 					scene18_putDownGarbageCan(0);
 				}
 				scene18_closeHydrantValve();
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 20;
 				_hotspots[kHSWalkArea2]._flags |= SF_WALKABLE;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitGrubCity].x, _hotspotsWalkPos[kHSExitGrubCity].y, 0, 0x107B2, 1);
diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp
index 7982b076ec..54a8438345 100644
--- a/engines/gnap/scenes/scene20.cpp
+++ b/engines/gnap/scenes/scene20.cpp
@@ -324,7 +324,7 @@ void GnapEngine::scene20_run() {
 			if (_gnapActionStatus < 0) {
 				if (_s20_stonerGuyShowingJoint)
 					_timers[4] = 0;
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 21;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitParkingLot].x, _hotspotsWalkPos[kHSExitParkingLot].y, 0, 0x107AF, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -337,7 +337,7 @@ void GnapEngine::scene20_run() {
 			if (_gnapActionStatus < 0) {
 				if (_s20_stonerGuyShowingJoint)
 					_timers[4] = 0;
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 17;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitPhone].x, _hotspotsWalkPos[kHSExitPhone].y, 0, 0x107AE, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -349,7 +349,7 @@ void GnapEngine::scene20_run() {
 			if (_gnapActionStatus < 0) {
 				if (_s20_stonerGuyShowingJoint)
 					_timers[4] = 0;
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 18;
 				_hotspots[kHSWalkArea2]._flags |= SF_WALKABLE;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitOutsideToyStore].x, _hotspotsWalkPos[kHSExitOutsideToyStore].y, 0, 0x107AB, 1);
@@ -363,7 +363,7 @@ void GnapEngine::scene20_run() {
 			if (_gnapActionStatus < 0) {
 				if (_s20_stonerGuyShowingJoint)
 					_timers[4] = 0;
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 22;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitInsideGrubCity].x, _hotspotsWalkPos[kHSExitInsideGrubCity].y - 1, 0, 0x107BB, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -376,7 +376,7 @@ void GnapEngine::scene20_run() {
 			if (_gnapActionStatus < 0) {
 				if (_s20_stonerGuyShowingJoint)
 					_timers[4] = 0;
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 24;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitOutsideCircusWorld].x, _hotspotsWalkPos[kHSExitOutsideCircusWorld].y, 0, 0x107BB, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene21.cpp b/engines/gnap/scenes/scene21.cpp
index b04c8c92b5..fcc7f51ecd 100644
--- a/engines/gnap/scenes/scene21.cpp
+++ b/engines/gnap/scenes/scene21.cpp
@@ -206,7 +206,7 @@ void GnapEngine::scene21_run() {
 		
 		case kHSExitOutsideGrubCity:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 20;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitOutsideGrubCity].x, _hotspotsWalkPos[kHSExitOutsideGrubCity].y, 0, 0x107B3, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene22.cpp b/engines/gnap/scenes/scene22.cpp
index 80f3843f30..364e42f03d 100644
--- a/engines/gnap/scenes/scene22.cpp
+++ b/engines/gnap/scenes/scene22.cpp
@@ -162,7 +162,7 @@ void GnapEngine::scene22_run() {
 
 		case kHSExitOutsideGrubCity:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 20;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitOutsideGrubCity].x, _hotspotsWalkPos[kHSExitOutsideGrubCity].y, 0, 0x107AF, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -172,7 +172,7 @@ void GnapEngine::scene22_run() {
 
 		case kHSExitBackGrubCity:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 23;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitBackGrubCity].x, _hotspotsWalkPos[kHSExitBackGrubCity].y, 0, 0x107AB, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene27.cpp b/engines/gnap/scenes/scene27.cpp
index 2c5a8f1174..881007e634 100644
--- a/engines/gnap/scenes/scene27.cpp
+++ b/engines/gnap/scenes/scene27.cpp
@@ -235,7 +235,7 @@ void GnapEngine::scene27_run() {
 
 		case kHSExitBeerStand:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 31;
 				gnapWalkTo(-1, _hotspotsWalkPos[kHSExitBeerStand].y, 0, 0x107AB, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene31.cpp b/engines/gnap/scenes/scene31.cpp
index 027a4b5d80..7a58c4de28 100644
--- a/engines/gnap/scenes/scene31.cpp
+++ b/engines/gnap/scenes/scene31.cpp
@@ -216,7 +216,7 @@ void GnapEngine::scene31_run() {
 
 		case kHSExitCircus:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 26;
 				gnapWalkTo(-1, _hotspotsWalkPos[kHSExitCircus].y, 0, 0x107AE, 1);
 				_gnapActionStatus = kASLeaveScene;
@@ -226,7 +226,7 @@ void GnapEngine::scene31_run() {
 
 		case kHSExitOutsideClown:
 			if (_gnapActionStatus < 0) {
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				_newSceneNum = 27;
 				gnapWalkTo(-1, _hotspotsWalkPos[kHSExitOutsideClown].y, 0, 0x107AF, 1);
 				_gnapActionStatus = kASLeaveScene;
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index e371d4aa6b..5f74dfae35 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -166,7 +166,7 @@ void GnapEngine::scene43_run() {
 			
 			case kHSUfoExitLeft:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 4;
 					_newSceneNum = 42;
 					toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 3);
@@ -175,7 +175,7 @@ void GnapEngine::scene43_run() {
 			
 			case kHSUfoExitRight:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 4;
 					_newSceneNum = 44;
 					toyUfoFlyTo(835, -1, 0, 835, 0, 300, 3);
@@ -231,7 +231,7 @@ void GnapEngine::scene43_run() {
 				break;
 
 			case kHSExitUfoParty:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitUfoParty].x, _hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitUfoParty].x, _hotspotsWalkPos[kHSExitUfoParty].y, -1, 0x107C7, 1);
@@ -239,7 +239,7 @@ void GnapEngine::scene43_run() {
 				break;
 
 			case kHSExitBBQ:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitBBQ].x, _gnapY, 0, 0x107AF, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitBBQ].x, _hotspotsWalkPos[kHSExitBBQ].y, -1, 0x107CF, 1);
@@ -247,7 +247,7 @@ void GnapEngine::scene43_run() {
 				break;
 
 			case kHSExitKissinBooth:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _gnapY, 0, 0x107AB, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _hotspotsWalkPos[kHSExitKissinBooth].y, -1, 0x107CD, 1);
diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp
index 5b53f114ec..ffd639d2e5 100644
--- a/engines/gnap/scenes/scene44.cpp
+++ b/engines/gnap/scenes/scene44.cpp
@@ -183,7 +183,7 @@ void GnapEngine::scene44_run() {
 			switch (_sceneClickedHotspot) {
 			case kHSUfoExitLeft:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 6;
 					_newSceneNum = 43;
 					toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 3);
@@ -192,7 +192,7 @@ void GnapEngine::scene44_run() {
 
 			case kHSUfoExitRight:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 6;
 					_newSceneNum = 46;
 					toyUfoFlyTo(835, -1, 0, 835, 0, 300, 3);
@@ -242,14 +242,14 @@ void GnapEngine::scene44_run() {
 				break;
 
 			case kHSExitUfoParty:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitUfoParty].x, _hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
 				_gnapActionStatus = 0;
 				_newSceneNum = 40;
 				break;
 			
 			case kHSExitUfo:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitUfo].x, _gnapY, 0, 0x107AF, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitUfo].x, _platY, -1, 0x107CF, 1);
@@ -257,7 +257,7 @@ void GnapEngine::scene44_run() {
 				break;
 			
 			case kHSExitShow:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitShow].x, _hotspotsWalkPos[kHSExitShow].y, 0, 0x107AB, 1);
 				_gnapActionStatus = 0;
 				_newSceneNum = 46;
diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp
index e8d421405a..1a875060a7 100644
--- a/engines/gnap/scenes/scene45.cpp
+++ b/engines/gnap/scenes/scene45.cpp
@@ -197,7 +197,7 @@ void GnapEngine::scene45_run() {
 
 			case kHSUfoExitLeft:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 2;
 					_newSceneNum = 46;
 					toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 5);
@@ -206,7 +206,7 @@ void GnapEngine::scene45_run() {
 
 			case kHSUfoExitRight:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 2;
 					_newSceneNum = 41;
 					toyUfoFlyTo(835, -1, 0, 835, 0, 300, 5);
@@ -257,7 +257,7 @@ void GnapEngine::scene45_run() {
 
 			case kHSExitUfoParty:
 				if (_gnapActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					gnapWalkTo(_gnapX, _hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
 					_gnapActionStatus = 0;
 					_newSceneNum = 40;
@@ -266,7 +266,7 @@ void GnapEngine::scene45_run() {
 			
 			case kHSExitShoe:
 				if (_gnapActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					gnapWalkTo(_hotspotsWalkPos[kHSExitShoe].x, _gnapY, 0, 0x107AF, 1);
 					_gnapActionStatus = 0;
 					platypusWalkTo(_hotspotsWalkPos[kHSExitShoe].x, _platY, -1, 0x107CF, 1);
@@ -276,7 +276,7 @@ void GnapEngine::scene45_run() {
 			
 			case kHSExitRight:
 				if (_gnapActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					gnapWalkTo(_hotspotsWalkPos[kHSExitRight].x, _gnapY, 0, 0x107AB, 1);
 					_gnapActionStatus = 0;
 					platypusWalkTo(_hotspotsWalkPos[kHSExitRight].x, _platY, -1, 0x107CD, 1);
diff --git a/engines/gnap/scenes/scene46.cpp b/engines/gnap/scenes/scene46.cpp
index 26a3be0b34..0f26181093 100644
--- a/engines/gnap/scenes/scene46.cpp
+++ b/engines/gnap/scenes/scene46.cpp
@@ -141,7 +141,7 @@ void GnapEngine::scene46_run() {
 
 			case kHSUfoExitLeft:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 3;
 					_newSceneNum = 44;
 					toyUfoFlyTo(-35, -1, -35, 799, 0, 300, 2);
@@ -150,7 +150,7 @@ void GnapEngine::scene46_run() {
 
 			case kHSUfoExitRight:
 				if (_toyUfoActionStatus < 0) {
-					_isLeavingScene = 1;
+					_isLeavingScene = true;
 					_toyUfoActionStatus = 3;
 					_newSceneNum = 45;
 					toyUfoFlyTo(835, -1, 0, 835, 0, 300, 2);
@@ -236,14 +236,14 @@ void GnapEngine::scene46_run() {
 				break;
 
 			case kHSExitUfoParty:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_gnapX, _hotspotsWalkPos[kHSExitUfoParty].y, 0, 0x107AE, 1);
 				_gnapActionStatus = 0;
 				_newSceneNum = 40;
 				break;
 
 			case kHSExitKissinBooth:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _gnapY, 0, 0x107AF, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitKissinBooth].x, _platY, -1, 0x107CF, 1);
@@ -251,7 +251,7 @@ void GnapEngine::scene46_run() {
 				break;
 
 			case kHSExitDisco:
-				_isLeavingScene = 1;
+				_isLeavingScene = true;
 				gnapWalkTo(_hotspotsWalkPos[kHSExitDisco].x, _gnapY, 0, 0x107AB, 1);
 				_gnapActionStatus = 0;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitDisco].x, _platY, -1, 0x107CD, 1);