Debloat

luanti-org · Feb 3, 2025 · d925573 · d925573
1 parent 9eae524
commit d925573
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 9 deletions.
diff --git a/src/client/localplayer.h b/src/client/localplayer.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "irr_aabb3d.h"
 #include "player.h"
 #include "environment.h"
 #include "constants.h"

diff --git a/src/clientdynamicinfo.h b/src/clientdynamicinfo.h
@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
 #include "config.h"
 
 

diff --git a/src/itemdef.h b/src/itemdef.h
@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
 #include <string>
 #include <iostream>
 #include <optional>

diff --git a/src/main.cpp b/src/main.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <[email protected]>
 
-#include "irrlichttypes_bloated.h"
 #include "irrlicht.h" // createDevice
 #include "irrlicht_changes/printing.h"
 #include "benchmark/benchmark.h"

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2013 celeron55, Perttu Ahola <[email protected]>
 
-#include "irrlichttypes_bloated.h"
 #include "mapnode.h"
 #include "porting.h"
 #include "nodedef.h"

diff --git a/src/mapnode.h b/src/mapnode.h
@@ -4,7 +4,9 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
+#include <SColor.h>
+#include "irr_v3d.h"
+#include "irr_aabb3d.h"
 #include "light.h"
 #include "util/pointer.h"
 #include <string>

diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
@@ -5,7 +5,8 @@
 #pragma once
 
 #include "util/pointer.h" // Buffer<T>
-#include "irrlichttypes_bloated.h"
+#include "irr_v3d.h"
+#include "irr_v2d.h"
 #include "networkprotocol.h"
 #include <SColor.h>
 #include <vector>

diff --git a/src/player.h b/src/player.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h"
 #include "util/basic_macros.h"

diff --git a/src/script/lua_api/l_metadata.h b/src/script/lua_api/l_metadata.h
@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
 #include "lua_api/l_base.h"
 
 class IMetadata;

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -3,7 +3,6 @@
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <[email protected]>
 
 #include "settings.h"
-#include "irrlichttypes_bloated.h"
 #include "exceptions.h"
 #include "threading/mutex_auto_lock.h"
 #include "util/numeric.h" // rangelim