Fix water-glass and water-lava surfaces

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

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index 9f28687d9b1d9a717c6b765cadcdfb8da4d92aa5..f4c2f76ecec26ab4257e5d925fb17a22266c2632 100644 (file)
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,7 +20,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef COMMON_IRRLICHT_HEADER
 #define COMMON_IRRLICHT_HEADER
 
-#include <irrlicht.h>
+#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>
+#ifndef SERVER
+#include <SColor.h>
+#include <IMesh.h>
+#include <IImage.h>
+#include <IrrlichtDevice.h>
+#include <IMeshSceneNode.h>
+#include <SMesh.h>
+#include <ISceneManager.h>
+#include <IMeshBuffer.h>
+#include <SMeshBuffer.h>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#endif
 using namespace irr;
 typedef core::vector3df v3f;
 typedef core::vector3d<s16> v3s16;
@@ -32,5 +54,15 @@ 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