luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 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_;
virtual core::array< core::rect<s32> >& getPositions() IRR_OVERRIDE;
virtual core::array< SGUISprite >& getSprites() IRR_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_;
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;
//! Add the texture and use it for a single non-animated sprite.
virtual s32 addTextureAsSprite(video::ITexture* texture) _IRR_OVERRIDE_;
virtual s32 addTextureAsSprite(video::ITexture* texture) IRR_OVERRIDE;
//! clears sprites, rectangles and textures
virtual void clear() _IRR_OVERRIDE_;
virtual void clear() IRR_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) IRR_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) IRR_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) IRR_OVERRIDE;
protected: