From b49c10777887f6d45ef284fe67e46dbdd1ad2d3d Mon Sep 17 00:00:00 2001 From: Brues <5278969+brues-code@users.noreply.github.com> Date: Fri, 6 Nov 2026 11:27:22 -0600 Subject: [PATCH] refactor(lua): take frame-method tables as arrays, not pointer and count Every RegisterFrameMethods call passed its method table and doc table with a count beside each: sizeof(t) / sizeof(t[0]), std::size, or a literal. The literals had to be kept in step with the tables by hand. Game::ArrayRef is a view over a file-scope array that takes the count from the array's type, the way Doc::FieldList already did for a function's arguments and returns. FieldList is now ArrayRef, Doc::MethodList is ArrayRef, and RegisterFrameMethods takes (context, methods, docs). The table and count still go to the engine's frame-method iterator (FUN_REGISTER_FRAME_METHODS) unchanged, and to the documentation recorder. All 84 call sites pass only the arrays. The 16 literal counts were checked against their tables first: each was the full length, so every registry gets the same methods as before. --- src/Game.cpp | 8 ++--- src/Game.h | 31 ++++++++++++------- src/animation/Region.cpp | 5 ++- src/api/Documentation.cpp | 9 ++++-- src/api/Documentation.h | 5 +-- src/editbox/CountInvisibleLetters.cpp | 4 +-- src/editbox/Enable.cpp | 4 +-- src/editbox/Ime.cpp | 4 +-- src/editbox/Methods.cpp | 4 +-- src/equipmentset/Tooltip.cpp | 4 +-- src/fontstring/FontHeight.cpp | 9 +++--- src/fontstring/IndentedWordWrap.cpp | 4 +-- src/fontstring/Metrics.cpp | 4 +-- src/fontstring/WordWrap.cpp | 4 +-- src/frame/AlphaGradient.cpp | 4 +-- src/frame/Attributes.cpp | 4 +-- src/frame/BoundsRect.cpp | 4 +-- src/frame/ClampRectInsets.cpp | 4 +-- src/frame/ClickMask.cpp | 3 +- src/frame/ClipChildren.cpp | 4 +-- src/frame/Cooldown.cpp | 4 +-- src/frame/DebugName.cpp | 4 +-- src/frame/Defaults.cpp | 5 ++- src/frame/DesaturateHierarchy.cpp | 4 +-- src/frame/DontSavePosition.cpp | 4 +-- src/frame/FormattedText.cpp | 9 +++--- src/frame/GetPointGuard.cpp | 3 +- src/frame/HyperlinksEnabled.cpp | 3 +- src/frame/KeyboardPropagation.cpp | 4 +-- src/frame/Modern.cpp | 21 +++---------- src/frame/MotionFocus.cpp | 5 ++- src/frame/MotionScriptsWhileDisabled.cpp | 4 +-- src/frame/MouseInput.cpp | 5 ++- src/frame/MouseRegistration.cpp | 4 +-- src/frame/Points.cpp | 4 +-- src/frame/Protection.cpp | 7 ++--- src/frame/SetEnabled.cpp | 4 +-- src/frame/SourceLocation.cpp | 4 +-- src/frame/UnitEvent.cpp | 3 +- src/frame/UseParentLevel.cpp | 4 +-- src/gameobject/Tooltip.cpp | 4 +-- src/item/Tooltip.cpp | 4 +-- src/model/Animation.cpp | 3 +- src/model/Camera.cpp | 3 +- src/model/DisplayInfo.cpp | 3 +- src/model/DressUp.cpp | 3 +- src/model/Glow.cpp | 4 +-- src/model/ItemDisplay.cpp | 3 +- src/model/KeepOnHide.cpp | 3 +- src/model/Rotation.cpp | 4 +-- src/model/Subject.cpp | 3 +- src/model/VisualKit.cpp | 3 +- src/scrollingmessageframe/DeferredLayout.cpp | 5 +-- .../DisplayRefreshed.cpp | 5 +-- src/scrollingmessageframe/InsertMode.cpp | 5 +-- src/scrollingmessageframe/MessageInfo.cpp | 5 +-- src/scrollingmessageframe/Scroll.cpp | 5 +-- src/slider/Enable.cpp | 4 +-- src/spell/Tooltip.cpp | 7 ++--- src/statusbar/BarTexture.cpp | 4 +-- src/statusbar/Display.cpp | 3 +- src/statusbar/Fill.cpp | 4 +-- src/talent/Tooltip.cpp | 4 +-- src/texture/Atlas.cpp | 3 +- src/texture/ColorTexture.cpp | 3 +- src/texture/Desaturation.cpp | 3 +- src/texture/Mask.cpp | 6 ++-- src/texture/SpriteSheet.cpp | 3 +- src/texture/Tile.cpp | 4 +-- src/texture/Transform.cpp | 6 ++-- src/texture/Wrap.cpp | 4 +-- src/tooltip/AddTexture.cpp | 3 +- src/tooltip/CompareItem.cpp | 4 +-- src/tooltip/FrameStack.cpp | 3 +- src/tooltip/Layout.cpp | 3 +- src/tooltip/Owner.cpp | 4 +-- src/tooltip/SetAction.cpp | 3 +- src/totem/Tracker.cpp | 4 +-- src/unit/Tooltip.cpp | 6 ++-- 79 files changed, 149 insertions(+), 231 deletions(-) diff --git a/src/Game.cpp b/src/Game.cpp index 531464b2..4d7fa804 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -367,11 +367,11 @@ void RegisterGlueFunction(const char *name, CFunction func, const Doc::Function Api::Documentation::RecordGlobal(name, doc); } -void RegisterFrameMethods(void *context, const FrameMethodEntry *table, int count, - const Doc::Method *docs, int docCount) { +void RegisterFrameMethods(void *context, ArrayRef methods, + Doc::MethodList docs) { auto fn = reinterpret_cast(Offsets::FUN_REGISTER_FRAME_METHODS); - fn(table, count, context); - Api::Documentation::RecordFrameMethods(context, table, count, docs, docCount); + fn(methods.data, methods.count, context); + Api::Documentation::RecordFrameMethods(context, methods, docs); } // Registers `func` at `_G[tableName][methodName]`. If the namespace diff --git a/src/Game.h b/src/Game.h index 9459489f..2511bc44 100644 --- a/src/Game.h +++ b/src/Game.h @@ -147,6 +147,18 @@ int StrCmpI(const char *a, const char *b, int n = 0x7FFFFFFF); // literals + file-scope arrays): no heap, no dynamic init. // - Summaries are user-facing text: one sentence, plain words, present // tense, no patch versions. + +// A view over a file-scope `const T[]` that takes its count from the array's +// type, so no call site passes one; `{}` means none. +template +struct ArrayRef { + const T *data = nullptr; + int count = 0; + constexpr ArrayRef() = default; + template + constexpr ArrayRef(const T (&a)[N]) : data(a), count(static_cast(N)) {} +}; + namespace Doc { struct Field { @@ -172,14 +184,7 @@ constexpr Field Vararg(const char *type, const char *doc = nullptr) { return {"...", type, true, nullptr, doc}; } -// A view over a file-scope `const Field[]`; `{}` means none. -struct FieldList { - const Field *data = nullptr; - int count = 0; - constexpr FieldList() = default; - template - constexpr FieldList(const Field (&a)[N]) : data(a), count(static_cast(N)) {} -}; +using FieldList = ArrayRef; // A registered function. Positional init: `{summary, args, rets}` for a // table function, `{summary, args, rets, "XGlobals"}` for a global, and @@ -200,6 +205,7 @@ struct Method { const char *name; const Function *doc; }; +using MethodList = ArrayRef; // A table shape a function returns or accepts → `Tables{Type="Structure"}` // in `system`. Self-registering: nothing binds a structure to Lua, so it @@ -527,10 +533,11 @@ struct FrameMethodEntry { // Registers a batch of methods on a per-frame-type registry (e.g. // GameTooltipMethodRegistry for `tooltip:Foo()` calls). `context` is the -// registry address — see Offsets::VAR_*_METHOD_REGISTRY. `docs` pairs -// descriptors to the entries by NAME (any order, any subset). -void RegisterFrameMethods(void *context, const FrameMethodEntry *table, int count, - const Doc::Method *docs = nullptr, int docCount = 0); +// registry address — see Offsets::VAR_*_METHOD_REGISTRY. `methods` and +// `docs` are file-scope arrays; `docs` pairs descriptors to the entries by +// NAME (any order, any subset). +void RegisterFrameMethods(void *context, ArrayRef methods, + Doc::MethodList docs = {}); // Registers `func` at `_G[tableName][methodName]`, creating the namespace // table if it doesn't already exist. This is how modern WoW C_*-style APIs diff --git a/src/animation/Region.cpp b/src/animation/Region.cpp index c34248ee..1dd983e7 100644 --- a/src/animation/Region.cpp +++ b/src/animation/Region.cpp @@ -560,9 +560,8 @@ void RegisterLuaFunctions() { RegisterClass(Anim::s_rotationClass); RegisterClass(Anim::s_pathClass); RegisterClass(ControlPoint::s_class); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), kRegionMethods, - static_cast(sizeof(kRegionMethods) / sizeof(kRegionMethods[0])), - kRegionDocs, static_cast(sizeof(kRegionDocs) / sizeof(kRegionDocs[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), kRegionMethods, kRegionDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/api/Documentation.cpp b/src/api/Documentation.cpp index ea88f3f5..f29db728 100644 --- a/src/api/Documentation.cpp +++ b/src/api/Documentation.cpp @@ -665,10 +665,15 @@ void RecordTable(const char *table, const char *name, const Function *doc) { Record(KIND_TABLE, table, name, nullptr, doc); } -void RecordFrameMethods(const void *registry, const Game::Lua::FrameMethodEntry *table, - int count, const Method *docs, int docCount) { +void RecordFrameMethods(const void *registry, + Game::ArrayRef methods, + Game::Doc::MethodList docList) { if (g_pass == ENV_NONE) return; + const Game::Lua::FrameMethodEntry *table = methods.data; + const int count = methods.count; + const Method *docs = docList.data; + const int docCount = docList.count; for (int i = 0; i < count; ++i) { const Function *doc = nullptr; for (int d = 0; d < docCount; ++d) { diff --git a/src/api/Documentation.h b/src/api/Documentation.h index a4e9419e..dffd05b1 100644 --- a/src/api/Documentation.h +++ b/src/api/Documentation.h @@ -32,8 +32,9 @@ void EndPass(); void RecordGlobal(const char *name, const Game::Doc::Function *doc); void RecordTable(const char *table, const char *name, const Game::Doc::Function *doc); -void RecordFrameMethods(const void *registry, const Game::Lua::FrameMethodEntry *table, - int count, const Game::Doc::Method *docs, int docCount); +void RecordFrameMethods(const void *registry, + Game::ArrayRef methods, + Game::Doc::MethodList docs); // 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); diff --git a/src/editbox/CountInvisibleLetters.cpp b/src/editbox/CountInvisibleLetters.cpp index 80af1ee9..8b032cac 100644 --- a/src/editbox/CountInvisibleLetters.cpp +++ b/src/editbox/CountInvisibleLetters.cpp @@ -125,8 +125,8 @@ const Game::Lua::FrameMethodEntry g_methods[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/editbox/Enable.cpp b/src/editbox/Enable.cpp index f2e8c878..bd6865ae 100644 --- a/src/editbox/Enable.cpp +++ b/src/editbox/Enable.cpp @@ -83,9 +83,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/editbox/Ime.cpp b/src/editbox/Ime.cpp index 779690fb..4b38f265 100644 --- a/src/editbox/Ime.cpp +++ b/src/editbox/Ime.cpp @@ -86,9 +86,7 @@ void RegisterLuaFunctions() { Common::RedirectCall(Offsets::CALL_EDITBOX_IME_COMPOSITION_INSERT, Offsets::FUN_EDITBOX_INSERT, reinterpret_cast(&CompositionInsert)); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/editbox/Methods.cpp b/src/editbox/Methods.cpp index cbc91846..e80f8a05 100644 --- a/src/editbox/Methods.cpp +++ b/src/editbox/Methods.cpp @@ -234,9 +234,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_EDITBOX_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/equipmentset/Tooltip.cpp b/src/equipmentset/Tooltip.cpp index 1d4a4e21..e4cb2d8b 100644 --- a/src/equipmentset/Tooltip.cpp +++ b/src/equipmentset/Tooltip.cpp @@ -224,9 +224,7 @@ static void RegisterLuaFunctions() { // 4.3.4's switch for the item-tooltip line; dedups by name on /reload. g_hideSetsCVar = CVar::Factory::Register("dontShowEquipmentSetsOnItems", "Don't show which equipment sets an item is associated with", Offsets::CVAR_CATEGORY_GAME, "0"); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/fontstring/FontHeight.cpp b/src/fontstring/FontHeight.cpp index 947bc0d2..ef5bd1d8 100644 --- a/src/fontstring/FontHeight.cpp +++ b/src/fontstring/FontHeight.cpp @@ -144,10 +144,11 @@ const Game::Doc::Method kFontDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), - kFontStringMethods, 2, kFontStringDocs, 2); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FONT_METHOD_REGISTRY), kFontMethods, - 2, kFontDocs, 2); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), kFontStringMethods, + kFontStringDocs); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FONT_METHOD_REGISTRY), kFontMethods, kFontDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/fontstring/IndentedWordWrap.cpp b/src/fontstring/IndentedWordWrap.cpp index a1c23276..4c13b73d 100644 --- a/src/fontstring/IndentedWordWrap.cpp +++ b/src/fontstring/IndentedWordWrap.cpp @@ -181,8 +181,8 @@ const Game::Doc::Method kHtmlDocs[] = { {"GetIndentedWordWrap", &kHtmlGet}, }; -template void Register(uintptr_t registry, const Game::Doc::Method *docs) { - Game::Lua::RegisterFrameMethods(reinterpret_cast(registry), P::methods, 2, docs, 2); +template void Register(uintptr_t registry, Game::Doc::MethodList docs) { + Game::Lua::RegisterFrameMethods(reinterpret_cast(registry), P::methods, docs); } // A font string takes the bit from its font only when its settable mask diff --git a/src/fontstring/Metrics.cpp b/src/fontstring/Metrics.cpp index ddb11aa1..c175ef4f 100644 --- a/src/fontstring/Metrics.cpp +++ b/src/fontstring/Metrics.cpp @@ -378,9 +378,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/fontstring/WordWrap.cpp b/src/fontstring/WordWrap.cpp index 90724100..31a2cf65 100644 --- a/src/fontstring/WordWrap.cpp +++ b/src/fontstring/WordWrap.cpp @@ -96,8 +96,8 @@ const Game::Doc::Method kDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), kMethods, 2, - kDocs, 2); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), kMethods, kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/AlphaGradient.cpp b/src/frame/AlphaGradient.cpp index 93d2360c..e684de64 100644 --- a/src/frame/AlphaGradient.cpp +++ b/src/frame/AlphaGradient.cpp @@ -324,9 +324,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Attributes.cpp b/src/frame/Attributes.cpp index 24a702e9..e819f412 100644 --- a/src/frame/Attributes.cpp +++ b/src/frame/Attributes.cpp @@ -1165,9 +1165,7 @@ const Game::Lua::FrameMethodEntry g_frameMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), - g_frameMethods, - static_cast(sizeof(g_frameMethods) / sizeof(g_frameMethods[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/BoundsRect.cpp b/src/frame/BoundsRect.cpp index 6c6f0cba..78fb75f9 100644 --- a/src/frame/BoundsRect.cpp +++ b/src/frame/BoundsRect.cpp @@ -117,9 +117,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/ClampRectInsets.cpp b/src/frame/ClampRectInsets.cpp index 5f6c9a7e..15a099ca 100644 --- a/src/frame/ClampRectInsets.cpp +++ b/src/frame/ClampRectInsets.cpp @@ -186,9 +186,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/ClickMask.cpp b/src/frame/ClickMask.cpp index 86d4ad21..4d8c713d 100644 --- a/src/frame/ClickMask.cpp +++ b/src/frame/ClickMask.cpp @@ -102,8 +102,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/ClipChildren.cpp b/src/frame/ClipChildren.cpp index d0f7ce6c..dd771a44 100644 --- a/src/frame/ClipChildren.cpp +++ b/src/frame/ClipChildren.cpp @@ -453,9 +453,7 @@ void RegisterLuaFunctions() { Common::ReplaceWithCall(Offsets::CALL_FRAME_DRAW_SELF_CHILD, kDrawChildCall, sizeof kDrawChildCall, reinterpret_cast(&DrawChildThunk)); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Cooldown.cpp b/src/frame/Cooldown.cpp index 983e34e3..433f3d8e 100644 --- a/src/frame/Cooldown.cpp +++ b/src/frame/Cooldown.cpp @@ -1588,9 +1588,7 @@ void RegisterLuaFunctions() { reinterpret_cast(Offsets::FUN_FRAMEXML_REGISTER_FACTORY)( "Cooldown", &CreateCooldown, 0); Api::Documentation::NameWidgetSystem(g_hash, "FrameAPICooldown"); - Game::Lua::RegisterFrameMethods( - g_hash, g_methods, static_cast(sizeof(g_methods) / sizeof(g_methods[0])), - g_methodDocs, static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + Game::Lua::RegisterFrameMethods(g_hash, g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/DebugName.cpp b/src/frame/DebugName.cpp index b59395fe..f32f4c24 100644 --- a/src/frame/DebugName.cpp +++ b/src/frame/DebugName.cpp @@ -111,9 +111,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Defaults.cpp b/src/frame/Defaults.cpp index fd63e338..a167d156 100644 --- a/src/frame/Defaults.cpp +++ b/src/frame/Defaults.cpp @@ -221,9 +221,8 @@ const Game::Doc::Method g_methodDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/DesaturateHierarchy.cpp b/src/frame/DesaturateHierarchy.cpp index 7b113aad..06f69d8c 100644 --- a/src/frame/DesaturateHierarchy.cpp +++ b/src/frame/DesaturateHierarchy.cpp @@ -67,9 +67,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/DontSavePosition.cpp b/src/frame/DontSavePosition.cpp index 43c3f60b..23588042 100644 --- a/src/frame/DontSavePosition.cpp +++ b/src/frame/DontSavePosition.cpp @@ -113,9 +113,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/FormattedText.cpp b/src/frame/FormattedText.cpp index 15ab103e..66d44c52 100644 --- a/src/frame/FormattedText.cpp +++ b/src/frame/FormattedText.cpp @@ -108,10 +108,11 @@ const Game::Doc::Method kFontStringDocs[] = {{"SetFormattedText", &kFontStringDo const Game::Doc::Method kButtonDocs[] = {{"SetFormattedText", &kButtonDoc}}; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), - kFontStringMethods, 1, kFontStringDocs, 1); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kButtonMethods, - 1, kButtonDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), kFontStringMethods, + kFontStringDocs); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kButtonMethods, kButtonDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/GetPointGuard.cpp b/src/frame/GetPointGuard.cpp index fdd7c1a6..c1836afb 100644 --- a/src/frame/GetPointGuard.cpp +++ b/src/frame/GetPointGuard.cpp @@ -198,8 +198,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/HyperlinksEnabled.cpp b/src/frame/HyperlinksEnabled.cpp index 0adb29a2..bf686c0a 100644 --- a/src/frame/HyperlinksEnabled.cpp +++ b/src/frame/HyperlinksEnabled.cpp @@ -95,8 +95,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { for (const uintptr_t registry : {static_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), static_cast(Offsets::VAR_SIMPLEHTML_METHOD_REGISTRY)}) { - Game::Lua::RegisterFrameMethods(reinterpret_cast(registry), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + Game::Lua::RegisterFrameMethods(reinterpret_cast(registry), g_methods); } } diff --git a/src/frame/KeyboardPropagation.cpp b/src/frame/KeyboardPropagation.cpp index 3f00de92..d8d0279a 100644 --- a/src/frame/KeyboardPropagation.cpp +++ b/src/frame/KeyboardPropagation.cpp @@ -139,9 +139,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Modern.cpp b/src/frame/Modern.cpp index 7412551c..af510aff 100644 --- a/src/frame/Modern.cpp +++ b/src/frame/Modern.cpp @@ -569,26 +569,15 @@ const Game::Lua::FrameMethodEntry g_fontStringMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), - g_regionMethods, - static_cast(sizeof(g_regionMethods) / sizeof(g_regionMethods[0]))); + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_regionMethods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), - g_frameMethods, - static_cast(sizeof(g_frameMethods) / sizeof(g_frameMethods[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), - g_buttonMethods, - static_cast(sizeof(g_buttonMethods) / sizeof(g_buttonMethods[0]))); + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), g_buttonMethods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), - g_textureMethods, - static_cast(sizeof(g_textureMethods) / sizeof(g_textureMethods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_textureMethods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), - g_fontStringMethods, - static_cast(sizeof(g_fontStringMethods) / - sizeof(g_fontStringMethods[0]))); + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), g_fontStringMethods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/MotionFocus.cpp b/src/frame/MotionFocus.cpp index 02d62779..15b8052d 100644 --- a/src/frame/MotionFocus.cpp +++ b/src/frame/MotionFocus.cpp @@ -380,9 +380,8 @@ void RegisterLuaFunctions() { reinterpret_cast(&RemovalThunk)); Common::ReplaceWithCall(Offsets::ADDR_UI_FOCUS_PASS_PROBE, kProbe, sizeof kProbe, reinterpret_cast(&ProbeThunk)); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); Game::Lua::RegisterGlobalFunction("GetMouseFoci", &Script_GetMouseFoci, &kGetMouseFoci); } diff --git a/src/frame/MotionScriptsWhileDisabled.cpp b/src/frame/MotionScriptsWhileDisabled.cpp index 8fc488be..9ea30270 100644 --- a/src/frame/MotionScriptsWhileDisabled.cpp +++ b/src/frame/MotionScriptsWhileDisabled.cpp @@ -148,8 +148,8 @@ const Game::Doc::Method kDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, 2, - kDocs, 2); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/MouseInput.cpp b/src/frame/MouseInput.cpp index 80a3a81c..0fb03dfc 100644 --- a/src/frame/MouseInput.cpp +++ b/src/frame/MouseInput.cpp @@ -389,9 +389,8 @@ void RegisterLuaFunctions() { reinterpret_cast(&PressDispatchThunk)); Common::ReplaceWithCall(Offsets::ADDR_UI_RELEASE_DISPATCH, kReleaseDispatch, sizeof kReleaseDispatch, reinterpret_cast(&ReleaseDispatchThunk)); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/MouseRegistration.cpp b/src/frame/MouseRegistration.cpp index ecb00c09..1808e96b 100644 --- a/src/frame/MouseRegistration.cpp +++ b/src/frame/MouseRegistration.cpp @@ -104,8 +104,8 @@ const Game::Doc::Function kDoc{"Sets which mouse buttons run the OnMouseDown and const Game::Doc::Method kDocs[] = {{"RegisterForMouse", &kDoc}}; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, 1, - kDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Points.cpp b/src/frame/Points.cpp index 7585dea0..4252c2a4 100644 --- a/src/frame/Points.cpp +++ b/src/frame/Points.cpp @@ -209,9 +209,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/Protection.cpp b/src/frame/Protection.cpp index ab5c66f5..0f65fee6 100644 --- a/src/frame/Protection.cpp +++ b/src/frame/Protection.cpp @@ -108,12 +108,9 @@ const Game::Doc::Method g_frameDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_regionMethods, - static_cast(sizeof(g_regionMethods) / sizeof(g_regionMethods[0])), g_regionDocs, - static_cast(sizeof(g_regionDocs) / sizeof(g_regionDocs[0]))); + g_regionDocs); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods, - static_cast(sizeof(g_frameMethods) / sizeof(g_frameMethods[0])), g_frameDocs, - static_cast(sizeof(g_frameDocs) / sizeof(g_frameDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods, g_frameDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/SetEnabled.cpp b/src/frame/SetEnabled.cpp index 362b013c..efd8bdf0 100644 --- a/src/frame/SetEnabled.cpp +++ b/src/frame/SetEnabled.cpp @@ -49,8 +49,8 @@ const Game::Doc::Function kDoc{"Enables or disables the button, as Enable() or D const Game::Doc::Method kDocs[] = {{"SetEnabled", &kDoc}}; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, 1, - kDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_BUTTON_METHOD_REGISTRY), kMethods, kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/SourceLocation.cpp b/src/frame/SourceLocation.cpp index d57bc0a2..e3fd0edc 100644 --- a/src/frame/SourceLocation.cpp +++ b/src/frame/SourceLocation.cpp @@ -203,9 +203,7 @@ void RegisterLuaFunctions() { Game::Lua::RegisterGlobalFunction("AddSourceLocationExclude", &Script_AddSourceLocationExclude, &kAddSourceLocationExclude); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_REGION_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/frame/UnitEvent.cpp b/src/frame/UnitEvent.cpp index bb35f19e..be5dd4ea 100644 --- a/src/frame/UnitEvent.cpp +++ b/src/frame/UnitEvent.cpp @@ -351,8 +351,7 @@ const Game::Lua::FrameMethodEntry g_frameMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods, - static_cast(sizeof(g_frameMethods) / sizeof(g_frameMethods[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods); } // Frames survive /reload but the engine rebuilds the event table with empty diff --git a/src/frame/UseParentLevel.cpp b/src/frame/UseParentLevel.cpp index e14eb74f..97b56346 100644 --- a/src/frame/UseParentLevel.cpp +++ b/src/frame/UseParentLevel.cpp @@ -114,9 +114,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/gameobject/Tooltip.cpp b/src/gameobject/Tooltip.cpp index 7726b25c..0225fe8b 100644 --- a/src/gameobject/Tooltip.cpp +++ b/src/gameobject/Tooltip.cpp @@ -126,9 +126,7 @@ static const Game::Lua::FrameMethodEntry g_methods[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/item/Tooltip.cpp b/src/item/Tooltip.cpp index fa8a05d5..e7ea22ea 100644 --- a/src/item/Tooltip.cpp +++ b/src/item/Tooltip.cpp @@ -366,9 +366,7 @@ static const Game::Lua::FrameMethodEntry g_methods[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/Animation.cpp b/src/model/Animation.cpp index 49b05231..d2193884 100644 --- a/src/model/Animation.cpp +++ b/src/model/Animation.cpp @@ -249,8 +249,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/Camera.cpp b/src/model/Camera.cpp index f6eb8c46..f697d956 100644 --- a/src/model/Camera.cpp +++ b/src/model/Camera.cpp @@ -257,8 +257,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/DisplayInfo.cpp b/src/model/DisplayInfo.cpp index 94573ec9..5a7657cf 100644 --- a/src/model/DisplayInfo.cpp +++ b/src/model/DisplayInfo.cpp @@ -266,8 +266,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/DressUp.cpp b/src/model/DressUp.cpp index 32c95723..49944e70 100644 --- a/src/model/DressUp.cpp +++ b/src/model/DressUp.cpp @@ -640,8 +640,7 @@ void RegisterLuaFunctions() { reinterpret_cast(&SetModelInstance)); Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_DRESSUPMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); Game::Lua::RegisterIntegerEnum( "Enum", "ItemTryOnReason", kItemTryOnReason, static_cast(sizeof(kItemTryOnReason) / sizeof(kItemTryOnReason[0])), "UIModelInfo"); diff --git a/src/model/Glow.cpp b/src/model/Glow.cpp index 6f04d8df..47003df6 100644 --- a/src/model/Glow.cpp +++ b/src/model/Glow.cpp @@ -47,8 +47,8 @@ const Game::Doc::Method g_methodDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_MODEL_METHOD_REGISTRY), - g_methods, 1, g_methodDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_MODEL_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/ItemDisplay.cpp b/src/model/ItemDisplay.cpp index f4e6a3fe..50d17364 100644 --- a/src/model/ItemDisplay.cpp +++ b/src/model/ItemDisplay.cpp @@ -249,8 +249,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/KeepOnHide.cpp b/src/model/KeepOnHide.cpp index d8a10c92..686e56d2 100644 --- a/src/model/KeepOnHide.cpp +++ b/src/model/KeepOnHide.cpp @@ -148,8 +148,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/Rotation.cpp b/src/model/Rotation.cpp index 564fa217..d734e5d0 100644 --- a/src/model/Rotation.cpp +++ b/src/model/Rotation.cpp @@ -61,8 +61,8 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, 1, - g_methodDocs, 1); + reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/Subject.cpp b/src/model/Subject.cpp index d7ef31e2..4208e0ce 100644 --- a/src/model/Subject.cpp +++ b/src/model/Subject.cpp @@ -106,8 +106,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/model/VisualKit.cpp b/src/model/VisualKit.cpp index 62139b81..6eb59410 100644 --- a/src/model/VisualKit.cpp +++ b/src/model/VisualKit.cpp @@ -227,8 +227,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_PLAYERMODEL_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/scrollingmessageframe/DeferredLayout.cpp b/src/scrollingmessageframe/DeferredLayout.cpp index 8bff9cd9..e39d9b87 100644 --- a/src/scrollingmessageframe/DeferredLayout.cpp +++ b/src/scrollingmessageframe/DeferredLayout.cpp @@ -168,8 +168,9 @@ const Game::Doc::Method kDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), - kMethods, 1, kDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), kMethods, + kDocs); // Every way to the put-off layout first; the writer's layout is put off // only when they all hold. const bool flushes = diff --git a/src/scrollingmessageframe/DisplayRefreshed.cpp b/src/scrollingmessageframe/DisplayRefreshed.cpp index 94e13054..a3e8d085 100644 --- a/src/scrollingmessageframe/DisplayRefreshed.cpp +++ b/src/scrollingmessageframe/DisplayRefreshed.cpp @@ -162,8 +162,9 @@ const Game::Doc::Method kDocs[] = { void RegisterLuaFunctions() { // Each registration pass is a new Lua state; the old state's ref is gone. g_callbacksRef = kNoRef; - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), - kMethods, 1, kDocs, 1); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), kMethods, + kDocs); } void PrepareForReload() { g_frames.clear(); } diff --git a/src/scrollingmessageframe/InsertMode.cpp b/src/scrollingmessageframe/InsertMode.cpp index 8f496c22..5fbf2fa7 100644 --- a/src/scrollingmessageframe/InsertMode.cpp +++ b/src/scrollingmessageframe/InsertMode.cpp @@ -166,8 +166,9 @@ void RegisterLuaFunctions() { void *L = Game::Lua::State(); Game::Lua::SetGlobalNumber(L, "SCROLLING_MESSAGE_FRAME_INSERT_MODE_TOP", kInsertModeTop); Game::Lua::SetGlobalNumber(L, "SCROLLING_MESSAGE_FRAME_INSERT_MODE_BOTTOM", kInsertModeBottom); - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), - kMethods, 2, kDocs, 2); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), kMethods, + kDocs); Common::RedirectCall(Offsets::CALL_SMF_LAYOUT_ANCHOR_LINE, Offsets::FUN_REGION_SET_POINT, reinterpret_cast(&AnchorNewLine)); } diff --git a/src/scrollingmessageframe/MessageInfo.cpp b/src/scrollingmessageframe/MessageInfo.cpp index 694679f9..68e95581 100644 --- a/src/scrollingmessageframe/MessageInfo.cpp +++ b/src/scrollingmessageframe/MessageInfo.cpp @@ -564,8 +564,9 @@ const Game::Doc::Method kDocs[] = { void RegisterLuaFunctions() { // Each registration pass is a new Lua state; the old state's ref is gone. g_extrasRef = kNoRef; - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), - kMethods, 4, kDocs, 4); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), kMethods, + kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/scrollingmessageframe/Scroll.cpp b/src/scrollingmessageframe/Scroll.cpp index 8647c6f9..cb754c08 100644 --- a/src/scrollingmessageframe/Scroll.cpp +++ b/src/scrollingmessageframe/Scroll.cpp @@ -157,8 +157,9 @@ const Game::Doc::Method kDocs[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), - kMethods, 4, kDocs, 4); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_SCROLLINGMESSAGEFRAME_METHOD_REGISTRY), kMethods, + kDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/slider/Enable.cpp b/src/slider/Enable.cpp index 8b17749c..3d59b6d4 100644 --- a/src/slider/Enable.cpp +++ b/src/slider/Enable.cpp @@ -100,9 +100,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_SLIDER_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_SLIDER_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/spell/Tooltip.cpp b/src/spell/Tooltip.cpp index 1a5d9a06..0d706eb0 100644 --- a/src/spell/Tooltip.cpp +++ b/src/spell/Tooltip.cpp @@ -240,11 +240,8 @@ static const Game::Doc::Method g_methodDocs[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), - g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, + g_methodDocs); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/statusbar/BarTexture.cpp b/src/statusbar/BarTexture.cpp index e0871f2f..5d87946a 100644 --- a/src/statusbar/BarTexture.cpp +++ b/src/statusbar/BarTexture.cpp @@ -155,9 +155,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/statusbar/Display.cpp b/src/statusbar/Display.cpp index b5959ca5..78aa9260 100644 --- a/src/statusbar/Display.cpp +++ b/src/statusbar/Display.cpp @@ -359,8 +359,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, - static_cast(std::size(g_methods)), g_methodDocs, - static_cast(std::size(g_methodDocs))); + g_methodDocs); Lua::RegisterIntegerEnum("Enum", "StatusBarTimerDirection", kDirectionEntries, static_cast(std::size(kDirectionEntries)), "SimpleStatusBarConstants"); Lua::RegisterIntegerEnum("Enum", "StatusBarInterpolation", kInterpolationEntries, diff --git a/src/statusbar/Fill.cpp b/src/statusbar/Fill.cpp index fbcfce8b..a76e1acc 100644 --- a/src/statusbar/Fill.cpp +++ b/src/statusbar/Fill.cpp @@ -382,9 +382,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_STATUSBAR_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + 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"); diff --git a/src/talent/Tooltip.cpp b/src/talent/Tooltip.cpp index 6c517900..82103a16 100644 --- a/src/talent/Tooltip.cpp +++ b/src/talent/Tooltip.cpp @@ -144,9 +144,7 @@ static const Game::Lua::FrameMethodEntry g_methods[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/texture/Atlas.cpp b/src/texture/Atlas.cpp index 299cb5fe..1a3daf11 100644 --- a/src/texture/Atlas.cpp +++ b/src/texture/Atlas.cpp @@ -537,8 +537,7 @@ const Game::Lua::FrameMethodEntry g_textureMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_textureMethods, - static_cast(sizeof(g_textureMethods) / sizeof(g_textureMethods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_textureMethods); Game::Lua::RegisterTableFunction("C_Texture", "GetAtlasInfo", &Script_GetAtlasInfo); Game::Lua::RegisterTableFunction("C_Texture", "GetAtlasExists", &Script_GetAtlasExists); diff --git a/src/texture/ColorTexture.cpp b/src/texture/ColorTexture.cpp index 9da541e0..dea3e60f 100644 --- a/src/texture/ColorTexture.cpp +++ b/src/texture/ColorTexture.cpp @@ -31,8 +31,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/texture/Desaturation.cpp b/src/texture/Desaturation.cpp index 638b4718..2aa969ab 100644 --- a/src/texture/Desaturation.cpp +++ b/src/texture/Desaturation.cpp @@ -468,8 +468,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); Game::Lua::RegisterGlobalFunction("IsDesaturateSupported", &Script_IsDesaturateSupported, &kIsDesaturateSupported); Game::Lua::RegisterGlobalFunction("_classicapi_DesaturationInfo", &Script_DesaturationInfo); diff --git a/src/texture/Mask.cpp b/src/texture/Mask.cpp index fff270a1..216da1cb 100644 --- a/src/texture/Mask.cpp +++ b/src/texture/Mask.cpp @@ -585,11 +585,9 @@ const Game::Lua::FrameMethodEntry g_frameMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods, - static_cast(sizeof(g_frameMethods) / sizeof(g_frameMethods[0]))); + reinterpret_cast(Offsets::VAR_FRAME_METHOD_REGISTRY), g_frameMethods); Game::Lua::RegisterGlobalFunction("_classicapi_TextureMaskEnable", &Script_TextureMaskEnable); } diff --git a/src/texture/SpriteSheet.cpp b/src/texture/SpriteSheet.cpp index 782b2b8a..2dabf635 100644 --- a/src/texture/SpriteSheet.cpp +++ b/src/texture/SpriteSheet.cpp @@ -76,8 +76,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/texture/Tile.cpp b/src/texture/Tile.cpp index ce45544d..d452baec 100644 --- a/src/texture/Tile.cpp +++ b/src/texture/Tile.cpp @@ -203,8 +203,8 @@ const Game::Lua::FrameMethodEntry g_methods[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/texture/Transform.cpp b/src/texture/Transform.cpp index bcd1ba9d..171ac6f3 100644 --- a/src/texture/Transform.cpp +++ b/src/texture/Transform.cpp @@ -719,11 +719,9 @@ const Game::Lua::FrameMethodEntry g_fontStringMethods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), g_fontStringMethods, - static_cast(sizeof(g_fontStringMethods) / sizeof(g_fontStringMethods[0]))); + reinterpret_cast(Offsets::VAR_FONTSTRING_METHOD_REGISTRY), g_fontStringMethods); // The UPPER_LEFT_VERTEX / … constants that VertexSlot maps are defined // FrameXML-style in the embedded addon's Util/Constants.lua, not here. } diff --git a/src/texture/Wrap.cpp b/src/texture/Wrap.cpp index ec24daeb..2ca7b40d 100644 --- a/src/texture/Wrap.cpp +++ b/src/texture/Wrap.cpp @@ -227,8 +227,8 @@ const Game::Lua::FrameMethodEntry g_methods[] = { }; void RegisterLuaFunctions() { - Game::Lua::RegisterFrameMethods(reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + Game::Lua::RegisterFrameMethods( + reinterpret_cast(Offsets::VAR_TEXTURE_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/AddTexture.cpp b/src/tooltip/AddTexture.cpp index 8bdcc790..220d621e 100644 --- a/src/tooltip/AddTexture.cpp +++ b/src/tooltip/AddTexture.cpp @@ -100,8 +100,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/CompareItem.cpp b/src/tooltip/CompareItem.cpp index eae54b08..5752207f 100644 --- a/src/tooltip/CompareItem.cpp +++ b/src/tooltip/CompareItem.cpp @@ -657,9 +657,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/FrameStack.cpp b/src/tooltip/FrameStack.cpp index 5bb65840..47e030fd 100644 --- a/src/tooltip/FrameStack.cpp +++ b/src/tooltip/FrameStack.cpp @@ -376,8 +376,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/Layout.cpp b/src/tooltip/Layout.cpp index c9eb5121..e564b236 100644 --- a/src/tooltip/Layout.cpp +++ b/src/tooltip/Layout.cpp @@ -271,8 +271,7 @@ const Game::Doc::Method g_methodDocs[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + g_methodDocs); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/Owner.cpp b/src/tooltip/Owner.cpp index ef8d8d3b..b0dc1002 100644 --- a/src/tooltip/Owner.cpp +++ b/src/tooltip/Owner.cpp @@ -73,9 +73,7 @@ static const Game::Lua::FrameMethodEntry g_methods[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/tooltip/SetAction.cpp b/src/tooltip/SetAction.cpp index f991d8c0..77ea20ea 100644 --- a/src/tooltip/SetAction.cpp +++ b/src/tooltip/SetAction.cpp @@ -202,8 +202,7 @@ const Game::Lua::FrameMethodEntry g_methods[] = { void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/totem/Tracker.cpp b/src/totem/Tracker.cpp index 6088cf30..ac6b2a28 100644 --- a/src/totem/Tracker.cpp +++ b/src/totem/Tracker.cpp @@ -526,9 +526,7 @@ void RegisterLuaFunctions() { {"SetTotem", &Script_GameTooltipSetTotem}, }; Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - kTooltipMethods, - static_cast(sizeof(kTooltipMethods) / sizeof(kTooltipMethods[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), kTooltipMethods); } const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions}; diff --git a/src/unit/Tooltip.cpp b/src/unit/Tooltip.cpp index a5e9defe..2293dbb0 100644 --- a/src/unit/Tooltip.cpp +++ b/src/unit/Tooltip.cpp @@ -438,10 +438,8 @@ static const Game::Doc::Method g_methodDocs[] = { static void RegisterLuaFunctions() { Game::Lua::RegisterFrameMethods( - reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), - g_methods, - static_cast(sizeof(g_methods) / sizeof(g_methods[0])), g_methodDocs, - static_cast(sizeof(g_methodDocs) / sizeof(g_methodDocs[0]))); + reinterpret_cast(Offsets::VAR_GAMETOOLTIP_METHOD_REGISTRY), g_methods, + g_methodDocs); } static const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions};