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/spritecache.cpp | |
| parent | 456dba4889108027f8af9c94514978d06012b6e7 (diff) | |
| download | openttd-2618d960e30882c097ba8b68249bbae974700ac8.tar.xz | |
(svn r26209) -Codechange: remove some template magic and simplify some code
Diffstat (limited to 'src/spritecache.cpp')
| -rw-r--r-- | src/spritecache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/spritecache.cpp b/src/spritecache.cpp index 6d514a8f6..49f2d7ff4 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -394,7 +394,7 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty sprite[ZOOM_LVL_NORMAL].type = sprite_type; SpriteLoaderGrf sprite_loader(sc->container_ver); - if (sprite_type != ST_MAPGEN && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 32) { + if (sprite_type != ST_MAPGEN && BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 32) { /* Try for 32bpp sprites first. */ sprite_avail = sprite_loader.LoadSprite(sprite, file_slot, file_pos, sprite_type, true); } @@ -442,7 +442,7 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty return (void*)GetRawSprite(SPR_IMG_QUERY, ST_NORMAL, allocator); } } - return BlitterFactoryBase::GetCurrentBlitter()->Encode(sprite, allocator); + return BlitterFactory::GetCurrentBlitter()->Encode(sprite, allocator); } @@ -847,7 +847,7 @@ void *GetRawSprite(SpriteID sprite, SpriteType type, AllocatorProc *allocator) static void GfxInitSpriteCache() { /* initialize sprite cache heap */ - int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); + int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); uint target_size = (bpp > 0 ? _sprite_cache_size * bpp / 8 : 1) * 1024 * 1024; /* Remember 'target_size' from the previous allocation attempt, so we do not try to reach the target_size multiple times in case of failure. */ |