Replace method table loop and remove empty end of array entries

ElunaLuaEngine · Aug 6, 2024 · 509f6ac · 509f6ac
1 parent d673864
commit 509f6ac
Show file tree

Hide file tree

Showing 77 changed files with 89 additions and 239 deletions.
diff --git a/ElunaTemplate.h b/ElunaTemplate.h
@@ -168,7 +168,7 @@ struct ElunaRegister
         : name(name), mfunc(func), regState(state) {}
 
     // constructor for nullptr functions and METHOD_REG_NONE (unimplemented methods)
-    ElunaRegister(const char* name = nullptr, MethodRegisterState state = METHOD_REG_NONE)
+    ElunaRegister(const char* name, MethodRegisterState state = METHOD_REG_NONE)
         : name(name), mfunc(nullptr), regState(state) {}
 };
 
@@ -277,8 +277,8 @@ class ElunaTemplate
         lua_pop(E->L, 1);
     }
 
-    template<typename C>
-    static void SetMethods(Eluna* E, ElunaRegister<C>* methodTable)
+    template<typename C, size_t N>
+    static void SetMethods(Eluna* E, ElunaRegister<C> const (&methodTable)[N])
     {
         ASSERT(E);
         ASSERT(methodTable);
@@ -301,25 +301,27 @@ class ElunaTemplate
         }
 
         // load all core-specific methods
-        for (; methodTable && methodTable->name; ++methodTable)
+        for (int i = 0; i < N; i++)
         {
+            const auto& method = methodTable + i;
+
             // push the method name to the Lua stack
-            lua_pushstring(E->L, methodTable->name);
+            lua_pushstring(E->L, method->name);
 
             // if the method should not be registered, push a closure to error output function
-            if (methodTable->regState == METHOD_REG_NONE)
+            if (method->regState == METHOD_REG_NONE)
             {
                 lua_pushcclosure(E->L, MethodUnimpl, 0);
                 lua_rawset(E->L, -3);
                 continue;
             }
 
             // if we're in multistate mode, we need to check whether a method is flagged as a world or a map specific method
-            if (!E->GetCompatibilityMode() && methodTable->regState != METHOD_REG_ALL)
+            if (!E->GetCompatibilityMode() && method->regState != METHOD_REG_ALL)
             {
                 // if the method should not be registered, push a closure to error output function
-                if ((E->GetBoundMapId() == -1 && methodTable->regState == METHOD_REG_MAP) ||
-                    (E->GetBoundMapId() != -1 && methodTable->regState == METHOD_REG_WORLD))
+                if ((E->GetBoundMapId() == -1 && method->regState == METHOD_REG_MAP) ||
+                    (E->GetBoundMapId() != -1 && method->regState == METHOD_REG_WORLD))
                 {
                     lua_pushcclosure(E->L, MethodWrongState, 0);
                     lua_rawset(E->L, -3);
@@ -328,7 +330,7 @@ class ElunaTemplate
             }
 
             // push method table and Eluna object pointers as light user data
-            lua_pushlightuserdata(E->L, (void*)methodTable);
+            lua_pushlightuserdata(E->L, (void*)method);
             lua_pushlightuserdata(E->L, (void*)E);
 
             // push a closure to the thunk function with 2 upvalues (method table and Eluna object)

diff --git a/methods/CMangos/AuraMethods.h b/methods/CMangos/AuraMethods.h
@@ -198,9 +198,7 @@ namespace LuaAura
         { "SetStackAmount", &LuaAura::SetStackAmount },
 
         // Other
-        { "Remove", &LuaAura::Remove },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Remove", &LuaAura::Remove }
     };
 };
 #endif
diff --git a/methods/CMangos/BattleGroundMethods.h b/methods/CMangos/BattleGroundMethods.h
@@ -245,9 +245,7 @@ namespace LuaBattleGround
         { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam },
         { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam },
         { "GetWinner", &LuaBattleGround::GetWinner },
-        { "GetStatus", &LuaBattleGround::GetStatus },
-
-        { nullptr, METHOD_REG_NONE }
+        { "GetStatus", &LuaBattleGround::GetStatus }
     };
 };
 #endif
diff --git a/methods/CMangos/CorpseMethods.h b/methods/CMangos/CorpseMethods.h
@@ -83,9 +83,7 @@ namespace LuaCorpse
 
         // Other
         { "ResetGhostTime", &LuaCorpse::ResetGhostTime },
-        { "SaveToDB", &LuaCorpse::SaveToDB },
-
-        { nullptr, METHOD_REG_NONE }
+        { "SaveToDB", &LuaCorpse::SaveToDB }
     };
 };
 #endif
diff --git a/methods/CMangos/CreatureMethods.h b/methods/CMangos/CreatureMethods.h
@@ -1308,9 +1308,7 @@ namespace LuaCreature
         { "ClearThreat", METHOD_REG_NONE }, // TC/Acore
         { "ResetAllThreat", METHOD_REG_NONE }, // TC/Acore
         { "FixateTarget", METHOD_REG_NONE }, // TC/Acore
-        { "ClearFixate", METHOD_REG_NONE }, // TC/Acore
-
-        { nullptr, METHOD_REG_NONE }
+        { "ClearFixate", METHOD_REG_NONE } // TC/Acore
     };
 };
 #endif
diff --git a/methods/CMangos/ElunaQueryMethods.h b/methods/CMangos/ElunaQueryMethods.h
@@ -333,9 +333,7 @@ namespace LuaQuery
 
         // Boolean
         { "NextRow", &LuaQuery::NextRow },
-        { "IsNull", &LuaQuery::IsNull },
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsNull", &LuaQuery::IsNull }
     };
 };
 #undef RESULT

diff --git a/methods/CMangos/GameObjectMethods.h b/methods/CMangos/GameObjectMethods.h
@@ -332,9 +332,7 @@ namespace LuaGameObject
         { "SaveToDB", &LuaGameObject::SaveToDB },
 
         // Not implemented methods
-        { "IsDestructible", METHOD_REG_NONE },  // Not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsDestructible", METHOD_REG_NONE } // Not implemented
     };
 };
 #endif
diff --git a/methods/CMangos/GlobalMethods.h b/methods/CMangos/GlobalMethods.h
@@ -3295,9 +3295,7 @@ namespace LuaGlobalFunctions
         { "CreateInt64", &LuaGlobalFunctions::CreateLongLong },
         { "CreateUint64", &LuaGlobalFunctions::CreateULongLong },
         { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent },
-        { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent },
-
-        { nullptr, METHOD_REG_NONE }
+        { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }
     };
 }
 #endif
diff --git a/methods/CMangos/GroupMethods.h b/methods/CMangos/GroupMethods.h
@@ -416,9 +416,7 @@ namespace LuaGroup
         { "IsBFGroup", METHOD_REG_NONE },   // not implemented
         { "ConvertToLFG", METHOD_REG_NONE },    // not implemented
         { "GetMemberFlags", METHOD_REG_NONE },    // not implemented
-        { "SetMemberFlag", METHOD_REG_NONE },    // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "SetMemberFlag", METHOD_REG_NONE }    // not implemented
     };
 };
 

diff --git a/methods/CMangos/GuildMethods.h b/methods/CMangos/GuildMethods.h
@@ -269,9 +269,7 @@ namespace LuaGuild
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
         { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
-        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
-
-        { nullptr, METHOD_REG_NONE }
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD } // World state method only in multistate
     };
 };
 #endif
diff --git a/methods/CMangos/ItemMethods.h b/methods/CMangos/ItemMethods.h
@@ -858,9 +858,7 @@ namespace LuaItem
         { "SaveToDB", &LuaItem::SaveToDB },
 
         // Not implemented methods
-        { "IsRefundExpired", METHOD_REG_NONE }, // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsRefundExpired", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/CMangos/MapMethods.h b/methods/CMangos/MapMethods.h
@@ -363,9 +363,7 @@ namespace LuaMap
 
         // Other
         { "SaveInstanceData", &LuaMap::SaveInstanceData },
-        { "Data", &LuaMap::Data },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Data", &LuaMap::Data }
     };
 };
 #endif
diff --git a/methods/CMangos/ObjectMethods.h b/methods/CMangos/ObjectMethods.h
@@ -490,9 +490,7 @@ namespace LuaObject
         { "ToCreature", &LuaObject::ToCreature },
         { "ToPlayer", &LuaObject::ToPlayer },
         { "ToCorpse", &LuaObject::ToCorpse },
-        { "RemoveFlag", &LuaObject::RemoveFlag },
-
-        { nullptr, METHOD_REG_NONE }
+        { "RemoveFlag", &LuaObject::RemoveFlag }
     };
 };
 #endif
diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h
@@ -4059,9 +4059,7 @@ namespace LuaPlayer
         { "ResetHonor", METHOD_REG_NONE },  // classic only
         { "ClearHonorInfo", METHOD_REG_NONE },  // classic only
         { "GetXP", METHOD_REG_NONE }, // not implemented
-        { "GetXPForNextLevel", METHOD_REG_NONE }, // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "GetXPForNextLevel", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/CMangos/QuestMethods.h b/methods/CMangos/QuestMethods.h
@@ -193,9 +193,7 @@ namespace LuaQuest
         { "IsRepeatable", &LuaQuest::IsRepeatable },
 
         // Not implemented methods
-        { "GetMaxLevel", METHOD_REG_NONE },  // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "GetMaxLevel", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/CMangos/SpellMethods.h b/methods/CMangos/SpellMethods.h
@@ -186,9 +186,7 @@ namespace LuaSpell
         // Other
         { "Cancel", &LuaSpell::Cancel },
         { "Cast", &LuaSpell::Cast },
-        { "Finish", &LuaSpell::Finish },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Finish", &LuaSpell::Finish }
     };
 };
 #endif
diff --git a/methods/CMangos/UnitMethods.h b/methods/CMangos/UnitMethods.h
@@ -2609,9 +2609,7 @@ namespace LuaUnit
         { "RemoveBindSightAuras", METHOD_REG_NONE }, // not implemented
         { "RemoveCharmAuras", METHOD_REG_NONE }, // not implemented
         { "DisableMelee", METHOD_REG_NONE }, // not implemented
-        { "SummonGuardian", METHOD_REG_NONE }, // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "SummonGuardian", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/CMangos/VehicleMethods.h b/methods/CMangos/VehicleMethods.h
@@ -104,9 +104,7 @@ namespace LuaVehicle
 
         // Other
         { "AddPassenger", &LuaVehicle::AddPassenger },
-        { "RemovePassenger", &LuaVehicle::RemovePassenger },
-
-        { nullptr, METHOD_REG_NONE }
+        { "RemovePassenger", &LuaVehicle::RemovePassenger }
     };
 }
 

diff --git a/methods/CMangos/WorldObjectMethods.h b/methods/CMangos/WorldObjectMethods.h
@@ -1185,9 +1185,7 @@ namespace LuaWorldObject
         { "PlayMusic", &LuaWorldObject::PlayMusic },
         { "PlayDirectSound", &LuaWorldObject::PlayDirectSound },
         { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound },
-        { "Data", &LuaWorldObject::Data },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Data", &LuaWorldObject::Data }
     };
 };
 #endif
diff --git a/methods/CMangos/WorldPacketMethods.h b/methods/CMangos/WorldPacketMethods.h
@@ -341,9 +341,7 @@ namespace LuaPacket
         { "WriteGUID", &LuaPacket::WriteGUID },
         { "WriteString", &LuaPacket::WriteString },
         { "WriteFloat", &LuaPacket::WriteFloat },
-        { "WriteDouble", &LuaPacket::WriteDouble },
-
-        { nullptr, METHOD_REG_NONE }
+        { "WriteDouble", &LuaPacket::WriteDouble }
     };
 };
 

diff --git a/methods/Mangos/AuraMethods.h b/methods/Mangos/AuraMethods.h
@@ -198,9 +198,7 @@ namespace LuaAura
         { "SetStackAmount", &LuaAura::SetStackAmount },
 
         // Other
-        { "Remove", &LuaAura::Remove },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Remove", &LuaAura::Remove }
     };
 };
 #endif
diff --git a/methods/Mangos/BattleGroundMethods.h b/methods/Mangos/BattleGroundMethods.h
@@ -243,9 +243,7 @@ namespace LuaBattleGround
         { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam },
         { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam },
         { "GetWinner", &LuaBattleGround::GetWinner },
-        { "GetStatus", &LuaBattleGround::GetStatus },
-
-        { nullptr, METHOD_REG_NONE }
+        { "GetStatus", &LuaBattleGround::GetStatus }
     };
 };
 #endif
diff --git a/methods/Mangos/CorpseMethods.h b/methods/Mangos/CorpseMethods.h
@@ -83,9 +83,7 @@ namespace LuaCorpse
 
         // Other
         { "ResetGhostTime", &LuaCorpse::ResetGhostTime },
-        { "SaveToDB", &LuaCorpse::SaveToDB },
-
-        { nullptr, METHOD_REG_NONE }
+        { "SaveToDB", &LuaCorpse::SaveToDB }
     };
 };
 #endif
diff --git a/methods/Mangos/CreatureMethods.h b/methods/Mangos/CreatureMethods.h
@@ -1206,9 +1206,7 @@ namespace LuaCreature
         { "ResetLootMode", METHOD_REG_NONE },   // not implemented
         { "RemoveLootMode", METHOD_REG_NONE },   // not implemented
         { "RemoveFromWorld", METHOD_REG_NONE }, // not implemented
-        { "GetRank", METHOD_REG_NONE }, // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "GetRank", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/Mangos/ElunaQueryMethods.h b/methods/Mangos/ElunaQueryMethods.h
@@ -335,9 +335,7 @@ namespace LuaQuery
 
         // Boolean
         { "NextRow", &LuaQuery::NextRow },
-        { "IsNull", &LuaQuery::IsNull },
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsNull", &LuaQuery::IsNull }
     };
 };
 #undef RESULT

diff --git a/methods/Mangos/GameObjectMethods.h b/methods/Mangos/GameObjectMethods.h
@@ -337,9 +337,7 @@ namespace LuaGameObject
         { "SaveToDB", &LuaGameObject::SaveToDB },
 
         // Not implemented methods
-        { "IsDestructible", METHOD_REG_NONE },  // Not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsDestructible", METHOD_REG_NONE } // Not implemented
     };
 };
 #endif
diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h
@@ -3039,9 +3039,7 @@ namespace LuaGlobalFunctions
         // unimplemented
         { "WorldDBQueryAsync", METHOD_REG_NONE },
         { "CharDBQueryAsync", METHOD_REG_NONE },
-        { "AuthDBQueryAsync", METHOD_REG_NONE },
-
-        { nullptr, METHOD_REG_NONE }
+        { "AuthDBQueryAsync", METHOD_REG_NONE }
     };
 }
 #endif
diff --git a/methods/Mangos/GroupMethods.h b/methods/Mangos/GroupMethods.h
@@ -411,9 +411,7 @@ namespace LuaGroup
         { "IsBFGroup", METHOD_REG_NONE },   // not implemented
         { "ConvertToLFG", METHOD_REG_NONE },    // not implemented
         { "GetMemberFlags", METHOD_REG_NONE },    // not implemented
-        { "SetMemberFlag", METHOD_REG_NONE },    // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "SetMemberFlag", METHOD_REG_NONE }    // not implemented
     };
 };
 

diff --git a/methods/Mangos/GuildMethods.h b/methods/Mangos/GuildMethods.h
@@ -259,9 +259,7 @@ namespace LuaGuild
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
         { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
-        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
-
-        { nullptr, METHOD_REG_NONE }
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD } // World state method only in multistate
     };
 };
 #endif
diff --git a/methods/Mangos/ItemMethods.h b/methods/Mangos/ItemMethods.h
@@ -867,9 +867,7 @@ namespace LuaItem
         { "SaveToDB", &LuaItem::SaveToDB },
 
         // Not implemented methods
-        { "IsRefundExpired", METHOD_REG_NONE }, // not implemented
-
-        { nullptr, METHOD_REG_NONE }
+        { "IsRefundExpired", METHOD_REG_NONE } // not implemented
     };
 };
 #endif
diff --git a/methods/Mangos/MapMethods.h b/methods/Mangos/MapMethods.h
@@ -364,9 +364,7 @@ namespace LuaMap
 #endif
         // Other
         { "SaveInstanceData", &LuaMap::SaveInstanceData },
-        { "Data", &LuaMap::Data },
-
-        { nullptr, METHOD_REG_NONE }
+        { "Data", &LuaMap::Data }
     };
 };
 #endif