diff options
| author | number Zero <numzer0@yandex.ru> | 2018-11-05 15:23:01 +0300 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2018-11-11 18:08:15 +0100 |
| commit | b78698240c4b0e4ac410e2aafe6d88b34b1618e2 (patch) | |
| tree | 2657602a7557477c8a8643d6f393fa3abe4ad8dc | |
| parent | 4f9c33de640a748d020e63c7c85ccbbe341ab7a7 (diff) | |
| download | minetest-b78698240c4b0e4ac410e2aafe6d88b34b1618e2.tar.gz minetest-b78698240c4b0e4ac410e2aafe6d88b34b1618e2.tar.bz2 minetest-b78698240c4b0e4ac410e2aafe6d88b34b1618e2.zip | |
Minor changes for IrrLicht 1.9 support
| -rw-r--r-- | src/gui/intlGUIEditBox.cpp | 4 | ||||
| -rw-r--r-- | src/irrlichttypes.h | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp index 0c596d3b9..6bbf74a7f 100644 --- a/src/gui/intlGUIEditBox.cpp +++ b/src/gui/intlGUIEditBox.cpp @@ -32,8 +32,6 @@ #include <util/numeric.h> #include "intlGUIEditBox.h" -#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 || defined(__ANDROID__) - #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" @@ -1591,5 +1589,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 5e03a7fd8..c1856bfa0 100644 --- a/src/irrlichttypes.h +++ b/src/irrlichttypes.h @@ -31,9 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #include <irrTypes.h> +#include <irrMath.h> 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 @@ -47,6 +50,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) |