From 200f405706daf97f9e0e15806ce04a021fe7649a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 23 Aug 2008 20:16:54 +0000 Subject: (svn r14146) -Codechange: allow palette override in both ways and remove some unneeded '(x == 0) ? 0 : 1' constructs. --- src/blitter/32bpp_anim.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/blitter') 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) -- cgit v1.2.3-70-g09d2