CMaNGOS specific fixes

Fix CMaNGOS specific functions per expansion
ElunaLuaEngine · Jul 28, 2023 · 61e2e43 · 61e2e43
1 parent faa42cd
commit 61e2e43
Show file tree

Hide file tree

Showing 10 changed files with 125 additions and 83 deletions.
diff --git a/CMangos/CreatureMethods.h b/CMangos/CreatureMethods.h
@@ -1518,8 +1518,8 @@ namespace LuaCreature
         { "GetRespawnDelay", &LuaCreature::GetRespawnDelay },
         { "GetWanderRadius", &LuaCreature::GetWanderRadius },
         { "GetCurrentWaypointId", &LuaCreature::GetCurrentWaypointId },
-        { "GetWaypointPath", &LuaCreature::GetWaypointPath },
-        { "GetLootMode", &LuaCreature::GetLootMode },
+        { "GetWaypointPath", nullptr }, // TC/Acore
+        { "GetLootMode", nullptr }, // TC/Acore
         { "GetLootRecipient", &LuaCreature::GetLootRecipient },
         { "GetLootRecipientGroup", &LuaCreature::GetLootRecipientGroup },
         { "GetNPCFlags", &LuaCreature::GetNPCFlags },
@@ -1529,7 +1529,7 @@ namespace LuaCreature
         { "GetCreatureFamily", &LuaCreature::GetCreatureFamily },
 
         // Setters
-        { "SetRegeneratingHealth", &LuaCreature::SetRegeneratingHealth },
+        { "SetRegeneratingHealth", nullptr }, // TC/Acore
         { "SetHover", &LuaCreature::SetHover },
         { "SetDisableGravity", &LuaCreature::SetDisableGravity },
         { "SetAggroEnabled", &LuaCreature::SetAggroEnabled },
@@ -1540,38 +1540,38 @@ namespace LuaCreature
         { "SetWanderRadius", &LuaCreature::SetWanderRadius },
         { "SetInCombatWithZone", &LuaCreature::SetInCombatWithZone },
         { "SetDisableReputationGain", &LuaCreature::SetDisableReputationGain },
-        { "SetLootMode", &LuaCreature::SetLootMode },
+        { "SetLootMode", nullptr }, // TC/Acore
         { "SetNPCFlags", &LuaCreature::SetNPCFlags },
-        { "SetReactState", &LuaCreature::SetReactState },
+        { "SetReactState", nullptr }, // TC/Acore
         { "SetDeathState", &LuaCreature::SetDeathState },
         { "SetWalk", &LuaCreature::SetWalk },
         { "SetHomePosition", &LuaCreature::SetHomePosition },
         { "SetEquipmentSlots", &LuaCreature::SetEquipmentSlots },
 
         // Boolean
         { "IsRegeneratingHealth", &LuaCreature::IsRegeneratingHealth },
-        { "IsDungeonBoss", &LuaCreature::IsDungeonBoss },
+        { "IsDungeonBoss", nullptr }, // TC/Acore
         { "IsWorldBoss", &LuaCreature::IsWorldBoss },
         { "IsRacialLeader", &LuaCreature::IsRacialLeader },
         { "IsCivilian", &LuaCreature::IsCivilian },
-        { "IsTrigger", &LuaCreature::IsTrigger },
+        { "IsTrigger", nullptr }, // TC/Acore
         { "IsGuard", &LuaCreature::IsGuard },
         { "IsElite", &LuaCreature::IsElite },
         { "IsInEvadeMode", &LuaCreature::IsInEvadeMode },
         { "HasCategoryCooldown", &LuaCreature::HasCategoryCooldown },
         { "CanWalk", &LuaCreature::CanWalk },
         { "CanSwim", &LuaCreature::CanSwim },
         { "CanAggro", &LuaCreature::CanAggro },
-        { "CanStartAttack", &LuaCreature::CanStartAttack },
+        { "CanStartAttack", nullptr }, // TC/Acore
         { "HasSearchedAssistance", &LuaCreature::HasSearchedAssistance },
         { "IsTappedBy", &LuaCreature::IsTappedBy },
         { "HasLootRecipient", &LuaCreature::HasLootRecipient },
         { "CanAssistTo", &LuaCreature::CanAssistTo },
         { "IsTargetableForAttack", &LuaCreature::IsTargetableForAttack },
         { "CanCompleteQuest", &LuaCreature::CanCompleteQuest },
         { "IsReputationGainDisabled", &LuaCreature::IsReputationGainDisabled },
-        { "IsDamageEnoughForLootingAndReward", &LuaCreature::IsDamageEnoughForLootingAndReward },
-        { "HasLootMode", &LuaCreature::HasLootMode },
+        { "IsDamageEnoughForLootingAndReward", nullptr }, // TC/Acore
+        { "HasLootMode", nullptr }, // TC/Acore
         { "HasSpell", &LuaCreature::HasSpell },
         { "HasQuest", &LuaCreature::HasQuest },
         { "HasSpellCooldown", &LuaCreature::HasSpellCooldown },
@@ -1585,9 +1585,9 @@ namespace LuaCreature
         { "DespawnOrUnsummon", &LuaCreature::DespawnOrUnsummon },
         { "Respawn", &LuaCreature::Respawn },
         { "AttackStart", &LuaCreature::AttackStart },
-        { "AddLootMode", &LuaCreature::AddLootMode },
-        { "ResetLootMode", &LuaCreature::ResetLootMode },
-        { "RemoveLootMode", &LuaCreature::RemoveLootMode },
+        { "AddLootMode", nullptr }, // TC/Acore
+        { "ResetLootMode", nullptr }, // TC/Acore
+        { "RemoveLootMode", nullptr }, // TC/Acore
         { "SaveToDB", &LuaCreature::SaveToDB },
         { "SelectVictim", &LuaCreature::SelectVictim },
         { "MoveWaypoint", &LuaCreature::MoveWaypoint },

diff --git a/CMangos/GlobalMethods.h b/CMangos/GlobalMethods.h
@@ -7,7 +7,7 @@
 #ifndef GLOBALMETHODS_H
 #define GLOBALMETHODS_H
 
-#include "BindingMap.h"
+#include "LuaEngine/BindingMap.h"
 
 #ifdef AZEROTHCORE
 

diff --git a/CMangos/GroupMethods.h b/CMangos/GroupMethods.h
@@ -447,14 +447,16 @@ namespace LuaGroup
         { "RemoveMember", &LuaGroup::RemoveMember },
         { "Disband", &LuaGroup::Disband },
         { "IsFull", &LuaGroup::IsFull },
-        { "IsLFGGroup", &LuaGroup::IsLFGGroup },
         { "IsRaidGroup", &LuaGroup::IsRaidGroup },
         { "IsBGGroup", &LuaGroup::IsBGGroup },
         { "IsBFGroup", nullptr },   // not implemented
         { "IsMember", &LuaGroup::IsMember },
         { "IsAssistant", &LuaGroup::IsAssistant },
         { "SameSubGroup", &LuaGroup::SameSubGroup },
         { "HasFreeSlotSubGroup", &LuaGroup::HasFreeSlotSubGroup },
+#if defined WOTLK
+        { "IsLFGGroup", &LuaGroup::IsLFGGroup },
+#endif
 
         // Other
         { "SendPacket", &LuaGroup::SendPacket },

diff --git a/CMangos/GuildMethods.h b/CMangos/GuildMethods.h
@@ -315,7 +315,9 @@ namespace LuaGuild
         { "GetMemberCount", &LuaGuild::GetMemberCount },
 
         // Setters
+#if defined(TBC) || defined(WOTLK)
         { "SetBankTabText", &LuaGuild::SetBankTabText },
+#endif
         { "SetMemberRank", &LuaGuild::SetMemberRank },
         { "SetLeader", &LuaGuild::SetLeader },
 

diff --git a/CMangos/ItemMethods.h b/CMangos/ItemMethods.h
@@ -791,11 +791,15 @@ namespace LuaItem
         { "GetAllowableRace", &LuaItem::GetAllowableRace },
         { "GetItemLevel", &LuaItem::GetItemLevel },
         { "GetRequiredLevel", &LuaItem::GetRequiredLevel },
-        { "GetStatsCount", &LuaItem::GetStatsCount },
         { "GetRandomProperty", &LuaItem::GetRandomProperty },
-        { "GetRandomSuffix", &LuaItem::GetRandomSuffix },
         { "GetItemSet", &LuaItem::GetItemSet },
         { "GetBagSize", &LuaItem::GetBagSize },
+#if defined(TBC) || defined(WOTLK)
+        { "GetRandomSuffix", &LuaItem::GetRandomSuffix },
+#endif
+#if defined(WOTLK)
+        { "GetStatsCount", &LuaItem::GetStatsCount },
+#endif
 
         // Setters
         { "SetOwner", &LuaItem::SetOwner },
@@ -804,12 +808,10 @@ namespace LuaItem
 
         // Boolean
         { "IsSoulBound", &LuaItem::IsSoulBound },
-        { "IsBoundAccountWide", &LuaItem::IsBoundAccountWide },
         { "IsBoundByEnchant", &LuaItem::IsBoundByEnchant },
         { "IsNotBoundToPlayer", &LuaItem::IsNotBoundToPlayer },
         { "IsLocked", &LuaItem::IsLocked },
         { "IsBag", &LuaItem::IsBag },
-        { "IsCurrencyToken", &LuaItem::IsCurrencyToken },
         { "IsNotEmptyBag", &LuaItem::IsNotEmptyBag },
         { "IsBroken", &LuaItem::IsBroken },
         { "CanBeTraded", &LuaItem::CanBeTraded },
@@ -818,12 +820,18 @@ namespace LuaItem
         { "IsEquipped", &LuaItem::IsEquipped },
         { "HasQuest", &LuaItem::HasQuest },
         { "IsPotion", &LuaItem::IsPotion },
-        { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
-        { "IsArmorVellum", &LuaItem::IsArmorVellum },
         { "IsConjuredConsumable", &LuaItem::IsConjuredConsumable },
         { "IsRefundExpired", nullptr }, // not implemented
         { "SetEnchantment", &LuaItem::SetEnchantment },
         { "ClearEnchantment", &LuaItem::ClearEnchantment },
+#if defined(TBC) || defined(WOTLK)
+        { "IsCurrencyToken", &LuaItem::IsCurrencyToken },
+#endif
+#if defined(WOTLK)
+        { "IsBoundAccountWide", &LuaItem::IsBoundAccountWide },
+        { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
+        { "IsArmorVellum", &LuaItem::IsArmorVellum },
+#endif
 
         // Other
         { "SaveToDB", &LuaItem::SaveToDB },

diff --git a/CMangos/MapMethods.h b/CMangos/MapMethods.h
@@ -7,7 +7,7 @@
 #ifndef MAPMETHODS_H
 #define MAPMETHODS_H
 
-#include "ElunaInstanceAI.h"
+#include "LuaEngine/ElunaInstanceAI.h"
 
 /***
  * A game map, e.g. Azeroth, Eastern Kingdoms, the Molten Core, etc.
@@ -388,12 +388,14 @@ namespace LuaMap
         { "SetWeather", &LuaMap::SetWeather },
 
         // Boolean
-        { "IsArena", &LuaMap::IsArena },
         { "IsBattleground", &LuaMap::IsBattleground },
         { "IsDungeon", &LuaMap::IsDungeon },
         { "IsEmpty", &LuaMap::IsEmpty },
-        { "IsHeroic", &LuaMap::IsHeroic },
         { "IsRaid", &LuaMap::IsRaid },
+#if defined(TBC) || defined(WOTLK)
+        { "IsArena", &LuaMap::IsArena },
+        { "IsHeroic", &LuaMap::IsHeroic },
+#endif
 
         // Other
         { "SaveInstanceData", &LuaMap::SaveInstanceData },