diff --git a/include/helpers/alignment.hpp b/include/helpers/alignment.hpp index 7ce0ead69a..60fee353e0 100644 --- a/include/helpers/alignment.hpp +++ b/include/helpers/alignment.hpp @@ -1,6 +1,6 @@ #pragma once -namespace dusk::helpers::alignment { +namespace dusk::helpers { /** * Read data from an address that may not be aligned properly. diff --git a/mods/luau_runtime/src/lua_bridge_helpers.hpp b/mods/luau_runtime/src/lua_bridge_helpers.hpp index 579b0bd9c9..bc42b653c6 100644 --- a/mods/luau_runtime/src/lua_bridge_helpers.hpp +++ b/mods/luau_runtime/src/lua_bridge_helpers.hpp @@ -14,12 +14,12 @@ */ #define DEFINE_STRING_ENUM(type, names) \ Result Stack::push(lua_State* L, type value) { \ - return Stack::push(L, ::luau_runtime::lua_helpers::enum_value_to_str(L, value, names)); \ + return Stack::push(L, ::luau_runtime::enum_value_to_str(L, value, names)); \ } \ \ TypeResult Stack::get(lua_State* L, int index) { \ const char* str = lua_tolstring(L, index, nullptr); \ - return ::luau_runtime::lua_helpers::enum_str_to_value(L, str, names); \ + return ::luau_runtime::enum_str_to_value(L, str, names); \ } /** diff --git a/mods/luau_runtime/src/lua_helpers.cpp b/mods/luau_runtime/src/lua_helpers.cpp index 4b6c6aa09a..f99322937b 100644 --- a/mods/luau_runtime/src/lua_helpers.cpp +++ b/mods/luau_runtime/src/lua_helpers.cpp @@ -2,7 +2,7 @@ #include -namespace luau_runtime::lua_helpers { +namespace luau_runtime { bool get_optional_bool(lua_State* state, int table, const char* field, bool fallback) { lua_getfield(state, table, field); diff --git a/mods/luau_runtime/src/lua_helpers.hpp b/mods/luau_runtime/src/lua_helpers.hpp index 3db3e73831..21b5072c07 100644 --- a/mods/luau_runtime/src/lua_helpers.hpp +++ b/mods/luau_runtime/src/lua_helpers.hpp @@ -10,7 +10,7 @@ * Helper functions for API bound between Lua <-> C++ */ -namespace luau_runtime::lua_helpers { +namespace luau_runtime { bool get_optional_bool(lua_State* state, int table, const char* field, bool fallback); double get_optional_number(lua_State* state, int table, const char* field, double fallback); diff --git a/mods/luau_runtime/src/services/audio_res/bst.cpp b/mods/luau_runtime/src/services/audio_res/bst.cpp index b41fcb37e3..87a23b2039 100644 --- a/mods/luau_runtime/src/services/audio_res/bst.cpp +++ b/mods/luau_runtime/src/services/audio_res/bst.cpp @@ -100,7 +100,7 @@ namespace { using namespace std::string_view_literals; -constexpr luau_runtime::lua_helpers::EnumName kSoundEffectCategoryNames[] = { +constexpr luau_runtime::EnumName kSoundEffectCategoryNames[] = { // clang-format off { SE_CATEGORY_SYSTEM_SE, "system_se"sv }, { SE_CATEGORY_PLAYER_VOICE, "player_voice"sv }, @@ -115,7 +115,7 @@ constexpr luau_runtime::lua_helpers::EnumName kSoundEffectC // clang-format on }; -constexpr luau_runtime::lua_helpers::EnumName kStreamPanNames[] = { +constexpr luau_runtime::EnumName kStreamPanNames[] = { // clang-format off { STREAM_PAN_CENTER, "center"sv }, { STREAM_PAN_LEFT, "left"sv }, diff --git a/mods/luau_runtime/src/services/audio_res/wsys.cpp b/mods/luau_runtime/src/services/audio_res/wsys.cpp index eb55feae78..36c6c988aa 100644 --- a/mods/luau_runtime/src/services/audio_res/wsys.cpp +++ b/mods/luau_runtime/src/services/audio_res/wsys.cpp @@ -117,14 +117,14 @@ namespace { using namespace std::string_view_literals; -constexpr luau_runtime::lua_helpers::EnumName kWaveFormatNames[] = { +constexpr luau_runtime::EnumName kWaveFormatNames[] = { { AUDIO_WAVE_FORMAT_ADPCM4, "adpcm4"sv }, { AUDIO_WAVE_FORMAT_ADPCM2, "adpcm2"sv }, { AUDIO_WAVE_FORMAT_PCM8, "pcm8"sv }, { AUDIO_WAVE_FORMAT_PCM16, "pcm16"sv }, }; -constexpr luau_runtime::lua_helpers::EnumName kWaveBankNames[] = { +constexpr luau_runtime::EnumName kWaveBankNames[] = { { AUDIO_WAVE_BANK_SOUND_EFFECTS, "sound_effects"sv } , { AUDIO_WAVE_BANK_MUSIC_SAMPLES, "music_samples"sv } , }; diff --git a/mods/luau_runtime/src/services/bindings.cpp b/mods/luau_runtime/src/services/bindings.cpp index 479e8cfc63..af58b446a3 100644 --- a/mods/luau_runtime/src/services/bindings.cpp +++ b/mods/luau_runtime/src/services/bindings.cpp @@ -8,8 +8,6 @@ namespace luau_runtime::services { namespace { -using namespace luau_runtime::lua_helpers; - constexpr char kOverlayMetatable[] = "dusklight.overlay_handle"; constexpr char kTextureMetatable[] = "dusklight.texture_handle"; diff --git a/mods/luau_runtime/src/services/config.cpp b/mods/luau_runtime/src/services/config.cpp index ef215b1824..5bce363a9e 100644 --- a/mods/luau_runtime/src/services/config.cpp +++ b/mods/luau_runtime/src/services/config.cpp @@ -9,8 +9,6 @@ namespace luau_runtime::services { namespace { -using namespace luau_runtime::lua_helpers; - constexpr char kConfigVarMetatable[] = "dusklight.config_var"; constexpr char kConfigSubscriptionMetatable[] = "dusklight.config_subscription"; diff --git a/mods/luau_runtime/src/services/ui.cpp b/mods/luau_runtime/src/services/ui.cpp index 07e377d3d1..e73da576aa 100644 --- a/mods/luau_runtime/src/services/ui.cpp +++ b/mods/luau_runtime/src/services/ui.cpp @@ -12,7 +12,6 @@ namespace luau_runtime::services { namespace { -using namespace luau_runtime::lua_helpers; using namespace std::string_view_literals; constexpr char kUiWindowMetatable[] = "dusklight.ui_window"; diff --git a/src/dusk/mods/svc/audio_res/wave.cpp b/src/dusk/mods/svc/audio_res/wave.cpp index 83f991dcd4..cb1f74752b 100644 --- a/src/dusk/mods/svc/audio_res/wave.cpp +++ b/src/dusk/mods/svc/audio_res/wave.cpp @@ -40,7 +40,7 @@ bool check_four_cc(char const (&field)[4], char const (&expected)[5]) { namespace dusk::mods::svc::audio_res::wsys { ModResult load_wav(LoadedMod const& mod, RuntimeWaveReplacementSlot& slot, std::span fileData) { - using namespace helpers::alignment; + using namespace helpers; if (fileData.size() < sizeof(RiffChunk)) { return MOD_UNSUPPORTED;