Chore: Remove unused #if statement (TrinityCore, Mangos, AzerothCore, TBC, Classic, Mists, Cata) (#217)

src/LuaEngine/LuaFunctions.cpp

@@ -212,10 +212,8 @@ ElunaRegister<WorldObject> WorldObjectMethods[] =
     // Getters
     { "GetName", &LuaWorldObject::GetName },
     { "GetMap", &LuaWorldObject::GetMap },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "GetPhaseMask", &LuaWorldObject::GetPhaseMask },
     { "SetPhaseMask", &LuaWorldObject::SetPhaseMask },
-#endif
     { "GetInstanceId", &LuaWorldObject::GetInstanceId },
     { "GetAreaId", &LuaWorldObject::GetAreaId },
     { "GetZoneId", &LuaWorldObject::GetZoneId },
@@ -301,9 +299,7 @@ ElunaRegister<Unit> UnitMethods[] =
     { "GetCharmerGUID", &LuaUnit::GetCharmerGUID },
     { "GetCharmGUID", &LuaUnit::GetCharmGUID },
     { "GetPetGUID", &LuaUnit::GetPetGUID },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "GetCritterGUID", &LuaUnit::GetCritterGUID },
-#endif
     { "GetControllerGUID", &LuaUnit::GetControllerGUID },
     { "GetControllerGUIDS", &LuaUnit::GetControllerGUIDS },
     { "GetStandState", &LuaUnit::GetStandState },
@@ -312,10 +308,8 @@ ElunaRegister<Unit> UnitMethods[] =
     { "GetSpeedRate", &LuaUnit::GetSpeedRate },
     { "GetStat", &LuaUnit::GetStat },
     { "GetBaseSpellPower", &LuaUnit::GetBaseSpellPower },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "GetVehicleKit", &LuaUnit::GetVehicleKit },
     // {"GetVehicle", &LuaUnit::GetVehicle},                           // :GetVehicle() - UNDOCUMENTED - Gets the Vehicle kit of the vehicle the unit is on
-#endif
     { "GetMovementType", &LuaUnit::GetMovementType },
     { "GetAttackers", &LuaUnit::GetAttackers },
 
@@ -338,10 +332,8 @@ ElunaRegister<Unit> UnitMethods[] =
     {"SetConfused", &LuaUnit::SetConfused},
     {"SetFeared", &LuaUnit::SetFeared},
     { "SetPvP", &LuaUnit::SetPvP },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "SetFFA", &LuaUnit::SetFFA },
     { "SetSanctuary", &LuaUnit::SetSanctuary },
-#endif
     // {"SetCanFly", &LuaUnit::SetCanFly},                             // :SetCanFly(apply) - UNDOCUMENTED
     // {"SetVisible", &LuaUnit::SetVisible},                           // :SetVisible(x) - UNDOCUMENTED
     { "SetOwnerGUID", &LuaUnit::SetOwnerGUID },
@@ -350,9 +342,7 @@ ElunaRegister<Unit> UnitMethods[] =
     { "SetCreatorGUID", &LuaUnit::SetCreatorGUID },
     { "SetMinionGUID", &LuaUnit::SetPetGUID },
     { "SetPetGUID", &LuaUnit::SetPetGUID },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "SetCritterGUID", &LuaUnit::SetCritterGUID },
-#endif
     { "SetWaterWalk", &LuaUnit::SetWaterWalk },
     { "SetStandState", &LuaUnit::SetStandState },
     { "SetInCombatWith", &LuaUnit::SetInCombatWith },
@@ -401,18 +391,14 @@ ElunaRegister<Unit> UnitMethods[] =
     { "HasAura", &LuaUnit::HasAura },
     { "IsCasting", &LuaUnit::IsCasting },
     { "IsStandState", &LuaUnit::IsStandState },
-#ifndef CLASSIC
     { "IsOnVehicle", &LuaUnit::IsOnVehicle },
-#endif
 
     // Other
     { "HandleStatModifier", &LuaUnit::HandleStatModifier },
     { "AddAura", &LuaUnit::AddAura },
     { "RemoveAura", &LuaUnit::RemoveAura },
     { "RemoveAllAuras", &LuaUnit::RemoveAllAuras },
-#if !defined(CLASSIC)
     { "RemoveArenaAuras", &LuaUnit::RemoveArenaAuras },
-#endif
     { "ClearInCombat", &LuaUnit::ClearInCombat },
     { "DeMorph", &LuaUnit::DeMorph },
     { "SendUnitWhisper", &LuaUnit::SendUnitWhisper },
@@ -451,9 +437,7 @@ ElunaRegister<Unit> UnitMethods[] =
     { "MoveConfused", &LuaUnit::MoveConfused },
     { "MoveFleeing", &LuaUnit::MoveFleeing },
     { "MoveTo", &LuaUnit::MoveTo },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "MoveJump", &LuaUnit::MoveJump },
-#endif
     { "MoveStop", &LuaUnit::MoveStop },
     { "MoveExpire", &LuaUnit::MoveExpire },
     { "MoveClear", &LuaUnit::MoveClear },
@@ -479,10 +463,8 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GetAccountId", &LuaPlayer::GetAccountId },
     { "GetAccountName", &LuaPlayer::GetAccountName },
     { "GetCompletedQuestsCount", &LuaPlayer::GetCompletedQuestsCount },
-#if defined (TBC) || defined (WOTLK)
     { "GetArenaPoints", &LuaPlayer::GetArenaPoints },
     { "GetHonorPoints", &LuaPlayer::GetHonorPoints },
-#endif
     { "GetLifetimeKills", &LuaPlayer::GetLifetimeKills },
     { "GetPlayerIP", &LuaPlayer::GetPlayerIP },
     { "GetLevelPlayedTime", &LuaPlayer::GetLevelPlayedTime },
@@ -497,11 +479,9 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GetQuestLevel", &LuaPlayer::GetQuestLevel },
     { "GetChatTag", &LuaPlayer::GetChatTag },
     { "GetRestBonus", &LuaPlayer::GetRestBonus },
-#ifdef WOTLK
     { "GetPhaseMaskForSpawn", &LuaPlayer::GetPhaseMaskForSpawn },
     { "GetAchievementPoints", &LuaPlayer::GetAchievementPoints },
     { "GetCompletedAchievementsCount", &LuaPlayer::GetCompletedAchievementsCount },
-#endif
     { "GetReqKillOrCastCurrentCount", &LuaPlayer::GetReqKillOrCastCurrentCount },
     { "GetQuestStatus", &LuaPlayer::GetQuestStatus },
     { "GetInGameTime", &LuaPlayer::GetInGameTime },
@@ -509,10 +489,8 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GetComboTarget", &LuaPlayer::GetComboTarget },
     { "GetGuildName", &LuaPlayer::GetGuildName },
     { "GetFreeTalentPoints", &LuaPlayer::GetFreeTalentPoints },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "GetActiveSpec", &LuaPlayer::GetActiveSpec },
     { "GetSpecsCount", &LuaPlayer::GetSpecsCount },
-#endif
     { "GetSpellCooldownDelay", &LuaPlayer::GetSpellCooldownDelay },
     { "GetGuildRank", &LuaPlayer::GetGuildRank },
     { "GetDifficulty", &LuaPlayer::GetDifficulty },
@@ -536,9 +514,7 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GetNextRandomRaidMember", &LuaPlayer::GetNextRandomRaidMember },
     { "GetOriginalGroup", &LuaPlayer::GetOriginalGroup },
     { "GetOriginalSubGroup", &LuaPlayer::GetOriginalSubGroup },
-#if defined(TRINITY) || AZEROTHCORE
     { "GetChampioningFaction", &LuaPlayer::GetChampioningFaction },
-#endif
     { "GetLatency", &LuaPlayer::GetLatency },
     // {"GetRecruiterId", &LuaPlayer::GetRecruiterId},                            // :GetRecruiterId() - UNDOCUMENTED - Returns player's recruiter's ID
     { "GetDbLocaleIndex", &LuaPlayer::GetDbLocaleIndex },
@@ -546,14 +522,7 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GetCorpse", &LuaPlayer::GetCorpse },
     { "GetGossipTextId", &LuaPlayer::GetGossipTextId },
     { "GetQuestRewardStatus", &LuaPlayer::GetQuestRewardStatus },
-#if defined(CLASSIC) || defined(TBC) || defined(WOTLK)
     { "GetShieldBlockValue", &LuaPlayer::GetShieldBlockValue },
-#endif
-#ifdef CLASSIC
-    { "GetHonorStoredKills", &LuaPlayer::GetHonorStoredKills },
-    { "GetRankPoints", &LuaPlayer::GetRankPoints },
-    { "GetHonorLastWeekStandingPos", &LuaPlayer::GetHonorLastWeekStandingPos },
-#endif
     { "GetPlayerSettingValue", &LuaPlayer::GetPlayerSettingValue },
     { "GetTrader", &LuaPlayer::GetTrader },
 
@@ -563,20 +532,11 @@ ElunaRegister<Player> PlayerMethods[] =
     { "AdvanceAllSkills", &LuaPlayer::AdvanceAllSkills },
     { "AddLifetimeKills", &LuaPlayer::AddLifetimeKills },
     { "SetCoinage", &LuaPlayer::SetCoinage },
-#ifndef CLASSIC
     { "SetKnownTitle", &LuaPlayer::SetKnownTitle },
     { "UnsetKnownTitle", &LuaPlayer::UnsetKnownTitle },
-#endif
     { "SetBindPoint", &LuaPlayer::SetBindPoint },
-#if defined(TBC) || defined(WOTLK)
     { "SetArenaPoints", &LuaPlayer::SetArenaPoints },
     { "SetHonorPoints", &LuaPlayer::SetHonorPoints },
-#endif
-#ifdef CLASSIC
-    { "SetHonorStoredKills", &LuaPlayer::SetHonorStoredKills },
-    { "SetRankPoints", &LuaPlayer::SetRankPoints },
-    { "SetHonorLastWeekStandingPos", &LuaPlayer::SetHonorLastWeekStandingPos },
-#endif
     { "SetSpellPower", &LuaPlayer::SetSpellPower },
     { "SetLifetimeKills", &LuaPlayer::SetLifetimeKills },
     { "SetGameMaster", &LuaPlayer::SetGameMaster },
@@ -598,9 +558,6 @@ ElunaRegister<Player> PlayerMethods[] =
     { "SetPlayerLock", &LuaPlayer::SetPlayerLock },
     { "SetGender", &LuaPlayer::SetGender },
     { "SetSheath", &LuaPlayer::SetSheath },
-#if !defined TRINITY && !AZEROTHCORE
-    { "SetFFA", &LuaPlayer::SetFFA },
-#endif
 
     // Boolean
     { "HasTankSpec", &LuaPlayer::HasTankSpec },
@@ -613,15 +570,11 @@ ElunaRegister<Player> PlayerMethods[] =
     { "IsImmuneToDamage", &LuaPlayer::IsImmuneToDamage },
     { "IsAlliance", &LuaPlayer::IsAlliance },
     { "IsHorde", &LuaPlayer::IsHorde },
-#ifndef CLASSIC
     { "HasTitle", &LuaPlayer::HasTitle },
-#endif
     { "HasItem", &LuaPlayer::HasItem },
     { "Teleport", &LuaPlayer::Teleport },
     { "AddItem", &LuaPlayer::AddItem },
-#ifndef CLASSIC
     { "IsInArenaTeam", &LuaPlayer::IsInArenaTeam },
-#endif
     { "CanRewardQuest", &LuaPlayer::CanRewardQuest },
     { "CanCompleteRepeatableQuest", &LuaPlayer::CanCompleteRepeatableQuest },
     { "CanCompleteQuest", &LuaPlayer::CanCompleteQuest },
@@ -642,13 +595,9 @@ ElunaRegister<Player> PlayerMethods[] =
     { "HasAtLoginFlag", &LuaPlayer::HasAtLoginFlag },
     // {"InRandomLfgDungeon", &LuaPlayer::InRandomLfgDungeon},                              // :InRandomLfgDungeon() - UNDOCUMENTED - Returns true if the player is in a random LFG dungeon
     // {"HasPendingBind", &LuaPlayer::HasPendingBind},                                      // :HasPendingBind() - UNDOCUMENTED - Returns true if the player has a pending instance bind
-#if (!defined(TBC) && !defined(CLASSIC))
     { "HasAchieved", &LuaPlayer::HasAchieved },
     { "GetAchievementCriteriaProgress", &LuaPlayer::GetAchievementCriteriaProgress },
-#if defined(TRINITY) || defined(AZEROTHCORE)
     { "SetAchievement", &LuaPlayer::SetAchievement },
-#endif
-#endif
     { "CanUninviteFromGroup", &LuaPlayer::CanUninviteFromGroup },
     { "IsRested", &LuaPlayer::IsRested },
     // {"CanFlyInZone", &LuaPlayer::CanFlyInZone},                                          // :CanFlyInZone(mapid, zone) - UNDOCUMENTED - Returns true if the player can fly in the area
@@ -659,9 +608,7 @@ ElunaRegister<Player> PlayerMethods[] =
     { "HasQuestForGO", &LuaPlayer::HasQuestForGO },
     { "CanShareQuest", &LuaPlayer::CanShareQuest },
     // {"HasReceivedQuestReward", &LuaPlayer::HasReceivedQuestReward},                      // :HasReceivedQuestReward(entry) - UNDOCUMENTED - Returns true if the player has recieved the quest's reward
-#if (!defined(TBC) && !defined(CLASSIC))
     { "HasTalent", &LuaPlayer::HasTalent },
-#endif
     { "IsInSameGroupWith", &LuaPlayer::IsInSameGroupWith },
     { "IsInSameRaidWith", &LuaPlayer::IsInSameRaidWith },
     { "IsGroupVisibleFor", &LuaPlayer::IsGroupVisibleFor },
@@ -669,26 +616,18 @@ ElunaRegister<Player> PlayerMethods[] =
     { "IsHonorOrXPTarget", &LuaPlayer::IsHonorOrXPTarget },
     { "CanParry", &LuaPlayer::CanParry },
     { "CanBlock", &LuaPlayer::CanBlock },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "CanTitanGrip", &LuaPlayer::CanTitanGrip },
-#endif
     { "InBattleground", &LuaPlayer::InBattleground },
-#ifndef CLASSIC
     { "InArena", &LuaPlayer::InArena },
-#endif
     // {"IsOutdoorPvPActive", &LuaPlayer::IsOutdoorPvPActive},                              // :IsOutdoorPvPActive() - UNDOCUMENTED - Returns true if the player is outdoor pvp active
     // {"IsARecruiter", &LuaPlayer::IsARecruiter},                                          // :IsARecruiter() - UNDOCUMENTED - Returns true if the player is a recruiter
     { "CanUseItem", &LuaPlayer::CanUseItem },
     { "HasSpell", &LuaPlayer::HasSpell },
     { "HasSpellCooldown", &LuaPlayer::HasSpellCooldown },
     { "IsInWater", &LuaPlayer::IsInWater },
-#ifndef CLASSIC
     { "CanFly", &LuaPlayer::CanFly },
-#endif
     { "IsMoving", &LuaPlayer::IsMoving },
-#ifndef CLASSIC
     { "IsFlying", &LuaPlayer::IsFlying },
-#endif
 
     // Gossip
     { "GossipMenuAddItem", &LuaPlayer::GossipMenuAddItem },
@@ -709,9 +648,7 @@ ElunaRegister<Player> PlayerMethods[] =
     { "RunCommand", &LuaPlayer::RunCommand },
     { "SetGlyph", &LuaPlayer::SetGlyph },
     { "GetGlyph", &LuaPlayer::GetGlyph },
-#if !defined(CLASSIC)
     { "RemoveArenaSpellCooldowns", &LuaPlayer::RemoveArenaSpellCooldowns },
-#endif
     { "RemoveItem", &LuaPlayer::RemoveItem },
     { "RemoveLifetimeKills", &LuaPlayer::RemoveLifetimeKills },
     { "ResurrectPlayer", &LuaPlayer::ResurrectPlayer },
@@ -739,9 +676,7 @@ ElunaRegister<Player> PlayerMethods[] =
     // {"KilledPlayerCredit", &LuaPlayer::KilledPlayerCredit},                              // :KilledPlayerCredit() - UNDOCUMENTED - Satisfies a player kill for the player
     // {"KillGOCredit", &LuaPlayer::KillGOCredit},                                          // :KillGOCredit(GOEntry[, GUID]) - UNDOCUMENTED - Credits the player for destroying a GO, guid is optional
     { "TalkedToCreature", &LuaPlayer::TalkedToCreature },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "ResetPetTalents", &LuaPlayer::ResetPetTalents },
-#endif
     { "AddComboPoints", &LuaPlayer::AddComboPoints },
     // {"GainSpellComboPoints", &LuaPlayer::GainSpellComboPoints},                          // :GainSpellComboPoints(amount) - UNDOCUMENTED - Player gains spell combo points
     { "ClearComboPoints", &LuaPlayer::ClearComboPoints },
@@ -758,18 +693,14 @@ ElunaRegister<Player> PlayerMethods[] =
     { "DurabilityPointLossForEquipSlot", &LuaPlayer::DurabilityPointLossForEquipSlot },
     { "DurabilityRepairAll", &LuaPlayer::DurabilityRepairAll },
     { "DurabilityRepair", &LuaPlayer::DurabilityRepair },
-#if defined(TBC) || defined(WOTLK)
     { "ModifyHonorPoints", &LuaPlayer::ModifyHonorPoints },
     { "ModifyArenaPoints", &LuaPlayer::ModifyArenaPoints },
-#endif
     { "LeaveBattleground", &LuaPlayer::LeaveBattleground },
     // {"BindToInstance", &LuaPlayer::BindToInstance},                                      // :BindToInstance() - UNDOCUMENTED - Binds the player to the current instance
     { "UnbindInstance", &LuaPlayer::UnbindInstance },
     { "UnbindAllInstances", &LuaPlayer::UnbindAllInstances },
     { "RemoveFromBattlegroundRaid", &LuaPlayer::RemoveFromBattlegroundRaid },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "ResetAchievements", &LuaPlayer::ResetAchievements },
-#endif
     { "KickPlayer", &LuaPlayer::KickPlayer },
     { "LogoutPlayer", &LuaPlayer::LogoutPlayer },
     { "SendTrainerList", &LuaPlayer::SendTrainerList },
@@ -795,14 +726,7 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GroupInvite", &LuaPlayer::GroupInvite },
     { "GroupCreate", &LuaPlayer::GroupCreate },
     { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
-#if !defined(CLASSIC) && !defined(TBC)
     { "SendMovieStart", &LuaPlayer::SendMovieStart },
-#endif
-#ifdef CLASSIC
-    { "UpdateHonor", &LuaPlayer::UpdateHonor },
-    { "ResetHonor", &LuaPlayer::ResetHonor },
-    { "ClearHonorInfo", &LuaPlayer::ClearHonorInfo },
-#endif
     { "UpdatePlayerSetting", &LuaPlayer::UpdatePlayerSetting },
 
     { NULL, NULL }
@@ -820,18 +744,13 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "GetScriptId", &LuaCreature::GetScriptId },
     { "GetAIName", &LuaCreature::GetAIName },
     { "GetScriptName", &LuaCreature::GetScriptName },
-#ifndef AZEROTHCORE
-    { "GetAttackDistance", &LuaCreature::GetAttackDistance },
-#endif
     { "GetAggroRange", &LuaCreature::GetAggroRange },
     { "GetDefaultMovementType", &LuaCreature::GetDefaultMovementType },
     { "GetRespawnDelay", &LuaCreature::GetRespawnDelay },
     { "GetWanderRadius", &LuaCreature::GetWanderRadius },
     { "GetCurrentWaypointId", &LuaCreature::GetCurrentWaypointId },
-#if defined(TRINITY) || AZEROTHCORE
     { "GetWaypointPath", &LuaCreature::GetWaypointPath },
     { "GetLootMode", &LuaCreature::GetLootMode },
-#endif
     { "GetLootRecipient", &LuaCreature::GetLootRecipient },
     { "GetLootRecipientGroup", &LuaCreature::GetLootRecipientGroup },
     { "GetNPCFlags", &LuaCreature::GetNPCFlags },
@@ -839,16 +758,12 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "GetUnitFlagsTwo", &LuaCreature::GetUnitFlagsTwo },
     { "GetExtraFlags", &LuaCreature::GetExtraFlags },
     { "GetRank", &LuaCreature::GetRank },
-#if defined(CLASSIC) || defined(TBC) || defined(WOTLK)
     { "GetShieldBlockValue", &LuaCreature::GetShieldBlockValue },
-#endif
     { "GetDBTableGUIDLow", &LuaCreature::GetDBTableGUIDLow },
     { "GetCreatureFamily", &LuaCreature::GetCreatureFamily },
 
     // Setters
-#if defined(TRINITY) || defined(AZEROTHCORE)
     { "SetRegeneratingHealth", &LuaCreature::SetRegeneratingHealth },
-#endif
     { "SetHover", &LuaCreature::SetHover },
     { "SetDisableGravity", &LuaCreature::SetDisableGravity },
     { "SetAggroEnabled", &LuaCreature::SetAggroEnabled },
@@ -859,15 +774,11 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "SetWanderRadius", &LuaCreature::SetWanderRadius },
     { "SetInCombatWithZone", &LuaCreature::SetInCombatWithZone },
     { "SetDisableReputationGain", &LuaCreature::SetDisableReputationGain },
-#if defined(TRINITY) || AZEROTHCORE
     { "SetLootMode", &LuaCreature::SetLootMode },
-#endif
     { "SetNPCFlags", &LuaCreature::SetNPCFlags },
     { "SetUnitFlags", &LuaCreature::SetUnitFlags },
     { "SetUnitFlagsTwo", &LuaCreature::SetUnitFlagsTwo },
-#if defined(TRINITY) || AZEROTHCORE
     { "SetReactState", &LuaCreature::SetReactState },
-#endif
     { "SetDeathState", &LuaCreature::SetDeathState },
     { "SetWalk", &LuaCreature::SetWalk },
     { "SetHomePosition", &LuaCreature::SetHomePosition },
@@ -875,15 +786,11 @@ ElunaRegister<Creature> CreatureMethods[] =
 
     // Boolean
     { "IsRegeneratingHealth", &LuaCreature::IsRegeneratingHealth },
-#if defined(TRINITY) || defined(AZEROTHCORE)
     { "IsDungeonBoss", &LuaCreature::IsDungeonBoss },
-#endif
     { "IsWorldBoss", &LuaCreature::IsWorldBoss },
     { "IsRacialLeader", &LuaCreature::IsRacialLeader },
     { "IsCivilian", &LuaCreature::IsCivilian },
-#if defined(TRINITY) || AZEROTHCORE
     { "IsTrigger", &LuaCreature::IsTrigger },
-#endif
     { "IsGuard", &LuaCreature::IsGuard },
     { "IsElite", &LuaCreature::IsElite },
     { "IsInEvadeMode", &LuaCreature::IsInEvadeMode },
@@ -891,9 +798,7 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "CanWalk", &LuaCreature::CanWalk },
     { "CanSwim", &LuaCreature::CanSwim },
     { "CanAggro", &LuaCreature::CanAggro },
-#if defined(TRINITY) || AZEROTHCORE
     { "CanStartAttack", &LuaCreature::CanStartAttack },
-#endif
     { "HasSearchedAssistance", &LuaCreature::HasSearchedAssistance },
     { "IsTappedBy", &LuaCreature::IsTappedBy },
     { "HasLootRecipient", &LuaCreature::HasLootRecipient },
@@ -901,10 +806,8 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "IsTargetableForAttack", &LuaCreature::IsTargetableForAttack },
     { "CanCompleteQuest", &LuaCreature::CanCompleteQuest },
     { "IsReputationGainDisabled", &LuaCreature::IsReputationGainDisabled },
-#if defined(TRINITY) || AZEROTHCORE
     { "IsDamageEnoughForLootingAndReward", &LuaCreature::IsDamageEnoughForLootingAndReward },
     { "HasLootMode", &LuaCreature::HasLootMode },
-#endif
     { "HasSpell", &LuaCreature::HasSpell },
     { "HasQuest", &LuaCreature::HasQuest },
     { "HasSpellCooldown", &LuaCreature::HasSpellCooldown },
@@ -918,11 +821,9 @@ ElunaRegister<Creature> CreatureMethods[] =
     { "DespawnOrUnsummon", &LuaCreature::DespawnOrUnsummon },
     { "Respawn", &LuaCreature::Respawn },
     { "AttackStart", &LuaCreature::AttackStart },
-#if defined(TRINITY) || AZEROTHCORE
     { "AddLootMode", &LuaCreature::AddLootMode },
     { "ResetLootMode", &LuaCreature::ResetLootMode },
     { "RemoveLootMode", &LuaCreature::RemoveLootMode },
-#endif
     { "SaveToDB", &LuaCreature::SaveToDB },
     { "SelectVictim", &LuaCreature::SelectVictim },
     { "MoveWaypoint", &LuaCreature::MoveWaypoint },
@@ -990,13 +891,9 @@ ElunaRegister<Item> ItemMethods[] =
     { "GetAllowableRace", &LuaItem::GetAllowableRace },
     { "GetItemLevel", &LuaItem::GetItemLevel },
     { "GetRequiredLevel", &LuaItem::GetRequiredLevel },
-#ifdef WOTLK
     { "GetStatsCount", &LuaItem::GetStatsCount },
-#endif
     { "GetRandomProperty", &LuaItem::GetRandomProperty },
-#ifndef CLASSIC
     { "GetRandomSuffix", &LuaItem::GetRandomSuffix },
-#endif
     { "GetItemSet", &LuaItem::GetItemSet },
     { "GetBagSize", &LuaItem::GetBagSize },
     { "GetItemTemplate", &LuaItem::GetItemTemplate },
@@ -1008,16 +905,12 @@ ElunaRegister<Item> ItemMethods[] =
 
     // Boolean
     { "IsSoulBound", &LuaItem::IsSoulBound },
-#if (!defined(TBC) && !defined(CLASSIC))
     { "IsBoundAccountWide", &LuaItem::IsBoundAccountWide },
-#endif
     { "IsBoundByEnchant", &LuaItem::IsBoundByEnchant },
     { "IsNotBoundToPlayer", &LuaItem::IsNotBoundToPlayer },
     { "IsLocked", &LuaItem::IsLocked },
     { "IsBag", &LuaItem::IsBag },
-#ifndef CLASSIC
     { "IsCurrencyToken", &LuaItem::IsCurrencyToken },
-#endif
     { "IsNotEmptyBag", &LuaItem::IsNotEmptyBag },
     { "IsBroken", &LuaItem::IsBroken },
     { "CanBeTraded", &LuaItem::CanBeTraded },
@@ -1026,10 +919,8 @@ ElunaRegister<Item> ItemMethods[] =
     { "IsEquipped", &LuaItem::IsEquipped },
     { "HasQuest", &LuaItem::HasQuest },
     { "IsPotion", &LuaItem::IsPotion },
-#if defined(CLASSIC) || defined(TBC) || defined(WOTLK)
     { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
     { "IsArmorVellum", &LuaItem::IsArmorVellum },
-#endif
     { "IsConjuredConsumable", &LuaItem::IsConjuredConsumable },
     //{"IsRefundExpired", &LuaItem::IsRefundExpired},               // :IsRefundExpired() - UNDOCUMENTED - Returns true if the item's refund time has expired
     { "SetEnchantment", &LuaItem::SetEnchantment },
@@ -1126,9 +1017,7 @@ ElunaRegister<Quest> QuestMethods[] =
 
     // Boolean
     { "HasFlag", &LuaQuest::HasFlag },
-#ifndef CLASSIC
     { "IsDaily", &LuaQuest::IsDaily },
-#endif
     { "IsRepeatable", &LuaQuest::IsRepeatable },
 
     { NULL, NULL }
@@ -1187,13 +1076,9 @@ ElunaRegister<Guild> GuildMethods[] =
     { "GetMemberCount", &LuaGuild::GetMemberCount },
 
     // Setters
-#ifndef CLASSIC
     { "SetBankTabText", &LuaGuild::SetBankTabText },
-#endif
     { "SetMemberRank", &LuaGuild::SetMemberRank },
-#if defined(CLASSIC) || defined(TBC) || defined(WOTLK)
     { "SetLeader", &LuaGuild::SetLeader },
-#endif
 
     // Other
     { "SendPacket", &LuaGuild::SendPacket },
@@ -1205,8 +1090,6 @@ ElunaRegister<Guild> GuildMethods[] =
     { NULL, NULL }
 };
 
-#ifndef CLASSIC
-#ifndef TBC
 ElunaRegister<Vehicle> VehicleMethods[] =
 {
     // Getters
@@ -1223,8 +1106,6 @@ ElunaRegister<Vehicle> VehicleMethods[] =
 
     { NULL, NULL }
 };
-#endif
-#endif
 
 ElunaRegister<ElunaQuery> QueryMethods[] =
 {
@@ -1306,15 +1187,11 @@ ElunaRegister<Map> MapMethods[] =
     { "SetWeather", &LuaMap::SetWeather },
 
     // Boolean
-#ifndef CLASSIC
     { "IsArena", &LuaMap::IsArena },
-#endif
     { "IsBattleground", &LuaMap::IsBattleground },
     { "IsDungeon", &LuaMap::IsDungeon },
     { "IsEmpty", &LuaMap::IsEmpty },
-#ifndef CLASSIC
     { "IsHeroic", &LuaMap::IsHeroic },
-#endif
     { "IsRaid", &LuaMap::IsRaid },
 
     // Other
@@ -1349,9 +1226,6 @@ ElunaRegister<BattleGround> BattleGroundMethods[] =
     { "GetAlivePlayersCountByTeam", &LuaBattleGround::GetAlivePlayersCountByTeam },
     { "GetMap", &LuaBattleGround::GetMap },
     { "GetBonusHonorFromKillCount", &LuaBattleGround::GetBonusHonorFromKillCount },
-#ifndef AZEROTHCORE
-    { "GetBracketId", &LuaBattleGround::GetBracketId },
-#endif
     { "GetEndTime", &LuaBattleGround::GetEndTime },
     { "GetFreeSlotsForTeam", &LuaBattleGround::GetFreeSlotsForTeam },
     { "GetInstanceId", &LuaBattleGround::GetInstanceId },
@@ -1416,7 +1290,6 @@ ElunaRegister<Roll> RollMethods[] =
     { NULL, NULL }
 };
 
-#if (!defined(TBC) && !defined(CLASSIC))
 // fix compile error about accessing vehicle destructor
 template<> int ElunaTemplate<Vehicle>::CollectGarbage(lua_State* L)
 {
@@ -1427,7 +1300,6 @@ template<> int ElunaTemplate<Vehicle>::CollectGarbage(lua_State* L)
     delete obj;
     return 0;
 }
-#endif
 
 // Template by Mud from http://stackoverflow.com/questions/4484437/lua-integer-type/4485511#4485511
 template<> int ElunaTemplate<unsigned long long>::Add(lua_State* L) { Eluna::Push(L, Eluna::CHECKVAL<unsigned long long>(L, 1) + Eluna::CHECKVAL<unsigned long long>(L, 2)); return 1; }
@@ -1521,12 +1393,8 @@ void RegisterFunctions(Eluna* E)
     ElunaTemplate<ItemTemplate>::Register(E, "ItemTemplate");
     ElunaTemplate<ItemTemplate>::SetMethods(E, ItemTemplateMethods);
 
-#ifndef CLASSIC
-#ifndef TBC
     ElunaTemplate<Vehicle>::Register(E, "Vehicle");
     ElunaTemplate<Vehicle>::SetMethods(E, VehicleMethods);
-#endif
-#endif
 
     ElunaTemplate<Group>::Register(E, "Group");
     ElunaTemplate<Group>::SetMethods(E, GroupMethods);