dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt
This commit is contained in:
Jonathan G Rennison
2021-03-04 00:17:10 +00:00
parent d566a152bb 0243ae4654
commit 5a364d3e8c
13 changed files with 351 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blitter/32bpp_optimized.hpp
View File

@@ -27,9 +27,10 @@ public:
const char *GetName() override { return "32bpp-optimized"; }
template <BlitterMode mode> void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
template <BlitterMode mode, bool Tpal_to_rgb = false> void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
protected:
template <bool Tpal_to_rgb> void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
template <bool Tpal_to_rgb> Sprite *EncodeInternal(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
};