From 7eaab18ab5eca04a4c96864c71fa9bd06fc0e57a Mon Sep 17 00:00:00 2001 From: number Zero Date: Mon, 5 Nov 2018 15:23:01 +0300 Subject: [PATCH] Minor changes for IrrLicht 1.9 support --- src/intlGUIEditBox.cpp | 4 ---- src/irrlichttypes.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp index 9ae27bed4..fb9baf6e7 100644 --- a/src/intlGUIEditBox.cpp +++ b/src/intlGUIEditBox.cpp @@ -32,8 +32,6 @@ #include #include "intlGUIEditBox.h" -#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 - #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" @@ -1603,5 +1601,3 @@ void intlGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h index dedebd45b..5fe30d7da 100644 --- a/src/irrlichttypes.h +++ b/src/irrlichttypes.h @@ -32,9 +32,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #include +#include using namespace irr; +namespace irr { + // Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) #ifdef _MSC_VER @@ -48,6 +51,18 @@ using namespace irr; #endif #endif +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9) +namespace core { + template <> + inline s16 roundingError() + { + return 0; + } +} +#endif + +} + #define S8_MIN (-0x7F - 1) #define S16_MIN (-0x7FFF - 1) #define S32_MIN (-0x7FFFFFFF - 1)