diff options
Diffstat (limited to 'src/game/client')
56 files changed, 63 insertions, 55 deletions
diff --git a/src/game/client/background.hh b/src/game/client/background.hh index 634caf5..3f06175 100644 --- a/src/game/client/background.hh +++ b/src/game/client/background.hh @@ -9,4 +9,4 @@ void deinit(void); void layout(void); } // namespace background -#endif /* CLIENT_BACKGROUND_HH */ +#endif // CLIENT_BACKGROUND_HH diff --git a/src/game/client/bother.hh b/src/game/client/bother.hh index 5fbf247..fab62d1 100644 --- a/src/game/client/bother.hh +++ b/src/game/client/bother.hh @@ -20,4 +20,4 @@ void ping(unsigned int identity, const char* host, std::uint16_t port); void cancel(unsigned int identity); } // namespace bother -#endif /* CLIENT_BOTHER_HH */ +#endif // CLIENT_BOTHER_HH diff --git a/src/game/client/camera.hh b/src/game/client/camera.hh index 9718720..7cdce3b 100644 --- a/src/game/client/camera.hh +++ b/src/game/client/camera.hh @@ -29,4 +29,4 @@ void init(void); void update(void); } // namespace camera -#endif /* CLIENT_CAMERA_HH */ +#endif // CLIENT_CAMERA_HH diff --git a/src/game/client/chat.hh b/src/game/client/chat.hh index f2ee4de..6eb77fd 100644 --- a/src/game/client/chat.hh +++ b/src/game/client/chat.hh @@ -18,4 +18,4 @@ void refresh_timings(void); void print(const std::string& string); } // namespace client_chat -#endif /* CLIENT_CHAT_HH */ +#endif // CLIENT_CHAT_HH diff --git a/src/game/client/chunk_mesher.hh b/src/game/client/chunk_mesher.hh index 36580ac..ab65fae 100644 --- a/src/game/client/chunk_mesher.hh +++ b/src/game/client/chunk_mesher.hh @@ -16,4 +16,4 @@ void deinit(void); void update(void); } // namespace chunk_mesher -#endif /* CLIENT_CHUNK_MESHER_HH */ +#endif // CLIENT_CHUNK_MESHER_HH diff --git a/src/game/client/chunk_quad.hh b/src/game/client/chunk_quad.hh index 337bb1e..cb2c03d 100644 --- a/src/game/client/chunk_quad.hh +++ b/src/game/client/chunk_quad.hh @@ -36,4 +36,4 @@ constexpr inline static ChunkQuad make_chunk_quad( return result; } -#endif /* CLIENT_CHUNK_QUAD_HH */ +#endif // CLIENT_CHUNK_QUAD_HH diff --git a/src/game/client/chunk_renderer.hh b/src/game/client/chunk_renderer.hh index 3ebcf76..84688f7 100644 --- a/src/game/client/chunk_renderer.hh +++ b/src/game/client/chunk_renderer.hh @@ -9,4 +9,4 @@ void deinit(void); void render(void); } // namespace chunk_renderer -#endif /* CLIENT_CHUNK_RENDERER_HH */ +#endif // CLIENT_CHUNK_RENDERER_HH diff --git a/src/game/client/chunk_vbo.hh b/src/game/client/chunk_vbo.hh index ba27552..899abc6 100644 --- a/src/game/client/chunk_vbo.hh +++ b/src/game/client/chunk_vbo.hh @@ -20,4 +20,4 @@ public: } }; -#endif /* CLIENT_CHUNK_VBO_HH */ +#endif // CLIENT_CHUNK_VBO_HH diff --git a/src/game/client/chunk_visibility.hh b/src/game/client/chunk_visibility.hh index 70352c9..9c0eed1 100644 --- a/src/game/client/chunk_visibility.hh +++ b/src/game/client/chunk_visibility.hh @@ -9,4 +9,4 @@ namespace chunk_visibility void update_late(void); } // namespace chunk_visibility -#endif /* CLIENT_CHUNK_VISIBILITY_HH */ +#endif // CLIENT_CHUNK_VISIBILITY_HH diff --git a/src/game/client/const.hh b/src/game/client/const.hh index 9bd8346..c53fc1b 100644 --- a/src/game/client/const.hh +++ b/src/game/client/const.hh @@ -24,4 +24,4 @@ static_assert(DEFAULT_HEIGHT >= MIN_HEIGHT); constexpr static float MIN_PITCH = 0.0625f; constexpr static float MAX_PITCH = 10.0f; -#endif /* CLIENT_CONST_HH */ +#endif // CLIENT_CONST_HH diff --git a/src/game/client/crosshair.hh b/src/game/client/crosshair.hh index 6525792..8bcf86b 100644 --- a/src/game/client/crosshair.hh +++ b/src/game/client/crosshair.hh @@ -9,4 +9,4 @@ void deinit(void); void layout(void); } // namespace crosshair -#endif /* CLIENT_CROSSHAIR_HH */ +#endif // CLIENT_CROSSHAIR_HH diff --git a/src/game/client/direct_connection.hh b/src/game/client/direct_connection.hh index f94bcaf..f07f57d 100644 --- a/src/game/client/direct_connection.hh +++ b/src/game/client/direct_connection.hh @@ -8,4 +8,4 @@ void init(void); void layout(void); } // namespace direct_connection -#endif /* CLIENT_DIRECT_CONNECTION_HH */ +#endif // CLIENT_DIRECT_CONNECTION_HH diff --git a/src/game/client/experiments.hh b/src/game/client/experiments.hh index ae20426..7a83048 100644 --- a/src/game/client/experiments.hh +++ b/src/game/client/experiments.hh @@ -17,4 +17,4 @@ void attack(void); void interact(void); } // namespace experiments -#endif /* CLIENT_EXPERIMENTS_HH */ +#endif // CLIENT_EXPERIMENTS_HH diff --git a/src/game/client/factory.hh b/src/game/client/factory.hh index 6f883c2..29a3757 100644 --- a/src/game/client/factory.hh +++ b/src/game/client/factory.hh @@ -9,4 +9,4 @@ namespace client_factory void create_player(Dimension* dimension, entt::entity entity); } // namespace client_factory -#endif /* CLIENT_FACTORY_HH */ +#endif // CLIENT_FACTORY_HH diff --git a/src/game/client/game.hh b/src/game/client/game.hh index f3c6fc4..0735719 100644 --- a/src/game/client/game.hh +++ b/src/game/client/game.hh @@ -33,4 +33,4 @@ void render(void); void layout(void); } // namespace client_game -#endif /* CLIENT_GAME_HH */ +#endif // CLIENT_GAME_HH diff --git a/src/game/client/gamepad.hh b/src/game/client/gamepad.hh index d2483b7..692422e 100644 --- a/src/game/client/gamepad.hh +++ b/src/game/client/gamepad.hh @@ -42,4 +42,4 @@ struct GamepadButtonEvent final { int button; }; -#endif /* CLIENT_GAMEPAD_HH */ +#endif // CLIENT_GAMEPAD_HH diff --git a/src/game/client/gamepad_axis.hh b/src/game/client/gamepad_axis.hh index c0ed6ee..6a1f761 100644 --- a/src/game/client/gamepad_axis.hh +++ b/src/game/client/gamepad_axis.hh @@ -36,4 +36,4 @@ private: const char* m_name; }; -#endif /* CLIENT_GAMEPAD_AXIS_HH */ +#endif // CLIENT_GAMEPAD_AXIS_HH diff --git a/src/game/client/gamepad_button.hh b/src/game/client/gamepad_button.hh index 04b3a41..079988e 100644 --- a/src/game/client/gamepad_button.hh +++ b/src/game/client/gamepad_button.hh @@ -26,4 +26,4 @@ private: const char* m_name; }; -#endif /* CLIENT_GAMEPAD_BUTTON_HH */ +#endif // CLIENT_GAMEPAD_BUTTON_HH diff --git a/src/game/client/glfw.hh b/src/game/client/glfw.hh index 9cdf734..d978429 100644 --- a/src/game/client/glfw.hh +++ b/src/game/client/glfw.hh @@ -34,4 +34,4 @@ struct GlfwScrollEvent final { float dy; }; -#endif /* CLIENTFW */ +#endif // CLIENTFW diff --git a/src/game/client/globals.hh b/src/game/client/globals.hh index 3fc2223..a59b8bf 100644 --- a/src/game/client/globals.hh +++ b/src/game/client/globals.hh @@ -63,4 +63,4 @@ extern ALCdevice* sound_dev; extern ALCcontext* sound_ctx; } // namespace globals -#endif /* CLIENTOBALS_HH */ +#endif // CLIENTOBALS_HH diff --git a/src/game/client/gui_screen.hh b/src/game/client/gui_screen.hh index edad116..b36e6b2 100644 --- a/src/game/client/gui_screen.hh +++ b/src/game/client/gui_screen.hh @@ -11,4 +11,4 @@ constexpr static unsigned int GUI_MESSAGE_BOX = 0x0005U; constexpr static unsigned int GUI_CHAT = 0x0006U; constexpr static unsigned int GUI_DIRECT_CONNECTION = 0x0007U; -#endif /* CLIENT_GUI_SCREEN_HH */ +#endif // CLIENT_GUI_SCREEN_HH diff --git a/src/game/client/hotbar.hh b/src/game/client/hotbar.hh index 318c631..186bc6e 100644 --- a/src/game/client/hotbar.hh +++ b/src/game/client/hotbar.hh @@ -28,4 +28,4 @@ void next_slot(void); void prev_slot(void); } // namespace hotbar -#endif /* CLIENT_HOTBAR_HH */ +#endif // CLIENT_HOTBAR_HH diff --git a/src/game/client/imdraw_ext.hh b/src/game/client/imdraw_ext.hh index 0a84e69..04d3b68 100644 --- a/src/game/client/imdraw_ext.hh +++ b/src/game/client/imdraw_ext.hh @@ -8,4 +8,4 @@ void text_shadow( const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list); } // namespace imdraw_ext -#endif /* CLIENT_IMDRAW_EXT_HH */ +#endif // CLIENT_IMDRAW_EXT_HH diff --git a/src/game/client/interpolation.hh b/src/game/client/interpolation.hh index 3565a26..677f31b 100644 --- a/src/game/client/interpolation.hh +++ b/src/game/client/interpolation.hh @@ -7,4 +7,4 @@ namespace interpolation void update(void); } // namespace interpolation -#endif /* CLIENT_INTERPOLATION_HH */ +#endif // CLIENT_INTERPOLATION_HH diff --git a/src/game/client/keybind.hh b/src/game/client/keybind.hh index 8cf3c3c..1749357 100644 --- a/src/game/client/keybind.hh +++ b/src/game/client/keybind.hh @@ -23,4 +23,4 @@ private: int m_glfw_keycode; }; -#endif /* CLIENT_KEYBIND_HH */ +#endif // CLIENT_KEYBIND_HH diff --git a/src/game/client/language.hh b/src/game/client/language.hh index 680cd92..44f6834 100644 --- a/src/game/client/language.hh +++ b/src/game/client/language.hh @@ -40,4 +40,4 @@ const char* resolve(const char* key); std::string resolve_gui(const char* key); } // namespace language -#endif /* CLIENT_LANGUAGE_HH */ +#endif // CLIENT_LANGUAGE_HH diff --git a/src/game/client/listener.hh b/src/game/client/listener.hh index 731babc..fbf9f4a 100644 --- a/src/game/client/listener.hh +++ b/src/game/client/listener.hh @@ -7,4 +7,4 @@ namespace listener void update(void); } // namespace listener -#endif /* CLIENT_LISTENER_HH */ +#endif // CLIENT_LISTENER_HH diff --git a/src/game/client/main_menu.hh b/src/game/client/main_menu.hh index 9166722..f127c5f 100644 --- a/src/game/client/main_menu.hh +++ b/src/game/client/main_menu.hh @@ -9,4 +9,4 @@ void deinit(void); void layout(void); } // namespace main_menu -#endif /* CLIENT_MAIN_MENU_HH */ +#endif // CLIENT_MAIN_MENU_HH diff --git a/src/game/client/message_box.hh b/src/game/client/message_box.hh index 7ea2466..ad5cb57 100644 --- a/src/game/client/message_box.hh +++ b/src/game/client/message_box.hh @@ -18,4 +18,4 @@ void set_subtitle(const char* subtitle); void add_button(const char* text, const message_box_action& action); } // namespace message_box -#endif /* CLIENT_MESSAGE_BOX_HH */ +#endif // CLIENT_MESSAGE_BOX_HH diff --git a/src/game/client/metrics.hh b/src/game/client/metrics.hh index ba68a86..1f13761 100644 --- a/src/game/client/metrics.hh +++ b/src/game/client/metrics.hh @@ -8,4 +8,4 @@ void init(void); void layout(void); } // namespace metrics -#endif /* CLIENT_METRICS_HH */ +#endif // CLIENT_METRICS_HH diff --git a/src/game/client/outline.hh b/src/game/client/outline.hh index a7789b2..da8e232 100644 --- a/src/game/client/outline.hh +++ b/src/game/client/outline.hh @@ -17,4 +17,4 @@ void cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, void line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color); } // namespace outline -#endif /* CLIENT_OUTLINE_HH */ +#endif // CLIENT_OUTLINE_HH diff --git a/src/game/client/pch.hh b/src/game/client/pch.hh index df9d2b5..98c5e52 100644 --- a/src/game/client/pch.hh +++ b/src/game/client/pch.hh @@ -29,4 +29,4 @@ #include <dlfcn.h> #endif -#endif /* CLIENT_PCH_HH */ +#endif // CLIENT_PCH_HH diff --git a/src/game/client/play_menu.hh b/src/game/client/play_menu.hh index 44193df..ddf97f9 100644 --- a/src/game/client/play_menu.hh +++ b/src/game/client/play_menu.hh @@ -10,4 +10,4 @@ void layout(void); void update_late(void); } // namespace play_menu -#endif /* CLIENT_PLAY_MENU_HH */ +#endif // CLIENT_PLAY_MENU_HH diff --git a/src/game/client/player_look.hh b/src/game/client/player_look.hh index c10df0e..84e0e96 100644 --- a/src/game/client/player_look.hh +++ b/src/game/client/player_look.hh @@ -8,4 +8,4 @@ void init(void); void update_late(void); } // namespace player_look -#endif /* CLIENT_PLAYER_LOOK_HH */ +#endif // CLIENT_PLAYER_LOOK_HH diff --git a/src/game/client/player_move.hh b/src/game/client/player_move.hh index 7730d08..27fb2dc 100644 --- a/src/game/client/player_move.hh +++ b/src/game/client/player_move.hh @@ -16,4 +16,4 @@ void fixed_update(void); void update_late(void); } // namespace player_move -#endif /* CLIENT_PLAYER_MOVE_HH */ +#endif // CLIENT_PLAYER_MOVE_HH diff --git a/src/game/client/player_target.hh b/src/game/client/player_target.hh index b60d1a5..d49c1d2 100644 --- a/src/game/client/player_target.hh +++ b/src/game/client/player_target.hh @@ -19,4 +19,4 @@ void update(void); void render(void); } // namespace player_target -#endif /* CLIENT_PLAYER_TARGET_HH */ +#endif // CLIENT_PLAYER_TARGET_HH diff --git a/src/game/client/program.hh b/src/game/client/program.hh index 4d83e14..ce2538b 100644 --- a/src/game/client/program.hh +++ b/src/game/client/program.hh @@ -35,4 +35,4 @@ public: GLuint handle; }; -#endif /* CLIENT_PROGRAM_HH */ +#endif // CLIENT_PROGRAM_HH diff --git a/src/game/client/progress_bar.hh b/src/game/client/progress_bar.hh index 5375d3f..96524dd 100644 --- a/src/game/client/progress_bar.hh +++ b/src/game/client/progress_bar.hh @@ -17,4 +17,4 @@ void set_title(const char* title); void set_button(const char* text, const progress_bar_action& action); } // namespace progress_bar -#endif /* CLIENT_PROGRESS_BAR_HH */ +#endif // CLIENT_PROGRESS_BAR_HH diff --git a/src/game/client/receive.hh b/src/game/client/receive.hh index 27ed2b2..1b793b0 100644 --- a/src/game/client/receive.hh +++ b/src/game/client/receive.hh @@ -7,4 +7,4 @@ namespace client_receive void init(void); } // namespace client_receive -#endif /* CLIENT_RECEIVE_HH */ +#endif // CLIENT_RECEIVE_HH diff --git a/src/game/client/scoreboard.hh b/src/game/client/scoreboard.hh index 0ae1688..58e2f8b 100644 --- a/src/game/client/scoreboard.hh +++ b/src/game/client/scoreboard.hh @@ -8,4 +8,4 @@ void init(void); void layout(void); } // namespace scoreboard -#endif /* CLIENT_SCOREBOARD_HH */ +#endif // CLIENT_SCOREBOARD_HH diff --git a/src/game/client/screenshot.hh b/src/game/client/screenshot.hh index 9888644..7cb8cd5 100644 --- a/src/game/client/screenshot.hh +++ b/src/game/client/screenshot.hh @@ -8,4 +8,4 @@ void init(void); void take(void); } // namespace screenshot -#endif /* CLIENT_SCREENSHOT_HH */ +#endif // CLIENT_SCREENSHOT_HH diff --git a/src/game/client/session.hh b/src/game/client/session.hh index 051b57f..0ba0fc6 100644 --- a/src/game/client/session.hh +++ b/src/game/client/session.hh @@ -28,4 +28,4 @@ namespace session bool is_ingame(void); } // namespace session -#endif /* CLIENT_SESSION_HH */ +#endif // CLIENT_SESSION_HH diff --git a/src/game/client/settings.hh b/src/game/client/settings.hh index 4704a58..388fdab 100644 --- a/src/game/client/settings.hh +++ b/src/game/client/settings.hh @@ -80,4 +80,4 @@ namespace settings void add_language_select(int priority, settings_location location, const char* name); } // namespace settings -#endif /* CLIENT_SETTINGS_HH */ +#endif // CLIENT_SETTINGS_HH diff --git a/src/game/client/skybox.hh b/src/game/client/skybox.hh index a3853f0..9a23029 100644 --- a/src/game/client/skybox.hh +++ b/src/game/client/skybox.hh @@ -12,4 +12,4 @@ namespace skybox void init(void); } // namespace skybox -#endif /* CLIENT_SKYBOX_HH */ +#endif // CLIENT_SKYBOX_HH diff --git a/src/game/client/sound.hh b/src/game/client/sound.hh index 2701ae0..23fbca9 100644 --- a/src/game/client/sound.hh +++ b/src/game/client/sound.hh @@ -40,4 +40,4 @@ void play_player(resource_ptr<SoundEffect> sound, bool looping, float pitch); void play_ui(resource_ptr<SoundEffect> sound, bool looping, float pitch); } // namespace sound -#endif /* CLIENT_SOUND_HH */ +#endif // CLIENT_SOUND_HH diff --git a/src/game/client/sound_effect.hh b/src/game/client/sound_effect.hh index 83b5e4d..8b1372b 100644 --- a/src/game/client/sound_effect.hh +++ b/src/game/client/sound_effect.hh @@ -7,4 +7,4 @@ struct SoundEffect final { ALuint buffer; }; -#endif /* CLIENT_SOUND_EFFECT_HH */ +#endif // CLIENT_SOUND_EFFECT_HH diff --git a/src/game/client/sound_emitter.hh b/src/game/client/sound_emitter.hh index 88d99eb..17598ad 100644 --- a/src/game/client/sound_emitter.hh +++ b/src/game/client/sound_emitter.hh @@ -18,4 +18,4 @@ public: static void update(void); }; -#endif /* CLIENT_SOUND_EMITTER_HH */ +#endif // CLIENT_SOUND_EMITTER_HH diff --git a/src/game/client/splash.hh b/src/game/client/splash.hh index 2b66e2c..e930470 100644 --- a/src/game/client/splash.hh +++ b/src/game/client/splash.hh @@ -9,4 +9,4 @@ void init_late(void); void render(void); } // namespace client_splash -#endif /* CLIENT_SPLASH_HH */ +#endif // CLIENT_SPLASH_HH diff --git a/src/game/client/status_lines.hh b/src/game/client/status_lines.hh index c252a34..88bf986 100644 --- a/src/game/client/status_lines.hh +++ b/src/game/client/status_lines.hh @@ -19,4 +19,4 @@ void set(unsigned int line, const std::string& text, const ImVec4& color, float void unset(unsigned int line); } // namespace status_lines -#endif /* CLIENT_STATUS_LINES_HH */ +#endif // CLIENT_STATUS_LINES_HH diff --git a/src/game/client/texture_gui.hh b/src/game/client/texture_gui.hh index 97a91b4..855596e 100644 --- a/src/game/client/texture_gui.hh +++ b/src/game/client/texture_gui.hh @@ -14,4 +14,4 @@ struct TextureGUI { glm::ivec2 size; }; -#endif /* CLIENT_TEXTURE2D_HH */ +#endif // CLIENT_TEXTURE2D_HH diff --git a/src/game/client/toast.hh b/src/game/client/toast.hh new file mode 100644 index 0000000..0d32304 --- /dev/null +++ b/src/game/client/toast.hh @@ -0,0 +1,8 @@ +#ifndef CLIENT_TOAST_HH +#define CLIENT_TOAST_HH +#pragma once + +// You did not see a thing +// This file was committed by a mistake + +#endif // CLIENT_TOAST_HH diff --git a/src/game/client/toggles.hh b/src/game/client/toggles.hh index d892d33..86ef7ea 100644 --- a/src/game/client/toggles.hh +++ b/src/game/client/toggles.hh @@ -36,4 +36,4 @@ bool get(toggle_type type); void set(toggle_type type, bool value); } // namespace toggles -#endif /* CLIENT_TOGGLES_HH */ +#endif // CLIENT_TOGGLES_HH diff --git a/src/game/client/voxel_anims.hh b/src/game/client/voxel_anims.hh index 5d6b9f9..fe0b75f 100644 --- a/src/game/client/voxel_anims.hh +++ b/src/game/client/voxel_anims.hh @@ -14,4 +14,4 @@ void init(void); void update(void); } // namespace voxel_anims -#endif /* CLIENT_VOXEL_ANIMS_HH */ +#endif // CLIENT_VOXEL_ANIMS_HH diff --git a/src/game/client/voxel_atlas.hh b/src/game/client/voxel_atlas.hh index 67036ca..724b482 100644 --- a/src/game/client/voxel_atlas.hh +++ b/src/game/client/voxel_atlas.hh @@ -26,4 +26,4 @@ AtlasStrip* find_or_load(const std::vector<std::string>& paths); AtlasStrip* find(const std::vector<std::string>& paths); } // namespace voxel_atlas -#endif /* CLIENT_VOXEL_ATLAS_HH */ +#endif // CLIENT_VOXEL_ATLAS_HH diff --git a/src/game/client/voxel_sounds.hh b/src/game/client/voxel_sounds.hh index ed11c0f..37e1fe9 100644 --- a/src/game/client/voxel_sounds.hh +++ b/src/game/client/voxel_sounds.hh @@ -20,4 +20,4 @@ resource_ptr<SoundEffect> get_footsteps(voxel_surface surface); resource_ptr<SoundEffect> get_placebreak(voxel_surface surface); } // namespace voxel_sounds -#endif /* CLIENT_VOXEL_SOUNDS_HH */ +#endif // CLIENT_VOXEL_SOUNDS_HH diff --git a/src/game/client/window_title.hh b/src/game/client/window_title.hh index 25051c8..268cad6 100644 --- a/src/game/client/window_title.hh +++ b/src/game/client/window_title.hh @@ -7,4 +7,4 @@ namespace window_title void update(void); } // namespace window_title -#endif /* CLIENT_WINDOW_TITLE_HH */ +#endif // CLIENT_WINDOW_TITLE_HH |