aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-11-12 03:13:17 +0100
committerShauren <shauren.trinity@gmail.com>2017-11-12 03:13:17 +0100
commit2b184c58b8cc3f91ac2f9292db6061a84266f30e (patch)
treefe8e05db923eb49eea35155ed88b1824d8b5d47f /src
parent331c70e695c6eef085be03a4f149158b68470035 (diff)
Warning fix
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rw-r--r--src/server/game/Spells/Spell.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 5da9a2c1eac..92fb8a6c406 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18018,7 +18018,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder)
uint32 runeCooldown = GetRuneBaseCooldown();
while (runes < maxRunes)
{
- SetRuneCooldown(runes, runeCooldown, false);
+ SetRuneCooldown(runes, runeCooldown);
++runes;
}
}
@@ -25469,7 +25469,7 @@ uint32 Player::GetRuneBaseCooldown() const
return cooldown;
}
-void Player::SetRuneCooldown(uint8 index, uint32 cooldown, bool casted /*= false*/)
+void Player::SetRuneCooldown(uint8 index, uint32 cooldown)
{
m_runes->Cooldown[index] = cooldown;
m_runes->SetRuneState(index, (cooldown == 0) ? true : false);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index f9d0710277d..f392ba70e10 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2269,7 +2269,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
uint8 GetRunesState() const;
uint32 GetRuneCooldown(uint8 index) const { return m_runes->Cooldown[index]; }
uint32 GetRuneBaseCooldown() const;
- void SetRuneCooldown(uint8 index, uint32 cooldown, bool casted = false);
+ void SetRuneCooldown(uint8 index, uint32 cooldown);
void ResyncRunes() const;
void AddRunePower(uint8 index) const;
void InitRunes();
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index e5c74c91f55..10668afa77f 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4656,7 +4656,7 @@ void Spell::TakeRunePower(bool didHit)
{
if (!player->GetRuneCooldown(i) && runeCost > 0)
{
- player->SetRuneCooldown(i, didHit ? player->GetRuneBaseCooldown() : uint32(RUNE_MISS_COOLDOWN), true);
+ player->SetRuneCooldown(i, didHit ? player->GetRuneBaseCooldown() : uint32(RUNE_MISS_COOLDOWN));
--runeCost;
}
}