[12236] Finalize first part of Vehicle Implementation

Special thanks to kid10 for lasting endurance to get this finally ready to go Also thanks to the very many people to contributed over the years to make this possible. Just to name a few: NetSky for first version, Rastikzzz for further development, Wojta and the Valhalla team for further work. Zergtmn for streamlinging the design, rsa for maintaining a usable version over the time. Machiavelli from Trinity for ongoing research (especially about flags) Thanks to crackm for providing dataz, and to the people who actually contributed the data to the developers for implementation Thanks to the many people who helped with testing to get nasty little bug fixed! Happy driving with C-Mangos :) Signed-off-by: Schmoozerd <schmoozerd@cmangos>
mokerjoke · Sep 15, 2012 · 5ff65d8 · 5ff65d8
1 parent c352efa
commit 5ff65d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
@@ -8501,29 +8501,16 @@ void Aura::HandleAuraControlVehicle(bool apply, bool Real)
     if (!target->IsVehicle())
         return;
 
-    // TODO: Check for free seat
-
     Unit* caster = GetCaster();
     if (!caster)
         return;
 
     if (apply)
     {
-        if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->RemovePet(PET_SAVE_AS_CURRENT);
-
-        // caster->EnterVehicle(target);
+        target->GetVehicleInfo()->Board(caster, GetSpellProto()->CalculateSimpleValue(m_effIndex) - 1);
     }
     else
-    {
-        // some SPELL_AURA_CONTROL_VEHICLE auras have a dummy effect on the player - remove them
-        caster->RemoveAurasDueToSpell(GetId());
-
-        // caster->ExitVehicle();
-
-        if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->ResummonPetTemporaryUnSummonedIfAny();
-    }
+        target->GetVehicleInfo()->UnBoard(caster, m_removeMode == AURA_REMOVE_BY_TRACKING);
 }
 
 void Aura::HandleAuraAddMechanicAbilities(bool apply, bool Real)

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12235"
+ #define REVISION_NR "12236"
 #endif // __REVISION_NR_H__