diff options
| author | QAston <qaston@gmail.com> | 2011-08-31 11:33:26 -0700 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-08-31 11:33:26 -0700 |
| commit | 534ca8e23f425192a770d76866b911bc8c3cf983 (patch) | |
| tree | c5a218a8f8cb591d0b8b5c1ecb37918acb2eb086 /src/server/scripts/Northrend | |
| parent | 048ae9cfab780dc260759eb002dd3b5936a8a268 (diff) | |
| parent | f5a668ae8d55657490ed8b06b76f091bcb4f6e40 (diff) | |
Merge pull request #2821 from Chaplain/cleanup2
Core/Misc: Cleanup
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index f8aaf0ee363..c34528530bd 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -204,12 +204,11 @@ class mob_corrupted_soul_fragment : public CreatureScript if (type != TARGETED_MOTION_TYPE) return; - uint64 BronjahmGUID = 0; if (instance) { if (TempSummon* summ = me->ToTempSummon()) { - BronjahmGUID = instance->GetData64(DATA_BRONJAHM); + uint64 BronjahmGUID = instance->GetData64(DATA_BRONJAHM); if (GUID_LOPART(BronjahmGUID) != id) return; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index e7dffae5c9d..748de08f5e0 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -78,6 +78,7 @@ class instance_ulduar : public InstanceMapScript // Miscellaneous uint32 TeamInInstance; uint32 HodirRareCacheData; + uint32 ColossusData; uint8 elderCount; bool conSpeedAtory; @@ -117,6 +118,7 @@ class instance_ulduar : public InstanceMapScript ArchivumDoorGUID = 0; TeamInInstance = 0; HodirRareCacheData = 0; + ColossusData = 0; elderCount = 0; conSpeedAtory = false; @@ -473,7 +475,7 @@ class instance_ulduar : public InstanceMapScript switch (type) { case DATA_COLOSSUS: - Encounter[DATA_COLOSSUS] = data; + ColossusData = data; if (data == 2) { if (Creature* Leviathan = instance->GetCreature(LeviathanGUID)) @@ -589,7 +591,7 @@ class instance_ulduar : public InstanceMapScript switch (type) { case DATA_COLOSSUS: - return Encounter[type]; + return ColossusData; case DATA_HODIR_RARE_CACHE: return HodirRareCacheData; default: |