diff options
author | rubidium <rubidium@openttd.org> | 2011-12-08 18:13:29 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-12-08 18:13:29 +0000 |
commit | 2ccbd2a6f5d0e3b9000122fe1845482241334f41 (patch) | |
tree | d8a346dc40e1f7f85376c413a0c12065e277ae49 /src/video/sdl_v.cpp | |
parent | 9e8b76650a084bb26b32113317933217b1d99e42 (diff) | |
download | openttd-2ccbd2a6f5d0e3b9000122fe1845482241334f41.tar.xz |
(svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure
Diffstat (limited to 'src/video/sdl_v.cpp')
-rw-r--r-- | src/video/sdl_v.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index ebb0ca757..1b579cc51 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -60,9 +60,9 @@ static void UpdatePalette(uint start, uint count) SDL_Color pal[256]; for (uint i = 0; i != count; i++) { - pal[i].r = _cur_palette[start + i].r; - pal[i].g = _cur_palette[start + i].g; - pal[i].b = _cur_palette[start + i].b; + pal[i].r = _cur_palette.palette[start + i].r; + pal[i].g = _cur_palette.palette[start + i].g; + pal[i].b = _cur_palette.palette[start + i].b; pal[i].unused = 0; } @@ -76,16 +76,16 @@ static void InitPalette() static void CheckPaletteAnim() { - if (_pal_count_dirty != 0) { + if (_cur_palette.count_dirty != 0) { Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); switch (blitter->UsePaletteAnimation()) { case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: - UpdatePalette(_pal_first_dirty, _pal_count_dirty); + UpdatePalette(_cur_palette.first_dirty, _cur_palette.count_dirty); break; case Blitter::PALETTE_ANIMATION_BLITTER: - blitter->PaletteAnimate(_pal_first_dirty, _pal_count_dirty); + blitter->PaletteAnimate(_cur_palette.first_dirty, _cur_palette.count_dirty); break; case Blitter::PALETTE_ANIMATION_NONE: @@ -94,7 +94,7 @@ static void CheckPaletteAnim() default: NOT_REACHED(); } - _pal_count_dirty = 0; + _cur_palette.count_dirty = 0; } } |