Fix placement of not implemented functions for TCPP

-As Foe found when converting to this system placing a function with a nullptr causes all the functions below it to not register properly and not work.
ElunaLuaEngine · Nov 5, 2023 · 851a35d · 851a35d
1 parent 058ffa1
commit 851a35d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 37 deletions.
diff --git a/TrinityCore/CreatureMethods.h b/TrinityCore/CreatureMethods.h
@@ -1284,8 +1284,6 @@ namespace LuaCreature
         { "GetExtraFlags", &LuaCreature::GetExtraFlags },
 #ifndef CATA
         { "GetShieldBlockValue", &LuaCreature::GetShieldBlockValue },
-#else
-        { "GetShieldBlockValue", nullptr },
 #endif
         { "GetDBTableGUIDLow", &LuaCreature::GetDBTableGUIDLow },
         { "GetCreatureFamily", &LuaCreature::GetCreatureFamily },
@@ -1355,6 +1353,10 @@ namespace LuaCreature
         { "MoveWaypoint", &LuaCreature::MoveWaypoint },
         { "UpdateEntry", &LuaCreature::UpdateEntry },
 
+#ifdef CATA //Not implemented in TCPP
+        { "GetShieldBlockValue", nullptr },
+#endif
+
         { NULL, NULL }
     };
 };

diff --git a/TrinityCore/GroupMethods.h b/TrinityCore/GroupMethods.h
@@ -436,8 +436,6 @@ namespace LuaGroup
         { "GetMembersCount", &LuaGroup::GetMembersCount },
 #ifndef CATA
         { "GetMemberFlags", &LuaGroup::GetMemberFlags },
-#else
-        { "GetMemberFlags", nullptr },
 #endif
 
         // Setters
@@ -446,8 +444,6 @@ namespace LuaGroup
         { "SetTargetIcon", &LuaGroup::SetTargetIcon },
 #ifndef CATA
         { "SetMemberFlag", &LuaGroup::SetMemberFlag },
-#else
-        { "SetMemberFlag", nullptr },
 #endif
 
         // Boolean
@@ -470,6 +466,11 @@ namespace LuaGroup
         { "ConvertToLFG", &LuaGroup::ConvertToLFG },
         { "ConvertToRaid", &LuaGroup::ConvertToRaid },
 
+#ifdef CATA //Not implemented in TCPP
+        { "GetMemberFlags", nullptr },
+        { "SetMemberFlag", nullptr },
+#endif
+
         { NULL, NULL }
     };
 };

diff --git a/TrinityCore/GuildMethods.h b/TrinityCore/GuildMethods.h
@@ -259,8 +259,6 @@ namespace LuaGuild
         { "SetMemberRank", &LuaGuild::SetMemberRank },
 #ifndef CATA
         { "SetLeader", &LuaGuild::SetLeader },
-#else
-        { "SetLeader", nullptr },
 #endif
 
         // Other
@@ -270,6 +268,10 @@ namespace LuaGuild
         { "AddMember", &LuaGuild::AddMember },
         { "DeleteMember", &LuaGuild::DeleteMember },
 
+#ifdef CATA //Not implemented in TCPP
+        { "SetLeader", nullptr },
+#endif
+
         { NULL, NULL }
     };
 };

diff --git a/TrinityCore/ItemMethods.h b/TrinityCore/ItemMethods.h
@@ -834,8 +834,6 @@ namespace LuaItem
         { "GetRequiredLevel", &LuaItem::GetRequiredLevel },
 #ifndef CATA
         { "GetStatsCount", &LuaItem::GetStatsCount },
-#else
-        { "GetStatsCount", nullptr },
 #endif
         { "GetRandomProperty", &LuaItem::GetRandomProperty },
         { "GetRandomSuffix", &LuaItem::GetRandomSuffix },
@@ -867,10 +865,6 @@ namespace LuaItem
         { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
         { "IsArmorVellum", &LuaItem::IsArmorVellum },
         { "IsRefundExpired", &LuaItem::IsRefundExpired },
-#else
-        { "IsWeaponVellum", nullptr },
-        { "IsArmorVellum", nullptr },
-        { "IsRefundExpired", nullptr },
 #endif
         { "IsConjuredConsumable", &LuaItem::IsConjuredConsumable },
         { "SetEnchantment", &LuaItem::SetEnchantment },
@@ -879,6 +873,13 @@ namespace LuaItem
         // Other
         { "SaveToDB", &LuaItem::SaveToDB },
 
+#ifdef CATA //Not implemented in TCPP
+        { "GetStatsCount", nullptr },
+        { "IsWeaponVellum", nullptr },
+        { "IsArmorVellum", nullptr },
+        { "IsRefundExpired", nullptr },
+#endif
+
         { NULL, NULL }
     };
 };

diff --git a/TrinityCore/PlayerMethods.h b/TrinityCore/PlayerMethods.h
@@ -3824,9 +3824,6 @@ namespace LuaPlayer
 #ifndef CATA
         { "GetArenaPoints", &LuaPlayer::GetArenaPoints },
         { "GetHonorPoints", &LuaPlayer::GetHonorPoints },
-#else
-        { "GetArenaPoints", nullptr }, 
-        { "GetHonorPoints", nullptr },
 #endif
         { "GetLifetimeKills", &LuaPlayer::GetLifetimeKills },
         { "GetPlayerIP", &LuaPlayer::GetPlayerIP },
@@ -3843,8 +3840,6 @@ namespace LuaPlayer
         { "GetRestBonus", &LuaPlayer::GetRestBonus },
 #ifndef CATA
         { "GetPhaseMaskForSpawn", &LuaPlayer::GetPhaseMaskForSpawn },
-#else
-        { "GetPhaseMaskForSpawn", nullptr },
 #endif
         { "GetReqKillOrCastCurrentCount", &LuaPlayer::GetReqKillOrCastCurrentCount },
         { "GetQuestStatus", &LuaPlayer::GetQuestStatus },
@@ -3890,18 +3885,11 @@ namespace LuaPlayer
         { "GetMailCount", &LuaPlayer::GetMailCount },
         { "GetXP", &LuaPlayer::GetXP },
         { "GetXPForNextLevel", &LuaPlayer::GetXPForNextLevel },
-#else
-        { "GetShieldBlockValue", nullptr },
-        { "GetMailCount", nullptr },
-        { "GetXP", nullptr },
-        { "GetXPForNextLevel", nullptr },
 #endif
 
         // Setters
 #ifndef CATA
         { "AdvanceSkillsToMax", &LuaPlayer::AdvanceSkillsToMax },
-#else
-        { "AdvanceSkillsToMax", nullptr },
 #endif
         { "AdvanceSkill", &LuaPlayer::AdvanceSkill },
         { "AdvanceAllSkills", &LuaPlayer::AdvanceAllSkills },
@@ -3913,9 +3901,6 @@ namespace LuaPlayer
 #ifndef CATA
         { "SetArenaPoints", &LuaPlayer::SetArenaPoints },
         { "SetHonorPoints", &LuaPlayer::SetHonorPoints },
-#else
-        { "SetArenaPoints", nullptr },
-        { "SetHonorPoints", nullptr },
 #endif
         { "SetLifetimeKills", &LuaPlayer::SetLifetimeKills },
         { "SetGameMaster", &LuaPlayer::SetGameMaster },
@@ -3931,8 +3916,6 @@ namespace LuaPlayer
         { "SetGuildRank", &LuaPlayer::SetGuildRank },
 #ifndef CATA
         { "SetMovement", &LuaPlayer::SetMovement },
-#else
-        { "SetMovement", nullptr },
 #endif
         { "SetSkill", &LuaPlayer::SetSkill },
         { "SetFactionForRace", &LuaPlayer::SetFactionForRace },
@@ -4007,9 +3990,6 @@ namespace LuaPlayer
 #ifndef CATA
         { "CanCompleteRepeatableQuest", &LuaPlayer::CanCompleteRepeatableQuest },
         { "CanRewardQuest", &LuaPlayer::CanRewardQuest },
-#else
-        { "CanCompleteRepeatableQuest", nullptr },
-        { "CanRewardQuest", nullptr },
 #endif
 
         // Gossip
@@ -4074,9 +4054,6 @@ namespace LuaPlayer
 #ifndef CATA
         { "ModifyHonorPoints", &LuaPlayer::ModifyHonorPoints },
         { "ModifyArenaPoints", &LuaPlayer::ModifyArenaPoints },
-#else
-        { "ModifyHonorPoints", nullptr },
-        { "ModifyArenaPoints", nullptr },
 #endif
         { "LeaveBattleground", &LuaPlayer::LeaveBattleground },
         { "BindToInstance", &LuaPlayer::BindToInstance },
@@ -4127,6 +4104,24 @@ namespace LuaPlayer
         { "ClearHonorInfo", nullptr }, // classic only
         { "GainSpellComboPoints", nullptr }, // not implemented
 
+#ifdef CATA //Not implmented in TCPP
+        { "GetArenaPoints", nullptr },
+        { "GetHonorPoints", nullptr },
+        { "GetPhaseMaskForSpawn", nullptr },
+        { "GetShieldBlockValue", nullptr },
+        { "GetMailCount", nullptr },
+        { "GetXP", nullptr },
+        { "GetXPForNextLevel", nullptr },
+        { "AdvanceSkillsToMax", nullptr },
+        { "SetArenaPoints", nullptr },
+        { "SetHonorPoints", nullptr },
+        { "SetMovement", nullptr },
+        { "CanCompleteRepeatableQuest", nullptr },
+        { "CanRewardQuest", nullptr },
+        { "ModifyHonorPoints", nullptr },
+        { "ModifyArenaPoints", nullptr },
+#endif
+
         { NULL, NULL }
     };
 };