diff options
| author | RichieSams | 2013-10-04 09:08:40 -0500 |
|---|---|---|
| committer | RichieSams | 2013-10-04 09:20:32 -0500 |
| commit | 2887e8295d707df99dc21c5e04eecc76953b4d41 (patch) | |
| tree | 4e30b3372ec7b781b9c9a93018cb1984ee327f11 /engines/zvision | |
| parent | 39a8243c696f3883f5d1609b1dc333dfae2264ed (diff) | |
| download | scummvm-rg350-2887e8295d707df99dc21c5e04eecc76953b4d41.tar.gz scummvm-rg350-2887e8295d707df99dc21c5e04eecc76953b4d41.tar.bz2 scummvm-rg350-2887e8295d707df99dc21c5e04eecc76953b4d41.zip | |
ZVISION: Fix nested template formatting
Diffstat (limited to 'engines/zvision')
| -rw-r--r-- | engines/zvision/rlf_animation.cpp | 12 | ||||
| -rw-r--r-- | engines/zvision/string_manager.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp index 94e48d3609..8981a6983c 100644 --- a/engines/zvision/rlf_animation.cpp +++ b/engines/zvision/rlf_animation.cpp @@ -246,8 +246,8 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3 } byte r, g, b; - Graphics::colorToRGB<Graphics::ColorMasks<555>>(READ_LE_UINT16(source + sourceOffset), r, g, b); - uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565>>(r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b); + uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); WRITE_UINT16(dest + destOffset, destColor); sourceOffset += 2; @@ -292,8 +292,8 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3 } byte r, g, b; - Graphics::colorToRGB<Graphics::ColorMasks<555>>(READ_LE_UINT16(source + sourceOffset), r, g, b); - uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565>>(r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b); + uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); WRITE_UINT16(dest + destOffset, destColor); sourceOffset += 2; @@ -309,8 +309,8 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3 } byte r, g, b; - Graphics::colorToRGB<Graphics::ColorMasks<555>>(READ_LE_UINT16(source + sourceOffset), r, g, b); - uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565>>(r, g, b); + Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b); + uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); sourceOffset += 2; numberOfSamples += 2; diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp index fde99c02a1..ab42f3d3e0 100644 --- a/engines/zvision/string_manager.cpp +++ b/engines/zvision/string_manager.cpp @@ -206,7 +206,7 @@ void StringManager::parseTag(const Common::String &tagString, uint lineNumber) { } fragment.style.align = align; - fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565>>(0, red, green, blue); + fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565> >(0, red, green, blue); _inGameText[lineNumber].fragments.push_back(fragment); _lastStyle = fragment.style; |