mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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.
release/1.7
frosch 2017-03-11 12:52:26 +00:00
parent 9184b32978
commit d5f82bf55b
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blitter/32bpp_anim.hpp
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();

13
src/video/sdl_v.cpp
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);