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/openttd.cpp | |
| parent | 456dba4889108027f8af9c94514978d06012b6e7 (diff) | |
| download | openttd-2618d960e30882c097ba8b68249bbae974700ac8.tar.xz | |
(svn r26209) -Codechange: remove some template magic and simplify some code
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 2c76d9ba6..7a3f84eea 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -192,7 +192,7 @@ static void ShowHelp() p = DriverFactoryBase::GetDriversInfo(p, lastof(buf)); /* List the blitters */ - p = BlitterFactoryBase::GetBlittersInfo(p, lastof(buf)); + p = BlitterFactory::GetBlittersInfo(p, lastof(buf)); /* List the debug facilities. */ p = DumpDebugFacilityNames(p, lastof(buf)); @@ -756,8 +756,8 @@ int openttd_main(int argc, char *argv[]) if (blitter == NULL && _ini_blitter != NULL) blitter = strdup(_ini_blitter); _blitter_autodetected = StrEmpty(blitter); /* If we have a 32 bpp base set, try to select the 32 bpp blitter first, but only if we autoprobe the blitter. */ - if (!_blitter_autodetected || BaseGraphics::GetUsedSet() == NULL || BaseGraphics::GetUsedSet()->blitter == BLT_8BPP || BlitterFactoryBase::SelectBlitter("32bpp-anim") == NULL) { - if (BlitterFactoryBase::SelectBlitter(blitter) == NULL) { + if (!_blitter_autodetected || BaseGraphics::GetUsedSet() == NULL || BaseGraphics::GetUsedSet()->blitter == BLT_8BPP || BlitterFactory::SelectBlitter("32bpp-anim") == NULL) { + if (BlitterFactory::SelectBlitter(blitter) == NULL) { StrEmpty(blitter) ? usererror("Failed to autoprobe blitter") : usererror("Failed to select requested blitter '%s'; does it exist?", blitter); |