diff options
| author | Drahy <none@none> | 2009-06-29 22:26:41 +0200 |
|---|---|---|
| committer | Drahy <none@none> | 2009-06-29 22:26:41 +0200 |
| commit | 966a5374cc5c423bdbc4527315bb48c39684b1d7 (patch) | |
| tree | 9849d7803a313e47a0ab57e748ad2a3e2f5baf9a /src/game/Player.cpp | |
| parent | 7b1e0b8e0d806939ac292603f86f895f16bc364a (diff) | |
| parent | 527f36108b45f987efcc757e471e7774b9822efc (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 62f712aabf1..0a90f721899 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -17316,6 +17316,9 @@ void Player::SetSpellModTakingSpell(Spell * spell, bool apply) if (!spell || (m_spellModTakingSpell && m_spellModTakingSpell != spell)) return; + if (apply && spell->getState() == SPELL_STATE_FINISHED) + return; + if (apply) m_spellModTakingSpell = spell; else |