diff options
| author | megamage <none@none> | 2008-11-25 17:58:06 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-11-25 17:58:06 -0600 |
| commit | 99cf79bdf7db602d213210b60bbd37a708e45e88 (patch) | |
| tree | 148eb00e7ced98f7ecd822ec030353030c39dfa5 /src/game/Player.cpp | |
| parent | f6ea784eda445794bf99ba2b9f97012ea4009f59 (diff) | |
*Do not let Steady shot pause autoshot timer.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 6e51e368281..307dc6c7407 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1048,10 +1048,9 @@ void Player::Update( uint32 p_time ) } } - if (hasUnitState(UNIT_STAT_MELEE_ATTACKING)) + if (hasUnitState(UNIT_STAT_MELEE_ATTACKING) && !hasUnitState(UNIT_STAT_CASTING)) { - Unit *pVictim = getVictim(); - if( !IsNonMeleeSpellCasted(false) && pVictim) + if(Unit *pVictim = getVictim()) { // default combat reach 10 // TODO add weapon,skill check |