TITANIC: Extra debugging info for starfield movement

7 files changed, 17 insertions, 4 deletions

diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index 19fbefb75c..ff07b9bd03 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -82,4 +82,8 @@ FVector FVector::fn5(const FPose &pose) const {
 	return v;
 }
 
+Common::String FVector::toString() const {
+	return Common::String::format("(%.3f,%.3f,%.3f)", _x, _y, _z);
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/fvector.h b/engines/titanic/star_control/fvector.h
index 6ad281883d..a9cb44a19c 100644
--- a/engines/titanic/star_control/fvector.h
+++ b/engines/titanic/star_control/fvector.h
@@ -122,6 +122,11 @@ public:
 		_x -= delta._x;
 		_y -= delta._y;
 	}
+
+	/**
+	 * Converts the vector to a string
+	 */
+	Common::String toString() const;
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 071448a8a7..adcc7e4e94 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -220,8 +220,8 @@ FVector CStarCamera::proc31(int index, const FVector &v) {
 	return _sub13.fn18(index, v);
 }
 
-void CStarCamera::setViewportPosition(const FPoint &angles) {
-	debug(DEBUG_INTERMEDIATE, "setViewportPosition %f %f", angles._x, angles._y);
+void CStarCamera::setViewportAngle(const FPoint &angles) {
+	debug(DEBUG_DETAILED, "setViewportAngle %f %f", angles._x, angles._y);
 
 	if (isLocked())
 		return;
diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h
index 4363606dc8..e389f14a4a 100644
--- a/engines/titanic/star_control/star_camera.h
+++ b/engines/titanic/star_control/star_camera.h
@@ -111,7 +111,7 @@ public:
 	/**
 	 * Sets the viewport position within the starfield
 	 */
-	virtual void setViewportPosition(const FPoint &angles);
+	virtual void setViewportAngle(const FPoint &angles);
 
 	virtual int getMatrixRow() const { return _matrixRow; }
 	virtual bool addMatrixRow(const FVector &v);
diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index 74b3d7228d..8565d812f1 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -101,6 +101,7 @@ void CStarControlSub13::save(SimpleFile *file, int indent) {
 }
 
 void CStarControlSub13::setPosition(const FVector &v) {
+	debugC(DEBUG_INTERMEDIATE, kDebugStarfield, "Setting starmap position to %s", v.toString().c_str());
 	_position = v;
 	_flag = false;
 }
diff --git a/engines/titanic/star_control/star_control_sub21.cpp b/engines/titanic/star_control/star_control_sub21.cpp
index 4f95ad206d..89ea3a1d13 100644
--- a/engines/titanic/star_control/star_control_sub21.cpp
+++ b/engines/titanic/star_control/star_control_sub21.cpp
@@ -23,6 +23,7 @@
 #include "titanic/star_control/star_control_sub21.h"
 #include "titanic/star_control/dmatrix.h"
 #include "titanic/star_control/dvector.h"
+#include "titanic/titanic.h"
 #include "common/textconsole.h"
 
 namespace Titanic {
@@ -35,6 +36,8 @@ void CStarControlSub21::moveTo(const FVector &srcV, const FVector &destV, const
 	if (isLocked())
 		decLockCount();
 
+	debugC(DEBUG_BASIC, kDebugStarfield, "Starfield move %s to %s", srcV.toString().c_str(),
+		destV.toString().c_str());
 	_sub24.setPath(srcV, destV, srcM);
 }
 
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 95c6a3831c..fd2c407045 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -135,7 +135,7 @@ bool CStarView::MouseMoveMsg(int unused, const Point &pt) {
 
 				FPoint angle(tempPt._x * -2.0 * distance / threshold, 
 					tempPt._y * -2.0 * distance / threshold);
-				_camera.setViewportPosition(angle);
+				_camera.setViewportAngle(angle);
 				return true;
 			}
 		}