diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp | 4 | ||||
| -rw-r--r-- | src/game/Spell.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp index 68e15fd0282..77005fc14c6 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp @@ -560,13 +560,13 @@ struct TRINITY_DLL_DECL npc_ros_dark_riderAI : public ScriptedAI return; // this should be before next one otherwise he may enter vehicle again - if(!me->m_Vehicle && who->GetEntry() == 28782 && CAST_CRE(who)->isVehicle() && !who->GetCharmerGUID()) + if(!me->m_Vehicle && who->GetEntry() == 28782 && CAST_CRE(who)->isVehicle() && CAST_VEH(who)->HasEmptySeat(0)) me->EnterVehicle((Vehicle*)who); ScriptedAI::MoveInLineOfSight(who); } - void CombatStart(Unit *who) + void EnterCombat(Unit *who) { me->ExitVehicle(); } diff --git a/src/game/Spell.h b/src/game/Spell.h index 9f666ecf47b..5d108f48fa1 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -621,10 +621,6 @@ class Spell uint32 m_spellState; uint32 m_timer; - float m_castPositionX; - float m_castPositionY; - float m_castPositionZ; - float m_castOrientation; bool m_IsTriggeredSpell; // if need this can be replaced by Aura copy |