diff options
| author | Filippos Karapetis | 2019-05-27 14:45:13 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-27 14:53:43 +0300 |
| commit | f4e8eed13d7da5bcd87db7424358bf0d8759208f (patch) | |
| tree | 8d1027565f453c6c14fe5f82abff449ead741c7c /engines/sludge/sprites.cpp | |
| parent | 174721e911497ab232915da5ebed7c5d5f2b86ba (diff) | |
| download | scummvm-rg350-f4e8eed13d7da5bcd87db7424358bf0d8759208f.tar.gz scummvm-rg350-f4e8eed13d7da5bcd87db7424358bf0d8759208f.tar.bz2 scummvm-rg350-f4e8eed13d7da5bcd87db7424358bf0d8759208f.zip | |
SLUDGE: Fix MSVC warnings
- Fix invalid check with empty()
- Change float suffixes to uppercase
- Fix potentially uninitialized variables
Diffstat (limited to 'engines/sludge/sprites.cpp')
| -rw-r--r-- | engines/sludge/sprites.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp index 49c27dbed8..a7f82de0a8 100644 --- a/engines/sludge/sprites.cpp +++ b/engines/sludge/sprites.cpp @@ -384,11 +384,11 @@ Graphics::Surface *GraphicsManager::applyLightmapToSprite(Graphics::Surface *&bl // calculate light map color float fr, fg, fb; - fr = fg = fb = 0.f; + fr = fg = fb = 0.0F; if (thisPerson->colourmix) { - fr = curLight[0]*thisPerson->r * thisPerson->colourmix / 65025 / 255.f; - fg = curLight[1]*thisPerson->g * thisPerson->colourmix / 65025 / 255.f; - fb = curLight[2]*thisPerson->b * thisPerson->colourmix / 65025 / 255.f; + fr = curLight[0]*thisPerson->r * thisPerson->colourmix / 65025 / 255.0F; + fg = curLight[1]*thisPerson->g * thisPerson->colourmix / 65025 / 255.0F; + fb = curLight[2]*thisPerson->b * thisPerson->colourmix / 65025 / 255.0F; } uint32 primaryColor = TS_ARGB((uint8)(255 - thisPerson->transparency), |