summaryrefslogtreecommitdiff
path: root/src/blitter/32bpp_anim.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-23 20:16:54 +0000
committerrubidium <rubidium@openttd.org>2008-08-23 20:16:54 +0000
commit200f405706daf97f9e0e15806ce04a021fe7649a (patch)
tree5286eef504f7700e89f70f223dd516dc542ba066 /src/blitter/32bpp_anim.cpp
parent5de17da66e55661250aba173817ed56d0e46cbee (diff)
downloadopenttd-200f405706daf97f9e0e15806ce04a021fe7649a.tar.xz
(svn r14146) -Codechange: allow palette override in both ways and remove some unneeded '(x == 0) ? 0 : 1' constructs.
Diffstat (limited to 'src/blitter/32bpp_anim.cpp')
-rw-r--r--src/blitter/32bpp_anim.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index c989f9b2e..d9e8eea45 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -327,7 +327,7 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
}
/* We update the palette (or the pixels that do animation) immediatly, to avoid graphical glitches */
- this->PaletteAnimate(PALETTE_ANIM_SIZE_START, _use_dos_palette ? PALETTE_ANIM_SIZE_DOS : PALETTE_ANIM_SIZE_WIN);
+ this->PaletteAnimate(PALETTE_ANIM_SIZE_START, (_use_palette == PAL_DOS) ? PALETTE_ANIM_SIZE_DOS : PALETTE_ANIM_SIZE_WIN);
}
void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, int height)