diff options
author | Strangerke | 2014-05-19 21:54:25 +0200 |
---|---|---|
committer | Strangerke | 2014-05-19 21:54:25 +0200 |
commit | b384447e71af3b10a152f7a3d863e65db525476c (patch) | |
tree | 832700a184b10931a77b428f514e3992988b999b /engines | |
parent | 83f82104d0a49ba9eff521426b58831ac3b21a86 (diff) | |
download | scummvm-rg350-b384447e71af3b10a152f7a3d863e65db525476c.tar.gz scummvm-rg350-b384447e71af3b10a152f7a3d863e65db525476c.tar.bz2 scummvm-rg350-b384447e71af3b10a152f7a3d863e65db525476c.zip |
MADS: Reduce the scope of some variables in Palette
Diffstat (limited to 'engines')
-rw-r--r-- | engines/mads/palette.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp index a4608a6c1a..23e889566e 100644 --- a/engines/mads/palette.cpp +++ b/engines/mads/palette.cpp @@ -587,7 +587,6 @@ uint8 Palette::palIndexFromRgb(byte r, byte g, byte b, byte *paletteData) { byte index = 0; int32 minDist = 0x7fffffff; byte palData[PALETTE_SIZE]; - int Rdiff, Gdiff, Bdiff; if (paletteData == NULL) { g_system->getPaletteManager()->grabPalette(palData, 0, PALETTE_COUNT); @@ -595,9 +594,9 @@ uint8 Palette::palIndexFromRgb(byte r, byte g, byte b, byte *paletteData) { } for (int palIndex = 0; palIndex < PALETTE_COUNT; ++palIndex) { - Rdiff = r - paletteData[palIndex * 3]; - Gdiff = g - paletteData[palIndex * 3 + 1]; - Bdiff = b - paletteData[palIndex * 3 + 2]; + int Rdiff = r - paletteData[palIndex * 3]; + int Gdiff = g - paletteData[palIndex * 3 + 1]; + int Bdiff = b - paletteData[palIndex * 3 + 2]; if (Rdiff * Rdiff + Gdiff * Gdiff + Bdiff * Bdiff < minDist) { minDist = Rdiff * Rdiff + Gdiff * Gdiff + Bdiff * Bdiff; @@ -609,7 +608,6 @@ uint8 Palette::palIndexFromRgb(byte r, byte g, byte b, byte *paletteData) { } void Palette::setGradient(byte *palette, int start, int count, int rgbValue1, int rgbValue2) { - int rgbCtr = 0; int rgbCurrent = rgbValue2; int rgbDiff = -(rgbValue2 - rgbValue1); @@ -618,6 +616,7 @@ void Palette::setGradient(byte *palette, int start, int count, int rgbValue1, in int endVal = count - 1; int numLeft = count; + int rgbCtr = 0; do { pDest[0] = pDest[1] = pDest[2] = rgbCurrent; |