summaryrefslogtreecommitdiff
path: root/src/blitter/32bpp_anim.hpp
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-03-03 22:25:13 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commitaf7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch)
tree1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/blitter/32bpp_anim.hpp
parent31260e66252fb4d0dda6f992520faeeb96929cfe (diff)
downloadopenttd-af7d9020a15c1b1a14b3981ac73c70d2e58cc877.tar.xz
Codechange: Use override specifer for overriding member declarations
This is a C++11 feature that allows the compiler to check that a virtual member declaration overrides a base-class member with the same signature. Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked as virtual despite being a template.
Diffstat (limited to 'src/blitter/32bpp_anim.hpp')
-rw-r--r--src/blitter/32bpp_anim.hpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp
index ecf6dcfca..f8fd89281 100644
--- a/src/blitter/32bpp_anim.hpp
+++ b/src/blitter/32bpp_anim.hpp
@@ -37,21 +37,21 @@ public:
~Blitter_32bppAnim();
- /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
- /* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
- /* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);
- /* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash);
- /* virtual */ void DrawRect(void *video, int width, int height, uint8 colour);
- /* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height);
- /* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height);
- /* virtual */ void ScrollBuffer(void *video, int &left, int &top, int &width, int &height, int scroll_x, int scroll_y);
- /* virtual */ int BufferSize(int width, int height);
- /* virtual */ void PaletteAnimate(const Palette &palette);
- /* virtual */ Blitter::PaletteAnimation UsePaletteAnimation();
+ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
+ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) override;
+ void SetPixel(void *video, int x, int y, uint8 colour) override;
+ void DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash) override;
+ void DrawRect(void *video, int width, int height, uint8 colour) override;
+ void CopyFromBuffer(void *video, const void *src, int width, int height) override;
+ void CopyToBuffer(const void *video, void *dst, int width, int height) override;
+ void ScrollBuffer(void *video, int &left, int &top, int &width, int &height, int scroll_x, int scroll_y) override;
+ int BufferSize(int width, int height) override;
+ void PaletteAnimate(const Palette &palette) override;
+ Blitter::PaletteAnimation UsePaletteAnimation() override;
- /* virtual */ const char *GetName() { return "32bpp-anim"; }
- /* virtual */ int GetBytesPerPixel() { return 6; }
- /* virtual */ void PostResize();
+ const char *GetName() override { return "32bpp-anim"; }
+ int GetBytesPerPixel() override { return 6; }
+ void PostResize() override;
/**
* Look up the colour in the current palette.
@@ -77,7 +77,7 @@ public:
class FBlitter_32bppAnim : public BlitterFactory {
public:
FBlitter_32bppAnim() : BlitterFactory("32bpp-anim", "32bpp Animation Blitter (palette animation)") {}
- /* virtual */ Blitter *CreateInstance() { return new Blitter_32bppAnim(); }
+ Blitter *CreateInstance() override { return new Blitter_32bppAnim(); }
};
#endif /* BLITTER_32BPP_ANIM_HPP */