diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 7 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp | 41 |
4 files changed, 0 insertions, 57 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d995a57617f..4bcf5e101ef 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12092,9 +12092,6 @@ void Unit::_ExitVehicle(Position const* exitPosition) pos = vehicle->GetBase()->GetPosition(); pos.SetOrientation(GetOrientation()); - // To-do: snap this hook out of existance - sScriptMgr->ModifyVehiclePassengerExitPos(this, vehicle, pos); - // Change exit position based on seat entry addon data if (seatAddon) { diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 4bda44df27e..35aaf0829cb 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -2349,12 +2349,6 @@ void ScriptMgr::OnQuestObjectiveChange(Player* player, Quest const* quest, Quest tmpscript->OnQuestObjectiveChange(player, quest, objective, oldAmount, newAmount); } -void ScriptMgr::ModifyVehiclePassengerExitPos(Unit* passenger, Vehicle* vehicle, Position& pos) -{ - FOREACH_SCRIPT(UnitScript)->ModifyVehiclePassengerExitPos(passenger, vehicle, pos); - FOREACH_SCRIPT(CreatureScript)->ModifyVehiclePassengerExitPos(passenger, vehicle, pos); -} - SpellScriptLoader::SpellScriptLoader(char const* name) : ScriptObject(name) { diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 5796a7ebd92..bca92bbe3af 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -447,9 +447,6 @@ class TC_GAME_API UnitScript : public ScriptObject // Called when Spell Damage is being Dealt virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/, SpellInfo const* /*spellInfo*/) { } - - // Called when an unit exits a vehicle - virtual void ModifyVehiclePassengerExitPos(Unit* /*passenger*/, Vehicle* /*vehicle*/, Position& /*pos*/) { } }; class TC_GAME_API CreatureScript : public ScriptObject @@ -462,9 +459,6 @@ class TC_GAME_API CreatureScript : public ScriptObject ~CreatureScript(); - // Called when an unit exits a vehicle - virtual void ModifyVehiclePassengerExitPos(Unit* /*passenger*/, Vehicle* /*vehicle*/, Position& /*pos*/) { } - // Called when a CreatureAI object is needed for the creature. virtual CreatureAI* GetAI(Creature* /*creature*/) const = 0; }; @@ -1271,7 +1265,6 @@ class TC_GAME_API ScriptMgr void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage); void ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage); void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage, SpellInfo const* spellInfo); - void ModifyVehiclePassengerExitPos(Unit* passenger, Vehicle* vehicle, Position& pos); public: /* AreaTriggerEntityScript */ diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index e29a429506f..c7a23a39d50 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1738,46 +1738,6 @@ public: } }; -enum OrabusTheHelmsman -{ - NPC_ORABUS = 32576, - NPC_KVALDIR_CREWMAN_1 = 32577, - NPC_KVALDIR_CREWMAN_2 = 32578, - NPC_KVALDIR_CREWMAN_3 = 32579, - NPC_KVALDIR_CREWMAN_4 = 32580 -}; - -class npc_orabus_the_helmsman_ship_exit_pos : public UnitScript -{ -public: - npc_orabus_the_helmsman_ship_exit_pos() : UnitScript("npc_orabus_the_helmsman_ship_exit_pos") { } - - void ModifyVehiclePassengerExitPos(Unit* passenger, Vehicle* /*vehicle*/, Position& pos) - { - if (passenger->GetTypeId() == TYPEID_UNIT) - { - switch (passenger->GetEntry()) - { - case NPC_ORABUS: - pos.Relocate(2807.858f, 7038.571f, 7.075813f, 4.73481f); - break; - case NPC_KVALDIR_CREWMAN_1: - pos.Relocate(2801.168f, 7046.468f, 5.362013f, 4.73481f); - break; - case NPC_KVALDIR_CREWMAN_2: - pos.Relocate(2803.729f, 7046.516f, 5.362013f, 4.73481f); - break; - case NPC_KVALDIR_CREWMAN_3: - pos.Relocate(2801.48f, 7051.379f, 5.362913f, 4.73481f); - break; - case NPC_KVALDIR_CREWMAN_4: - pos.Relocate(2803.319f, 7051.411f, 5.362913f, 4.73481f); - break; - } - } - } -}; - enum ShorteningBlaster { SPELL_SHORTENING_BLASTER_BIGGER1 = 45674, @@ -1952,7 +1912,6 @@ void AddSC_borean_tundra() new spell_windsoul_totem_aura(); new spell_q11719_bloodspore_ruination_45997(); new npc_bloodmage_laurith(); - new npc_orabus_the_helmsman_ship_exit_pos(); RegisterSpellScript(spell_q11653_shortening_blaster); RegisterSpellScript(spell_nerubar_web_random_unit_not_on_quest); RegisterSpellScript(spell_nerubar_web_random_unit_not_on_quest_dummy); |