Merge branch 'master' of https://github.com/ElunaLuaEngine/Eluna into aura_application_hook

# Conflicts:
#	hooks/Hooks.h

Author: Terrorblade

ElunaConfig.cpp

@@ -4,7 +4,7 @@
 * Please see the included DOCS/LICENSE.md for more information
 */
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 #include "Config.h"
 #else
 #include "Config/Config.h"
@@ -56,6 +56,8 @@ void ElunaConfig::SetConfig(ElunaConfigBoolValues index, char const* fieldname,
 {
 #if defined ELUNA_TRINITY
     SetConfig(index, sConfigMgr->GetBoolDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<bool>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetBoolDefault(fieldname, defvalue));
 #endif
@@ -67,6 +69,8 @@ void ElunaConfig::SetConfig(ElunaConfigStringValues index, char const* fieldname
     SetConfig(index, sConfigMgr->GetStringDefault(fieldname, defvalue));
 #elif defined ELUNA_CMANGOS
     SetConfig(index, sConfig.GetStringDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<std::string>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetStringDefault(fieldname, defvalue.c_str()));
 #endif
@@ -76,6 +80,8 @@ void ElunaConfig::SetConfig(ElunaConfigUInt32Values index, char const* fieldname
 {
 #if defined ELUNA_TRINITY
     SetConfig(index, sConfigMgr->GetIntDefault(fieldname, defvalue));
+#elif defined ELUNA_AZEROTHCORE
+    SetConfig(index, sConfigMgr->GetOption<uint32>(fieldname, defvalue));
 #else
     SetConfig(index, sConfig.GetIntDefault(fieldname, defvalue));
 #endif

ElunaCreatureAI.h

@@ -12,7 +12,7 @@
 #include "AI/BaseAI/CreatureAI.h"
 #endif
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
 struct ScriptedAI;
 typedef ScriptedAI NativeScriptedAI;
 #elif defined ELUNA_CMANGOS || ELUNA_MANGOS
@@ -29,7 +29,7 @@ struct ElunaCreatureAI : NativeScriptedAI
     bool justSpawned;
     // used to delay movementinform hook (WP hook)
     std::vector< std::pair<uint32, uint32> > movepoints;
-#if !defined ELUNA_TRINITY
+#if !defined ELUNA_TRINITY && !defined ELUNA_AZEROTHCORE
 #define me  m_creature
 #endif
     ElunaCreatureAI(Creature* creature) : NativeScriptedAI(creature), justSpawned(true)
@@ -73,7 +73,7 @@ struct ElunaCreatureAI : NativeScriptedAI
         }
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called for reaction when initially engaged - this will always happen _after_ JustEnteredCombat
     // Called at creature aggro either by MoveInLOS or Attack Start
     void JustEngagedWith(Unit* target) override
@@ -94,6 +94,8 @@ struct ElunaCreatureAI : NativeScriptedAI
     // Called at any Damage from any attacker (before damage apply)
 #if defined ELUNA_TRINITY || defined ELUNA_CMANGOS 
     void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
+#elif defined ELUNA_AZEROTHCORE
+    void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override
 #else
     void DamageTaken(Unit* attacker, uint32& damage) override
 #endif
@@ -102,6 +104,8 @@ struct ElunaCreatureAI : NativeScriptedAI
         {
 #if defined ELUNA_TRINITY || defined ELUNA_CMANGOS
             NativeScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
+#elif defined ELUNA_AZEROTHCORE
+            NativeScriptedAI::DamageTaken(attacker, damage, damagetype, damageSchoolMask);
 #else
             NativeScriptedAI::DamageTaken(attacker, damage);
 #endif
@@ -151,7 +155,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::AttackStart(target);
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called for reaction at stopping attack at no attackers or targets
     void EnterEvadeMode(EvadeReason /*why*/) override
 #else
@@ -199,7 +203,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::CorpseRemoved(respawnDelay);
     }
 
-#if !defined ELUNA_TRINITY && !defined ELUNA_VMANGOS
+#if !defined ELUNA_TRINITY && !defined ELUNA_VMANGOS && !defined ELUNA_AZEROTHCORE
     // Enables use of MoveInLineOfSight
     bool IsVisible(Unit* who) const override
     {
@@ -237,7 +241,7 @@ struct ElunaCreatureAI : NativeScriptedAI
             NativeScriptedAI::SpellHitTarget(target, spell);
     }
 
-#if defined ELUNA_TRINITY
+#if defined ELUNA_TRINITY || defined ELUNA_AZEROTHCORE
     // Called when the creature is summoned successfully by other creature
     void IsSummonedBy(WorldObject* summoner) override
     {
@@ -266,7 +270,7 @@ struct ElunaCreatureAI : NativeScriptedAI
     }
 #endif
 
-#if !defined ELUNA_TRINITY
+#if !defined ELUNA_TRINITY && !defined ELUNA_AZEROTHCORE
 #undef me
 #endif
 };