diff options
| author | maximius <none@none> | 2009-09-26 17:16:17 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-26 17:16:17 -0700 |
| commit | 07084713d14092a9d08f3532e2bb7c583dab303e (patch) | |
| tree | 4bba018e9b81c5965f65242fdf1238615ad0116b /src | |
| parent | f8155b4f95560188f4e6ea7a83d793e27ef41ba8 (diff) | |
*Some better checks.. don't want to try and store a Unit* in a bool!
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 7d225ec4935..b361f949237 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -544,8 +544,8 @@ void Creature::Update(uint32 diff) if(!isAlive()) break; - bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() || - (getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() && + bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getVictim() == NULL || + (getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() != NULL && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster())); if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed) |