diff options
| author | Paul Gilbert | 2017-01-15 10:21:52 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-15 10:21:52 -0500 |
| commit | c11f32f4aa278d707f25427f67a5bf729c18855f (patch) | |
| tree | 5f825860dac4a2cbb9112b8e380871abb60c553b /engines/titanic | |
| parent | baf6b58313d74ea0fad8c321b1ae88bccb8a63da (diff) | |
| download | scummvm-rg350-c11f32f4aa278d707f25427f67a5bf729c18855f.tar.gz scummvm-rg350-c11f32f4aa278d707f25427f67a5bf729c18855f.tar.bz2 scummvm-rg350-c11f32f4aa278d707f25427f67a5bf729c18855f.zip | |
TITANIC: Further compiler warning fixes
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/star_control/star_points2.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/support/avi_surface.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/support/mouse_cursor.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp index 4fea298f93..97047181fd 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 2c56c018d4..36a5891f0d 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 c6942510cc..86623da044 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(); } |