diff options
| author | megamage <none@none> | 2009-02-24 21:14:00 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-24 21:14:00 -0600 |
| commit | 5fda4992661583d7b3cf26ff50dc1b3d8ceedf26 (patch) | |
| tree | 3aecfaae1a4d0faf9294497cba6103f307403569 /src/game/Creature.cpp | |
| parent | 65a933c6c15faa9c4243aa729f42b2c458f0c9ea (diff) | |
| parent | 8770a90bc6389d123a2716079bde40f43fc26357 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 6c0e8a419ac..5c6c7e0566b 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1670,6 +1670,8 @@ void Creature::setDeathState(DeathState s) } if(s == JUST_ALIVED) { + if(isPet()) + setActive(true); SetHealth(GetMaxHealth()); SetLootRecipient(NULL); Unit::setDeathState(ALIVE); |