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 69f00a7520ea2bc5f45459a5480f9f6e700a4fc1..f4c2f76ecec26ab4257e5d925fb17a22266c2632 100644 (file)
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -1,7 +1,48 @@
+/*
+Minetest-c55
+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
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #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;
@@ -13,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