diff options
| author | Liberate <tbaart@gmail.com> | 2010-08-27 18:22:46 +0200 |
|---|---|---|
| committer | Liberate <tbaart@gmail.com> | 2010-08-27 18:22:46 +0200 |
| commit | 5b5055a6dfc662bf6200059af4ea201618d61e13 (patch) | |
| tree | 1f13b712283df1fafde986185354d91b3e99950c /src/server/scripts | |
| parent | 9bd804deced7dff9e170d19fc7744afb9afb8062 (diff) | |
| parent | 5fbc8f1de41958cbcbbf5d1c9a3457b3a2075284 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
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)) { |