Core/Entities: Use ObjectGuid class in game project

This commit is contained in:
Shauren committed 2014-09-14 16:14:12 +02:00
1 parent ce67a097bf
commit a0e50ea35f
256 files changed
+3334 -3833

No files matched your search

@@ -1654,7 +1654,7 @@ class spell_halion_twilight_cutter : public SpellScriptLoader
return;
Unit* caster = GetCaster();
if (Unit* channelTarget = ObjectAccessor::GetUnit(*caster, caster->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT)))
if (Unit* channelTarget = ObjectAccessor::GetUnit(*caster, caster->GetChannelObjectGuid()))
{
unitList.remove_if(TwilightCutterSelector(caster, channelTarget));
return;
@@ -203,8 +203,8 @@ class npc_corrupted_soul_fragment : public CreatureScript
if (TempSummon* summ = me->ToTempSummon())
{
uint64 BronjahmGUID = instance->GetData64(DATA_BRONJAHM);
if (GUID_LOPART(BronjahmGUID) != id)
ObjectGuid BronjahmGUID(instance->GetData64(DATA_BRONJAHM));
if (BronjahmGUID.GetCounter() != id)
return;
if (Creature* bronjahm = ObjectAccessor::GetCreature(*me, BronjahmGUID))
@@ -213,7 +213,7 @@ struct boss_horAI : BossAI
class GameObjectDeleteDelayEvent : public BasicEvent
{
public:
GameObjectDeleteDelayEvent(Unit* owner, uint64 gameObjectGUID) : _owner(owner), _gameObjectGUID(gameObjectGUID) { }
GameObjectDeleteDelayEvent(Unit* owner, ObjectGuid gameObjectGUID) : _owner(owner), _gameObjectGUID(gameObjectGUID) { }
void DeleteGameObject()
{
@@ -234,7 +234,7 @@ class GameObjectDeleteDelayEvent : public BasicEvent
private:
Unit* _owner;
uint64 _gameObjectGUID;
ObjectGuid _gameObjectGUID;
};
template<class AI>
@@ -85,27 +85,6 @@ class instance_halls_of_reflection : public InstanceMapScript
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
JainaOrSylvanasIntroGUID = 0;
KorelnOrLoralenGUID = 0;
TheLichkingIntroGUID = 0;
FalricGUID = 0;
MarwynGUID = 0;
FrostmourneAltarBunnyGUID = 0;
FrostswornGeneralGUID = 0;
JainaOrSylvanasEscapeGUID = 0;
TheLichKingEscapeGUID = 0;
FrostmourneGUID = 0;
EntranceDoorGUID = 0;
ImpenetrableDoorGUID = 0;
ShadowThroneDoorGUID = 0;
CaveInGUID = 0;
GunshipGUID = 0;
CaptainsChestGUID = 0;
CaptainGUID = 0;
IcewallGUID = 0;
IcewallTargetGUID = 0;
_teamInInstance = 0;
_waveCount = 0;
_introState = NOT_STARTED;
@@ -200,7 +179,7 @@ class instance_halls_of_reflection : public InstanceMapScript
break;
}
case NPC_ICE_WALL_TARGET:
IcewallTargetGUID = 0;
IcewallTargetGUID.Clear();
break;
case NPC_WORLD_TRIGGER:
case NPC_GUNSHIP_CANNON_HORDE:
@@ -256,11 +235,11 @@ class instance_halls_of_reflection : public InstanceMapScript
break;
case GO_IMPENETRABLE_DOOR:
ImpenetrableDoorGUID = go->GetGUID();
HandleGameObject(0, GetBossState(DATA_MARWYN) == DONE, go);
HandleGameObject(ObjectGuid::Empty, GetBossState(DATA_MARWYN) == DONE, go);
break;
case GO_SHADOW_THRONE_DOOR:
ShadowThroneDoorGUID = go->GetGUID();
HandleGameObject(0, GetData(DATA_FROSTSWORN_GENERAL) == DONE, go);
HandleGameObject(ObjectGuid::Empty, GetData(DATA_FROSTSWORN_GENERAL) == DONE, go);
break;
case GO_CAVE_IN:
CaveInGUID = go->GetGUID();
@@ -282,7 +261,7 @@ class instance_halls_of_reflection : public InstanceMapScript
CaptainsChestGUID = go->GetGUID();
break;
case GO_ICE_WALL:
HandleGameObject(0, false, go);
HandleGameObject(ObjectGuid::Empty, false, go);
IcewallGUID = go->GetGUID();
break;
default:
@@ -483,7 +462,7 @@ class instance_halls_of_reflection : public InstanceMapScript
case NPC_WAVE_MAGE:
{
uint32 waveId = creature->AI()->GetData(0);
for (uint64 guid : waveGuidList[waveId])
for (ObjectGuid guid : waveGuidList[waveId])
{
if (Creature* npc = instance->GetCreature(guid))
if (npc->IsAlive())
@@ -539,7 +518,7 @@ class instance_halls_of_reflection : public InstanceMapScript
{
tempList = possibilityList;
uint64 bossGuid = i <= 3 ? FalricGUID : MarwynGUID;
ObjectGuid bossGuid = i <= 3 ? FalricGUID : MarwynGUID;
if (!i)
Trinity::Containers::RandomResizeList(tempList, 3);
@@ -571,7 +550,7 @@ class instance_halls_of_reflection : public InstanceMapScript
if (_waveCount % 5)
{
uint32 internalWaveId = _waveCount - ((_waveCount < 5) ? 1 : 2);
for (uint64 guid : waveGuidList[internalWaveId])
for (ObjectGuid guid : waveGuidList[internalWaveId])
{
if (Creature* temp = instance->GetCreature(guid))
{
@@ -610,7 +589,7 @@ class instance_halls_of_reflection : public InstanceMapScript
// despawn wave npcs
for (uint8 i = 0; i < 8; ++i)
{
for (uint64 guid : waveGuidList[i])
for (ObjectGuid guid : waveGuidList[i])
if (Creature* creature = instance->GetCreature(guid))
creature->DespawnOrUnsummon(1);
waveGuidList[i].clear();
@@ -630,9 +609,9 @@ class instance_halls_of_reflection : public InstanceMapScript
if (Creature* captain = instance->GetCreature(CaptainGUID))
captain->AI()->Talk(SAY_CAPTAIN_FIRE);
for (uint64 guid : GunshipCannonGUIDs)
for (ObjectGuid guid : GunshipCannonGUIDs)
{
uint32 entry = GUID_ENPART(guid);
uint32 entry = guid.GetEntry();
if ((entry == NPC_WORLD_TRIGGER && _teamInInstance == ALLIANCE) || (entry == NPC_GUNSHIP_CANNON_HORDE && _teamInInstance == HORDE))
if (Creature* cannon = instance->GetCreature(guid))
cannon->CastSpell(cannon, SPELL_GUNSHIP_CANNON_FIRE, true);
@@ -642,7 +621,7 @@ class instance_halls_of_reflection : public InstanceMapScript
if (Transport* gunship = instance->GetTransport(GunshipGUID))
gunship->EnableMovement(false);
for (uint64 guid : GunshipStairGUIDs)
for (ObjectGuid guid : GunshipStairGUIDs)
if (GameObject* stairs = instance->GetGameObject(guid))
stairs->SetRespawnTime(DAY);
@@ -732,21 +711,21 @@ class instance_halls_of_reflection : public InstanceMapScript
}
private:
uint64 JainaOrSylvanasIntroGUID; // unused
uint64 KorelnOrLoralenGUID;
uint64 TheLichkingIntroGUID; // unused
uint64 FalricGUID;
uint64 MarwynGUID;
uint64 FrostmourneAltarBunnyGUID;
uint64 FrostswornGeneralGUID;
uint64 JainaOrSylvanasEscapeGUID;
uint64 TheLichKingEscapeGUID;
ObjectGuid JainaOrSylvanasIntroGUID; // unused
ObjectGuid KorelnOrLoralenGUID;
ObjectGuid TheLichkingIntroGUID; // unused
ObjectGuid FalricGUID;
ObjectGuid MarwynGUID;
ObjectGuid FrostmourneAltarBunnyGUID;
ObjectGuid FrostswornGeneralGUID;
ObjectGuid JainaOrSylvanasEscapeGUID;
ObjectGuid TheLichKingEscapeGUID;
uint64 FrostmourneGUID;
uint64 EntranceDoorGUID;
uint64 ImpenetrableDoorGUID;
uint64 ShadowThroneDoorGUID;
uint64 CaveInGUID;
ObjectGuid FrostmourneGUID;
ObjectGuid EntranceDoorGUID;
ObjectGuid ImpenetrableDoorGUID;
ObjectGuid ShadowThroneDoorGUID;
ObjectGuid CaveInGUID;
uint32 _teamInInstance;
uint32 _waveCount;
@@ -754,16 +733,16 @@ class instance_halls_of_reflection : public InstanceMapScript
uint32 _frostswornGeneralState;
EventMap events;
std::set<uint64> waveGuidList[8];
GuidSet waveGuidList[8];
uint64 GunshipGUID;
uint64 CaptainsChestGUID;
uint64 CaptainGUID;
uint64 IcewallGUID;
uint64 IcewallTargetGUID;
ObjectGuid GunshipGUID;
ObjectGuid CaptainsChestGUID;
ObjectGuid CaptainGUID;
ObjectGuid IcewallGUID;
ObjectGuid IcewallTargetGUID;
std::set<uint64> GunshipCannonGUIDs;
std::set<uint64> GunshipStairGUIDs;
GuidSet GunshipCannonGUIDs;
GuidSet GunshipStairGUIDs;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override
@@ -1148,7 +1148,6 @@ class npc_ball_of_flame : public CreatureScript
npc_ball_of_flameAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript())
{
_despawnTimer = 0;
_chaseGUID = 0;
}
void Reset() override
@@ -1163,7 +1162,7 @@ class npc_ball_of_flame : public CreatureScript
void MovementInform(uint32 type, uint32 id) override
{
if (type == CHASE_MOTION_TYPE && id == GUID_LOPART(_chaseGUID) && _chaseGUID)
if (type == CHASE_MOTION_TYPE && id == _chaseGUID.GetCounter() && _chaseGUID)
{
me->RemoveAurasDueToSpell(SPELL_BALL_OF_FLAMES_PERIODIC);
DoCast(me, SPELL_FLAMES);
@@ -1174,7 +1173,7 @@ class npc_ball_of_flame : public CreatureScript
void SetGUID(uint64 guid, int32 /*type*/) override
{
_chaseGUID = guid;
_chaseGUID.Set(guid);
}
void DoAction(int32 action) override
@@ -1213,7 +1212,7 @@ class npc_ball_of_flame : public CreatureScript
}
private:
uint64 _chaseGUID;
ObjectGuid _chaseGUID;
InstanceScript* _instance;
uint32 _despawnTimer;
};
@@ -330,7 +330,7 @@ enum MiscData
class VehicleCheckPredicate
{
public:
bool operator()(uint64 guid) { return IS_VEHICLE_GUID(guid); }
bool operator()(ObjectGuid guid) { return guid.IsVehicle(); }
};
class boss_malygos : public CreatureScript
@@ -1633,7 +1633,7 @@ class FlameLeviathanPursuedTargetSelector
//! Vehicle must be in use by player
bool playerFound = false;
for (SeatMap::const_iterator itr = vehicle->Seats.begin(); itr != vehicle->Seats.end() && !playerFound; ++itr)
if (IS_PLAYER_GUID(itr->second.Passenger.Guid))
if (itr->second.Passenger.Guid.IsPlayer())
playerFound = true;
return !playerFound;
@@ -1028,7 +1028,7 @@ class boss_vx_001 : public CreatureScript
// Handle rotation during SPELL_SPINNING_UP, SPELL_P3WX2_LASER_BARRAGE, SPELL_RAPID_BURST, and SPELL_HAND_PULSE_LEFT/RIGHT
if (me->HasUnitState(UNIT_STATE_CASTING))
{
if (Creature* channelTarget = ObjectAccessor::GetCreature(*me, me->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT)))
if (Creature* channelTarget = ObjectAccessor::GetCreature(*me, me->GetChannelObjectGuid()))
me->SetFacingToObject(channelTarget);
return;
}
@@ -1953,7 +1953,7 @@ class spell_mimiron_p3wx2_laser_barrage : public SpellScriptLoader
void OnHit(SpellEffIndex /*effIndex*/)
{
GetCaster()->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, GetHitUnit()->GetGUID());
GetCaster()->SetChannelObjectGuid(GetHitUnit()->GetGUID());
}
void Register() override
@@ -2357,7 +2357,7 @@ class spell_mimiron_spinning_up : public SpellScriptLoader
void OnHit(SpellEffIndex /*effIndex*/)
{
if (GetHitUnit() != GetCaster())
GetCaster()->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, GetHitUnit()->GetGUID());
GetCaster()->SetChannelObjectGuid(GetHitUnit()->GetGUID());
}
void Register() override
@@ -266,11 +266,14 @@ public:
break;
}
/*
BEWARE - SHIT.
if (creature->GetGUID() == uiFirstBoss || creature->GetGUID() == uiSecondBoss)
{
creature->AllLootRemovedFromCorpse();
creature->RemoveLootMode(1);
}
*/
}
void OnGameObjectCreate(GameObject* go) override