*Fix a bug that dark rider of dk quest cannot be attacked.

--HG--
branch : trunk

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();
     }

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