minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-02 08:10:26 +02:00
Code Issues Projects Releases Wiki Activity

Replace _IRR_OVERRIDE_ macro with override keyword

Browse Source 
The commit also establishes a precedent of leaving off the `virtual`
keyword in overrides. Although not strictly necessary, I believe this is
good for readability because it makes it clear it is an override and not
a pure virtual function, and it helps keep line lengths shorter. We
should move towards eliminating the macro altogether, but the definition
has been left in with a note on deprecation so that in-progress work
will not suffer merge conflicts.
This commit is contained in:
JosiahWI
2022-10-09 13:57:28 -05:00
committed by sfan5
parent f3a1f9f656
commit 59fc4401f1
87 changed files with 1471 additions and 1474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/Irrlicht/CGUISpriteBank.h
View File

@ -32,38 +32,38 @@ public:
CGUISpriteBank(IGUIEnvironment* env);
virtual ~CGUISpriteBank();
virtual core::array< core::rect<s32> >& getPositions() _IRR_OVERRIDE_;
virtual core::array< SGUISprite >& getSprites() _IRR_OVERRIDE_;
core::array< core::rect<s32> >& getPositions() override;
core::array< SGUISprite >& getSprites() override;
virtual u32 getTextureCount() const _IRR_OVERRIDE_;
virtual video::ITexture* getTexture(u32 index) const _IRR_OVERRIDE_;
virtual void addTexture(video::ITexture* texture) _IRR_OVERRIDE_;
virtual void setTexture(u32 index, video::ITexture* texture) _IRR_OVERRIDE_;
u32 getTextureCount() const override;
video::ITexture* getTexture(u32 index) const override;
void addTexture(video::ITexture* texture) override;
void setTexture(u32 index, video::ITexture* texture) override;
//! Add the texture and use it for a single non-animated sprite.
virtual s32 addTextureAsSprite(video::ITexture* texture) _IRR_OVERRIDE_;
s32 addTextureAsSprite(video::ITexture* texture) override;
//! clears sprites, rectangles and textures
virtual void clear() _IRR_OVERRIDE_;
void clear() override;
//! Draws a sprite in 2d with position and color
virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) _IRR_OVERRIDE_;
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) override;
//! Draws a sprite in 2d with destination rectangle and colors
virtual void draw2DSprite(u32 index, const core::rect<s32>& destRect,
const core::rect<s32>* clip=0,
const video::SColor * const colors=0,
u32 timeTicks = 0,
bool loop=true) _IRR_OVERRIDE_;
bool loop=true) override;
//! Draws a sprite batch in 2d using an array of positions and a color
virtual void draw2DSpriteBatch(const core::array<u32>& indices, const core::array<core::position2di>& pos,
const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0,
bool loop=true, bool center=false) _IRR_OVERRIDE_;
bool loop=true, bool center=false) override;
protected: