From 89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654 Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Wed, 11 Jul 2012 20:59:28 +0200 Subject: Fixed small bug in attack core. warmup and cooldown was mixed --- src/game-server/attack.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game-server/attack.cpp b/src/game-server/attack.cpp index e807df6a..9118b10c 100644 --- a/src/game-server/attack.cpp +++ b/src/game-server/attack.cpp @@ -101,9 +101,11 @@ Attack *Attacks::getTriggerableAttack() if (!mCurrentAttack) return 0; - int warmupTime = mCurrentAttack->getAttackInfo()->getWarmupTime(); - if (mAttackTimer.remaining() <= warmupTime) + int cooldownTime = mCurrentAttack->getAttackInfo()->getCooldownTime(); + if (mAttackTimer.remaining() <= cooldownTime) + { return mCurrentAttack; + } return 0; } -- cgit v1.2.3-70-g09d2