From fac3be3a0b4d71ff3a839574ad72364ea71fbdfe Mon Sep 17 00:00:00 2001 From: Brues <5278969+brues-code@users.noreply.github.com> Date: Fri, 6 Nov 2026 11:34:27 -0600 Subject: [PATCH] refactor(lua): take integer enum and constants entries as arrays RegisterIntegerEnum and RegisterConstants took their entries with a count beside them, written as sizeof(t) / sizeof(t[0]), std::size, or a literal. They now take Game::ArrayRef, as RegisterFrameMethods does, so the count comes from the array's type. The documentation recorders RecordEnum and RecordConstants take the same view. All 34 call sites pass only the array. The six literal counts were checked against their arrays first: each was the full length, so every Enum.* and Constants.* table gets the same entries as before. Five files that included only for std::size drop it. --- src/Game.cpp | 13 ++++++------- src/Game.h | 6 +++--- src/action/Find.cpp | 4 +--- src/addons/Info.cpp | 6 +----- src/api/Documentation.cpp | 10 +++++----- src/api/Documentation.h | 6 +++--- src/autocomplete/Names.cpp | 10 ++++------ src/combat/Swing.cpp | 4 +--- src/console/Commands.cpp | 8 ++------ src/container/BagIndex.cpp | 3 +-- src/currency/MoneyConstants.cpp | 6 ++---- src/cursor/Changed.cpp | 4 +--- src/death/SelfResurrect.cpp | 5 ++--- src/duration/Object.cpp | 4 +--- src/duration/TextBinding.cpp | 5 ++--- src/editbox/InputContext.cpp | 3 +-- src/encoding/Base64.cpp | 3 +-- src/encoding/Compress.cpp | 3 +-- src/item/TypeInfo.cpp | 12 +++--------- src/model/DressUp.cpp | 4 +--- src/quest/Info.cpp | 10 +++------- src/sound/ItemSound.cpp | 4 +--- src/sound/VocalError.cpp | 4 +--- src/spell/ActivationOverlay.cpp | 4 +--- src/spell/Info.cpp | 8 ++++---- src/statusbar/Display.cpp | 9 ++++----- src/statusbar/Fill.cpp | 5 ++--- src/taxi/Map.cpp | 4 ++-- src/text/NumericFormatter.cpp | 4 +--- src/unit/Power.cpp | 5 +---- 30 files changed, 62 insertions(+), 114 deletions(-) diff --git a/src/Game.cpp b/src/Game.cpp index 4d7fa804..047c523d 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -437,17 +437,16 @@ static bool SetIntegerTable(const char *parent, const char *sub, return true; } -void RegisterIntegerEnum(const char *parent, const char *sub, - const EnumIntegerEntry *entries, int count, +void RegisterIntegerEnum(const char *parent, const char *sub, ArrayRef entries, const char *docSystem) { - if (SetIntegerTable(parent, sub, entries, count)) - Api::Documentation::RecordEnum(parent, sub, entries, count, docSystem); + if (SetIntegerTable(parent, sub, entries.data, entries.count)) + Api::Documentation::RecordEnum(parent, sub, entries, docSystem); } -void RegisterConstants(const char *sub, const EnumIntegerEntry *entries, int count, +void RegisterConstants(const char *sub, ArrayRef entries, const char *docSystem) { - if (SetIntegerTable("Constants", sub, entries, count)) - Api::Documentation::RecordConstants(sub, entries, count, docSystem); + if (SetIntegerTable("Constants", sub, entries.data, entries.count)) + Api::Documentation::RecordConstants(sub, entries, docSystem); } void SetFieldNumber(void *L, const char *key, double value) { diff --git a/src/Game.h b/src/Game.h index 2511bc44..e49ba365 100644 --- a/src/Game.h +++ b/src/Game.h @@ -568,14 +568,14 @@ struct EnumIntegerEntry { // `Enum.AddOnSecurityStatus = { Secure=0, Insecure=1, ... }` shapes. // `docSystem` is the documentation System the enumeration belongs to // ("SpellBook", "Item", …); the entries themselves are the documentation. -void RegisterIntegerEnum(const char *parent, const char *sub, - const EnumIntegerEntry *entries, int count, +// `entries` is a file-scope array. +void RegisterIntegerEnum(const char *parent, const char *sub, ArrayRef entries, const char *docSystem = nullptr); // Registers `Constants[sub] = { entries }`, Blizzard's engine constant // tables (`Constants.MoneyFormattingConstants`). Documented as a "Constants" // table of `docSystem`. -void RegisterConstants(const char *sub, const EnumIntegerEntry *entries, int count, +void RegisterConstants(const char *sub, ArrayRef entries, const char *docSystem); // Set `t[key] = value` on the table currently at stack[-1] (the most diff --git a/src/action/Find.cpp b/src/action/Find.cpp index 88bb1ff1..f718e684 100644 --- a/src/action/Find.cpp +++ b/src/action/Find.cpp @@ -170,9 +170,7 @@ static void RegisterLuaFunctions() { &Script_HasSpellActionButtons, &kHasSpellActionButtons); Game::Lua::RegisterTableFunction("C_ActionBar", "IsOnBarOrSpecialBar", &Script_IsOnBarOrSpecialBar, &kIsOnBarOrSpecialBar); - Game::Lua::RegisterIntegerEnum("Enum", "ActionBarSet", kActionBarSet, - static_cast(sizeof(kActionBarSet) / sizeof(kActionBarSet[0])), - "ActionBar"); + Game::Lua::RegisterIntegerEnum("Enum", "ActionBarSet", kActionBarSet, "ActionBar"); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/addons/Info.cpp b/src/addons/Info.cpp index d3c1516b..f465a727 100644 --- a/src/addons/Info.cpp +++ b/src/addons/Info.cpp @@ -408,11 +408,7 @@ static void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_AddOns", "GetAddOnInterfaceVersion", &Script_GetAddOnInterfaceVersion, &kGetAddOnInterfaceVersion); - Game::Lua::RegisterIntegerEnum( - "Enum", "AddOnSecurityStatus", - kAddOnSecurityStatusEntries, - sizeof(kAddOnSecurityStatusEntries) / - sizeof(kAddOnSecurityStatusEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "AddOnSecurityStatus", kAddOnSecurityStatusEntries); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/api/Documentation.cpp b/src/api/Documentation.cpp index f29db728..cb51d53d 100644 --- a/src/api/Documentation.cpp +++ b/src/api/Documentation.cpp @@ -725,14 +725,14 @@ void RecordValueTable(Kind kind, const char *parent, const char *sub, } // namespace -void RecordEnum(const char *parent, const char *sub, const Game::Lua::EnumIntegerEntry *entries, - int count, const char *system) { - RecordValueTable(KIND_ENUM, parent, sub, entries, count, system); +void RecordEnum(const char *parent, const char *sub, + Game::ArrayRef entries, const char *system) { + RecordValueTable(KIND_ENUM, parent, sub, entries.data, entries.count, system); } -void RecordConstants(const char *sub, const Game::Lua::EnumIntegerEntry *entries, int count, +void RecordConstants(const char *sub, Game::ArrayRef entries, const char *system) { - RecordValueTable(KIND_CONSTANTS, "Constants", sub, entries, count, system); + RecordValueTable(KIND_CONSTANTS, "Constants", sub, entries.data, entries.count, system); } } // namespace Api::Documentation diff --git a/src/api/Documentation.h b/src/api/Documentation.h index dffd05b1..84819dc3 100644 --- a/src/api/Documentation.h +++ b/src/api/Documentation.h @@ -38,9 +38,9 @@ void RecordFrameMethods(const void *registry, // Names the widget system of a method hash this DLL owns (a frame class it // adds), alongside the engine registries the exporter already knows. void NameWidgetSystem(const void *registry, const char *system); -void RecordEnum(const char *parent, const char *sub, const Game::Lua::EnumIntegerEntry *entries, - int count, const char *system); -void RecordConstants(const char *sub, const Game::Lua::EnumIntegerEntry *entries, int count, +void RecordEnum(const char *parent, const char *sub, + Game::ArrayRef entries, const char *system); +void RecordConstants(const char *sub, Game::ArrayRef entries, const char *system); } // namespace Api::Documentation diff --git a/src/autocomplete/Names.cpp b/src/autocomplete/Names.cpp index 72ba1356..051ea77c 100644 --- a/src/autocomplete/Names.cpp +++ b/src/autocomplete/Names.cpp @@ -457,12 +457,10 @@ static void RegisterLuaFunctions() { &Script_GetAutoCompleteResults, &kGetAutoCompleteResults); Game::Lua::RegisterTableFunction("C_AutoComplete", "IsRecognizedName", &Script_IsRecognizedName, &kIsRecognizedName); - Game::Lua::RegisterIntegerEnum("Enum", "AutoCompleteEntryFlag", kEntryFlagEntries, - sizeof(kEntryFlagEntries) / sizeof(kEntryFlagEntries[0]), - "AutoComplete"); - Game::Lua::RegisterIntegerEnum("Enum", "AutoCompletePriority", kPriorityEntries, - sizeof(kPriorityEntries) / sizeof(kPriorityEntries[0]), - "AutoComplete"); + Game::Lua::RegisterIntegerEnum( + "Enum", "AutoCompleteEntryFlag", kEntryFlagEntries, "AutoComplete"); + Game::Lua::RegisterIntegerEnum( + "Enum", "AutoCompletePriority", kPriorityEntries, "AutoComplete"); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/combat/Swing.cpp b/src/combat/Swing.cpp index 83922cbb..6aa0471d 100644 --- a/src/combat/Swing.cpp +++ b/src/combat/Swing.cpp @@ -497,9 +497,7 @@ const Game::Lua::EnumIntegerEntry kSwingTypeEntries[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterIntegerEnum( - "Enum", "PlayerSwingType", kSwingTypeEntries, - sizeof(kSwingTypeEntries) / sizeof(kSwingTypeEntries[0]), "SwingTimer"); + Game::Lua::RegisterIntegerEnum("Enum", "PlayerSwingType", kSwingTypeEntries, "SwingTimer"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/console/Commands.cpp b/src/console/Commands.cpp index b9c8888f..18158295 100644 --- a/src/console/Commands.cpp +++ b/src/console/Commands.cpp @@ -145,12 +145,8 @@ void RegisterLuaFunctions() { Game::Lua::RegisterGlobalFunction("ConsoleGetAllCommands", &Script_GetAllCommands); Game::Lua::RegisterGlobalFunction("ConsolePrintAllMatchingCommands", &Script_ConsolePrintAllMatchingCommands); - Game::Lua::RegisterIntegerEnum("Enum", "ConsoleCommandType", kCommandTypeEntries, - sizeof(kCommandTypeEntries) / - sizeof(kCommandTypeEntries[0])); - Game::Lua::RegisterIntegerEnum("Enum", "ConsoleCategory", kCategoryEntries, - sizeof(kCategoryEntries) / - sizeof(kCategoryEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "ConsoleCommandType", kCommandTypeEntries); + Game::Lua::RegisterIntegerEnum("Enum", "ConsoleCategory", kCategoryEntries); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/container/BagIndex.cpp b/src/container/BagIndex.cpp index 88b28f9d..88945f45 100644 --- a/src/container/BagIndex.cpp +++ b/src/container/BagIndex.cpp @@ -42,8 +42,7 @@ const Game::Lua::EnumIntegerEntry kEntries[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterIntegerEnum("Enum", "BagIndex", kEntries, - sizeof(kEntries) / sizeof(kEntries[0]), "BagIndexConstants"); + Game::Lua::RegisterIntegerEnum("Enum", "BagIndex", kEntries, "BagIndexConstants"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/currency/MoneyConstants.cpp b/src/currency/MoneyConstants.cpp index eae470eb..0a3e7833 100644 --- a/src/currency/MoneyConstants.cpp +++ b/src/currency/MoneyConstants.cpp @@ -27,10 +27,8 @@ const Game::Lua::EnumIntegerEntry kMoneyFormattingConstants[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterConstants("MoneyFormattingConstants", kMoneyFormattingConstants, - sizeof(kMoneyFormattingConstants) / - sizeof(kMoneyFormattingConstants[0]), - "MoneyConstants"); + Game::Lua::RegisterConstants( + "MoneyFormattingConstants", kMoneyFormattingConstants, "MoneyConstants"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/cursor/Changed.cpp b/src/cursor/Changed.cpp index b1878e2d..4ec4d188 100644 --- a/src/cursor/Changed.cpp +++ b/src/cursor/Changed.cpp @@ -119,9 +119,7 @@ void OnTick() { const Tick::WorldTick::AutoSubscribe _tick{&OnTick}; void RegisterLuaFunctions() { - Game::Lua::RegisterIntegerEnum( - "Enum", "UICursorType", kCursorTypeEntries, - sizeof(kCursorTypeEntries) / sizeof(kCursorTypeEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "UICursorType", kCursorTypeEntries); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/death/SelfResurrect.cpp b/src/death/SelfResurrect.cpp index 5f1be0d1..87c8ab8d 100644 --- a/src/death/SelfResurrect.cpp +++ b/src/death/SelfResurrect.cpp @@ -206,9 +206,8 @@ void RegisterLuaFunctions() { &Script_GetSelfResurrectOptions, &kGetSelfResurrectOptions); Game::Lua::RegisterTableFunction("C_DeathInfo", "UseSelfResurrectOption", &Script_UseSelfResurrectOption, &kUseSelfResurrectOption); - Game::Lua::RegisterIntegerEnum("Enum", "SelfResurrectOptionType", kOptionTypeEntries, - sizeof(kOptionTypeEntries) / sizeof(kOptionTypeEntries[0]), - "DeathInfo"); + Game::Lua::RegisterIntegerEnum( + "Enum", "SelfResurrectOptionType", kOptionTypeEntries, "DeathInfo"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/duration/Object.cpp b/src/duration/Object.cpp index bea862e8..e031e306 100644 --- a/src/duration/Object.cpp +++ b/src/duration/Object.cpp @@ -47,7 +47,6 @@ #include #include -#include namespace Duration::Object { @@ -451,8 +450,7 @@ const Game::Doc::Function kCreateDuration{"Creates a zero duration object that c void RegisterLuaFunctions() { CreateMetatable(Lua::State()); Lua::RegisterTableFunction("C_DurationUtil", "CreateDuration", &Script_CreateDuration, &kCreateDuration); - Lua::RegisterIntegerEnum("Enum", "DurationTimeModifier", kModifiers, static_cast(std::size(kModifiers)), - "LuaDurationObjectShared"); + Lua::RegisterIntegerEnum("Enum", "DurationTimeModifier", kModifiers, "LuaDurationObjectShared"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/duration/TextBinding.cpp b/src/duration/TextBinding.cpp index 98680c5f..72b0713d 100644 --- a/src/duration/TextBinding.cpp +++ b/src/duration/TextBinding.cpp @@ -58,7 +58,6 @@ #include #include #include -#include #include #include @@ -780,8 +779,8 @@ void RegisterLuaFunctions() { CreateMetatable(Lua::State()); Lua::RegisterTableFunction("C_DurationUtil", "CreateDurationTextBinding", &Script_CreateDurationTextBinding, &kCreateDurationTextBinding); - Lua::RegisterIntegerEnum("Enum", "DurationTextBindingProperty", kProperties, - static_cast(std::size(kProperties)), "DurationTextBindingShared"); + Lua::RegisterIntegerEnum( + "Enum", "DurationTextBindingProperty", kProperties, "DurationTextBindingShared"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/editbox/InputContext.cpp b/src/editbox/InputContext.cpp index 0d052652..6abcd58a 100644 --- a/src/editbox/InputContext.cpp +++ b/src/editbox/InputContext.cpp @@ -30,8 +30,7 @@ const Game::Lua::EnumIntegerEntry kEntries[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterIntegerEnum("Enum", "InputContext", kEntries, - sizeof(kEntries) / sizeof(kEntries[0]), "InputConstants"); + Game::Lua::RegisterIntegerEnum("Enum", "InputContext", kEntries, "InputConstants"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/encoding/Base64.cpp b/src/encoding/Base64.cpp index dbaa3fbf..b08b2074 100644 --- a/src/encoding/Base64.cpp +++ b/src/encoding/Base64.cpp @@ -217,8 +217,7 @@ void Register() { {"Standard", static_cast(Variant::Standard)}, {"UrlSafe", static_cast(Variant::UrlSafe)}, }; - Game::Lua::RegisterIntegerEnum("Enum", "Base64Variant", - kBase64Variant, 2); + Game::Lua::RegisterIntegerEnum("Enum", "Base64Variant", kBase64Variant); } } // namespace diff --git a/src/encoding/Compress.cpp b/src/encoding/Compress.cpp index 6a54b20d..755965c5 100644 --- a/src/encoding/Compress.cpp +++ b/src/encoding/Compress.cpp @@ -305,8 +305,7 @@ void Register() { {"Zlib", static_cast(Method::Zlib)}, {"Gzip", static_cast(Method::Gzip)}, }; - Game::Lua::RegisterIntegerEnum("Enum", "CompressionMethod", - kCompressionMethod, 3); + Game::Lua::RegisterIntegerEnum("Enum", "CompressionMethod", kCompressionMethod); } } // namespace diff --git a/src/item/TypeInfo.cpp b/src/item/TypeInfo.cpp index 06a4775e..e21555f8 100644 --- a/src/item/TypeInfo.cpp +++ b/src/item/TypeInfo.cpp @@ -309,15 +309,9 @@ void RegisterLuaFunctions() { &Script_GetItemInventorySlotKey); Game::Lua::RegisterTableFunction("C_Item", "GetItemInventorySlotInfo", &Script_GetItemInventorySlotInfo); - Game::Lua::RegisterIntegerEnum( - "Enum", "InventoryType", kInventoryTypeEntries, - sizeof(kInventoryTypeEntries) / sizeof(kInventoryTypeEntries[0])); - Game::Lua::RegisterIntegerEnum( - "Enum", "ItemClass", kItemClassEntries, - sizeof(kItemClassEntries) / sizeof(kItemClassEntries[0])); - Game::Lua::RegisterIntegerEnum( - "Enum", "ItemQuality", kItemQualityEntries, - sizeof(kItemQualityEntries) / sizeof(kItemQualityEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "InventoryType", kInventoryTypeEntries); + Game::Lua::RegisterIntegerEnum("Enum", "ItemClass", kItemClassEntries); + Game::Lua::RegisterIntegerEnum("Enum", "ItemQuality", kItemQualityEntries); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/DressUp.cpp b/src/model/DressUp.cpp index 49944e70..21f5d4a1 100644 --- a/src/model/DressUp.cpp +++ b/src/model/DressUp.cpp @@ -641,9 +641,7 @@ void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_DRESSUPMODEL_METHOD_REGISTRY), g_methods, g_methodDocs); - Game::Lua::RegisterIntegerEnum( - "Enum", "ItemTryOnReason", kItemTryOnReason, - static_cast(sizeof(kItemTryOnReason) / sizeof(kItemTryOnReason[0])), "UIModelInfo"); + Game::Lua::RegisterIntegerEnum("Enum", "ItemTryOnReason", kItemTryOnReason, "UIModelInfo"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/quest/Info.cpp b/src/quest/Info.cpp index 72fb372a..48e86f86 100644 --- a/src/quest/Info.cpp +++ b/src/quest/Info.cpp @@ -15,7 +15,6 @@ #include "Offsets.h" #include -#include // `C_QuestLog.GetInfo(questLogIndex)` and `C_QuestLog.GetQuestLogTitle( // questLogIndex)` — the modern table and 17-tuple shapes of one quest-log row. @@ -235,12 +234,9 @@ static void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_QuestLog", "GetInfo", &Script_GetInfo, &kGetInfo); Game::Lua::RegisterTableFunction("C_QuestLog", "GetQuestLogTitle", &Script_GetQuestLogTitle, &kGetQuestLogTitle); - Game::Lua::RegisterIntegerEnum("Enum", "QuestFrequency", kQuestFrequencyEntries, - static_cast(std::size(kQuestFrequencyEntries)), - "QuestLog"); - Game::Lua::RegisterIntegerEnum("Enum", "QuestClassification", kQuestClassificationEntries, - static_cast(std::size(kQuestClassificationEntries)), - "QuestLog"); + Game::Lua::RegisterIntegerEnum("Enum", "QuestFrequency", kQuestFrequencyEntries, "QuestLog"); + Game::Lua::RegisterIntegerEnum( + "Enum", "QuestClassification", kQuestClassificationEntries, "QuestLog"); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/sound/ItemSound.cpp b/src/sound/ItemSound.cpp index aa69fe4f..0d6eb5fb 100644 --- a/src/sound/ItemSound.cpp +++ b/src/sound/ItemSound.cpp @@ -116,9 +116,7 @@ int __fastcall Script_PlayItemSound(void *L) { void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_Sound", "PlayItemSound", &Script_PlayItemSound); - Game::Lua::RegisterIntegerEnum("Enum", "ItemSoundType", kItemSoundTypeEntries, - sizeof(kItemSoundTypeEntries) / - sizeof(kItemSoundTypeEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "ItemSoundType", kItemSoundTypeEntries); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/sound/VocalError.cpp b/src/sound/VocalError.cpp index c62700ce..8e12b7dd 100644 --- a/src/sound/VocalError.cpp +++ b/src/sound/VocalError.cpp @@ -174,9 +174,7 @@ int __fastcall Script_PlayVocalErrorSound(void *L) { void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_Sound", "PlayVocalErrorSound", &Script_PlayVocalErrorSound); - Game::Lua::RegisterIntegerEnum("Enum", "Vocalerrorsounds", kVocalErrorEntries, - sizeof(kVocalErrorEntries) / - sizeof(kVocalErrorEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "Vocalerrorsounds", kVocalErrorEntries); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/spell/ActivationOverlay.cpp b/src/spell/ActivationOverlay.cpp index a77a3b4e..2cfd0d30 100644 --- a/src/spell/ActivationOverlay.cpp +++ b/src/spell/ActivationOverlay.cpp @@ -387,9 +387,7 @@ static void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_SpellActivationOverlay", "IsSpellOverlayed", &Script_IsSpellOverlayed, &kIsSpellOverlayed); Game::Lua::RegisterIntegerEnum( - "Enum", "ScreenLocationType", kScreenLocationEntries, - sizeof(kScreenLocationEntries) / sizeof(kScreenLocationEntries[0]), - "ScreenLocationConstants"); + "Enum", "ScreenLocationType", kScreenLocationEntries, "ScreenLocationConstants"); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/spell/Info.cpp b/src/spell/Info.cpp index c99f2401..c3de5515 100644 --- a/src/spell/Info.cpp +++ b/src/spell/Info.cpp @@ -1036,10 +1036,10 @@ static void RegisterLuaFunctions() { Game::Lua::RegisterTableFunction("C_SpellBook", "ContainsAnyDisenchantSpell", &Script_ContainsAnyDisenchantSpell, &kContainsAnyDisenchantSpell); - Game::Lua::RegisterIntegerEnum("Enum", "SpellBookSpellBank", - kSpellBookSpellBankEntries, 2, "SpellBook"); - Game::Lua::RegisterIntegerEnum("Enum", "SpellBookItemType", - kSpellBookItemTypeEntries, 5, "SpellBook"); + Game::Lua::RegisterIntegerEnum( + "Enum", "SpellBookSpellBank", kSpellBookSpellBankEntries, "SpellBook"); + Game::Lua::RegisterIntegerEnum( + "Enum", "SpellBookItemType", kSpellBookItemTypeEntries, "SpellBook"); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/statusbar/Display.cpp b/src/statusbar/Display.cpp index 78aa9260..021beb0f 100644 --- a/src/statusbar/Display.cpp +++ b/src/statusbar/Display.cpp @@ -82,7 +82,6 @@ #include #include -#include #include namespace StatusBar::Display { @@ -360,10 +359,10 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, g_methodDocs); - Lua::RegisterIntegerEnum("Enum", "StatusBarTimerDirection", kDirectionEntries, - static_cast(std::size(kDirectionEntries)), "SimpleStatusBarConstants"); - Lua::RegisterIntegerEnum("Enum", "StatusBarInterpolation", kInterpolationEntries, - static_cast(std::size(kInterpolationEntries)), "SimpleStatusBarConstants"); + Lua::RegisterIntegerEnum( + "Enum", "StatusBarTimerDirection", kDirectionEntries, "SimpleStatusBarConstants"); + Lua::RegisterIntegerEnum( + "Enum", "StatusBarInterpolation", kInterpolationEntries, "SimpleStatusBarConstants"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/statusbar/Fill.cpp b/src/statusbar/Fill.cpp index a76e1acc..0d1e8ff1 100644 --- a/src/statusbar/Fill.cpp +++ b/src/statusbar/Fill.cpp @@ -383,9 +383,8 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, g_methodDocs); - Game::Lua::RegisterIntegerEnum("Enum", "StatusBarFillStyle", kFillStyleEntries, - static_cast(sizeof(kFillStyleEntries) / sizeof(kFillStyleEntries[0])), - "SimpleStatusBarConstants"); + Game::Lua::RegisterIntegerEnum( + "Enum", "StatusBarFillStyle", kFillStyleEntries, "SimpleStatusBarConstants"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/taxi/Map.cpp b/src/taxi/Map.cpp index ccf2fe5a..1c3e46db 100644 --- a/src/taxi/Map.cpp +++ b/src/taxi/Map.cpp @@ -434,14 +434,14 @@ void RegisterLuaFunctions() { {"Horde", FACTION_HORDE}, {"Alliance", FACTION_ALLIANCE}, }; - Game::Lua::RegisterIntegerEnum("Enum", "FlightPathFaction", kFaction, 3); + Game::Lua::RegisterIntegerEnum("Enum", "FlightPathFaction", kFaction); static const Game::Lua::EnumIntegerEntry kState[] = { {"Current", STATE_CURRENT}, {"Reachable", STATE_REACHABLE}, {"Unreachable", STATE_UNREACHABLE}, }; - Game::Lua::RegisterIntegerEnum("Enum", "FlightPathState", kState, 3); + Game::Lua::RegisterIntegerEnum("Enum", "FlightPathState", kState); Game::Lua::RegisterTableFunction("C_TaxiMap", "GetTaxiNodesForMap", &Script_GetTaxiNodesForMap); diff --git a/src/text/NumericFormatter.cpp b/src/text/NumericFormatter.cpp index 11ac2918..462c6466 100644 --- a/src/text/NumericFormatter.cpp +++ b/src/text/NumericFormatter.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include @@ -521,8 +520,7 @@ void RegisterLuaFunctions() { CreateMetatable(Lua::State()); Lua::RegisterTableFunction("C_StringUtil", "CreateNumericRuleFormatter", &Script_CreateNumericRuleFormatter, &kCreateNumericRuleFormatter); - Lua::RegisterIntegerEnum("Enum", "NumericRuleFormatRounding", kRounding, - static_cast(std::size(kRounding)), "StringUtil"); + Lua::RegisterIntegerEnum("Enum", "NumericRuleFormatRounding", kRounding, "StringUtil"); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/unit/Power.cpp b/src/unit/Power.cpp index b5f43d5e..a802ee01 100644 --- a/src/unit/Power.cpp +++ b/src/unit/Power.cpp @@ -286,10 +286,7 @@ static void RegisterLuaFunctions() { Game::Lua::RegisterGlobalFunction("UnitPowerMax", &Script_UnitPowerMax); Game::Lua::RegisterGlobalFunction("UnitPowerMissing", &Script_UnitPowerMissing); Game::Lua::RegisterGlobalFunction("UnitPowerType", &Script_UnitPowerType); - Game::Lua::RegisterIntegerEnum( - "Enum", "PowerType", - kPowerTypeEntries, - sizeof(kPowerTypeEntries) / sizeof(kPowerTypeEntries[0])); + Game::Lua::RegisterIntegerEnum("Enum", "PowerType", kPowerTypeEntries); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions};