[Scummvm-cvs-logs] scummvm master -> f6f8c3198407c231cb6d1cb4f38c02bac5700d4a

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f234b0aea FULLPIPE: Fixed debuf channel registration
f6f8c31984 FULLPIPE: Hid warning under debug channel. More debug output


Commit: 9f234b0aea7ce359e16bfdd7f5971ed3207c0b96
    https://github.com/scummvm/scummvm/commit/9f234b0aea7ce359e16bfdd7f5971ed3207c0b96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:25:20+03:00

Commit Message:
FULLPIPE: Fixed debuf channel registration

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 283c71e..5f06d8a 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -48,6 +48,13 @@ FullpipeEngine *g_fp = 0;
 Vars *g_vars = 0;
 
 FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
+	DebugMan.addDebugChannel(kDebugPathfinding, "path", "Pathfinding");
+	DebugMan.addDebugChannel(kDebugDrawing, "drawing", "Drawing");
+	DebugMan.addDebugChannel(kDebugLoading, "loading", "Scene loading");
+	DebugMan.addDebugChannel(kDebugAnimation, "animation", "Animation");
+	DebugMan.addDebugChannel(kDebugMemory, "memory", "Memory management");
+	DebugMan.addDebugChannel(kDebugEvents, "events", "Event handling");
+
 	// Setup mixer
 	if (!_mixer->isReady()) {
 		warning("Sound initialization failed.");
@@ -200,13 +207,6 @@ FullpipeEngine::~FullpipeEngine() {
 }
 
 void FullpipeEngine::initialize() {
-	DebugMan.addDebugChannel(kDebugPathfinding, "path", "Pathfinding");
-	DebugMan.addDebugChannel(kDebugDrawing, "drawing", "Drawing");
-	DebugMan.addDebugChannel(kDebugLoading, "loading", "Scene loading");
-	DebugMan.addDebugChannel(kDebugAnimation, "animation", "Animation");
-	DebugMan.addDebugChannel(kDebugMemory, "memory", "Memory management");
-	DebugMan.addDebugChannel(kDebugEvents, "events", "Event handling");
-
 	_globalMessageQueueList = new GlobalMessageQueueList;
 	_behaviorManager = new BehaviorManager;
 


Commit: f6f8c3198407c231cb6d1cb4f38c02bac5700d4a
    https://github.com/scummvm/scummvm/commit/f6f8c3198407c231cb6d1cb4f38c02bac5700d4a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:27:41+03:00

Commit Message:
FULLPIPE: Hid warning under debug channel. More debug output

Changed paths:
    engines/fullpipe/interaction.cpp
    engines/fullpipe/messagehandlers.cpp
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 79c714c..484b1e1 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -143,6 +143,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
 			obj->setPicAniInfo(&aniInfo);
 
 			if (abs(xpos - subj->_ox) > 1 || abs(ypos - subj->_oy) > 1) {
+				debugC(0, kDebugPathfinding, "Calling doWalkTo() at [%d, %d]", xpos, ypos);
 				mq = getSc2MctlCompoundBySceneId(g_fp->_currentScene->_sceneId)->doWalkTo(subj, xpos, ypos, 1, cinter->_staticsId2);
 				if (mq) {
 					dur = mq->calcDuration(subj);
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index 903db15..c40af3b 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -425,7 +425,7 @@ int global_messageHandler3(ExCommand *cmd) {
 				if (g_fp->_msgX != cmd->_sceneClickX || g_fp->_msgY != cmd->_sceneClickY) {
 					ani = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_gameLoader->_field_FA, -1);
 					if (!ani || (ani->isIdle() && !(ani->_flags & 0x80) && !(ani->_flags & 0x100))) {
-						warning("WWW 1");
+						debugC(0, kDebugPathfinding, "WWW 1");
 						result = startWalkTo(g_fp->_gameLoader->_field_FA, -1, cmd->_sceneClickX, cmd->_sceneClickY, 0);
 						if (result) {
 							ExCommand *ex = new ExCommand(g_fp->_gameLoader->_field_FA, 17, 64, 0, 0, 0, 1, 0, 0, 0);
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index ad6bef2..952defa 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2227,7 +2227,7 @@ MessageQueue *MovGraph2::doWalkTo(StaticANIObject *obj, int xpos, int ypos, int
 	Common::Array<MovGraphLink *> tempLinkList;
 	double minPath = findMinPath(&linkInfoSource, &linkInfoDest, &tempLinkList);
 
-	debugC(1, kDebugPathfinding, "MovGraph2::doWalkTo(): path: %g  parts: %d", minPath, tempLinkList.size());
+	debugC(0, kDebugPathfinding, "MovGraph2::doWalkTo(): path: %g  parts: %d", minPath, tempLinkList.size());
 
 	if (minPath < 0.0 || ((linkInfoSource.node != linkInfoDest.node || !linkInfoSource.node) && !tempLinkList.size()))
 		return 0;