(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.
This commit is contained in:
frosch 2017-03-11 12:52:26 +00:00
parent f2af019eb7
commit 5b7a04ca27
2 changed files with 3 additions and 14 deletions

View File

@ -27,7 +27,9 @@ public:
anim_buf(NULL), anim_buf(NULL),
anim_buf_width(0), anim_buf_width(0),
anim_buf_height(0) anim_buf_height(0)
{} {
this->palette = _cur_palette;
}
~Blitter_32bppAnim(); ~Blitter_32bppAnim();

View File

@ -404,19 +404,6 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h)
blitter->PostResize(); blitter->PostResize();
InitPalette(); 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); seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision);
SDL_CALL SDL_WM_SetCaption(caption, caption); SDL_CALL SDL_WM_SetCaption(caption, caption);