Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes for IrrLicht 1.9 support

master
number Zero 2018-11-05 15:23:01 +03:00 committed by sfan5
parent 4f9c33de64
commit b78698240c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/intlGUIEditBox.cpp
View File

@ -32,8 +32,6 @@
#include <util/numeric.h> #include <util/numeric.h>
#include "intlGUIEditBox.h" #include "intlGUIEditBox.h"
#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 || defined(__ANDROID__)
#include "IGUISkin.h" #include "IGUISkin.h"
#include "IGUIEnvironment.h" #include "IGUIEnvironment.h"
#include "IGUIFont.h" #include "IGUIFont.h"
@ -1591,5 +1589,3 @@ void intlGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
} // end namespace gui } // end namespace gui
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_GUI_

15
src/irrlichttypes.h
View File

@ -31,9 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif #endif
#include <irrTypes.h> #include <irrTypes.h>
#include <irrMath.h>
using namespace irr; using namespace irr;
namespace irr {
// Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h // Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
#ifdef _MSC_VER #ifdef _MSC_VER
@ -47,6 +50,18 @@ using namespace irr;
#endif #endif
#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 S8_MIN (-0x7F - 1)
#define S16_MIN (-0x7FFF - 1) #define S16_MIN (-0x7FFF - 1)
#define S32_MIN (-0x7FFFFFFF - 1) #define S32_MIN (-0x7FFFFFFF - 1)