diff options
110 files changed, 8 insertions, 449 deletions
diff --git a/core/config/boolean.hh b/core/config/boolean.hh index 2e9855f..cfd8b0b 100644 --- a/core/config/boolean.hh +++ b/core/config/boolean.hh @@ -1,5 +1,3 @@ -#ifndef CORE_CONFIG_BOOLEAN_HH -#define CORE_CONFIG_BOOLEAN_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -25,5 +23,3 @@ public: static bool from_string(std::string_view value); }; } // namespace config - -#endif // CORE_CONFIG_BOOLEAN_HH diff --git a/core/config/ivalue.hh b/core/config/ivalue.hh index 97d87dc..13e9a3a 100644 --- a/core/config/ivalue.hh +++ b/core/config/ivalue.hh @@ -1,5 +1,3 @@ -#ifndef CORE_CONFIG_IVALUE_HH -#define CORE_CONFIG_IVALUE_HH 1 #pragma once namespace config @@ -11,5 +9,3 @@ public: virtual std::string_view get(void) const = 0; }; } // namespace config - -#endif // CORE_CONFIG_IVALUE_HH diff --git a/core/config/number.hh b/core/config/number.hh index 3455910..45d4773 100644 --- a/core/config/number.hh +++ b/core/config/number.hh @@ -1,5 +1,3 @@ -#ifndef CORE_CONFIG_NUMBER_HH -#define CORE_CONFIG_NUMBER_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -130,5 +128,3 @@ inline void config::Number<T>::set_limits(T min_value, T max_value) m_value = std::clamp(m_value, m_min_value, m_max_value); m_string = std::to_string(m_value); } - -#endif // CORE_CONFIG_NUMBER_HH diff --git a/core/config/string.hh b/core/config/string.hh index 772c330..8fd3901 100644 --- a/core/config/string.hh +++ b/core/config/string.hh @@ -1,5 +1,3 @@ -#ifndef CORE_CONFIG_STRING_HH -#define CORE_CONFIG_STRING_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -31,5 +29,3 @@ constexpr const char* config::String::c_str(void) const noexcept { return m_value.c_str(); } - -#endif // CORE_CONFIG_STRING_HH diff --git a/core/io/buffer.hh b/core/io/buffer.hh index c301204..96a37b1 100644 --- a/core/io/buffer.hh +++ b/core/io/buffer.hh @@ -1,6 +1,3 @@ -#ifndef CORE_IO_BUFFER_HH -#define CORE_IO_BUFFER_HH 1 - namespace io { class ReadBuffer final { @@ -89,5 +86,3 @@ io::WriteBuffer& io::WriteBuffer::operator<<(const T value) write<T>(value); return *this; } - -#endif // CORE_BUFFER_HH diff --git a/core/io/cmdline.hh b/core/io/cmdline.hh index 8b2b4ee..e90433c 100644 --- a/core/io/cmdline.hh +++ b/core/io/cmdline.hh @@ -1,5 +1,3 @@ -#ifndef CORE_IO_CMDLINE_HH -#define CORE_IO_CMDLINE_HH 1 #pragma once namespace io::cmdline @@ -11,5 +9,3 @@ std::string_view get(std::string_view option, std::string_view fallback = ""); const char* get_cstr(std::string_view option, const char* fallback = nullptr); bool contains(std::string_view option); } // namespace io::cmdline - -#endif // CORE_IO_CMDLINE_HH diff --git a/core/io/config_map.hh b/core/io/config_map.hh index 7ab7543..b0cd579 100644 --- a/core/io/config_map.hh +++ b/core/io/config_map.hh @@ -1,5 +1,3 @@ -#ifndef CORE_CONFIG_MAP_HH -#define CORE_CONFIG_MAP_HH 1 #pragma once namespace config @@ -29,5 +27,3 @@ private: std::unordered_map<std::string, config::IValue*> m_values; }; } // namespace io - -#endif // CORE_CONFIG_MAP_HH diff --git a/core/math/aabb.hh b/core/math/aabb.hh index 943eeee..b843cd9 100644 --- a/core/math/aabb.hh +++ b/core/math/aabb.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_AABB_HH -#define CORE_MATH_AABB_HH 1 #pragma once namespace math @@ -28,5 +26,3 @@ public: glm::fvec3 max; }; } // namespace math - -#endif // CORE_MATH_AABB_HH diff --git a/core/math/angles.hh b/core/math/angles.hh index 868160b..174f320 100644 --- a/core/math/angles.hh +++ b/core/math/angles.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_ANGLES_HH -#define CORE_MATH_ANGLES_HH 1 #pragma once #include "core/math/constexpr.hh" @@ -103,5 +101,3 @@ inline void math::vectors(const glm::fvec3& angles, glm::fvec3* forward, glm::fv up->z = nsv.x * ncv.y * pcv.z + psv.y * psv.z; } } - -#endif // CORE_MATH_ANGLES_HH diff --git a/core/math/concepts.hh b/core/math/concepts.hh index 1b9beb9..70859c2 100644 --- a/core/math/concepts.hh +++ b/core/math/concepts.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_CONCEPTS_HH -#define CORE_MATH_CONCEPTS_HH 1 #pragma once namespace math @@ -11,5 +9,3 @@ concept Integer = std::is_integral_v<T>; template<typename T> concept FloatingPoint = std::is_floating_point_v<T>; } // namespace math - -#endif // CORE_MATH_CONCEPTS_HH diff --git a/core/math/constexpr.hh b/core/math/constexpr.hh index 263a6e8..65dbbbf 100644 --- a/core/math/constexpr.hh +++ b/core/math/constexpr.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_CONSTEXPR_HH -#define CORE_MATH_CONSTEXPR_HH 1 #pragma once #include "core/math/concepts.hh" @@ -198,5 +196,3 @@ constexpr static inline const T math::smoothstep(const T x, const T y, const F a const F t = math::clamp<F>((a - x) / (y - x), F(0), F(1)); return static_cast<T>(t * t * (F(3) - F(2) * t)); } - -#endif // CORE_MATH_CONSTEXPR_HH diff --git a/core/math/crc64.hh b/core/math/crc64.hh index ac2c4b6..4dc484d 100644 --- a/core/math/crc64.hh +++ b/core/math/crc64.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_CRC64_HH -#define CORE_MATH_CRC64_HH 1 #pragma once namespace math @@ -8,5 +6,3 @@ std::uint64_t crc64(const void* buffer, std::size_t size, std::uint64_t combine std::uint64_t crc64(const std::vector<std::byte>& buffer, std::uint64_t combine = UINT64_C(0)); std::uint64_t crc64(const std::string& buffer, std::uint64_t combine = UINT64_C(0)); } // namespace math - -#endif // CORE_MATH_CRC64_HH diff --git a/core/math/randomizer.hh b/core/math/randomizer.hh index 206af42..04665f9 100644 --- a/core/math/randomizer.hh +++ b/core/math/randomizer.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_RANDOMIZER_HH -#define CORE_MATH_RANDOMIZER_HH 1 #pragma once namespace math @@ -56,5 +54,3 @@ inline void math::Randomizer<T>::clear(void) m_vector.clear(); m_dist = std::uniform_int_distribution<std::size_t>(0, 0); } - -#endif // CORE_MATH_RANDOMIZER_HH diff --git a/core/math/vectors.hh b/core/math/vectors.hh index 06d1bcf..73c9ab0 100644 --- a/core/math/vectors.hh +++ b/core/math/vectors.hh @@ -1,5 +1,3 @@ -#ifndef CORE_MATH_VECTORS_HH -#define CORE_MATH_VECTORS_HH 1 #pragma once #include "core/math/concepts.hh" @@ -43,5 +41,3 @@ constexpr static inline const T math::distance2(const glm::vec<3, T>& vector_a, { return math::length2(vector_a - vector_b); } - -#endif // CORE_MATH_VECTORS_HH diff --git a/core/pch.hh b/core/pch.hh index dedd310..17417a5 100644 --- a/core/pch.hh +++ b/core/pch.hh @@ -1,5 +1,3 @@ -#ifndef CORE_PCH_HH -#define CORE_PCH_HH 1 #pragma once #include <cinttypes> @@ -49,5 +47,3 @@ #include <stb_image.h> #include <stb_image_write.h> - -#endif // CORE_PCH_HH diff --git a/core/resource/image.hh b/core/resource/image.hh index b62fcbb..575591f 100644 --- a/core/resource/image.hh +++ b/core/resource/image.hh @@ -1,5 +1,3 @@ -#ifndef CORE_RESOURCE_IMAGE_HH -#define CORE_RESOURCE_IMAGE_HH 1 #pragma once constexpr static unsigned int IMAGE_LOAD_GRAY = 0x0001U; @@ -11,5 +9,3 @@ struct Image final { stbi_uc* pixels; glm::ivec2 size; }; - -#endif // CORE_RESOURCE_IMAGE_HH diff --git a/core/resource/resource.hh b/core/resource/resource.hh index ad8d944..105c7ff 100644 --- a/core/resource/resource.hh +++ b/core/resource/resource.hh @@ -1,5 +1,3 @@ -#ifndef CORE_RESOURCE_RESOURCE_HH -#define CORE_RESOURCE_RESOURCE_HH 1 #pragma once template<typename T> @@ -53,5 +51,3 @@ resource_ptr<T> resource::find(std::string_view name) auto result = resource::detail::find_resource(typeid(T), name); return std::reinterpret_pointer_cast<const T>(result); } - -#endif // CORE_RESOURCE_RESOURCE_HH diff --git a/core/threading.hh b/core/threading.hh index bd359ad..14f17f8 100644 --- a/core/threading.hh +++ b/core/threading.hh @@ -1,5 +1,3 @@ -#ifndef CORE_THREADING_HH -#define CORE_THREADING_HH 1 #pragma once enum class task_status : unsigned int { @@ -46,5 +44,3 @@ inline void threading::submit(AT&&... args) { threading::detail::submit_new(new T(args...)); } - -#endif // CORE_THREADING_HH diff --git a/core/utils/epoch.hh b/core/utils/epoch.hh index 1cd7f43..4bf5460 100644 --- a/core/utils/epoch.hh +++ b/core/utils/epoch.hh @@ -1,5 +1,3 @@ -#ifndef CORE_UTILS_EPOCH_HH -#define CORE_UTILS_EPOCH_HH 1 #pragma once namespace utils @@ -15,5 +13,3 @@ std::int64_t signed_unix_seconds(void); std::int64_t signed_unix_milliseconds(void); std::int64_t signed_unix_microseconds(void); } // namespace utils - -#endif // CORE_UTILS_EPOCH_HH diff --git a/core/utils/physfs.hh b/core/utils/physfs.hh index df5e392..4af94dc 100644 --- a/core/utils/physfs.hh +++ b/core/utils/physfs.hh @@ -1,5 +1,3 @@ -#ifndef UTILS_PHYSFS_HH -#define UTILS_PHYSFS_HH 1 #pragma once namespace utils @@ -14,5 +12,3 @@ namespace utils { std::string_view physfs_error(void); } // namespace utils - -#endif // UTILS_PHYSFS_HH diff --git a/core/utils/string.hh b/core/utils/string.hh index 3ba56a0..827c3ca 100644 --- a/core/utils/string.hh +++ b/core/utils/string.hh @@ -1,5 +1,3 @@ -#ifndef CORE_UTILS_STRING_HH -#define CORE_UTILS_STRING_HH 1 #pragma once namespace utils @@ -17,5 +15,3 @@ namespace utils { std::string trim_whitespace(const std::string& string); } // namespace utils - -#endif // CORE_UTILS_STRING_HH diff --git a/core/version.hh b/core/version.hh index b84a2fc..fc33374 100644 --- a/core/version.hh +++ b/core/version.hh @@ -1,5 +1,3 @@ -#ifndef CORE_VERSION_HH -#define CORE_VERSION_HH 1 #pragma once namespace version @@ -14,5 +12,3 @@ namespace version extern const std::string_view commit; extern const std::string_view semver; } // namespace version - -#endif // CORE_VERSION_HH diff --git a/game/client/config/gamepad_axis.hh b/game/client/config/gamepad_axis.hh index 86a2990..9392a35 100644 --- a/game/client/config/gamepad_axis.hh +++ b/game/client/config/gamepad_axis.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_GAMEPAD_AXIS_HH -#define CLIENT_GAMEPAD_AXIS_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -38,5 +36,3 @@ private: std::string_view m_name; }; } // namespace config - -#endif // CLIENT_GAMEPAD_AXIS_HH diff --git a/game/client/config/gamepad_button.hh b/game/client/config/gamepad_button.hh index e1d1224..584c353 100644 --- a/game/client/config/gamepad_button.hh +++ b/game/client/config/gamepad_button.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_GAMEPAD_BUTTON_HH -#define CLIENT_GAMEPAD_BUTTON_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -28,5 +26,3 @@ private: std::string_view m_name; }; } // namespace config - -#endif // CLIENT_GAMEPAD_BUTTON_HH diff --git a/game/client/config/keybind.hh b/game/client/config/keybind.hh index 0005fe4..dff6c18 100644 --- a/game/client/config/keybind.hh +++ b/game/client/config/keybind.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_KEYBIND_HH -#define CLIENT_KEYBIND_HH 1 #pragma once #include "core/config/ivalue.hh" @@ -25,5 +23,3 @@ private: int m_glfw_keycode; }; } // namespace config - -#endif // CLIENT_KEYBIND_HH diff --git a/game/client/const.hh b/game/client/const.hh index c53fc1b..461b500 100644 --- a/game/client/const.hh +++ b/game/client/const.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CONST_HH -#define CLIENT_CONST_HH 1 #pragma once #include "shared/const.hh" @@ -23,5 +21,3 @@ static_assert(DEFAULT_HEIGHT >= MIN_HEIGHT); constexpr static float MIN_PITCH = 0.0625f; constexpr static float MAX_PITCH = 10.0f; - -#endif // CLIENT_CONST_HH diff --git a/game/client/entity/camera.hh b/game/client/entity/camera.hh index 2484bfd..67baf72 100644 --- a/game/client/entity/camera.hh +++ b/game/client/entity/camera.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CAMERA_HH -#define CLIENT_CAMERA_HH 1 #pragma once #include "shared/types.hh" @@ -31,5 +29,3 @@ namespace entity::camera void init(void); void update(void); } // namespace entity::camera - -#endif // CLIENT_CAMERA_HH diff --git a/game/client/entity/factory.hh b/game/client/entity/factory.hh index b9d3f45..63e6e44 100644 --- a/game/client/entity/factory.hh +++ b/game/client/entity/factory.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_FACTORY_HH -#define CLIENT_FACTORY_HH 1 #pragma once namespace world @@ -11,5 +9,3 @@ namespace entity::client { void create_player(world::Dimension* dimension, entt::entity entity); } // namespace entity::client - -#endif // CLIENT_FACTORY_HH diff --git a/game/client/entity/interpolation.hh b/game/client/entity/interpolation.hh index 74a2b7e..6935fe8 100644 --- a/game/client/entity/interpolation.hh +++ b/game/client/entity/interpolation.hh @@ -1,10 +1,6 @@ -#ifndef CLIENT_INTERPOLATION_HH -#define CLIENT_INTERPOLATION_HH 1 #pragma once namespace entity::interpolation { void update(void); } // namespace entity::interpolation - -#endif // CLIENT_INTERPOLATION_HH diff --git a/game/client/entity/listener.hh b/game/client/entity/listener.hh index fd76816..594cde1 100644 --- a/game/client/entity/listener.hh +++ b/game/client/entity/listener.hh @@ -1,10 +1,6 @@ -#ifndef CLIENT_LISTENER_HH -#define CLIENT_LISTENER_HH 1 #pragma once namespace entity::listener { void update(void); } // namespace entity::listener - -#endif // CLIENT_LISTENER_HH diff --git a/game/client/entity/player_look.hh b/game/client/entity/player_look.hh index 6532b8f..0ae18db 100644 --- a/game/client/entity/player_look.hh +++ b/game/client/entity/player_look.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PLAYER_LOOK_HH -#define CLIENT_PLAYER_LOOK_HH 1 #pragma once namespace entity::player_look @@ -7,5 +5,3 @@ namespace entity::player_look void init(void); void update_late(void); } // namespace entity::player_look - -#endif // CLIENT_PLAYER_LOOK_HH diff --git a/game/client/entity/player_move.hh b/game/client/entity/player_move.hh index aa221f3..8c033cc 100644 --- a/game/client/entity/player_move.hh +++ b/game/client/entity/player_move.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PLAYER_MOVE_HH -#define CLIENT_PLAYER_MOVE_HH 1 #pragma once constexpr static float PMOVE_MAX_SPEED_AIR = 16.0f; @@ -15,5 +13,3 @@ void init(void); void fixed_update(void); void update_late(void); } // namespace entity::player_move - -#endif // CLIENT_PLAYER_MOVE_HH diff --git a/game/client/entity/sound_emitter.hh b/game/client/entity/sound_emitter.hh index d5834d1..72a3f74 100644 --- a/game/client/entity/sound_emitter.hh +++ b/game/client/entity/sound_emitter.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SOUND_EMITTER_HH -#define CLIENT_SOUND_EMITTER_HH 1 #pragma once #include "core/resource/resource.hh" @@ -20,5 +18,3 @@ public: static void update(void); }; } // namespace entity - -#endif // CLIENT_SOUND_EMITTER_HH diff --git a/game/client/experiments.hh b/game/client/experiments.hh index a2ce66a..ff2cbad 100644 --- a/game/client/experiments.hh +++ b/game/client/experiments.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_EXPERIMENTS_HH -#define CLIENT_EXPERIMENTS_HH 1 #pragma once namespace experiments @@ -16,5 +14,3 @@ namespace experiments void attack(void); void interact(void); } // namespace experiments - -#endif // CLIENT_EXPERIMENTS_HH diff --git a/game/client/game.hh b/game/client/game.hh index cc136df..395acc9 100644 --- a/game/client/game.hh +++ b/game/client/game.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_GAME_HH -#define CLIENT_GAME_HH 1 #pragma once namespace config @@ -35,5 +33,3 @@ void update_late(void); void render(void); void layout(void); } // namespace client_game - -#endif // CLIENT_GAME_HH diff --git a/game/client/globals.hh b/game/client/globals.hh index 69ce29c..ba57a9e 100644 --- a/game/client/globals.hh +++ b/game/client/globals.hh @@ -1,5 +1,3 @@ -#ifndef CLIENTOBALS_HH -#define CLIENTOBALS_HH 1 #pragma once #include "shared/globals.hh" @@ -71,5 +69,3 @@ extern unsigned int gui_screen; extern ALCdevice* sound_dev; extern ALCcontext* sound_ctx; } // namespace globals - -#endif // CLIENTOBALS_HH diff --git a/game/client/gui/background.hh b/game/client/gui/background.hh index 1974c34..5c72a3f 100644 --- a/game/client/gui/background.hh +++ b/game/client/gui/background.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_BACKGROUND_HH -#define CLIENT_BACKGROUND_HH 1 #pragma once namespace gui::background @@ -8,5 +6,3 @@ void init(void); void shutdown(void); void layout(void); } // namespace gui::background - -#endif // CLIENT_BACKGROUND_HH diff --git a/game/client/gui/bother.hh b/game/client/gui/bother.hh index f555d74..c83294c 100644 --- a/game/client/gui/bother.hh +++ b/game/client/gui/bother.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_BOTHER_HH -#define CLIENT_BOTHER_HH 1 #pragma once namespace gui @@ -22,5 +20,3 @@ void update_late(void); void ping(unsigned int identity, std::string_view host, std::uint16_t port); void cancel(unsigned int identity); } // namespace gui::bother - -#endif // CLIENT_BOTHER_HH diff --git a/game/client/gui/chat.hh b/game/client/gui/chat.hh index b56681e..6a3ea33 100644 --- a/game/client/gui/chat.hh +++ b/game/client/gui/chat.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CHAT_HH -#define CLIENT_CHAT_HH 1 #pragma once namespace gui::client_chat @@ -17,5 +15,3 @@ void clear(void); void refresh_timings(void); void print(const std::string& string); } // namespace gui::client_chat - -#endif // CLIENT_CHAT_HH diff --git a/game/client/gui/crosshair.hh b/game/client/gui/crosshair.hh index d29a661..589727e 100644 --- a/game/client/gui/crosshair.hh +++ b/game/client/gui/crosshair.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CROSSHAIR_HH -#define CLIENT_CROSSHAIR_HH 1 #pragma once namespace gui::crosshair @@ -8,5 +6,3 @@ void init(void); void shutdown(void); void layout(void); } // namespace gui::crosshair - -#endif // CLIENT_CROSSHAIR_HH diff --git a/game/client/gui/direct_connection.hh b/game/client/gui/direct_connection.hh index 7331843..aa02d7c 100644 --- a/game/client/gui/direct_connection.hh +++ b/game/client/gui/direct_connection.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_DIRECT_CONNECTION_HH -#define CLIENT_DIRECT_CONNECTION_HH 1 #pragma once namespace gui::direct_connection @@ -7,5 +5,3 @@ namespace gui::direct_connection void init(void); void layout(void); } // namespace gui::direct_connection - -#endif // CLIENT_DIRECT_CONNECTION_HH diff --git a/game/client/gui/gui_screen.hh b/game/client/gui/gui_screen.hh index b36e6b2..2eae310 100644 --- a/game/client/gui/gui_screen.hh +++ b/game/client/gui/gui_screen.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_GUI_SCREEN_HH -#define CLIENT_GUI_SCREEN_HH 1 #pragma once constexpr static unsigned int GUI_SCREEN_NONE = 0x0000U; @@ -10,5 +8,3 @@ constexpr static unsigned int GUI_PROGRESS_BAR = 0x0004U; 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 diff --git a/game/client/gui/hotbar.hh b/game/client/gui/hotbar.hh index 4712ee5..85d75aa 100644 --- a/game/client/gui/hotbar.hh +++ b/game/client/gui/hotbar.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_HOTBAR_HH -#define CLIENT_HOTBAR_HH 1 #pragma once #include "shared/types.hh" @@ -27,5 +25,3 @@ namespace gui::hotbar void next_slot(void); void prev_slot(void); } // namespace gui::hotbar - -#endif // CLIENT_HOTBAR_HH diff --git a/game/client/gui/imdraw_ext.hh b/game/client/gui/imdraw_ext.hh index 664b702..a7e1503 100644 --- a/game/client/gui/imdraw_ext.hh +++ b/game/client/gui/imdraw_ext.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_IMDRAW_EXT_HH -#define CLIENT_IMDRAW_EXT_HH 1 #pragma once namespace gui::imdraw_ext @@ -17,5 +15,3 @@ void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_c void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list, float font_size, float wrap_width); } // namespace gui::imdraw_ext - -#endif // CLIENT_IMDRAW_EXT_HH diff --git a/game/client/gui/language.hh b/game/client/gui/language.hh index 37cc790..90132d7 100644 --- a/game/client/gui/language.hh +++ b/game/client/gui/language.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_LANGUAGE_HH -#define CLIENT_LANGUAGE_HH 1 #pragma once namespace gui @@ -42,5 +40,3 @@ namespace gui::language std::string_view resolve(std::string_view key); std::string resolve_gui(std::string_view key); } // namespace gui::language - -#endif // CLIENT_LANGUAGE_HH diff --git a/game/client/gui/main_menu.hh b/game/client/gui/main_menu.hh index c93e284..205f078 100644 --- a/game/client/gui/main_menu.hh +++ b/game/client/gui/main_menu.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_MAIN_MENU_HH -#define CLIENT_MAIN_MENU_HH 1 #pragma once namespace gui::main_menu @@ -8,5 +6,3 @@ void init(void); void shutdown(void); void layout(void); } // namespace gui::main_menu - -#endif // CLIENT_MAIN_MENU_HH diff --git a/game/client/gui/message_box.hh b/game/client/gui/message_box.hh index a906744..74a6fbf 100644 --- a/game/client/gui/message_box.hh +++ b/game/client/gui/message_box.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_MESSAGE_BOX_HH -#define CLIENT_MESSAGE_BOX_HH 1 #pragma once namespace gui @@ -20,5 +18,3 @@ void set_title(std::string_view title); void set_subtitle(std::string_view subtitle); void add_button(std::string_view text, const message_box_action& action); } // namespace gui::message_box - -#endif // CLIENT_MESSAGE_BOX_HH diff --git a/game/client/gui/metrics.hh b/game/client/gui/metrics.hh index 57e1108..4898332 100644 --- a/game/client/gui/metrics.hh +++ b/game/client/gui/metrics.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_METRICS_HH -#define CLIENT_METRICS_HH 1 #pragma once namespace gui::metrics @@ -7,5 +5,3 @@ namespace gui::metrics void init(void); void layout(void); } // namespace gui::metrics - -#endif // CLIENT_METRICS_HH diff --git a/game/client/gui/play_menu.hh b/game/client/gui/play_menu.hh index f63d27e..1b1f003 100644 --- a/game/client/gui/play_menu.hh +++ b/game/client/gui/play_menu.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PLAY_MENU_HH -#define CLIENT_PLAY_MENU_HH 1 #pragma once namespace gui::play_menu @@ -9,5 +7,3 @@ void shutdown(void); void layout(void); void update_late(void); } // namespace gui::play_menu - -#endif // CLIENT_PLAY_MENU_HH diff --git a/game/client/gui/progress_bar.hh b/game/client/gui/progress_bar.hh index 79fdcb5..7a0581d 100644 --- a/game/client/gui/progress_bar.hh +++ b/game/client/gui/progress_bar.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PROGRESS_BAR_HH -#define CLIENT_PROGRESS_BAR_HH 1 #pragma once namespace gui @@ -19,5 +17,3 @@ void reset(void); void set_title(std::string_view title); void set_button(std::string_view text, const progress_bar_action& action); } // namespace gui::progress_bar - -#endif // CLIENT_PROGRESS_BAR_HH diff --git a/game/client/gui/scoreboard.hh b/game/client/gui/scoreboard.hh index af77ae2..320e185 100644 --- a/game/client/gui/scoreboard.hh +++ b/game/client/gui/scoreboard.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SCOREBOARD_HH -#define CLIENT_SCOREBOARD_HH 1 #pragma once namespace gui::scoreboard @@ -7,5 +5,3 @@ namespace gui::scoreboard void init(void); void layout(void); } // namespace gui::scoreboard - -#endif // CLIENT_SCOREBOARD_HH diff --git a/game/client/gui/settings.hh b/game/client/gui/settings.hh index d807bc4..efb8ca4 100644 --- a/game/client/gui/settings.hh +++ b/game/client/gui/settings.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SETTINGS_HH -#define CLIENT_SETTINGS_HH 1 #pragma once namespace config @@ -55,8 +53,8 @@ void add_checkbox(int priority, config::Boolean& value, settings_location locati namespace settings { void add_input(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip); -void add_input( - int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, std::string_view fmt = "%.3f"); +void add_input(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, + std::string_view fmt = "%.3f"); void add_input(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip); void add_input(int priority, config::String& value, settings_location location, std::string_view name, bool tooltip, bool allow_whitespace); } // namespace settings @@ -64,8 +62,8 @@ void add_input(int priority, config::String& value, settings_location location, namespace settings { void add_slider(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip); -void add_slider( - int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, std::string_view format = "%.3f"); +void add_slider(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, + std::string_view format = "%.3f"); void add_slider(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip); } // namespace settings @@ -90,5 +88,3 @@ namespace settings { void add_language_select(int priority, settings_location location, std::string_view name); } // namespace settings - -#endif // CLIENT_SETTINGS_HH diff --git a/game/client/gui/splash.hh b/game/client/gui/splash.hh index 7a032ad..3ce63e4 100644 --- a/game/client/gui/splash.hh +++ b/game/client/gui/splash.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SPLASH_HH -#define CLIENT_SPLASH_HH 1 #pragma once namespace gui::client_splash @@ -8,5 +6,3 @@ void init(void); void init_late(void); void render(void); } // namespace gui::client_splash - -#endif // CLIENT_SPLASH_HH diff --git a/game/client/gui/status_lines.hh b/game/client/gui/status_lines.hh index 907cdfc..c86e248 100644 --- a/game/client/gui/status_lines.hh +++ b/game/client/gui/status_lines.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_STATUS_LINES_HH -#define CLIENT_STATUS_LINES_HH 1 #pragma once namespace gui @@ -21,5 +19,3 @@ namespace gui::status_lines void set(unsigned int line, const std::string& text, const ImVec4& color, float fadeout); void unset(unsigned int line); } // namespace gui::status_lines - -#endif // CLIENT_STATUS_LINES_HH diff --git a/game/client/gui/window_title.hh b/game/client/gui/window_title.hh index a6fe4ec..af1ab7c 100644 --- a/game/client/gui/window_title.hh +++ b/game/client/gui/window_title.hh @@ -1,10 +1,6 @@ -#ifndef CLIENT_WINDOW_TITLE_HH -#define CLIENT_WINDOW_TITLE_HH 1 #pragma once namespace gui::window_title { void update(void); } // namespace gui::window_title - -#endif // CLIENT_WINDOW_TITLE_HH diff --git a/game/client/io/gamepad.hh b/game/client/io/gamepad.hh index 4200037..9c56894 100644 --- a/game/client/io/gamepad.hh +++ b/game/client/io/gamepad.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_GAMEPAD_HH -#define CLIENT_GAMEPAD_HH 1 #pragma once namespace io @@ -50,5 +48,3 @@ struct GamepadButtonEvent final { int button; }; } // namespace io - -#endif // CLIENT_GAMEPAD_HH diff --git a/game/client/pch.hh b/game/client/pch.hh index 98c5e52..3832081 100644 --- a/game/client/pch.hh +++ b/game/client/pch.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PCH_HH -#define CLIENT_PCH_HH 1 #pragma once #include <shared/pch.hh> @@ -28,5 +26,3 @@ #if defined(__unix__) #include <dlfcn.h> #endif - -#endif // CLIENT_PCH_HH diff --git a/game/client/program.hh b/game/client/program.hh index 4e796fa..af78513 100644 --- a/game/client/program.hh +++ b/game/client/program.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PROGRAM_HH -#define CLIENT_PROGRAM_HH 1 #pragma once struct GL_VariedMacro final { @@ -34,5 +32,3 @@ public: bool needs_update; GLuint handle; }; - -#endif // CLIENT_PROGRAM_HH diff --git a/game/client/receive.hh b/game/client/receive.hh index 1b793b0..d675392 100644 --- a/game/client/receive.hh +++ b/game/client/receive.hh @@ -1,10 +1,6 @@ -#ifndef CLIENT_RECEIVE_HH -#define CLIENT_RECEIVE_HH 1 #pragma once namespace client_receive { void init(void); } // namespace client_receive - -#endif // CLIENT_RECEIVE_HH diff --git a/game/client/resource/sound_effect.hh b/game/client/resource/sound_effect.hh index 8fa3da4..f2db33b 100644 --- a/game/client/resource/sound_effect.hh +++ b/game/client/resource/sound_effect.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SOUND_EFFECT_HH -#define CLIENT_SOUND_EFFECT_HH 1 #pragma once struct SoundEffect final { @@ -8,5 +6,3 @@ struct SoundEffect final { std::string name; ALuint buffer; }; - -#endif // CLIENT_SOUND_EFFECT_HH diff --git a/game/client/resource/texture_gui.hh b/game/client/resource/texture_gui.hh index 988c642..2d42c83 100644 --- a/game/client/resource/texture_gui.hh +++ b/game/client/resource/texture_gui.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_TEXTURE2D_HH -#define CLIENT_TEXTURE2D_HH 1 #pragma once constexpr static unsigned int TEXTURE_GUI_LOAD_CLAMP_S = 0x0001; @@ -15,5 +13,3 @@ struct TextureGUI final { ImTextureID handle; glm::ivec2 size; }; - -#endif // CLIENT_TEXTURE2D_HH diff --git a/game/client/screenshot.hh b/game/client/screenshot.hh index 7cb8cd5..fecbd2f 100644 --- a/game/client/screenshot.hh +++ b/game/client/screenshot.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SCREENSHOT_HH -#define CLIENT_SCREENSHOT_HH 1 #pragma once namespace screenshot @@ -7,5 +5,3 @@ namespace screenshot void init(void); void take(void); } // namespace screenshot - -#endif // CLIENT_SCREENSHOT_HH diff --git a/game/client/session.hh b/game/client/session.hh index 8384a49..f61d62d 100644 --- a/game/client/session.hh +++ b/game/client/session.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SESSION_HH -#define CLIENT_SESSION_HH 1 #pragma once namespace session @@ -27,5 +25,3 @@ namespace session { bool is_ingame(void); } // namespace session - -#endif // CLIENT_SESSION_HH diff --git a/game/client/sound/sound.hh b/game/client/sound/sound.hh index 877c64a..d96d0c4 100644 --- a/game/client/sound/sound.hh +++ b/game/client/sound/sound.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SOUND_HH -#define CLIENT_SOUND_HH 1 #pragma once #include "core/resource/resource.hh" @@ -43,5 +41,3 @@ void play_entity(entt::entity entity, resource_ptr<SoundEffect> sound, bool loop 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 diff --git a/game/client/toggles.hh b/game/client/toggles.hh index 86ef7ea..d051a92 100644 --- a/game/client/toggles.hh +++ b/game/client/toggles.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_TOGGLES_HH -#define CLIENT_TOGGLES_HH 1 #pragma once using toggle_type = unsigned int; @@ -35,5 +33,3 @@ void init_late(void); bool get(toggle_type type); void set(toggle_type type, bool value); } // namespace toggles - -#endif // CLIENT_TOGGLES_HH diff --git a/game/client/world/chunk_mesher.hh b/game/client/world/chunk_mesher.hh index 14df019..cb0c7c5 100644 --- a/game/client/world/chunk_mesher.hh +++ b/game/client/world/chunk_mesher.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CHUNK_MESHER_HH -#define CLIENT_CHUNK_MESHER_HH 1 #pragma once #include "client/world/chunk_vbo.hh" @@ -18,5 +16,3 @@ void init(void); void shutdown(void); void update(void); } // namespace world::chunk_mesher - -#endif // CLIENT_CHUNK_MESHER_HH diff --git a/game/client/world/chunk_quad.hh b/game/client/world/chunk_quad.hh index 9b3ca47..d160b7e 100644 --- a/game/client/world/chunk_quad.hh +++ b/game/client/world/chunk_quad.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CHUNK_QUAD_HH -#define CLIENT_CHUNK_QUAD_HH 1 #pragma once #include "core/math/constexpr.hh" @@ -15,8 +13,8 @@ using ChunkQuad = std::array<std::uint32_t, 2>; namespace world { -constexpr inline static ChunkQuad make_chunk_quad( - const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing, std::size_t texture, std::size_t frames) +constexpr inline static ChunkQuad make_chunk_quad(const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing, + std::size_t texture, std::size_t frames) { ChunkQuad result = {}; result[0] = 0x00000000; @@ -41,5 +39,3 @@ constexpr inline static ChunkQuad make_chunk_quad( return result; } } // namespace world - -#endif // CLIENT_CHUNK_QUAD_HH diff --git a/game/client/world/chunk_renderer.hh b/game/client/world/chunk_renderer.hh index fdc5eea..2b73225 100644 --- a/game/client/world/chunk_renderer.hh +++ b/game/client/world/chunk_renderer.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CHUNK_RENDERER_HH -#define CLIENT_CHUNK_RENDERER_HH 1 #pragma once namespace world::chunk_renderer @@ -8,5 +6,3 @@ void init(void); void shutdown(void); void render(void); } // namespace world::chunk_renderer - -#endif // CLIENT_CHUNK_RENDERER_HH diff --git a/game/client/world/chunk_vbo.hh b/game/client/world/chunk_vbo.hh index 586c313..175b34f 100644 --- a/game/client/world/chunk_vbo.hh +++ b/game/client/world/chunk_vbo.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_CHUNK_VBO_HH -#define CLIENT_CHUNK_VBO_HH 1 #pragma once namespace world @@ -22,5 +20,3 @@ public: } }; } // namespace world - -#endif // CLIENT_CHUNK_VBO_HH diff --git a/game/client/world/chunk_visibility.hh b/game/client/world/chunk_visibility.hh index a57baa1..8d1f3cd 100644 --- a/game/client/world/chunk_visibility.hh +++ b/game/client/world/chunk_visibility.hh @@ -1,10 +1,6 @@ -#ifndef CLIENT_CHUNK_VISIBILITY_HH -#define CLIENT_CHUNK_VISIBILITY_HH 1 #pragma once namespace world::chunk_visibility { void update_late(void); } // namespace world::chunk_visibility - -#endif // CLIENT_CHUNK_VISIBILITY_HH diff --git a/game/client/world/outline.hh b/game/client/world/outline.hh index 5cef7ed..2456a32 100644 --- a/game/client/world/outline.hh +++ b/game/client/world/outline.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_OUTLINE_HH -#define CLIENT_OUTLINE_HH 1 #pragma once #include "shared/types.hh" @@ -16,5 +14,3 @@ namespace world::outline void cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color); void line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color); } // namespace world::outline - -#endif // CLIENT_OUTLINE_HH diff --git a/game/client/world/player_target.hh b/game/client/world/player_target.hh index 33d90fb..f137a1b 100644 --- a/game/client/world/player_target.hh +++ b/game/client/world/player_target.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_PLAYER_TARGET_HH -#define CLIENT_PLAYER_TARGET_HH 1 #pragma once #include "shared/world/voxel_registry.hh" @@ -18,5 +16,3 @@ void init(void); void update(void); void render(void); } // namespace world::player_target - -#endif // CLIENT_PLAYER_TARGET_HH diff --git a/game/client/world/skybox.hh b/game/client/world/skybox.hh index 6dd82f9..40113cd 100644 --- a/game/client/world/skybox.hh +++ b/game/client/world/skybox.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_SKYBOX_HH -#define CLIENT_SKYBOX_HH 1 #pragma once namespace world::skybox @@ -11,5 +9,3 @@ namespace world::skybox { void init(void); } // namespace world::skybox - -#endif // CLIENT_SKYBOX_HH diff --git a/game/client/world/voxel_anims.hh b/game/client/world/voxel_anims.hh index 5e9c56f..0d8a0d0 100644 --- a/game/client/world/voxel_anims.hh +++ b/game/client/world/voxel_anims.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_VOXEL_ANIMS_HH -#define CLIENT_VOXEL_ANIMS_HH 1 #pragma once namespace world::voxel_anims @@ -13,5 +11,3 @@ namespace world::voxel_anims void init(void); void update(void); } // namespace world::voxel_anims - -#endif // CLIENT_VOXEL_ANIMS_HH diff --git a/game/client/world/voxel_atlas.hh b/game/client/world/voxel_atlas.hh index f94c6bd..70e8a1e 100644 --- a/game/client/world/voxel_atlas.hh +++ b/game/client/world/voxel_atlas.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_VOXEL_ATLAS_HH -#define CLIENT_VOXEL_ATLAS_HH 1 #pragma once namespace world @@ -28,5 +26,3 @@ namespace world::voxel_atlas AtlasStrip* find_or_load(const std::vector<std::string>& paths); AtlasStrip* find(const std::vector<std::string>& paths); } // namespace world::voxel_atlas - -#endif // CLIENT_VOXEL_ATLAS_HH diff --git a/game/client/world/voxel_sounds.hh b/game/client/world/voxel_sounds.hh index d6f860f..b09b475 100644 --- a/game/client/world/voxel_sounds.hh +++ b/game/client/world/voxel_sounds.hh @@ -1,5 +1,3 @@ -#ifndef CLIENT_VOXEL_SOUNDS_HH -#define CLIENT_VOXEL_SOUNDS_HH 1 #pragma once #include "core/resource/resource.hh" @@ -19,5 +17,3 @@ namespace world::voxel_sounds resource_ptr<SoundEffect> get_footsteps(voxel_surface surface); resource_ptr<SoundEffect> get_placebreak(voxel_surface surface); } // namespace world::voxel_sounds - -#endif // CLIENT_VOXEL_SOUNDS_HH diff --git a/game/server/chat.hh b/game/server/chat.hh index fdf1a75..1b3e11b 100644 --- a/game/server/chat.hh +++ b/game/server/chat.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_CHAT_HH -#define SERVER_CHAT_HH 1 #pragma once struct Session; @@ -12,5 +10,3 @@ void broadcast(std::string_view message, std::string_view sender); void send(Session* session, std::string_view message); void send(Session* session, std::string_view message, std::string_view sender); } // namespace server_chat - -#endif // SERVER_CHAT_HH diff --git a/game/server/game.hh b/game/server/game.hh index 2d40be7..1dbe4b8 100644 --- a/game/server/game.hh +++ b/game/server/game.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_GAME_HH -#define SERVER_GAME_HH 1 #pragma once namespace config @@ -25,5 +23,3 @@ void shutdown(void); void fixed_update(void); void fixed_update_late(void); } // namespace server_game - -#endif // SERVER_GAME_HH diff --git a/game/server/globals.hh b/game/server/globals.hh index fdfc359..b684d3b 100644 --- a/game/server/globals.hh +++ b/game/server/globals.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_GLOBALS_HH -#define SERVER_GLOBALS_HH 1 #pragma once #include "shared/globals.hh" @@ -27,5 +25,3 @@ extern std::uint64_t tickrate_dt; extern world::Dimension* spawn_dimension; extern std::unordered_map<std::string, world::Dimension*> dimensions; } // namespace globals - -#endif // SERVER_GLOBALS_HH diff --git a/game/server/pch.hh b/game/server/pch.hh index 810a7e4..6f42c17 100644 --- a/game/server/pch.hh +++ b/game/server/pch.hh @@ -1,7 +1,3 @@ -#ifndef SERVER_PCH_HH -#define SERVER_PCH_HH 1 #pragma once #include <shared/pch.hh> - -#endif // SERVER_PCH_HH diff --git a/game/server/receive.hh b/game/server/receive.hh index 17333d0..4150226 100644 --- a/game/server/receive.hh +++ b/game/server/receive.hh @@ -1,10 +1,6 @@ -#ifndef SERVER_RECEIVE_HH -#define SERVER_RECEIVE_HH 1 #pragma once namespace server_recieve { void init(void); } // namespace server_recieve - -#endif // SERVER_RECEIVE_HH diff --git a/game/server/sessions.hh b/game/server/sessions.hh index e9ce989..656b76d 100644 --- a/game/server/sessions.hh +++ b/game/server/sessions.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_SESSIONS_HH -#define SERVER_SESSIONS_HH 1 #pragma once namespace world @@ -55,5 +53,3 @@ namespace sessions { void refresh_scoreboard(void); } // namespace sessions - -#endif // SERVER_SESSIONS_HH diff --git a/game/server/status.hh b/game/server/status.hh index 218eab0..35370a0 100644 --- a/game/server/status.hh +++ b/game/server/status.hh @@ -1,10 +1,6 @@ -#ifndef SERVER_STATUS_HH -#define SERVER_STATUS_HH 1 #pragma once namespace status { void init(void); } // namespace status - -#endif // SERVER_STATUS_HH diff --git a/game/server/whitelist.hh b/game/server/whitelist.hh index b84a34c..4695d16 100644 --- a/game/server/whitelist.hh +++ b/game/server/whitelist.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_WHITELIST_HH -#define SERVER_WHITELIST_HH 1 #pragma once namespace config @@ -26,5 +24,3 @@ namespace whitelist bool contains(std::string_view username); bool matches(std::string_view username, std::uint64_t password_hash); } // namespace whitelist - -#endif // SERVER_WHITELIST_HH diff --git a/game/server/world/inhabited.hh b/game/server/world/inhabited.hh index bbb7a03..57008e9 100644 --- a/game/server/world/inhabited.hh +++ b/game/server/world/inhabited.hh @@ -1,10 +1,6 @@ -#ifndef SERVER_INHABITED_HH -#define SERVER_INHABITED_HH 1 #pragma once namespace world { struct Inhabited final {}; } // namespace world - -#endif // SERVER_INHABITED_HH diff --git a/game/server/world/overworld.hh b/game/server/world/overworld.hh index cc6be91..f3fc8cf 100644 --- a/game/server/world/overworld.hh +++ b/game/server/world/overworld.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_OVERWORLD_HH -#define SERVER_OVERWORLD_HH 1 #pragma once #include "core/config/number.hh" @@ -68,5 +66,3 @@ private: std::mutex m_mutex; }; } // namespace world - -#endif // SERVER_OVERWORLD_HH diff --git a/game/server/world/universe.hh b/game/server/world/universe.hh index 164ff01..285911e 100644 --- a/game/server/world/universe.hh +++ b/game/server/world/universe.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_UNIVERSE_HH -#define SERVER_UNIVERSE_HH 1 #pragma once #include "shared/types.hh" @@ -25,5 +23,3 @@ Chunk* load_chunk(Dimension* dimension, const chunk_pos& cpos); void save_chunk(Dimension* dimension, const chunk_pos& cpos); void save_all_chunks(Dimension* dimension); } // namespace world::universe - -#endif // SERVER_UNIVERSE_HH diff --git a/game/server/world/unloader.hh b/game/server/world/unloader.hh index a995152..9682de6 100644 --- a/game/server/world/unloader.hh +++ b/game/server/world/unloader.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_UNLOADER_HH -#define SERVER_UNLOADER_HH 1 #pragma once namespace world @@ -13,5 +11,3 @@ void init(void); void init_late(void); void fixed_update_late(Dimension* dimension); } // namespace world::unloader - -#endif // SERVER_UNLOADER_HH diff --git a/game/server/world/worldgen.hh b/game/server/world/worldgen.hh index db5b91f..8ffec36 100644 --- a/game/server/world/worldgen.hh +++ b/game/server/world/worldgen.hh @@ -1,5 +1,3 @@ -#ifndef SERVER_WORLDGEN_HH -#define SERVER_WORLDGEN_HH 1 #pragma once #include "shared/types.hh" @@ -21,5 +19,3 @@ namespace world::worldgen bool is_generating(Dimension* dimension, const chunk_pos& cpos); void request_chunk(Session* session, const chunk_pos& cpos); } // namespace world::worldgen - -#endif // SERVER_WORLDGEN_HH diff --git a/game/shared/const.hh b/game/shared/const.hh index 0755848..187962a 100644 --- a/game/shared/const.hh +++ b/game/shared/const.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_CONST_HH -#define SHARED_CONST_HH 1 #pragma once #include "core/math/constexpr.hh" @@ -43,5 +41,3 @@ constexpr static glm::vec<2, T> ZERO_VEC2 = glm::vec<2, T>(0, 0); template<typename T> constexpr static glm::vec<3, T> ZERO_VEC3 = glm::vec<3, T>(0, 0, 0); - -#endif // SHARED_CONST_HH diff --git a/game/shared/coord.hh b/game/shared/coord.hh index 18d45b5..9d9be18 100644 --- a/game/shared/coord.hh +++ b/game/shared/coord.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_COORD_HH -#define SHARED_COORD_HH 1 #pragma once #include "shared/const.hh" @@ -118,8 +116,8 @@ inline constexpr glm::fvec3 coord::to_relative(const chunk_pos& pivot_cpos, cons }; } -inline constexpr glm::fvec3 coord::to_relative( - const chunk_pos& pivot_cpos, const glm::fvec3& pivot_fvec, const chunk_pos& cpos, const glm::fvec3& fvec) +inline constexpr glm::fvec3 coord::to_relative(const chunk_pos& pivot_cpos, const glm::fvec3& pivot_fvec, const chunk_pos& cpos, + const glm::fvec3& fvec) { return glm::fvec3 { static_cast<float>((cpos.x - pivot_cpos.x) << CHUNK_BITSHIFT) + (fvec.x - pivot_fvec.x), @@ -145,5 +143,3 @@ inline constexpr glm::fvec3 coord::to_fvec3(const chunk_pos& cpos, const glm::fv fpos.z + static_cast<float>(cpos.z << CHUNK_BITSHIFT), }; } - -#endif // SHARED_COORD_HH diff --git a/game/shared/entity/collision.hh b/game/shared/entity/collision.hh index 536a066..33ddaac 100644 --- a/game/shared/entity/collision.hh +++ b/game/shared/entity/collision.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_COLLISION_HH -#define SHARED_ENTITY_COLLISION_HH 1 #pragma once #include "core/math/aabb.hh" @@ -21,5 +19,3 @@ public: static void fixed_update(world::Dimension* dimension); }; } // namespace entity - -#endif // SHARED_ENTITY_COLLISION_HH diff --git a/game/shared/entity/factory.hh b/game/shared/entity/factory.hh index c0e0716..e709060 100644 --- a/game/shared/entity/factory.hh +++ b/game/shared/entity/factory.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_FACTORY_HH -#define SHARED_ENTITY_FACTORY_HH 1 #pragma once namespace world @@ -11,5 +9,3 @@ namespace entity::shared { void create_player(world::Dimension* dimension, entt::entity entity); } // namespace entity::shared - -#endif // SHARED_ENTITY_FACTORY_HH diff --git a/game/shared/entity/gravity.hh b/game/shared/entity/gravity.hh index 064f92d..21f4582 100644 --- a/game/shared/entity/gravity.hh +++ b/game/shared/entity/gravity.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_GRAVITY_HH -#define SHARED_ENTITY_GRAVITY_HH 1 #pragma once namespace world @@ -14,5 +12,3 @@ public: static void fixed_update(world::Dimension* dimension); }; } // namespace entity - -#endif // SHARED_ENTITY_GRAVITY_HH diff --git a/game/shared/entity/head.hh b/game/shared/entity/head.hh index 1437207..3f5d6d1 100644 --- a/game/shared/entity/head.hh +++ b/game/shared/entity/head.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_HEAD_HH -#define SHARED_ENTITY_HEAD_HH 1 #pragma once namespace entity @@ -16,5 +14,3 @@ namespace entity::client struct HeadIntr final : public Head {}; struct HeadPrev final : public Head {}; } // namespace entity::client - -#endif // SHARED_ENTITY_HEAD_HH diff --git a/game/shared/entity/player.hh b/game/shared/entity/player.hh index 3c8be32..4bd0217 100644 --- a/game/shared/entity/player.hh +++ b/game/shared/entity/player.hh @@ -1,10 +1,6 @@ -#ifndef SHARED_ENTITY_PLAYER_HH -#define SHARED_ENTITY_PLAYER_HH 1 #pragma once namespace entity { struct Player final {}; } // namespace entity - -#endif // SHARED_ENTITY_PLAYER_HH diff --git a/game/shared/entity/stasis.hh b/game/shared/entity/stasis.hh index 27c0131..e6cb9e4 100644 --- a/game/shared/entity/stasis.hh +++ b/game/shared/entity/stasis.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_STASIS_HH -#define SHARED_ENTITY_STASIS_HH 1 #pragma once namespace world @@ -16,5 +14,3 @@ public: static void fixed_update(world::Dimension* dimension); }; } // namespace entity - -#endif // SHARED_ENTITY_STASIS_HH diff --git a/game/shared/entity/transform.hh b/game/shared/entity/transform.hh index b1fdcf4..2b357f8 100644 --- a/game/shared/entity/transform.hh +++ b/game/shared/entity/transform.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_TRANSFORM_HH -#define SHARED_ENTITY_TRANSFORM_HH 1 #pragma once #include "shared/types.hh" @@ -30,5 +28,3 @@ namespace entity::client struct TransformIntr final : public Transform {}; struct TransformPrev final : public Transform {}; } // namespace entity::client - -#endif // SHARED_ENTITY_TRANSFORM_HH diff --git a/game/shared/entity/velocity.hh b/game/shared/entity/velocity.hh index 5d4ec03..c8a1c91 100644 --- a/game/shared/entity/velocity.hh +++ b/game/shared/entity/velocity.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ENTITY_VELOCITY_HH -#define SHARED_ENTITY_VELOCITY_HH 1 #pragma once namespace world @@ -19,5 +17,3 @@ public: static void fixed_update(world::Dimension* dimension); }; } // namespace entity - -#endif // SHARED_VELOCITY_HH diff --git a/game/shared/globals.hh b/game/shared/globals.hh index bfaf6cb..39a12a7 100644 --- a/game/shared/globals.hh +++ b/game/shared/globals.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_GLOBALS_HH -#define SHARED_GLOBALS_HH 1 #pragma once namespace globals @@ -19,5 +17,3 @@ namespace globals { extern std::uint64_t curtime; } // namespace globals - -#endif // SHARED_GLOBALS_HH diff --git a/game/shared/pch.hh b/game/shared/pch.hh index 95ee6d0..e978e0f 100644 --- a/game/shared/pch.hh +++ b/game/shared/pch.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_PCH_HH -#define SHARED_PCH_HH 1 #pragma once #include <core/pch.hh> // inherit dependent includes from core.lib @@ -19,5 +17,3 @@ #include <spdlog/sinks/basic_file_sink.h> #include <spdlog/sinks/stdout_color_sinks.h> - -#endif // SHARED_PCH_HH diff --git a/game/shared/protocol.hh b/game/shared/protocol.hh index 0b6038b..21f9da9 100644 --- a/game/shared/protocol.hh +++ b/game/shared/protocol.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_PROTOCOL_HH -#define SHARED_PROTOCOL_HH 1 #pragma once #include "shared/world/chunk.hh" @@ -212,5 +210,3 @@ struct protocol::DimensionInfo final : public protocol::Base<0x0012> { std::string name; float gravity; }; - -#endif // SHARED_PROTOCOL_HH diff --git a/game/shared/splash.hh b/game/shared/splash.hh index 2857621..be80cd6 100644 --- a/game/shared/splash.hh +++ b/game/shared/splash.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_SPLASH_HH -#define SHARED_SPLASH_HH 1 #pragma once namespace splash @@ -8,5 +6,3 @@ void init_client(void); void init_server(void); std::string_view get(void); } // namespace splash - -#endif // SHARED_SPLASH_HH diff --git a/game/shared/types.hh b/game/shared/types.hh index 161ea46..792ed0f 100644 --- a/game/shared/types.hh +++ b/game/shared/types.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_TYPES_HH -#define SHARED_TYPES_HH 1 #pragma once using item_id = std::uint32_t; @@ -40,5 +38,3 @@ struct std::hash<chunk_pos_xz> final { return value; } }; - -#endif // SHARED_TYPES_HH diff --git a/game/shared/world/chunk.hh b/game/shared/world/chunk.hh index 4f70453..439694c 100644 --- a/game/shared/world/chunk.hh +++ b/game/shared/world/chunk.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_CHUNK_HH -#define SHARED_CHUNK_HH 1 #pragma once #include "shared/world/voxel_storage.hh" @@ -42,5 +40,3 @@ private: unsigned int m_biome; }; } // namespace world - -#endif // SHARED_CHUNK_HH diff --git a/game/shared/world/dimension.hh b/game/shared/world/dimension.hh index 3a383ac..8b6691d 100644 --- a/game/shared/world/dimension.hh +++ b/game/shared/world/dimension.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_DIMENSION_HH -#define SHARED_DIMENSION_HH 1 #pragma once #include "shared/const.hh" @@ -100,5 +98,3 @@ struct VoxelSetEvent final { Chunk* chunk; }; } // namespace world - -#endif // SHARED_DIMENSION_HH diff --git a/game/shared/world/feature.hh b/game/shared/world/feature.hh index e8465e3..5008223 100644 --- a/game/shared/world/feature.hh +++ b/game/shared/world/feature.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_FEATURE_HH -#define SHARED_FEATURE_HH 1 #pragma once #include "shared/types.hh" @@ -22,5 +20,3 @@ public: void place(const voxel_pos& vpos, const chunk_pos& cpos, VoxelStorage& voxels) const; }; } // namespace world - -#endif // SHARED_FEATURE_HH diff --git a/game/shared/world/item_registry.hh b/game/shared/world/item_registry.hh index 7508f2a..74bd60a 100644 --- a/game/shared/world/item_registry.hh +++ b/game/shared/world/item_registry.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_ITEM_REGISTRY_HH -#define SHARED_ITEM_REGISTRY_HH 1 #pragma once #include "core/resource/resource.hh" @@ -64,5 +62,3 @@ namespace world::item_registry { std::uint64_t calculate_checksum(void); } // namespace world::item_registry - -#endif // SHARED_ITEM_REGISTRY_HH diff --git a/game/shared/world/voxel_registry.hh b/game/shared/world/voxel_registry.hh index 9a7e206..6ab8c97 100644 --- a/game/shared/world/voxel_registry.hh +++ b/game/shared/world/voxel_registry.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_VOXEL_REGISTRY_HH -#define SHARED_VOXEL_REGISTRY_HH 1 #pragma once #include "shared/types.hh" @@ -149,5 +147,3 @@ namespace world::voxel_registry { std::uint64_t calculate_checksum(void); } // namespace world::voxel_registry - -#endif // SHARED_VOXEL_REGISTRY_HH diff --git a/game/shared/world/voxel_storage.hh b/game/shared/world/voxel_storage.hh index fdb6e33..ac7f03d 100644 --- a/game/shared/world/voxel_storage.hh +++ b/game/shared/world/voxel_storage.hh @@ -1,5 +1,3 @@ -#ifndef SHARED_VOXEL_STORAGE_HH -#define SHARED_VOXEL_STORAGE_HH 1 #pragma once #include "shared/const.hh" @@ -20,5 +18,3 @@ public: void deserialize(io::ReadBuffer& buffer); }; } // namespace world - -#endif // SHARED_VOXEL_STORAGE_HH |