Merge branch 'ElunaLuaEngine:master' into feat/arena-methods

CreatureMethods.h

@@ -769,7 +769,7 @@ namespace LuaCreature
 #elif defined(TRINITY)
         auto const& threatlist = creature->GetThreatManager().GetSortedThreatList();
 #elif defined(AZEROTHCORE)
-        auto const& threatlist = creature->getThreatManager().getThreatList();
+        auto const& threatlist = creature->getThreatMgr().getThreatList();
 #endif
 #ifndef TRINITY
         if (threatlist.empty())
@@ -860,7 +860,7 @@ namespace LuaCreature
 #if defined(TRINITY)
         auto const& threatlist = creature->GetThreatManager().GetThreatenedByMeList();
 #elif defined(AZEROTHCORE)
-auto const& threatlist = creature->getThreatManager().getThreatList();
+auto const& threatlist = creature->getThreatMgr().getThreatList();
 #else
         ThreatList const& threatlist = creature->GetThreatManager().getThreatList();
 #endif
@@ -894,7 +894,7 @@ auto const& threatlist = creature->getThreatManager().getThreatList();
 #if defined(TRINITY)
         Eluna::Push(L, creature->GetThreatManager().GetThreatenedByMeList().size());
 #elif defined(AZEROTHCORE)
-        Eluna::Push(L, creature->getThreatManager().getThreatList().size());
+        Eluna::Push(L, creature->getThreatMgr().getThreatList().size());
 #else
         Eluna::Push(L, creature->GetThreatManager().getThreatList().size());
 #endif

ElunaCreatureAI.h

@@ -90,16 +90,20 @@ struct ElunaCreatureAI : ScriptedAI
 #endif
 
     // Called at any Damage from any attacker (before damage apply)
-#if AZEROTHCORE
+#if defined AZEROTHCORE
     void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override
+#elif defined TRINITY
+    void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
 #else
     void DamageTaken(Unit* attacker, uint32& damage) override
 #endif
     {
         if (!sEluna->DamageTaken(me, attacker, damage))
         {
-#if AZEROTHCORE
+#if defined AZEROTHCORE
             ScriptedAI::DamageTaken(attacker, damage, damagetype, damageSchoolMask);
+#elif defined TRINITY
+            ScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
 #else
             ScriptedAI::DamageTaken(attacker, damage);
 #endif

ElunaIncludes.h

@@ -24,7 +24,6 @@
 #include "GuildMgr.h"
 #include "Language.h"
 #include "Mail.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
@@ -43,6 +42,12 @@
 #include "SpellHistory.h"
 #endif
 
+#if defined AZEROTHCORE
+#include "MapMgr.h"
+#else
+#include "MapManager.h"
+#endif
+
 #if defined TRINITY || defined AZEROTHCORE
 #include "Config.h"
 #include "GameEventMgr.h"

GlobalMethods.h

@@ -11,7 +11,7 @@
 
 #ifdef AZEROTHCORE
 
-#include "BanManager.h"
+#include "BanMgr.h"
 
 enum BanMode
 {

MapMethods.h

@@ -190,12 +190,10 @@ namespace LuaMap
         float x = Eluna::CHECKVAL<float>(L, 2);
         float y = Eluna::CHECKVAL<float>(L, 3);
         float z = Eluna::CHECKVAL<float>(L, 4);
-#if defined TRINITY
+#if defined TRINITY || defined AZEROTHCORE
         float phasemask = Eluna::CHECKVAL<uint32>(L, 5, PHASEMASK_NORMAL);
 
         Eluna::Push(L, map->GetAreaId(phasemask, x, y, z));
-#elif defined AZEROTHCORE
-        Eluna::Push(L, map->GetAreaId(x, y, z));
 #else
         Eluna::Push(L, map->GetTerrain()->GetAreaId(x, y, z));
 #endif

UnitMethods.h

@@ -2006,7 +2006,7 @@ namespace LuaUnit
 #ifdef TRINITY
         unit->GetThreatManager().ClearAllThreat();
 #elif AZEROTHCORE
-        unit->getThreatManager().clearReferences();
+        unit->getThreatMgr().clearReferences();
 #else
         unit->GetThreatManager().clearReferences();
 #endif