Optimize headers

diff --git a/src/activeobject.h b/src/activeobject.h
index 6c82034900ca8a0b33462bc9e1e25b118cbb112b..1108a19de9fce4314f085f25598837f0513a2e09 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ACTIVEOBJECT_HEADER
 #define ACTIVEOBJECT_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 
 #define ACTIVEOBJECT_TYPE_INVALID 0

diff --git a/src/ban.h b/src/ban.h
index 5a8532f14103d02d48234dd9dfce6f0dcf7db03e..f5b9c4440560e3a22eb0ea8ca0929c01952c4369 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include <jthread.h>
 #include <jmutex.h>
-#include "common_irrlicht.h"
 #include "exceptions.h"
 
 class BanManager

diff --git a/src/camera.h b/src/camera.h
index 763c4fd8c37dfd99152f1f84c73e3b791d41c48a..642b8d2d041e197ed89baec5e0f05cff32c8749e 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CAMERA_HEADER
 #define CAMERA_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "mesh.h"
 #include "tile.h"

diff --git a/src/chat.h b/src/chat.h
index 3a376aad2457c76339b87002c91dcd7eab3edfd7..49de529859b11da2845ccbe927b61cbf8c11f6be 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 
 // Chat console related classes, only used by the client

diff --git a/src/client.h b/src/client.h
index 6b797e6276a505264f76f66396137a4e85f153d5..18a0009a83123b62682ad5fc9cd5c6fa2ae03538 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "connection.h"
 #include "environment.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "jmutex.h"
 #include <ostream>
 #include <set>

diff --git a/src/clientmap.h b/src/clientmap.h
index 30d79cf883a1174e8e6e93b86538846cf45d8f85..29ebed15988d94488df41634b648a69ba2296a8b 100644 (file)
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTMAP_HEADER
 #define CLIENTMAP_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "map.h"
 
 struct MapDrawControl

diff --git a/src/clientobject.h b/src/clientobject.h
index 0d3ee3d30a48343dd510b68e91f807edc385f91e..8b0b57147adb91fc3e2db4f1806404b40bd8ce09 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTOBJECT_HEADER
 #define CLIENTOBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
 
 /*

diff --git a/src/clientsimpleobject.h b/src/clientsimpleobject.h
index 21e42b4cbed88f4a16da0bbb3d25fb22c575f84f..9dd8cc472e3b59c2281cb903d547f25706d17982 100644 (file)
--- a/src/clientsimpleobject.h
+++ b/src/clientsimpleobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTSIMPLEOBJECT_HEADER
 #define CLIENTSIMPLEOBJECT_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 class ClientEnvironment;
 
 class ClientSimpleObject

diff --git a/src/clouds.h b/src/clouds.h
index d377fcd7b15120ca3fc7e6bc399ca0dee74714a6..a7cde42bc8d7d2317cfd0815cde2b988247ce7bd 100644 (file)
--- a/src/clouds.h
+++ b/src/clouds.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLOUDS_HEADER
 #define CLOUDS_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <iostream>
 
 class Clouds : public scene::ISceneNode

diff --git a/src/collision.h b/src/collision.h
index 2cb55eb67c4346a783617f45e93f57974b82f49c..a4eca0dd821a6a9ce948c6019f1dc1c4f7730f13 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef COLLISION_HEADER
 #define COLLISION_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 
 class Map;
 class IGameDef;

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
deleted file mode 100644 (file)
index 0f9338c..0000000
--- a/src/common_irrlicht.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-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 Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser 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
-
-#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
-

diff --git a/src/connection.h b/src/connection.h
index e03c7983f77516bebf42dbc73322835dcbb006b5..f88e813a3f4afdb489c87ce2e599ae4a294d2e1b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CONNECTION_HEADER
 #define CONNECTION_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "socket.h"
 #include "exceptions.h"
 #include "constants.h"

diff --git a/src/content_cso.h b/src/content_cso.h
index 1a373731a322d55b7875c3c049edd420db604868..0b467f6c47e052a7581df28b95ff08a4d211173b 100644 (file)
--- a/src/content_cso.h
+++ b/src/content_cso.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CONTENT_CSO_HEADER
 #define CONTENT_CSO_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "clientsimpleobject.h"
 
 ClientSimpleObject* createSmokePuff(scene::ISceneManager *smgr,

diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 6604b36a28a41f240d23d30338490a784f999c04..410aaa911b7e0ffc05357a33f607a4bf27e434f8 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "content_mapnode.h"
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "mapnode.h"
 #include "nodedef.h"
 #include "nameidmapping.h"

diff --git a/src/debug.cpp b/src/debug.cpp
index d0d2e047ba5b37c0fb46073efdb2469e5bcd056c..8b25cc22d4ec6b08a8f17ce78ed0f444345147f5 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 
 /*
        Debug output

diff --git a/src/debug.h b/src/debug.h
index 7a3c6014471da59c9641a9467a8c203405bea79b..3e8066f4de7c55a317209b358e3ecc5c16872fe3 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <jmutexautolock.h>
 #include <iostream>
 #include "irrlichttypes.h"
+#include <irrMap.h>
 #include "threads.h"
 #include "gettime.h"
 #include "exceptions.h"

diff --git a/src/environment.h b/src/environment.h
index 710b62ee0e62058892c1d7449cce462290ec4f9d..0e4b85e06ef286e8aaa7e83e6e1f229714599ea5 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <set>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "player.h"
 #include "map.h"
 #include <ostream>

diff --git a/src/farmesh.h b/src/farmesh.h
index b3a8dde203b7ca97614be8372edd74224442d05f..2eaf7d486ccfc66420ac0f4e05f5cbfe08d63f28 100644 (file)
--- a/src/farmesh.h
+++ b/src/farmesh.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        distance according to map seed
 */
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 
 #define FARMESH_MATERIAL_COUNT 2
 

diff --git a/src/game.cpp b/src/game.cpp
index 83e853b93fb87e848d03d27f128b35ec9d1f98ac..c8defd82d39abd596dee4fb524afbd769eb56909 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "game.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <IGUICheckBox.h>
 #include <IGUIEditBox.h>
 #include <IGUIButton.h>

diff --git a/src/game.h b/src/game.h
index 3c127539a52d5bf0a450d20b2e6dd9385a495c8e..b74a7a8da33c620a6a0e3c2e553c2106e5f07797 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GAME_HEADER
 #define GAME_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <string>
 #include "keycode.h"
 

diff --git a/src/genericobject.h b/src/genericobject.h
index b3dd002c8cd9026512e49f79d1d29e32c394685b..81563c19b8a532e0104b3c266eda03e10970fb7b 100644 (file)
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERICOBJECT_HEADER
 
 #include <string>
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <iostream>
 
 #define GENERIC_CMD_SET_PROPERTIES 0

diff --git a/src/gettime.h b/src/gettime.h
index 23376be3f5d41e1bc1fc3453f153a6578adab790..b5cb830cc241ebe247d7e0ca827d046f0e5c898f 100644 (file)
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GETTIME_HEADER
 #define GETTIME_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 
 /*
        Get a millisecond counter value.

diff --git a/src/guiChatConsole.h b/src/guiChatConsole.h
index 9e76a116e72c1e4000e07ec7801deef42c0738c2..033a2624447bf96ff9dedc74fddd03e3f1cb9ff8 100644 (file)
--- a/src/guiChatConsole.h
+++ b/src/guiChatConsole.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUICHATCONSOLE_HEADER
 #define GUICHATCONSOLE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "chat.h"
 
 class Client;

diff --git a/src/guiConfirmMenu.h b/src/guiConfirmMenu.h
index 0007290b1c26eaacaa25d7db4a9013f87e271db6..b9fb2cd53749f62441244214f48b5fa42d2997ea 100644 (file)
--- a/src/guiConfirmMenu.h
+++ b/src/guiConfirmMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUICONFIRMMENU_HEADER
 #define GUICONFIRMMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

diff --git a/src/guiCreateWorld.h b/src/guiCreateWorld.h
index 6de8cdd4e158dc784b3cabf9c71a3e4ba28b9c71..492fcf56584dfae3bfd300266b37b88491da525f 100644 (file)
--- a/src/guiCreateWorld.h
+++ b/src/guiCreateWorld.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUICREATEWORLD_HEADER
 #define GUICREATEWORLD_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 #include "subgame.h"

diff --git a/src/guiDeathScreen.h b/src/guiDeathScreen.h
index 36adab617875ac26ab29e70711a9875f26625e48..3c0307634fba5cdb62b57f6f3b4846da0ccfd992 100644 (file)
--- a/src/guiDeathScreen.h
+++ b/src/guiDeathScreen.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIMESSAGEMENU_HEADER
 #define GUIMESSAGEMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h
index c49a345827d58439c992f76390a87f1c25cb3a15..5613db356973b562c7bc42bbf55499438e4ddbb0 100644 (file)
--- a/src/guiInventoryMenu.h
+++ b/src/guiInventoryMenu.h
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIINVENTORYMENU_HEADER
 #define GUIINVENTORYMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "inventorymanager.h"
 #include "modalMenu.h"

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index 442c0882a022caf4e6bcb7a9fd097db6ccef0412..7c71b297dd5ce748688b70b16d6f7db317053bf8 100644 (file)
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -22,7 +22,7 @@
 #ifndef GUIKEYCHANGEMENU_HEADER
 #define GUIKEYCHANGEMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include "client.h"
 #include "gettext.h"

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index f6452f8342688a38ce99b25223f8722b3b3a1876..fa3d83c45e167dcd704677fff99ab5a00cf58a28 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIMAINMENU_HEADER
 #define GUIMAINMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 #include <list>

diff --git a/src/guiMessageMenu.h b/src/guiMessageMenu.h
index 1be69c3b79fc7e892712f4740db8227a34585602..af2fc44a54f7357d3b243dfc0bb40d1155cae38c 100644 (file)
--- a/src/guiMessageMenu.h
+++ b/src/guiMessageMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIMESSAGEMENU_HEADER
 #define GUIMESSAGEMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

diff --git a/src/guiPasswordChange.h b/src/guiPasswordChange.h
index 3104840c5b356e1eba4de598408682603d3b9dfd..f5f767b5ec1edb0c65a13aee982ee3f54663768b 100644 (file)
--- a/src/guiPasswordChange.h
+++ b/src/guiPasswordChange.h
@@ -19,7 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef GUIPASSWORDCHANGE_HEADER
 #define GUIPASSWORDCHANGE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include "client.h"
 #include <string>

diff --git a/src/guiPauseMenu.h b/src/guiPauseMenu.h
index 389d042f03d4b7e19e808228c46c5d8fa4452f64..e28159a93c864fe5977f70b26e14fd198717aa93 100644 (file)
--- a/src/guiPauseMenu.h
+++ b/src/guiPauseMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIPAUSEMENU_HEADER\r
 #define GUIPAUSEMENU_HEADER\r
 \r
-#include "common_irrlicht.h"\r
+#include "irrlichttypes_extrabloated.h"\r
 #include "modalMenu.h"\r
 \r
 class IGameCallback\r

diff --git a/src/guiTextInputMenu.h b/src/guiTextInputMenu.h
index 2e2aff0f673a32bdd22d300f16a21f3880e64e75..76417894b8d755b0b8247a85cf88a98dadbefd54 100644 (file)
--- a/src/guiTextInputMenu.h
+++ b/src/guiTextInputMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUITEXTINPUTMENU_HEADER
 #define GUITEXTINPUTMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 

diff --git a/src/inventory.h b/src/inventory.h
index 48ee20e83bccb8d85db973406b3aa071405c1112..a3c5982562492fe7cccfff1b0fbbbd18e0cfff69 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 #include <string>
 #include <vector>
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include "debug.h"
 #include "itemdef.h"
 

diff --git a/src/irr_aabb3d.h b/src/irr_aabb3d.h
new file mode 100644 (file)
index 0000000..3f04198
--- /dev/null
+++ b/src/irr_aabb3d.h
@@ -0,0 +1,30 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2012 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 Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser 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 IRR_AABB3D_HEADER
+#define IRR_AABB3D_HEADER
+
+#include "irrlichttypes.h"
+
+#include <aabbox3d.h>
+
+typedef core::aabbox3d<f32> aabb3f;
+
+#endif
+

diff --git a/src/irr_v2d.h b/src/irr_v2d.h
new file mode 100644 (file)
index 0000000..0710684
--- /dev/null
+++ b/src/irr_v2d.h
@@ -0,0 +1,34 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2012 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 Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser 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 IRR_V2D_HEADER
+#define IRR_V2D_HEADER
+
+#include "irrlichttypes.h"
+
+#include <vector2d.h>
+
+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;
+
+#endif
+

diff --git a/src/irr_v3d.h b/src/irr_v3d.h
new file mode 100644 (file)
index 0000000..21051f9
--- /dev/null
+++ b/src/irr_v3d.h
@@ -0,0 +1,32 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2012 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 Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser 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 IRR_V3D_HEADER
+#define IRR_V3D_HEADER
+
+#include "irrlichttypes.h"
+
+#include <vector3d.h>
+
+typedef core::vector3df v3f;
+typedef core::vector3d<s16> v3s16;
+typedef core::vector3d<s32> v3s32;
+
+#endif
+

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 8f3eb14648b83e40f80a02b7feb06df2554b1675..82177299eaad932f02cfcf6ea5407be50328dd46 100644 (file)
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2012 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 Lesser General Public License as published by
@@ -21,25 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define IRRLICHTTYPES_HEADER
 
 #include <irrTypes.h>
-#include <vector2d.h>
-#include <vector3d.h>
-#include <irrMap.h>
-#include <irrList.h>
-#include <irrArray.h>
-#include <aabbox3d.h>
-#include <SColor.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;
 
-typedef core::aabbox3d<f32> aabb3f;
+using namespace irr;
 
 #ifdef _MSC_VER
        // Windows

diff --git a/src/irrlichttypes_bloated.h b/src/irrlichttypes_bloated.h
new file mode 100644 (file)
index 0000000..528ee1f
--- /dev/null
+++ b/src/irrlichttypes_bloated.h
@@ -0,0 +1,35 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2012 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 Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser 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 IRRLICHTTYPES_BLOATED_HEADER
+#define IRRLICHTTYPES_BLOATED_HEADER
+
+#include "irrlichttypes.h"
+
+#include "irr_v2d.h"
+#include "irr_v3d.h"
+#include "irr_aabb3d.h"
+
+#include <irrMap.h>
+#include <irrList.h>
+#include <irrArray.h>
+#include <SColor.h>
+
+#endif
+

diff --git a/src/irrlichttypes_extrabloated.h b/src/irrlichttypes_extrabloated.h
new file mode 100644 (file)
index 0000000..f85fb63
--- /dev/null
+++ b/src/irrlichttypes_extrabloated.h
@@ -0,0 +1,42 @@
+/*
+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 Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser 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 IRRLICHTTYPES_EXTRABLOATED_HEADER
+#define IRRLICHTTYPES_EXTRABLOATED_HEADER
+
+#define endSceneX(d){d->draw2DLine(v2s32(0,0),v2s32(1,0),\
+video::SColor(255,30,30,30));d->endScene();}
+
+#include "irrlichttypes_bloated.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
+

diff --git a/src/itemdef.h b/src/itemdef.h
index ac3a5ab879f72fa2088551ccdf50be08e37d9368..d1ac52bb8c82b8ffcffbf0dea65fd0665bb9ae01 100644 (file)
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ITEMDEF_HEADER
 #define ITEMDEF_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <string>
 #include <iostream>
 #include <set>

diff --git a/src/itemgroup.h b/src/itemgroup.h
index bec03a3c98129eb44b5b9fb7e3094fb58e6bd0cd..c6c36dcc4f03f8489c802b514f8987de46014f1c 100644 (file)
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ITEMGROUP_HEADER
 #define ITEMGROUP_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <string>
 #include <map>
 

diff --git a/src/keycode.h b/src/keycode.h
index cb3a7fbc0c1ca89cfe9766004110c26d8953b471..4105d43b8a3c1f117626bbcfacb6175465560cf0 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -20,7 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef KEYCODE_HEADER
 #define KEYCODE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include <IEventReceiver.h>
 #include <string>
 
 /* A key press, consisting of either an Irrlicht keycode

diff --git a/src/light.h b/src/light.h
index 8c397e1d4d28e6ac8bcc11283675311707e8abbd..218af348e1a21419add94aecc622cd9051a4c50d 100644 (file)
--- a/src/light.h
+++ b/src/light.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef LIGHT_HEADER
 #define LIGHT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "debug.h"
 
 /*

diff --git a/src/main.cpp b/src/main.cpp
index 3352b866c52a41c291c59c5621b5503cb36e1c52..092a7b03fc55099f5abfcac11c7c60a1ecce8fdb 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <fstream>
 #include <locale.h>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "test.h"
 #include "server.h"

diff --git a/src/map.h b/src/map.h
index f51d57569394c6ff79f3baae9c42bc11771e77e6..b25c269571f0c10bbb9af38124e96d4ab99beef5 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <sstream>
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "mapnode.h"
 #include "constants.h"
 #include "voxel.h"

diff --git a/src/mapblock.h b/src/mapblock.h
index 81e9502555e43912243f0038739ed63085b3a9ce..08fd2c7542ab0c6aa54a458601e96a4a066af3c0 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -24,7 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <jmutexautolock.h>
 #include <exception>
 #include "debug.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include "irr_v3d.h"
+#include "irr_aabb3d.h"
 #include "mapnode.h"
 #include "exceptions.h"
 #include "serialization.h"

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index d5733120b8b3cce4a6a4a9979e836a35991f2a22..82268efd2948ad8e836dca639e34e06b343a6e74 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPBLOCK_MESH_HEADER
 #define MAPBLOCK_MESH_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "tile.h"
 #include "voxel.h"
 #include <map>

diff --git a/src/mapgen.h b/src/mapgen.h
index 1d4ef136ddd2c821e8d77e4bf81eed59d7fe36a1..e2f20ecafdb92544390b8bd2a3ad66b6a27aa660 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPGEN_HEADER
 #define MAPGEN_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "util/container.h" // UniqueQueue
 
 struct BlockMakeData;

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 2cffd3e4405fa4f6426d47dca916acb3216164dc..4de84dd1d9190a9dc32d6e447915d8704703032c 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "mapnode.h"
 #include "porting.h"
 #include "main.h" // For g_settings

diff --git a/src/mapnode.h b/src/mapnode.h
index 37826dcdec545ea5450ab47454e5208a633cc697..32e46b63f26be0a9ef19603ffe29946f84575c75 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPNODE_HEADER
 
 #include "irrlichttypes.h"
+#include "irr_v3d.h"
 #include "light.h"
 
 class INodeDefManager;

diff --git a/src/mapsector.h b/src/mapsector.h
index 9fede7bd78b10f15af720d19ebad9d049f5da81f..74539ab240be6f22807a63ea9362f81a36b89a28 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -17,15 +17,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef MAPSECTOR_HEADER
 #define MAPSECTOR_HEADER
 
 #include <jmutex.h>
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include "exceptions.h"
 #include <ostream>
 

diff --git a/src/mesh.h b/src/mesh.h
index 02299b665ae50c0a5f4bfc0f8fdd372d859dd505..5e1efcd52797c79a09262cc3618f3c9bb692370f 100644 (file)
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MESH_HEADER
 #define MESH_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <string>
 
 /*

diff --git a/src/modalMenu.h b/src/modalMenu.h
index 2c20a29b2b17e5a9e604583978250e411644a1bb..04372167bc610fef073928c28fac745bd02ec6d8 100644 (file)
--- a/src/modalMenu.h
+++ b/src/modalMenu.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MODALMENU_HEADER
 #define MODALMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 
 class GUIModalMenu;
 

diff --git a/src/mods.h b/src/mods.h
index 1985e4de487b776b2e3db4c92c2ae0519f00b4c5..d55dd6c92ea4b19cc3b208319cab1d82fdb07dd1 100644 (file)
--- a/src/mods.h
+++ b/src/mods.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MODS_HEADER
 
 #include "irrlichttypes.h"
+#include <irrList.h>
 #include <set>
 #include <string>
 #include <exception>

diff --git a/src/nameidmapping.h b/src/nameidmapping.h
index 834ade961a627d7e3159c04156849484c81011d8..90d8dbed8bf8afd9ca842ec5e5b7ce61935286cc 100644 (file)
--- a/src/nameidmapping.h
+++ b/src/nameidmapping.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <set>
 #include <map>
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 
 class NameIdMapping
 {

diff --git a/src/nodedef.h b/src/nodedef.h
index 2f2bfe46eb17040febd839f7fc8d1ac9e0d8081e..fcd06be71d06f6024cc86649444dd5bcbb903f1e 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEDEF_HEADER
 #define NODEDEF_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <iostream>
 #include <map>

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index de74e14eeb7375f3be49d17ca6455fa54a057e88..24779a1ea8aaa5cdf11449c7ed54f4293747b952 100644 (file)
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <iostream>
 #include <map>

diff --git a/src/nodetimer.h b/src/nodetimer.h
index b9598673c2b383b5bc0f0293c1eff851df978e39..deb77f10ebd8f32e3aea67ac97df2db940278de5 100644 (file)
--- a/src/nodetimer.h
+++ b/src/nodetimer.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODETIMER_HEADER
 #define NODETIMER_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <iostream>
 #include <map>
 

diff --git a/src/object_properties.h b/src/object_properties.h
index 3218387d36ed27fc25e52be6bebc544070aec415..3f44771e9ab7ddcaa2a31870056918e30cd7aa5c 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define OBJECT_PROPERTIES_HEADER
 
 #include <string>
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <iostream>
 
 struct ObjectProperties

diff --git a/src/player.h b/src/player.h
index 3b549772179d747704ab0b756edf24a32fe482a5..c3ccc960dfb0ec1e41a714707b92983398fdb6a6 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PLAYER_HEADER
 #define PLAYER_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h" // BS
 

diff --git a/src/porting.h b/src/porting.h
index b9534a9c127524192874c8f8126f92c071533dd8..2f9d43acaa38ff1d3c898aec38dc87f9091a2859 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -25,8 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PORTING_HEADER
 
 #include <string>
-// Included for u32 and such
-#include "common_irrlicht.h"
+#include "irrlichttypes.h" // u32
 #include "debug.h"
 #include "constants.h"
 

diff --git a/src/profiler.h b/src/profiler.h
index dce7d57e266c82f62da5ae62e5557a92505a1507..b1e6abe5883312a1ceac1e06db2970b1876eb893 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PROFILER_HEADER
 #define PROFILER_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <jmutex.h>
 #include <jmutexautolock.h>

diff --git a/src/quicktune.h b/src/quicktune.h
index 5531ccc261dbb8b8bae0637d2560b7dd804a70a1..a733ccda4795e14a58061e65459d8134f2b5af78 100644 (file)
--- a/src/quicktune.h
+++ b/src/quicktune.h
@@ -49,7 +49,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef QUICKTUNE_HEADER
 #define QUICKTUNE_HEADER
 
-#include "irrlichttypes.h"
 #include <string>
 #include <map>
 #include <vector>

diff --git a/src/scriptapi.h b/src/scriptapi.h
index 59daa3aa094fbd7e7ec4ebcaeb6b1f60fcdb73e2..12a1172a7e2149d3242356ac57ba6f80a659e548 100644 (file)
--- a/src/scriptapi.h
+++ b/src/scriptapi.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SCRIPTAPI_HEADER
 #define SCRIPTAPI_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include "mapnode.h"
 #include <set>

diff --git a/src/serialization.h b/src/serialization.h
index 24648c1fc83dc5f9535adbdb26c2377652da9374..70b3ee74dfc50429428c068c471e56ca247c9c6a 100644 (file)
--- a/src/serialization.h
+++ b/src/serialization.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERIALIZATION_HEADER
 #define SERIALIZATION_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "exceptions.h"
 #include <iostream>
 #include "util/pointer.h"

diff --git a/src/server.h b/src/server.h
index 18c223ec7c0a4cd12df02843ee06e13df6d7b814..4d93ae6f35a49844c73c09b929b4ce3187cd07eb 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "connection.h"
 #include "environment.h"
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include "porting.h"
 #include "map.h"

diff --git a/src/servercommand.h b/src/servercommand.h
index a3cf750daeb26a96b981e9013e13796f2d5c4931..c0f78a9f2e2dc9d8c0bd579945413e25934cb217 100644 (file)
--- a/src/servercommand.h
+++ b/src/servercommand.h
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <vector>
 #include <sstream>
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "player.h"
 #include "server.h"
 

diff --git a/src/serverobject.h b/src/serverobject.h
index 0130ca1bf4f40a34bea3799d787d9bc2a4d01155..6acd0dfeea9c753176efe0c9027df38a577ae6b6 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVEROBJECT_HEADER
 #define SERVEROBJECT_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "activeobject.h"
 #include "inventorymanager.h"
 #include "itemgroup.h"

diff --git a/src/settings.h b/src/settings.h
index 16bac8eec36e83e8cf9a8165d672d5bcd40f4479..1ab6fcc6b550740181ed3eb888a5770144f14361 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SETTINGS_HEADER
 #define SETTINGS_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <jthread.h>
 #include <jmutex.h>

diff --git a/src/sky.h b/src/sky.h
index 2bd3b05f6bc53c798ea7fe568ed0e543b1b59e62..65170dad53de412e016cdcbdf77b9d065577365c 100644 (file)
--- a/src/sky.h
+++ b/src/sky.h
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <ISceneNode.h>
 
 #ifndef SKY_HEADER

diff --git a/src/sound.h b/src/sound.h
index ddce34dc804ec4ccd3179c8437afbb1ebbe32b34..d74acd550e73fef4b89ac1b9a4d8db1a4dfb3e60 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SOUND_HEADER
 #define SOUND_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <set>
 

diff --git a/src/staticobject.h b/src/staticobject.h
index a55471b7f8753bc73ce9ed15baaf2b3f12974730..87ba111ecf2ac14d4f88350f92498b91d0b32630 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef STATICOBJECT_HEADER
 #define STATICOBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <sstream>
 #include "util/serialize.h"

diff --git a/src/test.cpp b/src/test.cpp
index 63aa09c0b136ea894188cc88614587d6a14895cf..3dc6814b158c0badd8812f1dca711b73c8f39f87 100644 (file)
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "test.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "map.h"
 #include "player.h"

diff --git a/src/tile.h b/src/tile.h
index a6609a3a612ad3594f4a7fb206c387dc166a093e..8c1f42e075f4fe9405b4aad5552aa23ba11f2840 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -20,7 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef TILE_HEADER
 #define TILE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
+#include "irr_v3d.h"
+#include <ITexture.h>
+#include <IrrlichtDevice.h>
 #include "threads.h"
 #include <string>
 

diff --git a/src/tool.h b/src/tool.h
index 35a8c2ad6e1e5ee9d9edaea61a60c95fcbd1acef..18c09dca3b85df3f2fc7ab41e403fa325760ff20 100644 (file)
--- a/src/tool.h
+++ b/src/tool.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef TOOL_HEADER
 #define TOOL_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include <string>
 #include <iostream>
 #include <map>

diff --git a/src/util/directiontables.h b/src/util/directiontables.h
index c02b3d124b6604192a37d4e77dbff07963d6746c..5bebd2fdb96a8513c75a64cb788e6975fc3a43d4 100644 (file)
--- a/src/util/directiontables.h
+++ b/src/util/directiontables.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_DIRECTIONTABLES_HEADER
 
 #include "../irrlichttypes.h"
+#include "../irr_v3d.h"
 
 extern const v3s16 g_6dirs[6];
 

diff --git a/src/util/numeric.h b/src/util/numeric.h
index 0ce21b7e3c8331cb28ee17872edb488b2b0cbb4f..5ed4d0e999d1fc03e987d9dd109534a04027b944 100644 (file)
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -21,6 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_NUMERIC_HEADER
 
 #include "../irrlichttypes.h"
+#include "../irr_v2d.h"
+#include "../irr_v3d.h"
+#include "../irr_aabb3d.h"
+#include <irrList.h>
 
 // Calculate the borders of a "d-radius" cube
 void getFacePositions(core::list<v3s16> &list, u16 d);

diff --git a/src/util/pointedthing.h b/src/util/pointedthing.h
index 82d66dfa8ca82405846c834c2a3b5af26c30c9b8..e61e2f4f3b0e67d8011cad713c458e758e6959c7 100644 (file)
--- a/src/util/pointedthing.h
+++ b/src/util/pointedthing.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_POINTEDTHING_HEADER
 
 #include "../irrlichttypes.h"
+#include "../irr_v3d.h"
 #include <iostream>
 #include <string>
 

diff --git a/src/util/pointer.h b/src/util/pointer.h
index 02f11c2eaa28f9a7ad74cc3c2a970d69d1b5c8c7..766cc23289266c82aaf133c66bace7600583f349 100644 (file)
--- a/src/util/pointer.h
+++ b/src/util/pointer.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "../irrlichttypes.h"
 #include "../debug.h" // For assert()
+#include <cstring>
 
 template <typename T>
 class SharedPtr

diff --git a/src/util/serialize.h b/src/util/serialize.h
index e229a00be845e2268fa58ca633832e95bd5bddde..50a002c102882e9ce102dbaf5d1ebcfce745a2b1 100644 (file)
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define UTIL_SERIALIZE_HEADER
 
 #include "../irrlichttypes.h"
+#include "../irr_v2d.h"
+#include "../irr_v3d.h"
 #include <iostream>
 #include <string>
 #include "../exceptions.h"

diff --git a/src/voxel.h b/src/voxel.h
index 483b4d2a0f5654559e0ef2e6ce9fffc71c7b5c7b..e7155dfacce367165b2735744203a61cabc12ef5 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define VOXEL_HEADER
 
 #include "irrlichttypes.h"
+#include "irr_v3d.h"
+#include <irrList.h>
 #include <iostream>
 #include "debug.h"
 #include "mapnode.h"