From 5fbc8f1de41958cbcbbf5d1c9a3457b3a2075284 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 27 Aug 2010 18:11:21 +0200 Subject: Scripts/Icecrown Citadel: Added hacky workaround for teleporting spells because their default target is not supported by current grid system Scripts/Icecrown Citadel: Mark Gunship event as complete on Lady Deathwhisper's death (temporary, until transport system will fully allow scripting the event) --HG-- branch : trunk --- .../scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp | 1 + .../scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 2eaaf96820d..100440237bb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -63,6 +63,7 @@ class icecrown_citadel_teleport : public GameObjectScript bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) { + player->CLOSE_GOSSIP_MENU(); SpellEntry const* spell = sSpellStore.LookupEntry(action); if (!spell) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 236642e414c..dbf8ced0c48 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -207,8 +207,8 @@ class instance_icecrown_citadel : public InstanceMapScript switch (data) { case DONE: - // TEMPORARY, UNCOMMMENT IF YOU WANT TO DO SAURFANG AND SKIP GUNSHIP - //uiEncounterState[DATA_GUNSHIP_EVENT] = DONE; + // TEMPORARY, SKIP GUNSHIP + uiEncounterState[DATA_GUNSHIP_EVENT] = DONE; HandleGameObject(uiOratoryDoor, true); if (GameObject* elevator = instance->GetGameObject(uiLadyDeathwisperElevator)) { -- cgit v1.2.3