diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
| commit | 7d1d55124c1e289748d2afefae896c97f710e57b (patch) | |
| tree | dcae6831f97fa1d353233fa7367800af1c4caa98 /src/server/game/Instances/InstanceScript.cpp | |
| parent | 6810a4469ebe6600be2f8649e917110a17ce27f3 (diff) | |
| parent | 9b933b4a291e377d4ae124eb8e3d2ba74b37f34f (diff) | |
Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Scripting/MapScripts.cpp
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
Diffstat (limited to 'src/server/game/Instances/InstanceScript.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 6278e66baef..932c55559ad 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -206,7 +206,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) return false; if (state == DONE) - for (MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) + for (GuidSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) if (Creature* minion = instance->GetCreature(*i)) if (minion->isWorldBoss() && minion->IsAlive()) return false; @@ -216,11 +216,11 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) } for (uint32 type = 0; type < MAX_DOOR_TYPES; ++type) - for (DoorSet::iterator i = bossInfo->door[type].begin(); i != bossInfo->door[type].end(); ++i) + for (GuidSet::iterator i = bossInfo->door[type].begin(); i != bossInfo->door[type].end(); ++i) if (GameObject* door = instance->GetGameObject(*i)) UpdateDoorState(door); - for (MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) + for (GuidSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) if (Creature* minion = instance->GetCreature(*i)) UpdateMinionState(minion, state); @@ -308,7 +308,7 @@ void InstanceScript::WriteSaveDataBossStates(std::ostringstream& data) data << uint32(bossInfo.state) << ' '; } -void InstanceScript::HandleGameObject(uint64 guid, bool open, GameObject* go /*= nullptr*/) +void InstanceScript::HandleGameObject(ObjectGuid guid, bool open, GameObject* go /*= nullptr*/) { if (!go) go = instance->GetGameObject(guid); @@ -318,7 +318,7 @@ void InstanceScript::HandleGameObject(uint64 guid, bool open, GameObject* go /*= TC_LOG_DEBUG("scripts", "InstanceScript: HandleGameObject failed"); } -void InstanceScript::DoUseDoorOrButton(uint64 guid, uint32 withRestoreTime /*= 0*/, bool useAlternativeState /*= false*/) +void InstanceScript::DoUseDoorOrButton(ObjectGuid guid, uint32 withRestoreTime /*= 0*/, bool useAlternativeState /*= false*/) { if (!guid) return; @@ -339,7 +339,7 @@ void InstanceScript::DoUseDoorOrButton(uint64 guid, uint32 withRestoreTime /*= 0 TC_LOG_DEBUG("scripts", "InstanceScript: HandleGameObject failed"); } -void InstanceScript::DoRespawnGameObject(uint64 guid, uint32 timeToDespawn /*= MINUTE*/) +void InstanceScript::DoRespawnGameObject(ObjectGuid guid, uint32 timeToDespawn /*= MINUTE*/) { if (GameObject* go = instance->GetGameObject(guid)) { @@ -480,7 +480,7 @@ void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8 case ENCOUNTER_FRAME_UPDATE_PRIORITY: if (!unit) return; - data.append(unit->GetPackGUID()); + data << unit->GetPackGUID(); data << uint8(param1); break; case ENCOUNTER_FRAME_ADD_TIMER: |