aboutsummaryrefslogtreecommitdiff
path: root/src/game/Creature.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-22 11:37:59 -0600
committermegamage <none@none>2009-03-22 11:37:59 -0600
commit708449298efbf50783c6cf09fbea22196c7bd315 (patch)
treeefa8d7b730a697710101f2d10708df2686ae7eb5 /src/game/Creature.cpp
parentae7a8a09718115b291d18929c098c5082ee0fda8 (diff)
parent763c81de3cb3e144276f850ffa12265bf92d0d03 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
-rw-r--r--src/game/Creature.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index db502d2cc25..edf32d19cf2 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -355,8 +355,8 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
if(isTotem() || isTrigger()
|| GetCreatureType() == CREATURE_TYPE_CRITTER)
SetReactState(REACT_PASSIVE);
- else if(isCivilian())
- SetReactState(REACT_DEFENSIVE);
+ /*else if(isCivilian())
+ SetReactState(REACT_DEFENSIVE);*/
else
SetReactState(REACT_AGGRESSIVE);