diff options
| author | megamage <none@none> | 2009-02-20 12:05:58 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-20 12:05:58 -0600 |
| commit | 1b587c0fe3355567173918d7a0b56141c6bcd1b2 (patch) | |
| tree | fd8b03d40861ec08c1fd3d47744131032f7398bd /src/game/Pet.cpp | |
| parent | 187cd928ea6a02df715c349ec970d5899ef6274f (diff) | |
| parent | 956c828bf56f06b5c25ff20d760ad41be2642a51 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Pet.cpp')
| -rw-r--r-- | src/game/Pet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 9444bca7a02..ff2c8880852 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -53,7 +53,7 @@ m_declinedname(NULL) // pets always have a charminfo, even if they are not actually charmed CharmInfo* charmInfo = InitCharmInfo(this); - if(type == MINI_PET) // always passive + if(type == MINI_PET || type == POSSESSED_PET) // always passive charmInfo->SetReactState(REACT_PASSIVE); else if(type == GUARDIAN_PET) // always aggressive charmInfo->SetReactState(REACT_AGGRESSIVE); |