[Scummvm-cvs-logs] scummvm master -> 986f4bbbf668cf0a308f50d2188856f94cfdb8d1

[sev-]

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:
986f4bbbf6 SCI: Explicit type conversion. Avoids warnings on number of compilers.


Commit: 986f4bbbf668cf0a308f50d2188856f94cfdb8d1
    https://github.com/scummvm/scummvm/commit/986f4bbbf668cf0a308f50d2188856f94cfdb8d1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-28T17:11:49+02:00

Commit Message:
SCI: Explicit type conversion. Avoids warnings on number of compilers.

Changed paths:
    engines/sci/graphics/text32.cpp



diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index c6c474f..e1b522a 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -550,7 +550,7 @@ Common::Rect GfxText32::getTextSize(const Common::String &text, int16 maxWidth,
 			// before the compiler took over.
 			// Verify this by looking at a game that uses a
 			// scriptWidth other than 320, like LSL7
-			maxWidth = _scaledWidth * (scriptWidth * 0.6) / scriptWidth;
+			maxWidth = (int16)(_scaledWidth * (scriptWidth * 0.6) / scriptWidth);
 		}
 
 		result.right = maxWidth;