Skip to content

Commit

Permalink
Define and header cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Foereaper
Foereaper committed Jul 20, 2024
1 parent ff14dc1 commit ce11389
Show file tree
Hide file tree
Showing 18 changed files with 154 additions and 374 deletions.
2 changes: 1 addition & 1 deletion ElunaCompat.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010 - 2022 Eluna Lua Engine <https://elunaluaengine.github.io/>
* Copyright (C) 2010 - 2024 Eluna Lua Engine <https://elunaluaengine.github.io/>
* This program is free software licensed under GPL version 3
* Please see the included DOCS/LICENSE.md for more information
*/
Expand Down
2 changes: 1 addition & 1 deletion ElunaCompat.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010 - 2022 Eluna Lua Engine <https://elunaluaengine.github.io/>
* Copyright (C) 2010 - 2024 Eluna Lua Engine <https://elunaluaengine.github.io/>
* This program is free software licensed under GPL version 3
* Please see the included DOCS/LICENSE.md for more information
*/
Expand Down
185 changes: 43 additions & 142 deletions ElunaCreatureAI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,30 @@
#include "AI/BaseAI/CreatureAI.h"
#endif

#if defined TRINITY || AZEROTHCORE
#if defined TRINITY
struct ScriptedAI;
typedef ScriptedAI ElunaScriptedAI;
#elif defined CMANGOS
class CreatureAI;
typedef CreatureAI ElunaScriptedAI;
#elif defined VMANGOS
class BasicAI;
typedef BasicAI ScriptedAI;
typedef BasicAI ElunaScriptedAI;
#else
class AggressorAI;
typedef AggressorAI ScriptedAI;
typedef AggressorAI ElunaScriptedAI;
#endif

#ifndef CMANGOS
struct ElunaCreatureAI : ScriptedAI
#else
struct ElunaCreatureAI : CreatureAI
#endif
struct ElunaCreatureAI : ElunaScriptedAI
{
// used to delay the spawn hook triggering on AI creation
bool justSpawned;
// used to delay movementinform hook (WP hook)
std::vector< std::pair<uint32, uint32> > movepoints;
#if defined MANGOS || defined CMANGOS || defined VMANGOS
#ifndef TRINITY
#define me m_creature
#endif
#ifndef CMANGOS
ElunaCreatureAI(Creature* creature) : ScriptedAI(creature), justSpawned(true)
#else
ElunaCreatureAI(Creature* creature) : CreatureAI(creature), justSpawned(true)
#endif
ElunaCreatureAI(Creature* creature) : ElunaScriptedAI(creature), justSpawned(true)
{
}
~ElunaCreatureAI() { }
Expand All @@ -61,34 +55,24 @@ struct ElunaCreatureAI : CreatureAI
JustRespawned();
}
#endif

if (!movepoints.empty())
{
for (auto& point : movepoints)
{
#ifndef CMANGOS
if (!me->GetEluna()->MovementInform(me, point.first, point.second))
ScriptedAI::MovementInform(point.first, point.second);
#else
if (!me->GetEluna()->MovementInform(me, point.first, point.second))
CreatureAI::MovementInform(point.first, point.second);
#endif
ElunaScriptedAI::MovementInform(point.first, point.second);
}
movepoints.clear();
}

if (!me->GetEluna()->UpdateAI(me, diff))
{
#if defined TRINITY || AZEROTHCORE || VMANGOS
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC))
ScriptedAI::UpdateAI(diff);
#elif defined CMANGOS
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC))
CreatureAI::UpdateAI(diff);
#else
#ifdef MANGOS
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE))
ScriptedAI::UpdateAI(diff);
#else
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC))
#endif
ElunaScriptedAI::UpdateAI(diff);
}
}

Expand All @@ -98,94 +82,61 @@ struct ElunaCreatureAI : CreatureAI
void JustEngagedWith(Unit* target) override
{
if (!me->GetEluna()->EnterCombat(me, target))
ScriptedAI::JustEngagedWith(target);
ElunaScriptedAI::JustEngagedWith(target);
}
#else
//Called for reaction at enter to combat if not in combat yet (enemy can be NULL)
//Called at creature aggro either by MoveInLOS or Attack Start
void EnterCombat(Unit* target) override
{
#ifndef CMANGOS
if (!me->GetEluna()->EnterCombat(me, target))
ScriptedAI::EnterCombat(target);
#else
if (!me->GetEluna()->EnterCombat(me, target))
CreatureAI::EnterCombat(target);
#endif
ElunaScriptedAI::EnterCombat(target);
}
#endif

// Called at any Damage from any attacker (before damage apply)
#if defined AZEROTHCORE
void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override
#elif ((defined (TRINITY) || CMANGOS) && !defined CATA)
void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
#elif defined CATA && defined CMANGOS
#if defined TRINITY || defined CMANGOS
void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
#else
void DamageTaken(Unit* attacker, uint32& damage) override
#endif
{
if (!me->GetEluna()->DamageTaken(me, attacker, damage))
{
#if defined AZEROTHCORE
ScriptedAI::DamageTaken(attacker, damage, damagetype, damageSchoolMask);
#elif defined TRINITY && !defined CATA
ScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
#elif defined CMANGOS
CreatureAI::DamageTaken(attacker, damage, damageType, spellInfo);
#if defined TRINITY || defined CMANGOS
ElunaScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
#else
ScriptedAI::DamageTaken(attacker, damage);
ElunaScriptedAI::DamageTaken(attacker, damage);
#endif
}
}

//Called at creature death
void JustDied(Unit* killer) override
{
#ifndef CMANGOS
if (!me->GetEluna()->JustDied(me, killer))
ScriptedAI::JustDied(killer);
#else
if (!me->GetEluna()->JustDied(me, killer))
CreatureAI::JustDied(killer);
#endif
ElunaScriptedAI::JustDied(killer);
}

//Called at creature killing another unit
void KilledUnit(Unit* victim) override
{
#ifndef CMANGOS
if (!me->GetEluna()->KilledUnit(me, victim))
ScriptedAI::KilledUnit(victim);
#else
if (!me->GetEluna()->KilledUnit(me, victim))
CreatureAI::KilledUnit(victim);
#endif
ElunaScriptedAI::KilledUnit(victim);
}

// Called when the creature summon successfully other creature
void JustSummoned(Creature* summon) override
{
#ifndef CMANGOS
if (!me->GetEluna()->JustSummoned(me, summon))
ScriptedAI::JustSummoned(summon);
#else
if (!me->GetEluna()->JustSummoned(me, summon))
CreatureAI::JustSummoned(summon);
#endif
ElunaScriptedAI::JustSummoned(summon);
}

// Called when a summoned creature is despawned
void SummonedCreatureDespawn(Creature* summon) override
{
#ifndef CMANGOS
if (!me->GetEluna()->SummonedCreatureDespawn(me, summon))
ScriptedAI::SummonedCreatureDespawn(summon);
#else
if (!me->GetEluna()->SummonedCreatureDespawn(me, summon))
CreatureAI::SummonedCreatureDespawn(summon);
#endif
ElunaScriptedAI::SummonedCreatureDespawn(summon);
}

//Called at waypoint reached or PointMovement end
Expand All @@ -199,94 +150,59 @@ struct ElunaCreatureAI : CreatureAI
// Called before EnterCombat even before the creature is in combat.
void AttackStart(Unit* target) override
{
#ifndef CMANGOS
if (!me->GetEluna()->AttackStart(me, target))
ScriptedAI::AttackStart(target);
#else
if (!me->GetEluna()->AttackStart(me, target))
CreatureAI::AttackStart(target);
#endif
ElunaScriptedAI::AttackStart(target);
}

#ifdef TRINITY
// Called for reaction at stopping attack at no attackers or targets
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->GetEluna()->EnterEvadeMode(me))
ScriptedAI::EnterEvadeMode();
}
#else
// Called for reaction at stopping attack at no attackers or targets
void EnterEvadeMode() override
#endif
{
#ifndef CMANGOS
if (!me->GetEluna()->EnterEvadeMode(me))
ScriptedAI::EnterEvadeMode();
#else
if (!me->GetEluna()->EnterEvadeMode(me))
CreatureAI::EnterEvadeMode();
#endif
ElunaScriptedAI::EnterEvadeMode();
}
#endif

#ifdef TRINITY
// Called when creature appears in the world (spawn, respawn, grid load etc...)
void JustAppeared() override
{
if (!me->GetEluna()->JustRespawned(me))
ScriptedAI::JustAppeared();
ElunaScriptedAI::JustAppeared();
}
#else
// Called when creature is spawned or respawned (for reseting variables)
void JustRespawned() override
{
#ifndef CMANGOS
if (!me->GetEluna()->JustRespawned(me))
ScriptedAI::JustRespawned();
#else
if (!me->GetEluna()->JustRespawned(me))
CreatureAI::JustRespawned();
#endif
ElunaScriptedAI::JustRespawned();
}
#endif

// Called at reaching home after evade
void JustReachedHome() override
{
#ifndef CMANGOS
if (!me->GetEluna()->JustReachedHome(me))
ScriptedAI::JustReachedHome();
#else
if (!me->GetEluna()->JustReachedHome(me))
CreatureAI::JustReachedHome();
#endif
ElunaScriptedAI::JustReachedHome();
}

// Called at text emote receive from player
void ReceiveEmote(Player* player, uint32 emoteId) override
{
#ifndef CMANGOS
if (!me->GetEluna()->ReceiveEmote(me, player, emoteId))
ScriptedAI::ReceiveEmote(player, emoteId);
#else
if (!me->GetEluna()->ReceiveEmote(me, player, emoteId))
CreatureAI::ReceiveEmote(player, emoteId);
#endif
ElunaScriptedAI::ReceiveEmote(player, emoteId);
}

// called when the corpse of this creature gets removed
void CorpseRemoved(uint32& respawnDelay) override
{
#ifndef CMANGOS
if (!me->GetEluna()->CorpseRemoved(me, respawnDelay))
ScriptedAI::CorpseRemoved(respawnDelay);
#else
if (!me->GetEluna()->CorpseRemoved(me, respawnDelay))
CreatureAI::CorpseRemoved(respawnDelay);
#endif
ElunaScriptedAI::CorpseRemoved(respawnDelay);
}

#if !defined TRINITY && !AZEROTHCORE && !VMANGOS
#if !defined(TRINITY) && !defined(VMANGOS)
// Enables use of MoveInLineOfSight
bool IsVisible(Unit* who) const override
{
Expand All @@ -296,75 +212,60 @@ struct ElunaCreatureAI : CreatureAI

void MoveInLineOfSight(Unit* who) override
{
#ifndef CMANGOS
if (!me->GetEluna()->MoveInLineOfSight(me, who))
ScriptedAI::MoveInLineOfSight(who);
#else
if (!me->GetEluna()->MoveInLineOfSight(me, who))
CreatureAI::MoveInLineOfSight(who);
#endif
ElunaScriptedAI::MoveInLineOfSight(who);
}

// Called when hit by a spell
#if defined TRINITY
#ifdef TRINITY
void SpellHit(WorldObject* caster, SpellInfo const* spell) override
#elif defined VMANGOS
#elif VMANGOS
void SpellHit(Unit* caster, SpellInfo const* spell)
#else
void SpellHit(Unit* caster, SpellInfo const* spell) override
#endif
{
#ifndef CMANGOS
if (!me->GetEluna()->SpellHit(me, caster, spell))
ScriptedAI::SpellHit(caster, spell);
#else
if (!me->GetEluna()->SpellHit(me, caster, spell))
CreatureAI::SpellHit(caster, spell);
#endif
ElunaScriptedAI::SpellHit(caster, spell);
}

// Called when spell hits a target
#if defined TRINITY
#ifdef TRINITY
void SpellHitTarget(WorldObject* target, SpellInfo const* spell) override
#else
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
#endif
{
#ifndef CMANGOS
if (!me->GetEluna()->SpellHitTarget(me, target, spell))
ScriptedAI::SpellHitTarget(target, spell);
#else
if (!me->GetEluna()->SpellHitTarget(me, target, spell))
CreatureAI::SpellHitTarget(target, spell);
#endif
ElunaScriptedAI::SpellHitTarget(target, spell);
}

#if defined TRINITY
#ifdef TRINITY
// Called when the creature is summoned successfully by other creature
void IsSummonedBy(WorldObject* summoner) override
{
if (!summoner->ToUnit() || !me->GetEluna()->OnSummoned(me, summoner->ToUnit()))
ScriptedAI::IsSummonedBy(summoner);
ElunaScriptedAI::IsSummonedBy(summoner);
}

void SummonedCreatureDies(Creature* summon, Unit* killer) override
{
if (!me->GetEluna()->SummonedCreatureDies(me, summon, killer))
ScriptedAI::SummonedCreatureDies(summon, killer);
ElunaScriptedAI::SummonedCreatureDies(summon, killer);
}

// Called when owner takes damage
void OwnerAttackedBy(Unit* attacker) override
{
if (!me->GetEluna()->OwnerAttackedBy(me, attacker))
ScriptedAI::OwnerAttackedBy(attacker);
ElunaScriptedAI::OwnerAttackedBy(attacker);
}

// Called when owner attacks something
void OwnerAttacked(Unit* target) override
{
if (!me->GetEluna()->OwnerAttacked(me, target))
ScriptedAI::OwnerAttacked(target);
ElunaScriptedAI::OwnerAttacked(target);
}
#endif

Expand Down
Loading

0 comments on commit ce11389

Please sign in to comment.