From 07084713d14092a9d08f3532e2bb7c583dab303e Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sat, 26 Sep 2009 17:16:17 -0700
Subject: *Some better checks.. don't want to try and store a Unit* in a bool!

--HG--
branch : trunk
---
 src/game/Creature.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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)
-- 
cgit v1.2.3