PINK: hid debug output under channels and levels

7 files changed, 13 insertions, 9 deletions

diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp
index 34af26f597..66f30904dd 100644
--- a/engines/pink/objects/actors/actor.cpp
+++ b/engines/pink/objects/actors/actor.cpp
@@ -22,6 +22,7 @@
 
 #include "pink/constants.h"
 #include "pink/cursor_mgr.h"
+#include "pink/pink.h"
 #include "pink/objects/actions/action_cel.h"
 #include "pink/objects/actors/actor.h"
 #include "pink/objects/actors/lead_actor.h"
@@ -80,7 +81,7 @@ bool Actor::initPalette(Director *director) {
 }
 
 void Actor::toConsole() {
-	debug("Actor: _name = %s", _name.c_str());
+	debugC(6, kPinkDebugLoadingObjects, "Actor: _name = %s", _name.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();
 	}
diff --git a/engines/pink/objects/actors/audio_info_pda_button.cpp b/engines/pink/objects/actors/audio_info_pda_button.cpp
index af03d5adf6..ceb7df6666 100644
--- a/engines/pink/objects/actors/audio_info_pda_button.cpp
+++ b/engines/pink/objects/actors/audio_info_pda_button.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "pink/pink.h"
 #include "pink/objects/actors/audio_info_pda_button.h"
 #include "pink/objects/actors/lead_actor.h"
 #include "pink/objects/pages/page.h"
@@ -27,7 +28,7 @@
 namespace Pink {
 
 void AudioInfoPDAButton::toConsole()  {
-	debug("AudioInfoPDAButton: _name = %s", _name.c_str());
+	debugC(6, kPinkDebugLoadingObjects, "AudioInfoPDAButton: _name = %s", _name.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();
 	}
diff --git a/engines/pink/objects/actors/cursor_actor.h b/engines/pink/objects/actors/cursor_actor.h
index ff4c5de9c3..de1fea004b 100644
--- a/engines/pink/objects/actors/cursor_actor.h
+++ b/engines/pink/objects/actors/cursor_actor.h
@@ -25,6 +25,7 @@
 
 #include "common/debug.h"
 
+#include "pink/pink.h"
 #include "pink/objects/actions/action_cel.h"
 #include "pink/objects/actors/actor.h"
 
@@ -33,7 +34,7 @@ namespace Pink {
 class CursorActor : public Actor {
 public:
 	void toConsole() override {
-		debug("CursorActor: _name = %s", _name.c_str());
+		debugC(6, kPinkDebugLoadingObjects, "CursorActor: _name = %s", _name.c_str());
 		for (uint i = 0; i < _actions.size(); ++i) {
 			_actions[i]->toConsole();
 		}
diff --git a/engines/pink/objects/actors/inventory_actor.h b/engines/pink/objects/actors/inventory_actor.h
index cfd4408fb9..574c14b761 100644
--- a/engines/pink/objects/actors/inventory_actor.h
+++ b/engines/pink/objects/actors/inventory_actor.h
@@ -33,7 +33,7 @@ namespace Pink {
 class InventoryActor : public Actor {
 public:
 	void toConsole() override {
-		debug("InventoryActor: _name = %s", _name.c_str());
+		debugC(6, kPinkDebugLoadingObjects, "InventoryActor: _name = %s", _name.c_str());
 		for (uint i = 0; i < _actions.size(); ++i) {
 			_actions[i]->toConsole();
 		}
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 216797842e..b5fd04779c 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -48,7 +48,7 @@ void LeadActor::deserialize(Archive &archive) {
 }
 
 void LeadActor::toConsole() {
-	debug("LeadActor: _name = %s", _name.c_str());
+	debugC(6, kPinkDebugLoadingObjects, "LeadActor: _name = %s", _name.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();
 	}
@@ -440,7 +440,7 @@ Actor *LeadActor::findActor(const Common::String &name) {
 }
 
 void ParlSqPink::toConsole() {
-	debug("ParlSqPink: _name = %s", _name.c_str());
+	debugC(6, kPinkDebugLoadingObjects, "ParlSqPink: _name = %s", _name.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();
 	}
@@ -454,7 +454,7 @@ WalkLocation *ParlSqPink::getWalkDestination() {
 }
 
 void PubPink::toConsole() {
-	debug("PubPink: _name = %s", _name.c_str());
+	debugC(6, kPinkDebugLoadingObjects, "PubPink: _name = %s", _name.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();
 	}
diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp
index f919702097..647f426468 100644
--- a/engines/pink/objects/actors/pda_button_actor.cpp
+++ b/engines/pink/objects/actors/pda_button_actor.cpp
@@ -57,7 +57,7 @@ void PDAButtonActor::deserialize(Archive &archive) {
 }
 
 void PDAButtonActor::toConsole() {
-	debug("PDAButtonActor: _name = %s, _x = %u _y = %u _hideOnStop = %u, _opaque = %u, _commandType = %u, _arg = %s",
+	debugC(6, kPinkDebugLoadingObjects, "PDAButtonActor: _name = %s, _x = %u _y = %u _hideOnStop = %u, _opaque = %u, _commandType = %u, _arg = %s",
 		  _name.c_str(), _x, _y, _hideOnStop, _opaque, (int)_command.type, _command.arg.c_str());
 }
 
diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp
index b158650caa..d6310c9b6a 100644
--- a/engines/pink/objects/actors/supporting_actor.cpp
+++ b/engines/pink/objects/actors/supporting_actor.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "pink/pink.h"
 #include "pink/utils.h"
 #include "pink/constants.h"
 #include "pink/cursor_mgr.h"
@@ -38,7 +39,7 @@ void SupportingActor::deserialize(Archive &archive) {
 }
 
 void SupportingActor::toConsole() {
-	debug("SupportingActor: _name = %s, _location=%s, _pdaLink=%s, _cursor=%s",
+	debugC(6, kPinkDebugLoadingObjects, "SupportingActor: _name = %s, _location=%s, _pdaLink=%s, _cursor=%s",
 		  _name.c_str(), _location.c_str(), _pdaLink.c_str(), _cursor.c_str());
 	for (uint i = 0; i < _actions.size(); ++i) {
 		_actions[i]->toConsole();