From cec3174b3833a28f56f60a880413ca6b65c50b3c Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Thu, 17 Jul 2014 21:18:49 +0300
Subject: [PATCH] Eluna fix TC

---
 LuaFunctions.cpp |  4 ++--
 PlayerMethods.h  | 15 ++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index 0b4bfa8..7b2c9da 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -251,8 +251,8 @@ ElunaRegister<Unit> UnitMethods[] =
     { "SetPowerType", &LuaUnit::SetPowerType },               // :SetPowerType(type)
     { "SetDisplayId", &LuaUnit::SetDisplayId },               // :SetDisplayId(id)
     { "SetNativeDisplayId", &LuaUnit::SetNativeDisplayId },   // :SetNativeDisplayId(id)
-    { "SetFacing", &LuaUnit::SetFacing },                     // :SetFacing(o) - Sets the Unit facing to arg
-    { "SetFacingToObject", &LuaUnit::SetFacingToObject },     // :SetFacingToObject(worldObject) - Sets the Unit facing towards the WorldObject
+    { "SetFacing", &LuaUnit::SetFacing },                     // :SetFacing(o) - Sets the Unit facing / orientation to arg
+    { "SetFacingToObject", &LuaUnit::SetFacingToObject },     // :SetFacingToObject(worldObject) - Sets the Unit facing / orientation towards the WorldObject
 #if (!defined(TBC) && !defined(CLASSIC))
     { "SetPhaseMask", &LuaUnit::SetPhaseMask },               // :SetPhaseMask(Phase[, update]) - Sets the phase of the unit
 #endif
diff --git a/PlayerMethods.h b/PlayerMethods.h
index 2a1f4de..8b9363b 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -1622,12 +1622,8 @@ namespace LuaPlayer
 
     int ResetTalentsCost(lua_State* L, Player* player)
     {
-#ifdef TRINITY
 #ifdef CATA
         Eluna::Push(L, player->GetNextResetTalentsCost());
-#else
-        Eluna::Push(L, player->ResetTalentsCost());
-#endif
 #else
         Eluna::Push(L, player->resetTalentsCost());
 #endif
@@ -1638,7 +1634,7 @@ namespace LuaPlayer
     {
         bool no_cost = Eluna::CHECKVAL<bool>(L, 2, true);
 
-#ifdef TRINITY
+#ifdef CATA
         player->ResetTalents(no_cost);
 #else
         player->resetTalents(no_cost);
@@ -1655,11 +1651,7 @@ namespace LuaPlayer
         bool disabled = Eluna::CHECKVAL<bool>(L, 3, false);
         bool learn_low_rank = Eluna::CHECKVAL<bool>(L, 4, true);
 
-#ifdef TRINITY
-        player->RemoveSpell(entry, disabled, learn_low_rank);
-#else
         player->removeSpell(entry, disabled, learn_low_rank);
-#endif
         return 0;
     }
 
@@ -2101,11 +2093,8 @@ namespace LuaPlayer
     int LearnSpell(lua_State* L, Player* player)
     {
         uint32 id = Eluna::CHECKVAL<uint32>(L, 2);
-#ifdef TRINITY
-        player->LearnSpell(id, false);
-#else
+
         player->learnSpell(id, false);
-#endif
         return 0;
     }