GNAP: Use debug channels

3 files changed, 3 insertions, 15 deletions

diff --git a/engines/gnap/scenes/scene15.cpp b/engines/gnap/scenes/scene15.cpp
index 89ca126c01..7bdfc8174d 100644
--- a/engines/gnap/scenes/scene15.cpp
+++ b/engines/gnap/scenes/scene15.cpp
@@ -102,11 +102,7 @@ void GnapEngine::scene15_run() {
 		_sceneClickedHotspot = getClickedHotspotId();
 		updateGrabCursorSprite(0, 0);
 		
-		if (_sceneClickedHotspot >= 0)
-			debug("_sceneClickedHotspot: %d; _verbCursor: %d", _sceneClickedHotspot, _verbCursor);
-	
 		switch (_sceneClickedHotspot) {
-
 		case kHSDevice:
 			if (_gnapActionStatus < 0) {
 				runMenu();
@@ -238,13 +234,10 @@ void GnapEngine::scene15_run() {
 		}
 		
 		gameUpdateTick();
-		
 	}
-
 }
 
-void GnapEngine::scene15_updateAnimations() {
-	
+void GnapEngine::scene15_updateAnimations() {	
 	if (_gameSys->getAnimationStatus(0) == 2) {
 		if (_isLeavingScene) {
 			_sceneDone = true;
@@ -337,7 +330,6 @@ void GnapEngine::scene15_updateAnimations() {
 			}
 		}
 	}
-	
 }
 
 } // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index b338b4c3fc..4bd75f59a4 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -309,7 +309,7 @@ void GnapEngine::scene18_waitForGnapAction() {
 }
 
 void GnapEngine::scene18_run() {
-	_s18_cowboyHatSurface = 0;
+	_s18_cowboyHatSurface = nullptr;
 
 	playSound(0x10940, true);
 	startSoundTimerA(4);
@@ -398,7 +398,6 @@ void GnapEngine::scene18_run() {
 	}
 
 	while (!_sceneDone) {
-	
 		updateMouseCursor();
 		updateCursorByHotspot();
 	
@@ -407,9 +406,6 @@ void GnapEngine::scene18_run() {
 		_sceneClickedHotspot = getClickedHotspotId();
 		updateGrabCursorSprite(0, 0);
 		
-		if (_sceneClickedHotspot >= 0)
-			debug("_sceneClickedHotspot: %d", _sceneClickedHotspot);
-	
 		switch (_sceneClickedHotspot) {
 
 		case kHSDevice:
diff --git a/engines/gnap/scenes/scene53.cpp b/engines/gnap/scenes/scene53.cpp
index 9b2867ac12..a21641e505 100644
--- a/engines/gnap/scenes/scene53.cpp
+++ b/engines/gnap/scenes/scene53.cpp
@@ -301,7 +301,7 @@ void GnapEngine::scene53_run() {
 			stopSound(0xA0);
 			++phoneNumberLen;
 			phoneNumber = scene53_pressPhoneNumberButton(phoneNumber, _sceneClickedHotspot - 1);
-			debug("phoneNumber: %d", phoneNumber);
+			debugC(kDebugBasic, "phoneNumber: %d", phoneNumber);
 			if (phoneNumberLen == 7) {
 				_gnapActionStatus = 1;
 				if (isFlag(kGFSpringTaken)) {