diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-11 20:59:28 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-11 21:00:28 +0200 |
| commit | 89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654 (patch) | |
| tree | cf1ba9c92948d7ddbdb263ee3609c76194e3d38f | |
| parent | 3a8ed1324c54d895ed4efe688cca5769ab9bd77f (diff) | |
| download | manaserv-89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654.tar.gz manaserv-89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654.tar.bz2 manaserv-89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654.tar.xz manaserv-89847fcbb1befb5b6c31fc42fb3e56d3a2fd6654.zip | |
Fixed small bug in attack core. warmup and cooldown was mixed
| -rw-r--r-- | src/game-server/attack.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |