diff options
| author | megamage <none@none> | 2009-03-07 10:19:07 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-07 10:19:07 -0600 |
| commit | 814c6c2c3975bb9e04a8e64ff80888a33ad91963 (patch) | |
| tree | 18ae3799a0e858860e871f08e9785c2cb0ea2b4f /src/game/Unit.cpp | |
| parent | 318f173dd355951d08800d0bcf3b2e46b7d9884b (diff) | |
| parent | 6dc06ab53b2e5307b682c5723b3c6fd62318633e (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 53d0b06416f..6df058fbc36 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7704,7 +7704,7 @@ bool Unit::AttackStop() void Unit::CombatStop(bool cast) { - if(cast& IsNonMeleeSpellCasted(false)) + if(cast && IsNonMeleeSpellCasted(false)) InterruptNonMeleeSpells(false); AttackStop(); |