diff --git a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp index 8127a337..21777fd8 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp @@ -279,7 +279,7 @@ struct spell_go_black_dragon_egg : public SpellScript } // Store the eggs which are destroyed, in order to count them for the second phase - pInstance->SetData64(DATA_DRAGON_EGG, pGOTarget->GetObjectGuid()); + pInstance->SetData64(DATA_DRAGON_EGG, pGOTarget->GetObjectGuid().GetRawValue()); } return true; diff --git a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp index 0b1c739d..b935bea7 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp @@ -171,7 +171,7 @@ struct boss_gothik : public CreatureScript { if (Player* pPlayer = itr->getSource()) { - m_pInstance->SetData64(TYPE_SIGNAL_4, uint64(pPlayer->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL_4, pPlayer->GetObjectGuid().GetRawValue()); if (!m_pInstance->GetData(TYPE_SIGNAL_4) && pPlayer->IsAlive()) { return true; @@ -314,7 +314,7 @@ struct boss_gothik : public CreatureScript return; } - m_pInstance->SetData64(TYPE_SIGNAL_6, uint64(pSummoned->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL_6, pSummoned->GetObjectGuid().GetRawValue()); if (Creature* pAnchor = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL_6)))) { switch (pSummoned->GetEntry()) @@ -443,7 +443,7 @@ struct boss_gothik : public CreatureScript case PHASE_TELEPORTING: // Phase is only reached if m_pInstance is valid if (m_uiTeleportTimer < uiDiff) { - m_pInstance->SetData64(TYPE_SIGNAL_7, uint64(m_creature->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL_7, m_creature->GetObjectGuid().GetRawValue()); uint32 uiTeleportSpell = m_pInstance->GetData(TYPE_SIGNAL_7) ? SPELL_TELEPORT_LEFT : SPELL_TELEPORT_RIGHT; if (DoCastSpellIfCan(m_creature, uiTeleportSpell) == CAST_OK) { @@ -555,7 +555,7 @@ struct spell_anchor : public SpellScript { return true; } - pInstance->SetData64(TYPE_SIGNAL_2, pCreatureTarget->GetObjectGuid()); + pInstance->SetData64(TYPE_SIGNAL_2, pCreatureTarget->GetObjectGuid().GetRawValue()); pInstance->SetData(TYPE_SIGNAL_2, uiSpellId); diff --git a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp index 13a50499..8bbef0f4 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp @@ -300,7 +300,7 @@ struct boss_heigan : public CreatureScript continue; } - m_pInstance->SetData64(TYPE_SIGNAL_8, uint64(m_creature->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL_8, m_creature->GetObjectGuid().GetRawValue()); m_pInstance->SetData(TYPE_SIGNAL_8, uiArea); //m_pInstance->DoTriggerHeiganTraps(m_creature, uiArea); } diff --git a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp index 50ad7a13..da6cd5f5 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp @@ -783,12 +783,12 @@ struct is_naxxramas : public InstanceScript ++(const_cast(this))->gtit; if (gtit == m_mGothTriggerMap.cend()) return 0; - return uint64(gtit->first); + return gtit->first.GetRawValue(); } break; case TYPE_SIGNAL_6: //the same design flaw... if (Creature *anchor = (const_cast(this))->GetClosestAnchorForGoth(instance->GetCreature(ObjectGuid(m_tempCreatureGuid)), true)) - return uint64(anchor->GetObjectGuid()); + return anchor->GetObjectGuid().GetRawValue(); } return 0; } diff --git a/src/modules/SD2/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/modules/SD2/scripts/eastern_kingdoms/silverpine_forest.cpp index 1bd8e65c..1072d58d 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/silverpine_forest.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/silverpine_forest.cpp @@ -483,7 +483,7 @@ struct npc_deathstalker_faerleia : public CreatureScript if (npc_deathstalker_faerleiaAI* pFaerleiaAI = dynamic_cast(pCreature->AI())) { - pFaerleiaAI->StartEvent(pPlayer->GetObjectGuid()); + pFaerleiaAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue()); return true; } } diff --git a/src/modules/SD2/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/modules/SD2/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index 3bf14c86..659727de 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -186,7 +186,7 @@ struct boss_archaedas : public CreatureScript { if (m_uiAwakeDwarfTimer < uiDiff) { - m_pInstance->SetData64(TYPE_SIGNAL, uint64(m_creature->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue()); if (Creature* pEarthen = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL)))) { if (DoCastSpellIfCan(pEarthen, SPELL_AWAKEN_EARTHEN_DWARF) == CAST_OK) diff --git a/src/modules/SD2/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/modules/SD2/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index d1c928e7..94d8c569 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -260,7 +260,7 @@ struct is_uldaman : public InstanceScript case DATA_EVENT_STARTER: return m_playerGuid.GetRawValue(); case TYPE_SIGNAL: - return GetClosestDwarfNotInCombat() ? GetClosestDwarfNotInCombat()->GetObjectGuid() : 0; + return GetClosestDwarfNotInCombat() ? GetClosestDwarfNotInCombat()->GetObjectGuid().GetRawValue() : 0; } return 0; } @@ -385,7 +385,7 @@ struct event_spell_altar_boss_aggro : public MapEventScript { if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData()) { - pInstance->SetData64(DATA_EVENT_STARTER, pSource->GetObjectGuid()); + pInstance->SetData64(DATA_EVENT_STARTER, pSource->GetObjectGuid().GetRawValue()); pInstance->SetData(TYPE_SIGNAL, uiEventId); //pInstance->StartEvent(uiEventId, (Player*)pSource); return true; diff --git a/src/modules/SD2/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/modules/SD2/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp index a173f5af..279a10fe 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp @@ -202,7 +202,7 @@ struct is_zulgurub : public InstanceScript case TYPE_SIGNAL_2: case TYPE_SIGNAL_3: if (Creature *p = (const_cast(this))->SelectRandomPantherTrigger(type == TYPE_SIGNAL_2)) - return uint64(p->GetObjectGuid()); + return p->GetObjectGuid().GetRawValue(); break; default: break; diff --git a/src/modules/SD2/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp b/src/modules/SD2/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp index 61fd4d3a..08e9b90a 100644 --- a/src/modules/SD2/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp +++ b/src/modules/SD2/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp @@ -324,7 +324,7 @@ struct go_tutenkash_gong : public GameObjectScript { if (ScriptedInstance *m_pInstance = (ScriptedInstance*)pPlayer->GetInstanceData()) { - m_pInstance->SetData64(TYPE_GONG_USED, uint64(pPlayer->GetObjectGuid())); + m_pInstance->SetData64(TYPE_GONG_USED, pPlayer->GetObjectGuid().GetRawValue()); //m_pInstance->SetData(TYPE_GONG_USED, 0); called from SetData64 now } diff --git a/src/modules/SD2/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/modules/SD2/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp index cf1e44e2..a2e2a32c 100644 --- a/src/modules/SD2/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/modules/SD2/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -219,7 +219,7 @@ struct npc_general_andorov : public CreatureScript void DoInitializeFollowers() { if (m_pInstance) - m_pInstance->SetData64(TYPE_SIGNAL, uint64(m_creature->GetObjectGuid())); //implemented in the instance script + m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue()); //implemented in the instance script } // Wrapper to start the event diff --git a/src/modules/SD2/scripts/kalimdor/stonetalon_mountains.cpp b/src/modules/SD2/scripts/kalimdor/stonetalon_mountains.cpp index 4fdf03f8..533cd877 100644 --- a/src/modules/SD2/scripts/kalimdor/stonetalon_mountains.cpp +++ b/src/modules/SD2/scripts/kalimdor/stonetalon_mountains.cpp @@ -322,7 +322,7 @@ struct npc_piznik : public CreatureScript { if (npc_piznikAI* ppiznikAI = dynamic_cast(pCreature->AI())) { - ppiznikAI->StartEvent(pPlayer->GetObjectGuid()); + ppiznikAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue()); } } return true; diff --git a/src/modules/SD2/scripts/kalimdor/the_barrens.cpp b/src/modules/SD2/scripts/kalimdor/the_barrens.cpp index a71ebb76..1b97f1e6 100644 --- a/src/modules/SD2/scripts/kalimdor/the_barrens.cpp +++ b/src/modules/SD2/scripts/kalimdor/the_barrens.cpp @@ -1173,7 +1173,7 @@ struct npc_regthar_deathgate : public CreatureScript DoScriptText(SAY_START_REGTHAR, pCreature, pPlayer); pPlayer->CLOSE_GOSSIP_MENU(); if (npc_regthar_deathgateAI* pRegtharAI = dynamic_cast(pCreature->AI())) - pRegtharAI->StartEvent(pPlayer->GetObjectGuid()); + pRegtharAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue()); } return true; } diff --git a/src/modules/SD2/scripts/kalimdor/zulfarrak/boss_zumrah.cpp b/src/modules/SD2/scripts/kalimdor/zulfarrak/boss_zumrah.cpp index ce5b38ff..b950ae59 100644 --- a/src/modules/SD2/scripts/kalimdor/zulfarrak/boss_zumrah.cpp +++ b/src/modules/SD2/scripts/kalimdor/zulfarrak/boss_zumrah.cpp @@ -141,7 +141,7 @@ struct boss_zumrah : public CreatureScript if (m_uiSpawnZombieTimer <= uiDiff) { // Use a nearby grave to spawn zombies - m_pInstance->SetData64(TYPE_SIGNAL, uint64(m_creature->GetObjectGuid())); + m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue()); if (GameObject* pGrave = m_pInstance->instance->GetGameObject(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL)))) { m_creature->CastSpell(pGrave->GetPositionX(), pGrave->GetPositionY(), pGrave->GetPositionZ(), SPELL_SUMMON_ZOMBIES, true, NULL, NULL, pGrave->GetObjectGuid()); diff --git a/src/modules/SD2/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp b/src/modules/SD2/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp index 25a90b6e..f802a452 100644 --- a/src/modules/SD2/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp +++ b/src/modules/SD2/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp @@ -378,7 +378,7 @@ struct is_zulfarrak : public InstanceScript // Sort the graves lGravesInRange.sort(ObjectDistanceOrder(searcher)); - return (*lGravesInRange.begin())->GetObjectGuid(); + return (*lGravesInRange.begin())->GetObjectGuid().GetRawValue(); } uint32 m_auiEncounter[MAX_ENCOUNTER];