Move tool stuff to tool.{h,cpp}

[oweals/minetest.git] / src / common_irrlicht.h

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index f4c2f76ecec26ab4257e5d925fb17a22266c2632..379c2d15a6fb101279402c390bf0bcdd9ea4e204 100644 (file)
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -23,13 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define endSceneX(d){d->draw2DLine(v2s32(0,0),v2s32(1,0),\
 video::SColor(255,30,30,30));d->endScene();}
 
-#include <irrTypes.h>
-#include <vector2d.h>
-#include <vector3d.h>
-#include <irrMap.h>
-#include <irrList.h>
-#include <irrArray.h>
-#include <aabbox3d.h>
+#include "irrlichttypes.h"
+
 #ifndef SERVER
 #include <SColor.h>
 #include <IMesh.h>
@@ -43,26 +38,6 @@ video::SColor(255,30,30,30));d->endScene();}
 #include <IGUIElement.h>
 #include <IGUIEnvironment.h>
 #endif
-using namespace irr;
-typedef core::vector3df v3f;
-typedef core::vector3d<s16> v3s16;
-typedef core::vector3d<s32> v3s32;
-
-typedef core::vector2d<f32> v2f;
-typedef core::vector2d<s16> v2s16;
-typedef core::vector2d<s32> v2s32;
-typedef core::vector2d<u32> v2u32;
-typedef core::vector2d<f32> v2f32;
-
-#ifdef _MSC_VER
-       // Windows
-       typedef unsigned long long u64;
-#else
-       // Posix
-       #include <stdint.h>
-       typedef uint64_t u64;
-       //typedef unsigned long long u64;
-#endif
 
 #endif