From f97ebbb21fee3fe993bee939f5de2c794777b117 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 2 Jan 2018 22:17:47 +0100 Subject: [PATCH] Fixed build --- src/server/game/Spells/SpellMgr.cpp | 4 +--- .../LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 61d8d1f9582..11e7b321e2c 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1650,8 +1650,6 @@ void SpellMgr::LoadSpellProcs() procEntry.Charges = spellInfo->ProcCharges; if (!procEntry.Chance && !procEntry.ProcsPerMinute) procEntry.Chance = float(spellInfo->ProcChance); - if (procEntry.Cooldown == Milliseconds::zero()) - procEntry.Cooldown = Milliseconds(spellInfo->ProcCooldown); // validate data if (procEntry.SchoolMask & ~SPELL_SCHOOL_MASK_ALL) @@ -1898,7 +1896,7 @@ void SpellMgr::LoadSpellProcs() procEntry.ProcsPerMinute = 0; procEntry.Chance = spellInfo->ProcChance; - procEntry.Cooldown = Milliseconds(spellInfo->ProcCooldown); + procEntry.Cooldown = Milliseconds::zero(); procEntry.Charges = spellInfo->ProcCharges; mSpellProcMap[spellInfo->Id] = procEntry; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp index 5b46baa5503..ca7383d5ada 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp @@ -205,7 +205,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript augh->AI()->DoAction(ACTION_AUGH_INTRO); heroicAughSpawned = true; } - else if (_heroicAughSpawned) + else if (heroicAughSpawned) if (Creature* augh = instance->SummonCreature(BOSS_AUGH, AughHomePos)) augh->AI()->DoAction(ACTION_AUGH_ATTACKABLE); break;