josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-02-15 14:55:28 +01:00
parent cd39d27a9c 7fc2e0d45b
commit 1057a3f2c3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/northrend/storm_peaks.cpp
+1 -1
View File
@@ -163,7 +163,7 @@ bool GossipSelect_npc_thorim(Player* pPlayer, Creature* pCreature, uint32 uiSend
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(QUEST_SIBLING_RIVALRY); pPlayer->CompleteQuest(QUEST_SIBLING_RIVALRY);
break; break;
} }
return true; return true;
src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
+8
View File
@@ -91,21 +91,29 @@ struct instance_halls_of_lightning : public ScriptedInstance
m_uiBjarngrimDoorGUID = pGo->GetGUID(); m_uiBjarngrimDoorGUID = pGo->GetGUID();
if (m_auiEncounter[0] == DONE) if (m_auiEncounter[0] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else
pGo->SetGoState(GO_STATE_READY);
break; break;
case GO_VOLKHAN_DOOR: case GO_VOLKHAN_DOOR:
m_uiVolkhanDoorGUID = pGo->GetGUID(); m_uiVolkhanDoorGUID = pGo->GetGUID();
if (m_auiEncounter[1] == DONE) if (m_auiEncounter[1] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else
pGo->SetGoState(GO_STATE_READY);
break; break;
case GO_IONAR_DOOR: case GO_IONAR_DOOR:
m_uiIonarDoorGUID = pGo->GetGUID(); m_uiIonarDoorGUID = pGo->GetGUID();
if (m_auiEncounter[2] == DONE) if (m_auiEncounter[2] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else
pGo->SetGoState(GO_STATE_READY);
break; break;
case GO_LOKEN_DOOR: case GO_LOKEN_DOOR:
m_uiLokenDoorGUID = pGo->GetGUID(); m_uiLokenDoorGUID = pGo->GetGUID();
if (m_auiEncounter[3] == DONE) if (m_auiEncounter[3] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else
pGo->SetGoState(GO_STATE_READY);
break; break;
case GO_LOKEN_THRONE: case GO_LOKEN_THRONE:
m_uiLokenGlobeGUID = pGo->GetGUID(); m_uiLokenGlobeGUID = pGo->GetGUID();