summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2017-03-11 12:52:26 +0000
committerfrosch <frosch@openttd.org>2017-03-11 12:52:26 +0000
commitd5f82bf55b8a0e4c522066118a6e0d980651ae92 (patch)
treeaaa3d0a14182fb3824d8cc41cbca4ae6d1589d32
parent9184b32978a1bb2e7305e2e0e16f7496095ab262 (diff)
downloadopenttd-d5f82bf55b8a0e4c522066118a6e0d980651ae92.tar.xz
(svn r27774) -Fix [FS#5889]: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows.
-Revert (r23978): No SDL-specific fix required anymore. The new fix applies to all backends.
-rw-r--r--src/blitter/32bpp_anim.hpp4
-rw-r--r--src/video/sdl_v.cpp13
2 files changed, 3 insertions, 14 deletions
diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp
index a0a022e49..4b08429ed 100644
--- a/src/blitter/32bpp_anim.hpp
+++ b/src/blitter/32bpp_anim.hpp
@@ -27,7 +27,9 @@ public:
anim_buf(NULL),
anim_buf_width(0),
anim_buf_height(0)
- {}
+ {
+ this->palette = _cur_palette;
+ }
~Blitter_32bppAnim();
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 4ee96db77..4bb44c9d7 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -404,19 +404,6 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h)
blitter->PostResize();
InitPalette();
- switch (blitter->UsePaletteAnimation()) {
- case Blitter::PALETTE_ANIMATION_NONE:
- case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
- UpdatePalette();
- break;
-
- case Blitter::PALETTE_ANIMATION_BLITTER:
- if (VideoDriver::GetInstance() != NULL) blitter->PaletteAnimate(_local_palette);
- break;
-
- default:
- NOT_REACHED();
- }
seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision);
SDL_CALL SDL_WM_SetCaption(caption, caption);