Optimize headers

This commit is contained in:
Perttu Ahola 2012-06-17 04:00:31 +03:00
parent d0ea6f9920
commit 9f031a6759
81 changed files with 221 additions and 92 deletions

@ -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

@ -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

@ -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"

@ -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

@ -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>

@ -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

@ -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"
/*

@ -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

@ -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

@ -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;

@ -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"

@ -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,

@ -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"

@ -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

@ -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"

@ -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>

@ -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

@ -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>

@ -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"

@ -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

@ -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.

@ -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;

@ -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>

@ -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"

@ -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>

@ -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"

@ -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"

@ -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>

@ -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>

@ -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>

@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef GUIPAUSEMENU_HEADER
#define GUIPAUSEMENU_HEADER
#include "common_irrlicht.h"
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
class IGameCallback

@ -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>

@ -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"

30
src/irr_aabb3d.h Normal file

@ -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

34
src/irr_v2d.h Normal file

@ -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

32
src/irr_v3d.h Normal file

@ -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

@ -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;
#ifdef _MSC_VER
// Windows

@ -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

@ -17,13 +17,13 @@ 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
#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.h"
#include "irrlichttypes_bloated.h"
#ifndef SERVER
#include <IMesh.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>

@ -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>

@ -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

@ -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"
/*

@ -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"

@ -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"

@ -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"

@ -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>

@ -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;

@ -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

@ -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;

@ -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>

@ -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>
/*

@ -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;

@ -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>

@ -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
{

@ -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>

@ -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>

@ -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>

@ -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

@ -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

@ -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"

@ -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>

@ -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>

@ -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>

@ -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"

@ -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"

@ -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"

@ -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"

@ -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>

@ -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

@ -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>

@ -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"

@ -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"

@ -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>

@ -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>

@ -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];

@ -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);

@ -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>

@ -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

@ -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"

@ -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"