Rename hud.h/cpp to hud_element.h/cpp

To prevent include conflicts

src/CMakeLists.txt

@@ -417,7 +417,7 @@ set(independent_SRCS
 	face_position_cache.cpp
 	gettext_plural_form.cpp
 	httpfetch.cpp
-	hud.cpp
+	hud_element.cpp
 	inventory.cpp
 	itemstackmetadata.cpp
 	log.cpp

src/client/clientevent.h

@@ -6,7 +6,7 @@
 
 #include <string>
 #include "irrlichttypes.h"
-#include "../hud.h" // HudElementStat
+#include "hud_element.h" // HudElementStat
 
 struct ParticleParameters;
 struct ParticleSpawnerParameters;

src/client/gameui.cpp

@@ -14,7 +14,7 @@
 #include "client.h"
 #include "clientmap.h"
 #include "fontengine.h"
-#include "hud.h" // HUD_FLAG_*
+#include "hud_element.h" // HUD_FLAG_*
 #include "nodedef.h"
 #include "localplayer.h"
 #include "profiler.h"

src/client/hud.cpp

@@ -4,7 +4,7 @@
 // Copyright (C) 2010-2013 blue42u, Jonathon Anderson <anderjon@umail.iu.edu>
 // Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
-#include "client/hud.h"
+#include "hud.h"
 #include <string>
 #include <iostream>
 #include <cmath>

src/client/hud.h

@@ -11,7 +11,7 @@
 #include <CMeshBuffer.h>
 #include "irr_ptr.h"
 #include "irr_aabb3d.h"
-#include "../hud.h"
+#include "hud_element.h"
 
 class Client;
 class ITextureSource;

src/client/inputhandler.cpp

@@ -8,7 +8,7 @@
 #include "inputhandler.h"
 #include "gui/mainmenumanager.h"
 #include "gui/touchcontrols.h"
-#include "hud.h"
+#include "hud_element.h"
 #include "log_internal.h"
 #include "client/renderingengine.h"
 

src/client/minimap.h

@@ -10,7 +10,7 @@
 #include "CMeshBuffer.h"
 
 #include "constants.h"
-#include "../hud.h"
+#include "hud_element.h"
 #include "mapnode.h"
 #include "util/thread.h"
 #include <map>

src/hud_element.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
 
-#include "hud.h"
+#include "hud_element.h"
 
 const struct EnumString es_HudElementType[] =
 {

src/player.cpp

@@ -5,7 +5,7 @@
 #include "player.h"
 
 #include <cmath>
-#include "hud.h"
+#include "hud_element.h"
 #include "constants.h"
 #include "gamedef.h"
 #include <tuple>

src/script/common/c_content.h

@@ -23,8 +23,8 @@ extern "C" {
 #include "itemgroup.h"
 #include "util/pointabilities.h"
 // We do an explicit path include because by default c_content.h include src/client/hud.h
-// prior to the src/hud.h, which is not good on server only build
-#include "../../hud.h"
+// prior to the src/hud_element.h, which is not good on server only build
+#include "hud_element.h"
 
 class IGameDef;
 class IItemDefManager;

src/script/lua_api/l_localplayer.cpp

@@ -7,7 +7,7 @@
 #include "lua_api/l_item.h"
 #include "script/common/c_converter.h"
 #include "client/localplayer.h"
-#include "hud.h"
+#include "hud_element.h"
 #include "common/c_content.h"
 #include "client/content_cao.h"
 

src/script/lua_api/l_object.cpp

@@ -20,7 +20,7 @@
 #include "server.h"
 #include "serverenvironment.h"
 #include "settings.h"
-#include "hud.h"
+#include "hud_element.h"
 #include "server/luaentity_sao.h"
 #include "server/player_sao.h"
 #include "server/serverinventorymgr.h"

src/server.h

@@ -6,7 +6,7 @@
 
 #include "irr_v3d.h"
 #include "map.h"
-#include "hud.h" // HudElementStat
+#include "hud_element.h" // HudElementStat
 #include "gamedef.h"
 #include "content/subgames.h"
 #include "network/peerhandler.h"