diff options
Diffstat (limited to 'game/client/gui')
| -rw-r--r-- | game/client/gui/background.cc | 1 | ||||
| -rw-r--r-- | game/client/gui/chat.cc | 7 | ||||
| -rw-r--r-- | game/client/gui/crosshair.cc | 1 | ||||
| -rw-r--r-- | game/client/gui/direct_connection.cc | 2 | ||||
| -rw-r--r-- | game/client/gui/hotbar.cc | 4 | ||||
| -rw-r--r-- | game/client/gui/imdraw_ext.hh | 4 | ||||
| -rw-r--r-- | game/client/gui/language.cc | 1 | ||||
| -rw-r--r-- | game/client/gui/main_menu.cc | 3 | ||||
| -rw-r--r-- | game/client/gui/metrics.cc | 6 | ||||
| -rw-r--r-- | game/client/gui/play_menu.cc | 4 | ||||
| -rw-r--r-- | game/client/gui/scoreboard.cc | 1 | ||||
| -rw-r--r-- | game/client/gui/settings.cc | 4 | ||||
| -rw-r--r-- | game/client/gui/splash.cc | 5 |
13 files changed, 39 insertions, 4 deletions
diff --git a/game/client/gui/background.cc b/game/client/gui/background.cc index 0c38283..50fef01 100644 --- a/game/client/gui/background.cc +++ b/game/client/gui/background.cc @@ -3,6 +3,7 @@ #include "client/gui/background.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/chat.cc b/game/client/gui/chat.cc index 855c892..6e4498b 100644 --- a/game/client/gui/chat.cc +++ b/game/client/gui/chat.cc @@ -4,19 +4,26 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/resource/resource.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/imdraw_ext.hh" #include "client/gui/language.hh" #include "client/gui/settings.hh" + #include "client/io/glfw.hh" + #include "client/resource/sound_effect.hh" + #include "client/sound/sound.hh" #include "client/game.hh" diff --git a/game/client/gui/crosshair.cc b/game/client/gui/crosshair.cc index 729ede9..29b5fe5 100644 --- a/game/client/gui/crosshair.cc +++ b/game/client/gui/crosshair.cc @@ -3,6 +3,7 @@ #include "client/gui/crosshair.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/direct_connection.cc b/game/client/gui/direct_connection.cc index 0290bd3..37372e2 100644 --- a/game/client/gui/direct_connection.cc +++ b/game/client/gui/direct_connection.cc @@ -3,12 +3,14 @@ #include "client/gui/direct_connection.hh" #include "core/config/boolean.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/hotbar.cc b/game/client/gui/hotbar.cc index a7c3c62..ca058a3 100644 --- a/game/client/gui/hotbar.cc +++ b/game/client/gui/hotbar.cc @@ -3,14 +3,18 @@ #include "client/gui/hotbar.hh" #include "core/io/config_map.hh" + #include "core/resource/resource.hh" #include "shared/world/item_registry.hh" #include "client/config/keybind.hh" + #include "client/gui/settings.hh" #include "client/gui/status_lines.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/imdraw_ext.hh b/game/client/gui/imdraw_ext.hh index 35ee37e..664b702 100644 --- a/game/client/gui/imdraw_ext.hh +++ b/game/client/gui/imdraw_ext.hh @@ -4,8 +4,8 @@ namespace gui::imdraw_ext { -void text_shadow( - const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list); +void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, + ImDrawList* draw_list); void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list, float font_size); } // namespace gui::imdraw_ext diff --git a/game/client/gui/language.cc b/game/client/gui/language.cc index 3c700a2..f63dd99 100644 --- a/game/client/gui/language.cc +++ b/game/client/gui/language.cc @@ -3,6 +3,7 @@ #include "client/gui/language.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/main_menu.cc b/game/client/gui/main_menu.cc index 5395335..3c68612 100644 --- a/game/client/gui/main_menu.cc +++ b/game/client/gui/main_menu.cc @@ -3,6 +3,7 @@ #include "client/gui/main_menu.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "core/version.hh" @@ -10,7 +11,9 @@ #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" #include "client/gui/window_title.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/metrics.cc b/game/client/gui/metrics.cc index 234d3b5..57a6319 100644 --- a/game/client/gui/metrics.cc +++ b/game/client/gui/metrics.cc @@ -8,19 +8,21 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/gui/imdraw_ext.hh" #include "client/game.hh" #include "client/globals.hh" #include "client/session.hh" -constexpr static ImGuiWindowFlags WINDOW_FLAGS = - ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoNav; +constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs + | ImGuiWindowFlags_NoNav; static std::basic_string<GLubyte> r_version; static std::basic_string<GLubyte> r_renderer; diff --git a/game/client/gui/play_menu.cc b/game/client/gui/play_menu.cc index dc4ffed..2951bf2 100644 --- a/game/client/gui/play_menu.cc +++ b/game/client/gui/play_menu.cc @@ -3,8 +3,11 @@ #include "client/gui/play_menu.hh" #include "core/config/boolean.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" @@ -12,6 +15,7 @@ #include "client/gui/bother.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/scoreboard.cc b/game/client/gui/scoreboard.cc index ad49a69..fabd753 100644 --- a/game/client/gui/scoreboard.cc +++ b/game/client/gui/scoreboard.cc @@ -7,6 +7,7 @@ #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/settings.cc b/game/client/gui/settings.cc index e8f9bca..693f0d6 100644 --- a/game/client/gui/settings.cc +++ b/game/client/gui/settings.cc @@ -5,14 +5,18 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/gui/splash.cc b/game/client/gui/splash.cc index 887e209..440df49 100644 --- a/game/client/gui/splash.cc +++ b/game/client/gui/splash.cc @@ -3,13 +3,18 @@ #include "client/gui/splash.hh" #include "core/io/cmdline.hh" + #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" |
