[Scummvm-cvs-logs] scummvm master -> 51ef8a78ccc556527d58ab552b7a8b589f2c7c27
bluegr
md5 at scummvm.org
Mon Feb 13 01:32:15 CET 2012
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:
51ef8a78cc SWORD1: Silence some MSVC warnings (conversion from double to float)
Commit: 51ef8a78ccc556527d58ab552b7a8b589f2c7c27
https://github.com/scummvm/scummvm/commit/51ef8a78ccc556527d58ab552b7a8b589f2c7c27
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-02-12T16:30:05-08:00
Commit Message:
SWORD1: Silence some MSVC warnings (conversion from double to float)
Changed paths:
engines/sword1/animation.cpp
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index a8c313f..5ad84d9 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -271,10 +271,10 @@ bool MoviePlayer::playVideo() {
// Look for the best color indexes to use to display the subtitles
uint32 minWeight = 0xFFFFFFFF;
uint32 weight;
- float c1Weight = 1e+30;
- float c2Weight = 1e+30;
- float c3Weight = 1e+30;
- float c4Weight = 1e+30;
+ float c1Weight = 1e+30f;
+ float c2Weight = 1e+30f;
+ float c3Weight = 1e+30f;
+ float c4Weight = 1e+30f;
byte r, g, b;
float h, s, v, hd, hsvWeight;
More information about the Scummvm-git-logs
mailing list