diff options
author | truelight <truelight@openttd.org> | 2007-06-21 13:56:59 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2007-06-21 13:56:59 +0000 |
commit | c755fa43d08e5adaad87745769369ec8e5e59915 (patch) | |
tree | c12a3ec2a2a8ac699698a9ce4572fb65c2d367cc | |
parent | 2f0500a43831c1b7d51fc22a08d1994b2ee27154 (diff) | |
download | openttd-c755fa43d08e5adaad87745769369ec8e5e59915.tar.xz |
(svn r10245) -Codechange: added GetName also to all Blitters, instead of only the Factory
-rw-r--r-- | src/blitter/32bpp_anim.hpp | 2 | ||||
-rw-r--r-- | src/blitter/32bpp_simple.hpp | 2 | ||||
-rw-r--r-- | src/blitter/8bpp_debug.hpp | 2 | ||||
-rw-r--r-- | src/blitter/8bpp_optimized.hpp | 2 | ||||
-rw-r--r-- | src/blitter/8bpp_simple.hpp | 2 | ||||
-rw-r--r-- | src/blitter/base.hpp | 5 | ||||
-rw-r--r-- | src/blitter/null.hpp | 2 |
7 files changed, 17 insertions, 0 deletions
diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp index c40db1828..1da06af21 100644 --- a/src/blitter/32bpp_anim.hpp +++ b/src/blitter/32bpp_anim.hpp @@ -32,6 +32,8 @@ public: /* virtual */ int BufferSize(int width, int height); /* virtual */ void PaletteAnimate(uint start, uint count); /* virtual */ Blitter::PaletteAnimation UsePaletteAnimation(); + + /* virtual */ const char *GetName() { return "32bpp-anim"; } }; class FBlitter_32bppAnim: public BlitterFactory<FBlitter_32bppAnim> { diff --git a/src/blitter/32bpp_simple.hpp b/src/blitter/32bpp_simple.hpp index a8d6d1d58..448b819bf 100644 --- a/src/blitter/32bpp_simple.hpp +++ b/src/blitter/32bpp_simple.hpp @@ -13,6 +13,8 @@ public: /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); /* virtual */ void DrawColorMappingRect(void *dst, int width, int height, int pal); /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); + + /* virtual */ const char *GetName() { return "32bpp-simple"; } }; class FBlitter_32bppSimple: public BlitterFactory<FBlitter_32bppSimple> { diff --git a/src/blitter/8bpp_debug.hpp b/src/blitter/8bpp_debug.hpp index 9fd2a2d8e..e140d0db5 100644 --- a/src/blitter/8bpp_debug.hpp +++ b/src/blitter/8bpp_debug.hpp @@ -12,6 +12,8 @@ class Blitter_8bppDebug : public Blitter_8bppBase { public: /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); + + /* virtual */ const char *GetName() { return "8bpp-debug"; } }; class FBlitter_8bppDebug: public BlitterFactory<FBlitter_8bppDebug> { diff --git a/src/blitter/8bpp_optimized.hpp b/src/blitter/8bpp_optimized.hpp index bbade0080..4dfe91604 100644 --- a/src/blitter/8bpp_optimized.hpp +++ b/src/blitter/8bpp_optimized.hpp @@ -12,6 +12,8 @@ class Blitter_8bppOptimized : public Blitter_8bppBase { public: /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); + + /* virtual */ const char *GetName() { return "8bpp-optimized"; } }; class FBlitter_8bppOptimized: public BlitterFactory<FBlitter_8bppOptimized> { diff --git a/src/blitter/8bpp_simple.hpp b/src/blitter/8bpp_simple.hpp index 589df29f3..9ab78db64 100644 --- a/src/blitter/8bpp_simple.hpp +++ b/src/blitter/8bpp_simple.hpp @@ -12,6 +12,8 @@ class Blitter_8bppSimple : public Blitter_8bppBase { public: /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); + + /* virtual */ const char *GetName() { return "8bpp-simple"; } }; class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> { diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp index f3ac308e4..d9f2a32e1 100644 --- a/src/blitter/base.hpp +++ b/src/blitter/base.hpp @@ -179,6 +179,11 @@ public: */ virtual Blitter::PaletteAnimation UsePaletteAnimation() = 0; + /** + * Get the naem of the blitter, the same as the Factory-instance returns. + */ + virtual const char *GetName() = 0; + virtual ~Blitter() { } }; diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp index 8910d6583..326155551 100644 --- a/src/blitter/null.hpp +++ b/src/blitter/null.hpp @@ -26,6 +26,8 @@ public: /* virtual */ int BufferSize(int width, int height) { return 0; }; /* virtual */ void PaletteAnimate(uint start, uint count) { }; /* virtual */ Blitter::PaletteAnimation UsePaletteAnimation() { return Blitter::PALETTE_ANIMATION_NONE; }; + + /* virtual */ const char *GetName() { return "null"; } }; class FBlitter_Null: public BlitterFactory<FBlitter_Null> { |