Remove unnecessary ElunaTemplate constructor

ElunaLuaEngine · Aug 5, 2024 · a318fd7 · a318fd7
1 parent 36f13fb
commit a318fd7
Show file tree

Hide file tree

Showing 32 changed files with 329 additions and 333 deletions.
diff --git a/ElunaTemplate.h b/ElunaTemplate.h
@@ -168,10 +168,6 @@ struct ElunaRegister
         : name(name), mfunc(func), regState(state) {}
 
     // constructor for nullptr functions and METHOD_REG_NONE (unimplemented methods)
-    ElunaRegister(const char* name, std::nullptr_t, MethodRegisterState state = METHOD_REG_NONE)
-        : name(name), mfunc(std::monostate{}), regState(state) {}
-
-    // constructor for empty entry (last entry of method table)
     ElunaRegister(const char* name = nullptr, MethodRegisterState state = METHOD_REG_NONE)
         : name(name), mfunc(std::monostate{}), regState(state) {}
 };

diff --git a/methods/CMangos/CreatureMethods.h b/methods/CMangos/CreatureMethods.h
@@ -1222,7 +1222,7 @@ namespace LuaCreature
 #ifndef CATA
         { "GetShieldBlockValue", &LuaCreature::GetShieldBlockValue },
 #else
-        { "GetShieldBlockValue", nullptr, METHOD_REG_NONE },
+        { "GetShieldBlockValue", METHOD_REG_NONE },
 #endif
 
         // Setters
@@ -1243,7 +1243,7 @@ namespace LuaCreature
 #ifndef CATA
         { "SetDisableReputationGain", &LuaCreature::SetDisableReputationGain },
 #else
-        { "SetDisableReputationGain", nullptr, METHOD_REG_NONE },
+        { "SetDisableReputationGain", METHOD_REG_NONE },
 #endif
 
         // Boolean
@@ -1271,7 +1271,7 @@ namespace LuaCreature
 #ifndef CATA
         { "IsReputationGainDisabled", &LuaCreature::IsReputationGainDisabled },
 #else
-        { "IsReputationGainDisabled", nullptr, METHOD_REG_NONE },
+        { "IsReputationGainDisabled", METHOD_REG_NONE },
 #endif
 
         // Other
@@ -1291,24 +1291,24 @@ namespace LuaCreature
         { "RemoveFromWorld", &LuaCreature::RemoveFromWorld },
 
         // Not implemented methods
-        { "GetWaypointPath", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "GetLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "SetRegeneratingHealth", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "SetLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "SetReactState", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "IsDungeonBoss", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "IsTrigger", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "CanStartAttack", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "IsDamageEnoughForLootingAndReward", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "HasLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "AddLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "ResetLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "RemoveLootMode", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "GetThreat", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "ClearThreat", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "ResetAllThreat", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "FixateTarget", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "ClearFixate", nullptr, METHOD_REG_NONE }, // TC/Acore
+        { "GetWaypointPath", METHOD_REG_NONE }, // TC/Acore
+        { "GetLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "SetRegeneratingHealth", METHOD_REG_NONE }, // TC/Acore
+        { "SetLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "SetReactState", METHOD_REG_NONE }, // TC/Acore
+        { "IsDungeonBoss", METHOD_REG_NONE }, // TC/Acore
+        { "IsTrigger", METHOD_REG_NONE }, // TC/Acore
+        { "CanStartAttack", METHOD_REG_NONE }, // TC/Acore
+        { "IsDamageEnoughForLootingAndReward", METHOD_REG_NONE }, // TC/Acore
+        { "HasLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "AddLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "ResetLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "RemoveLootMode", METHOD_REG_NONE }, // TC/Acore
+        { "GetThreat", METHOD_REG_NONE }, // TC/Acore
+        { "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 }
     };

diff --git a/methods/CMangos/GameObjectMethods.h b/methods/CMangos/GameObjectMethods.h
@@ -332,7 +332,7 @@ namespace LuaGameObject
         { "SaveToDB", &LuaGameObject::SaveToDB },
 
         // Not implemented methods
-        { "IsDestructible", nullptr, METHOD_REG_NONE },  // Not implemented
+        { "IsDestructible", METHOD_REG_NONE },  // Not implemented
 
         { nullptr, METHOD_REG_NONE }
     };

diff --git a/methods/CMangos/GroupMethods.h b/methods/CMangos/GroupMethods.h
@@ -405,18 +405,18 @@ namespace LuaGroup
 #if defined WOTLK
         { "IsLFGGroup", &LuaGroup::IsLFGGroup },
 #else
-        { "IsLFGGroup", nullptr, METHOD_REG_NONE },
+        { "IsLFGGroup", METHOD_REG_NONE },
 #endif
 
         // Other
         { "SendPacket", &LuaGroup::SendPacket },
         { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Not implemented methods
-        { "IsBFGroup", nullptr, METHOD_REG_NONE },   // not implemented
-        { "ConvertToLFG", nullptr, METHOD_REG_NONE },    // not implemented
-        { "GetMemberFlags", nullptr, METHOD_REG_NONE },    // not implemented
-        { "SetMemberFlag", nullptr, METHOD_REG_NONE },    // not implemented
+        { "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 }
     };

diff --git a/methods/CMangos/GuildMethods.h b/methods/CMangos/GuildMethods.h
@@ -255,13 +255,13 @@ namespace LuaGuild
 #if defined(TBC) || defined(WOTLK)
         { "SetBankTabText", &LuaGuild::SetBankTabText, METHOD_REG_WORLD }, // World state method only in multistate
 #else
-        { "SetBankTabText", nullptr, METHOD_REG_NONE },
+        { "SetBankTabText", METHOD_REG_NONE },
 #endif
         { "SetMemberRank", &LuaGuild::SetMemberRank, METHOD_REG_WORLD }, // World state method only in multistate
 #ifndef CATA
         { "SetLeader", &LuaGuild::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
 #else
-        { "SetLeader", nullptr, METHOD_REG_NONE },
+        { "SetLeader", METHOD_REG_NONE },
 #endif
 
         // Other

diff --git a/methods/CMangos/ItemMethods.h b/methods/CMangos/ItemMethods.h
@@ -793,7 +793,7 @@ namespace LuaItem
 #if (!defined(TBC) && !defined(CLASSIC))
         { "GetFlags2", &LuaItem::GetFlags2 },
 #else
-        { "GetFlags2", nullptr, METHOD_REG_NONE },
+        { "GetFlags2", METHOD_REG_NONE },
 #endif
         { "GetExtraFlags", &LuaItem::GetExtraFlags },
         { "GetBuyCount", &LuaItem::GetBuyCount },
@@ -810,12 +810,12 @@ namespace LuaItem
 #if defined(TBC) || defined(WOTLK)
         { "GetRandomSuffix", &LuaItem::GetRandomSuffix },
 #else
-        { "GetRandomSuffix", nullptr, METHOD_REG_NONE },
+        { "GetRandomSuffix", METHOD_REG_NONE },
 #endif
 #if defined(WOTLK)
         { "GetStatsCount", &LuaItem::GetStatsCount },
 #else
-        { "GetStatsCount", nullptr, METHOD_REG_NONE },
+        { "GetStatsCount", METHOD_REG_NONE },
 #endif
 
         // Setters
@@ -843,22 +843,22 @@ namespace LuaItem
 #if defined(TBC) || defined(WOTLK)
         { "IsCurrencyToken", &LuaItem::IsCurrencyToken },
 #else
-        { "IsCurrencyToken", nullptr, METHOD_REG_NONE },
+        { "IsCurrencyToken", METHOD_REG_NONE },
 #endif
 #if defined(WOTLK)
         { "IsBoundAccountWide", &LuaItem::IsBoundAccountWide },
         { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
         { "IsArmorVellum", &LuaItem::IsArmorVellum },
 #else
-        { "IsBoundAccountWide", nullptr, METHOD_REG_NONE },
-        { "IsWeaponVellum", nullptr, METHOD_REG_NONE },
-        { "IsArmorVellum", nullptr, METHOD_REG_NONE },
+        { "IsBoundAccountWide", METHOD_REG_NONE },
+        { "IsWeaponVellum", METHOD_REG_NONE },
+        { "IsArmorVellum", METHOD_REG_NONE },
 #endif
         // Other
         { "SaveToDB", &LuaItem::SaveToDB },
 
         // Not implemented methods
-        { "IsRefundExpired", nullptr, METHOD_REG_NONE }, // not implemented
+        { "IsRefundExpired", METHOD_REG_NONE }, // not implemented
 
         { nullptr, METHOD_REG_NONE }
     };

diff --git a/methods/CMangos/MapMethods.h b/methods/CMangos/MapMethods.h
@@ -357,8 +357,8 @@ namespace LuaMap
         { "IsArena", &LuaMap::IsArena },
         { "IsHeroic", &LuaMap::IsHeroic },
 #else
-        { "IsArena", nullptr, METHOD_REG_NONE },
-        { "IsHeroic", nullptr, METHOD_REG_NONE },
+        { "IsArena", METHOD_REG_NONE },
+        { "IsHeroic", METHOD_REG_NONE },
 #endif
 
         // Other

diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h
@@ -3802,22 +3802,22 @@ namespace LuaPlayer
         { "GetArenaPoints", &LuaPlayer::GetArenaPoints },
         { "GetHonorPoints", &LuaPlayer::GetHonorPoints },
 #else
-        { "GetArenaPoints", nullptr, METHOD_REG_NONE },
-        { "GetHonorPoints", nullptr, METHOD_REG_NONE },
+        { "GetArenaPoints", METHOD_REG_NONE },
+        { "GetHonorPoints", METHOD_REG_NONE },
 #endif
 #if defined(WOTLK)
         { "GetPhaseMaskForSpawn", &LuaPlayer::GetPhaseMaskForSpawn },
         { "GetActiveSpec", &LuaPlayer::GetActiveSpec },
         { "GetSpecsCount", &LuaPlayer::GetSpecsCount },
 #else
-        { "GetPhaseMaskForSpawn", nullptr, METHOD_REG_NONE },
-        { "GetActiveSpec", nullptr, METHOD_REG_NONE },
-        { "GetSpecsCount", nullptr, METHOD_REG_NONE },
+        { "GetPhaseMaskForSpawn", METHOD_REG_NONE },
+        { "GetActiveSpec", METHOD_REG_NONE },
+        { "GetSpecsCount", METHOD_REG_NONE },
 #endif
 #ifndef CATA
         { "GetShieldBlockValue", &LuaPlayer::GetShieldBlockValue },
 #else
-        { "GetShieldBlockValue", nullptr, METHOD_REG_NONE },
+        { "GetShieldBlockValue", METHOD_REG_NONE },
 #endif
         { "GetMailCount", &LuaPlayer::GetMailCount },
 
@@ -3853,10 +3853,10 @@ namespace LuaPlayer
         { "SetArenaPoints", &LuaPlayer::SetArenaPoints },
         { "SetHonorPoints", &LuaPlayer::SetHonorPoints },
 #else
-        { "SetKnownTitle", nullptr, METHOD_REG_NONE },
-        { "UnsetKnownTitle", nullptr, METHOD_REG_NONE },
-        { "SetArenaPoints", nullptr, METHOD_REG_NONE },
-        { "SetHonorPoints", nullptr, METHOD_REG_NONE },
+        { "SetKnownTitle", METHOD_REG_NONE },
+        { "UnsetKnownTitle", METHOD_REG_NONE },
+        { "SetArenaPoints", METHOD_REG_NONE },
+        { "SetHonorPoints", METHOD_REG_NONE },
 #endif
 
         // Boolean
@@ -3910,20 +3910,20 @@ namespace LuaPlayer
         { "CanFly", &LuaPlayer::CanFly },
         { "IsFlying", &LuaPlayer::IsFlying },
 #else
-        { "HasTitle", nullptr, METHOD_REG_NONE },
-        { "IsInArenaTeam", nullptr, METHOD_REG_NONE },
-        { "InArena", nullptr, METHOD_REG_NONE },
-        { "CanFly", nullptr, METHOD_REG_NONE },
-        { "IsFlying", nullptr, METHOD_REG_NONE },
+        { "HasTitle", METHOD_REG_NONE },
+        { "IsInArenaTeam", METHOD_REG_NONE },
+        { "InArena", METHOD_REG_NONE },
+        { "CanFly", METHOD_REG_NONE },
+        { "IsFlying", METHOD_REG_NONE },
 #endif
 #if defined(WOTLK)
         { "HasAchieved", &LuaPlayer::HasAchieved },
         { "HasTalent", &LuaPlayer::HasTalent },
         { "CanTitanGrip", &LuaPlayer::CanTitanGrip },
 #else
-        { "HasAchieved", nullptr, METHOD_REG_NONE },
-        { "HasTalent", nullptr, METHOD_REG_NONE },
-        { "CanTitanGrip", nullptr, METHOD_REG_NONE },
+        { "HasAchieved", METHOD_REG_NONE },
+        { "HasTalent", METHOD_REG_NONE },
+        { "CanTitanGrip", METHOD_REG_NONE },
 #endif
         { "CanCompleteRepeatableQuest", &LuaPlayer::CanCompleteRepeatableQuest },
         { "CanRewardQuest", &LuaPlayer::CanRewardQuest },
@@ -4012,54 +4012,54 @@ namespace LuaPlayer
         { "ModifyHonorPoints", &LuaPlayer::ModifyHonorPoints },
         { "ModifyArenaPoints", &LuaPlayer::ModifyArenaPoints },
 #else
-        { "RemoveArenaSpellCooldowns", nullptr, METHOD_REG_NONE },
-        { "ModifyHonorPoints", nullptr, METHOD_REG_NONE },
-        { "ModifyArenaPoints", nullptr, METHOD_REG_NONE },
+        { "RemoveArenaSpellCooldowns", METHOD_REG_NONE },
+        { "ModifyHonorPoints", METHOD_REG_NONE },
+        { "ModifyArenaPoints", METHOD_REG_NONE },
 #endif
 #if defined(WOTLK)
         { "ResetPetTalents", &LuaPlayer::ResetPetTalents },
         { "ResetAchievements", &LuaPlayer::ResetAchievements },
         { "SendMovieStart", &LuaPlayer::SendMovieStart },
 #else
-        { "ResetPetTalents", nullptr, METHOD_REG_NONE },
-        { "ResetAchievements", nullptr, METHOD_REG_NONE },
-        { "SendMovieStart", nullptr, METHOD_REG_NONE },
+        { "ResetPetTalents", METHOD_REG_NONE },
+        { "ResetAchievements", METHOD_REG_NONE },
+        { "SendMovieStart", METHOD_REG_NONE },
 #endif
         // Not implemented methods
-        { "GetChampioningFaction", nullptr, METHOD_REG_NONE }, // ACore & TC only
-        { "GetRecruiterId", nullptr, METHOD_REG_NONE }, // not implemented
-        { "GetHonorStoredKills", nullptr, METHOD_REG_NONE }, // classic only
-        { "GetRankPoints", nullptr, METHOD_REG_NONE }, // classic only
-        { "GetHonorLastWeekStandingPos", nullptr, METHOD_REG_NONE }, // classic only
-        { "SetHonorStoredKills", nullptr, METHOD_REG_NONE }, // classic only
-        { "SetRankPoints", nullptr, METHOD_REG_NONE }, // classic only
-        { "SetHonorLastWeekStandingPos", nullptr, METHOD_REG_NONE }, // classic only
-        { "SetMovement", nullptr, METHOD_REG_NONE }, // not implemented
-        { "SetFFA", nullptr, METHOD_REG_NONE }, // not implemented
+        { "GetChampioningFaction", METHOD_REG_NONE }, // ACore & TC only
+        { "GetRecruiterId", METHOD_REG_NONE }, // not implemented
+        { "GetHonorStoredKills", METHOD_REG_NONE }, // classic only
+        { "GetRankPoints", METHOD_REG_NONE }, // classic only
+        { "GetHonorLastWeekStandingPos", METHOD_REG_NONE }, // classic only
+        { "SetHonorStoredKills", METHOD_REG_NONE }, // classic only
+        { "SetRankPoints", METHOD_REG_NONE }, // classic only
+        { "SetHonorLastWeekStandingPos", METHOD_REG_NONE }, // classic only
+        { "SetMovement", METHOD_REG_NONE }, // not implemented
+        { "SetFFA", METHOD_REG_NONE }, // not implemented
         { "IsImmuneToEnvironmentalDamage", nullptr}, // not implemented
-        { "InRandomLfgDungeon", nullptr, METHOD_REG_NONE }, // not implemented
-        { "HasPendingBind", nullptr, METHOD_REG_NONE }, //not implmented
-        { "CanFlyInZone", nullptr, METHOD_REG_NONE }, // not implemented
-        { "IsNeverVisible", nullptr, METHOD_REG_NONE }, // not implemented
-        { "IsUsingLfg", nullptr, METHOD_REG_NONE }, // not implemented
-        { "HasReceivedQuestReward", nullptr, METHOD_REG_NONE }, // not implemented
-        { "IsOutdoorPvPActive", nullptr, METHOD_REG_NONE }, // not implemented
-        { "IsARecruiter", nullptr, METHOD_REG_NONE }, // not implemented
-        { "SetAchievement", nullptr, METHOD_REG_NONE }, // TC/Acore
-        { "RemovePet", nullptr, METHOD_REG_NONE }, // not implemented
-        { "SummonPet", nullptr, METHOD_REG_NONE }, // not implemented
-        { "RemoveActiveQuest", nullptr, METHOD_REG_NONE }, // not implemented
-        { "RemoveRewardedQuest", nullptr, METHOD_REG_NONE }, // not implemented
-        { "KilledPlayerCredit", nullptr, METHOD_REG_NONE }, // not implemented
-        { "KillGOCredit", nullptr, METHOD_REG_NONE }, // not implemented
-        { "GainSpellComboPoints", nullptr, METHOD_REG_NONE }, // not implemented
-        { "AddTalent", nullptr, METHOD_REG_NONE }, // not implemented
-        { "BindToInstance", nullptr, METHOD_REG_NONE }, // not implemented
-        { "UpdateHonor", nullptr, METHOD_REG_NONE }, // classic only
-        { "ResetHonor", nullptr, METHOD_REG_NONE },  // classic only
-        { "ClearHonorInfo", nullptr, METHOD_REG_NONE },  // classic only
-        { "GetXP", nullptr, METHOD_REG_NONE }, // not implemented
-        { "GetXPForNextLevel", nullptr, METHOD_REG_NONE }, // not implemented
+        { "InRandomLfgDungeon", METHOD_REG_NONE }, // not implemented
+        { "HasPendingBind", METHOD_REG_NONE }, //not implmented
+        { "CanFlyInZone", METHOD_REG_NONE }, // not implemented
+        { "IsNeverVisible", METHOD_REG_NONE }, // not implemented
+        { "IsUsingLfg", METHOD_REG_NONE }, // not implemented
+        { "HasReceivedQuestReward", METHOD_REG_NONE }, // not implemented
+        { "IsOutdoorPvPActive", METHOD_REG_NONE }, // not implemented
+        { "IsARecruiter", METHOD_REG_NONE }, // not implemented
+        { "SetAchievement", METHOD_REG_NONE }, // TC/Acore
+        { "RemovePet", METHOD_REG_NONE }, // not implemented
+        { "SummonPet", METHOD_REG_NONE }, // not implemented
+        { "RemoveActiveQuest", METHOD_REG_NONE }, // not implemented
+        { "RemoveRewardedQuest", METHOD_REG_NONE }, // not implemented
+        { "KilledPlayerCredit", METHOD_REG_NONE }, // not implemented
+        { "KillGOCredit", METHOD_REG_NONE }, // not implemented
+        { "GainSpellComboPoints", METHOD_REG_NONE }, // not implemented
+        { "AddTalent", METHOD_REG_NONE }, // not implemented
+        { "BindToInstance", METHOD_REG_NONE }, // not implemented
+        { "UpdateHonor", METHOD_REG_NONE }, // classic only
+        { "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 }
     };

diff --git a/methods/CMangos/QuestMethods.h b/methods/CMangos/QuestMethods.h
@@ -188,12 +188,12 @@ namespace LuaQuest
 #if defined(TBC) || defined(WOTLK)
         { "IsDaily", &LuaQuest::IsDaily },
 #else
-        { "IsDaily", nullptr, METHOD_REG_NONE },
+        { "IsDaily", METHOD_REG_NONE },
 #endif
         { "IsRepeatable", &LuaQuest::IsRepeatable },
 
         // Not implemented methods
-        { "GetMaxLevel", nullptr, METHOD_REG_NONE },  // not implemented
+        { "GetMaxLevel", METHOD_REG_NONE },  // not implemented
 
         { nullptr, METHOD_REG_NONE }
     };