diff options
| author | n0n4m3 <none@none> | 2010-02-15 14:55:28 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2010-02-15 14:55:28 +0100 |
| commit | 1057a3f2c37cb1b8568fe2ed0d1a85465f19b43c (patch) | |
| tree | 4f9fc0acd8b58e909fd1acbbf8c01bc7b52b8814 | |
| parent | cd39d27a9cd5c4b2ace96ea1eaf25588ee88afdc (diff) | |
| parent | 7fc2e0d45b4a25bce073db3143efa99dd09ad2ac (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | src/scripts/northrend/storm_peaks.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/scripts/northrend/storm_peaks.cpp index 134a6a6c3b3..18c02d96777 100644 --- a/src/scripts/northrend/storm_peaks.cpp +++ b/src/scripts/northrend/storm_peaks.cpp @@ -163,7 +163,7 @@ bool GossipSelect_npc_thorim(Player* pPlayer, Creature* pCreature, uint32 uiSend break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(QUEST_SIBLING_RIVALRY); + pPlayer->CompleteQuest(QUEST_SIBLING_RIVALRY); break; } return true; diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp index 861b63858b0..11195e0cc1b 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp @@ -91,21 +91,29 @@ struct instance_halls_of_lightning : public ScriptedInstance m_uiBjarngrimDoorGUID = pGo->GetGUID(); if (m_auiEncounter[0] == DONE) pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); break; case GO_VOLKHAN_DOOR: m_uiVolkhanDoorGUID = pGo->GetGUID(); if (m_auiEncounter[1] == DONE) pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); break; case GO_IONAR_DOOR: m_uiIonarDoorGUID = pGo->GetGUID(); if (m_auiEncounter[2] == DONE) pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); break; case GO_LOKEN_DOOR: m_uiLokenDoorGUID = pGo->GetGUID(); if (m_auiEncounter[3] == DONE) pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); break; case GO_LOKEN_THRONE: m_uiLokenGlobeGUID = pGo->GetGUID(); |