[Scummvm-git-logs] scummvm master -> 25485af0a401084283134d37b1bc70578ef26ab0

[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:
25485af0a4 TITANIC: Fix some incorrect type casts


Commit: 25485af0a401084283134d37b1bc70578ef26ab0
    https://github.com/scummvm/scummvm/commit/25485af0a401084283134d37b1bc70578ef26ab0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-05T21:33:13-04:00

Commit Message:
TITANIC: Fix some incorrect type casts

Changed paths:
    engines/titanic/star_control/star_control_sub23.h
    engines/titanic/star_control/star_control_sub27.cpp


diff --git a/engines/titanic/star_control/star_control_sub23.h b/engines/titanic/star_control/star_control_sub23.h
index fa36563..082c18d 100644
--- a/engines/titanic/star_control/star_control_sub23.h
+++ b/engines/titanic/star_control/star_control_sub23.h
@@ -39,7 +39,7 @@ protected:
 	FVector _row3;
 	int _field34;
 	double _field38;
-	int _field3C;
+	double _field3C;
 	int _field40;
 	int _field44;
 	int _field48;
diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp
index 98c237c..cdd2dbb 100644
--- a/engines/titanic/star_control/star_control_sub27.cpp
+++ b/engines/titanic/star_control/star_control_sub27.cpp
@@ -28,7 +28,7 @@ namespace Titanic {
 void CStarControlSub27::proc2(FVector &v1, FVector &v2, FMatrix &m1, FMatrix &m2) {
 	CStarControlSub23::proc2(v1, v2, m1, m2);
 
-	int v24 = _field24;
+	double factor = _field24;
 	if (_field24 > 0.0) {
 		_field8 = 1;
 		_field34 = 1;
@@ -43,7 +43,7 @@ void CStarControlSub27::proc2(FVector &v1, FVector &v2, FMatrix &m1, FMatrix &m2
 			_field60 = 0.1;
 			_field8 = 1;
 		} else {
-			_field60 = 1.0 / (double)v24;
+			_field60 = 1.0 / factor;
 			_field8 = 1;
 		}
 	}