diff options
author | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
commit | 2618d960e30882c097ba8b68249bbae974700ac8 (patch) | |
tree | 3d5a349c6a13f6f843d5f6b56456faf91010af5b /src/gfxinit.cpp | |
parent | 456dba4889108027f8af9c94514978d06012b6e7 (diff) | |
download | openttd-2618d960e30882c097ba8b68249bbae974700ac8.tar.xz |
(svn r26209) -Codechange: remove some template magic and simplify some code
Diffstat (limited to 'src/gfxinit.cpp')
-rw-r--r-- | src/gfxinit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 0ee82d05e..06326ab3f 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -239,12 +239,12 @@ static void SwitchNewGRFBlitter() } /* A GRF would like a 32 bpp blitter, switch blitter if needed. Never switch if the blitter was specified by the user. */ - if (_blitter_autodetected && is_32bpp && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() != 0 && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() < 16) { - const char *cur_blitter = BlitterFactoryBase::GetCurrentBlitter()->GetName(); - if (BlitterFactoryBase::SelectBlitter("32bpp-anim") != NULL) { + if (_blitter_autodetected && is_32bpp && BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0 && BlitterFactory::GetCurrentBlitter()->GetScreenDepth() < 16) { + const char *cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName(); + if (BlitterFactory::SelectBlitter("32bpp-anim") != NULL) { if (!_video_driver->AfterBlitterChange()) { /* Failed to switch blitter, let's hope we can return to the old one. */ - if (BlitterFactoryBase::SelectBlitter(cur_blitter) == NULL || !_video_driver->AfterBlitterChange()) usererror("Failed to reinitialize video driver for 32 bpp blitter. Specify a fixed blitter in the config"); + if (BlitterFactory::SelectBlitter(cur_blitter) == NULL || !_video_driver->AfterBlitterChange()) usererror("Failed to reinitialize video driver for 32 bpp blitter. Specify a fixed blitter in the config"); } } } |