diff options
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 462c9bde89c..835c73912e7 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -70,7 +70,7 @@ public: void OnPlayerEnter(Player* player) { - if (GetData(DATA_DRAKOS_EVENT) == DONE && GetData(DATA_VAROS_EVENT) != DONE) + if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); @@ -122,7 +122,7 @@ public: { if (go->GetEntry() == GO_DRAGON_CAGE_DOOR) { - if (GetData(DATA_DRAKOS_EVENT) == DONE) + if (GetBossState(DATA_DRAKOS_EVENT) == DONE) go->SetGoState(GO_STATE_ACTIVE); else go->SetGoState(GO_STATE_READY); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 24a23b8251c..373d9c99008 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -155,15 +155,18 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + player->PrepareQuestMenu(creature->GetGUID()); - if (pCreature->GetInstanceScript()->GetData(DATA_DRAKOS_EVENT) == DONE) + if (InstanceScript* instance = creature->GetInstanceScript()) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, pCreature->GetGUID()); + if (instance->GetBossState(DATA_DRAKOS_EVENT) == DONE) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, creature->GetGUID()); + } } return true; |