diff options
Diffstat (limited to 'src/irrlicht_changes')
| -rw-r--r-- | src/irrlicht_changes/CGUITTFont.h | 5 | ||||
| -rw-r--r-- | src/irrlicht_changes/static_text.cpp | 2 | ||||
| -rw-r--r-- | src/irrlicht_changes/static_text.h | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h index 2721364f5..ebbdf4cf4 100644 --- a/src/irrlicht_changes/CGUITTFont.h +++ b/src/irrlicht_changes/CGUITTFont.h @@ -138,10 +138,8 @@ namespace gui bool flgmip = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS); driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false); -#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 bool flgcpy = driver->getTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY); driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, true); -#endif // Set the texture color format. switch (pixel_mode) @@ -157,9 +155,8 @@ namespace gui // Restore our texture creation flags. driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, flgmip); -#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, flgcpy); -#endif + return texture ? true : false; } diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp index a4749bab1..4dc452349 100644 --- a/src/irrlicht_changes/static_text.cpp +++ b/src/irrlicht_changes/static_text.cpp @@ -239,12 +239,10 @@ video::SColor StaticText::getOverrideColor() const return ColoredText.getDefaultColor(); } -#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 video::SColor StaticText::getActiveColor() const { return getOverrideColor(); } -#endif //! Sets if the static text should use the overide color or the //! color in the gui skin. diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h index fc58e3e90..93a2d8643 100644 --- a/src/irrlicht_changes/static_text.h +++ b/src/irrlicht_changes/static_text.h @@ -135,10 +135,8 @@ namespace gui //! Gets the override color virtual video::SColor getOverrideColor() const; - #if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 //! Gets the currently used text color virtual video::SColor getActiveColor() const; - #endif //! Sets if the static text should use the overide color or the //! color in the gui skin. |