X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcommon_irrlicht.h;h=0a2ed0be1bc3db8ff0d5825637bb3ec3b37f082c;hb=ca0fd4173cb18dd54219a1e8f05ec412e4d707ec;hp=9f28687d9b1d9a717c6b765cadcdfb8da4d92aa5;hpb=fc26dcdb19dd4e296d850714019ed7da1de0b021;p=dragonfireclient.git

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index 9f28687d9..0a2ed0be1 100644
--- 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,17 +20,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef COMMON_IRRLICHT_HEADER
 #define COMMON_IRRLICHT_HEADER
 
-#include <irrlicht.h>
-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;
+#define endSceneX(d){d->draw2DLine(v2s32(0,0),v2s32(1,0),\
+video::SColor(255,30,30,30));d->endScene();}
+
+#include "irrlichttypes.h"
+
+#ifndef SERVER
+#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
 
 #endif