Delete irrlichttypes_bloated.h

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

Hide file tree

Showing 12 changed files with 11 additions and 23 deletions.
diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
@@ -7,8 +7,8 @@
 #include "client/texturesource.h"
 #include "client/fontengine.h"
 #include "debug.h"
-#include "irrlichttypes_bloated.h"
 #include "util/string.h"
+#include "irr_v2d.h"
 #include <algorithm>
 #include <array>
 #include <vector>

diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
@@ -9,7 +9,6 @@
 #include <stack>
 #include <unordered_set>
 
-#include "irrlichttypes_bloated.h"
 #include "irr_ptr.h"
 #include "inventory.h"
 #include "inventorymanager.h"

diff --git a/src/gui/modalMenu.h b/src/gui/modalMenu.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "IGUIElement.h"
-#include "irrlichttypes_bloated.h"
+#include "irr_v2d.h"
 #include "irr_ptr.h"
 
 #include "util/string.h"

diff --git a/src/gui/touchcontrols.h b/src/gui/touchcontrols.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "irrlichttypes.h"
+#include "irr_aabb3d.h"
 #include "IEventReceiver.h"
 
 #include <memory>

diff --git a/src/gui/touchscreenlayout.h b/src/gui/touchscreenlayout.h
@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
 #include "irr_ptr.h"
-#include "irrlichttypes_bloated.h"
 #include "rect.h"
 #include <iostream>
 #include <unordered_map>

diff --git a/src/irrlichttypes_bloated.h b/src/irrlichttypes_bloated.h
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
@@ -20,7 +20,6 @@ extern "C" {
 #include <vector>
 #include <array>
 
-#include "irrlichttypes_bloated.h"
 #include "util/string.h"
 #include "itemgroup.h"
 #include "itemdef.h"

diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
@@ -14,7 +14,10 @@
 #include <vector>
 #include <string_view>
 
-#include "irrlichttypes_bloated.h"
+#include <SColor.h>
+#include "irr_v3d.h"
+#include "irr_v2d.h"
+#include "irr_aabb3d.h"
 
 extern "C" {
 #include <lua.h>

diff --git a/src/script/lua_api/l_itemstackmeta.h b/src/script/lua_api/l_itemstackmeta.h
@@ -9,7 +9,6 @@
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
 #include "lua_api/l_item.h"
-#include "irrlichttypes_bloated.h"
 
 class ItemStackMetaRef : public MetaDataRef
 {

diff --git a/src/script/lua_api/l_nodemeta.h b/src/script/lua_api/l_nodemeta.h
@@ -6,7 +6,6 @@
 
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
-#include "irrlichttypes_bloated.h"
 #include "nodemetadata.h"
 
 class ServerEnvironment;

diff --git a/src/script/lua_api/l_playermeta.h b/src/script/lua_api/l_playermeta.h
@@ -7,7 +7,6 @@
 
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
-#include "irrlichttypes_bloated.h"
 #include "inventory.h"
 
 class ServerEnvironment;

diff --git a/src/staticobject.h b/src/staticobject.h
@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
+#include "irr_v3d.h"
 #include <string>
 #include <sstream>
 #include <vector>