[Scummvm-git-logs] scummvm master -> 16d21cd0ff7fa200664fb75b915da015cccc8a48

[dreammaster]

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

Summary:
16d21cd0ff TITANIC: Fix CStarPoints2 initialization


Commit: 16d21cd0ff7fa200664fb75b915da015cccc8a48
    https://github.com/scummvm/scummvm/commit/16d21cd0ff7fa200664fb75b915da015cccc8a48
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-25T15:03:16-05:00

Commit Message:
TITANIC: Fix CStarPoints2 initialization

Changed paths:
    engines/titanic/star_control/star_points2.cpp
    engines/titanic/star_control/star_points2.h


diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp
index 9704718..287a46e 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -42,14 +42,15 @@ bool CStarPoints2::initialize() {
 		RootEntry &rootEntry = _data[rootCtr];
 		rootEntry.resize(count * 2);
 		for (int idx = 0; idx < count * 2; ++idx) {
-			DataEntry &entry = rootEntry[idx];
+			FVector &entry = rootEntry[idx];
 			v1 = stream->readSint32LE();
 			v2 = stream->readSint32LE();
 			v1 *= 0.015 * FACTOR;
 			v2 *= 0.0099999998 * FACTOR;
-			entry._v1 = static_cast<int>(cos(v1) * 3000000.0 * cos(v2));
-			entry._v2 = static_cast<int>(sin(v1) * 3000000.0 * cos(v2));
-			entry._v3 = static_cast<int>(sin(v2) * 3000000.0);
+
+			entry._x = cos(v1) * 3000000.0 * cos(v2);
+			entry._y = sin(v1) * 3000000.0 * cos(v2);
+			entry._z = sin(v2) * 3000000.0;
 		}
 	}
 
diff --git a/engines/titanic/star_control/star_points2.h b/engines/titanic/star_control/star_points2.h
index 31bded4..df302f6 100644
--- a/engines/titanic/star_control/star_points2.h
+++ b/engines/titanic/star_control/star_points2.h
@@ -24,17 +24,12 @@
 #define TITANIC_STAR_POINTS2_H
 
 #include "common/array.h"
+#include "titanic/star_control/fvector.h"
 
 namespace Titanic {
 
 class CStarPoints2 {
-	struct DataEntry {
-		int _v1;
-		int _v2;
-		int _v3;
-	};
-
-	class RootEntry : public Common::Array<DataEntry> {
+	class RootEntry : public Common::Array<FVector> {
 	public:
 		int _field0;
 		RootEntry() : _field0(0) {}