[Scummvm-git-logs] scummvm master -> c11f32f4aa278d707f25427f67a5bf729c18855f

[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:
c11f32f4aa TITANIC: Further compiler warning fixes


Commit: c11f32f4aa278d707f25427f67a5bf729c18855f
    https://github.com/scummvm/scummvm/commit/c11f32f4aa278d707f25427f67a5bf729c18855f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T10:21:52-05:00

Commit Message:
TITANIC: Further compiler warning fixes

Changed paths:
    engines/titanic/star_control/star_points2.cpp
    engines/titanic/support/avi_surface.cpp
    engines/titanic/support/mouse_cursor.cpp


diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp
index 4fea298..9704718 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -47,9 +47,9 @@ bool CStarPoints2::initialize() {
 			v2 = stream->readSint32LE();
 			v1 *= 0.015 * FACTOR;
 			v2 *= 0.0099999998 * FACTOR;
-			entry._v1 = cos(v1) * 3000000.0 * cos(v2);
-			entry._v2 = sin(v1) * 3000000.0 * cos(v2);
-			entry._v3 = sin(v2) * 3000000.0;
+			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);
 		}
 	}
 
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 2c56c01..36a5891 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -143,7 +143,7 @@ bool AVISurface::startAtFrame(int frameNumber) {
 
 	// If we're in reverse playback, set the decoder to play in reverse
 	if (_isReversed)
-		_decoder->setRate(-1.0);
+		_decoder->setRate(Common::Rational(-1));
 
 	renderFrame();
 
@@ -425,7 +425,7 @@ void AVISurface::setFrameRate(double rate) {
 	// Convert rate from fps to relative to 1.0 (normal speed)
 	const int PRECISION = 10000;
 	double playRate = rate / 15.0;	// Standard 15 FPS
-	Common::Rational pRate(playRate * PRECISION, PRECISION);
+	Common::Rational pRate((int)(playRate * PRECISION), PRECISION);
 
 	_decoder->setRate(pRate);
 }
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index c694251..86623da 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -204,7 +204,7 @@ void CMouseCursor::setPosition(const Point &pt, double duration) {
 	_moveStartPos = g_vm->_events->getMousePos();
 	_moveDestPos = pt;
 	_moveStartTime = g_system->getMillis();
-	_moveEndTime = _moveStartTime + duration;
+	_moveEndTime = _moveStartTime + (int)duration;
 	update();
 }