diff options
author | Machiavelli <none@none> | 2009-06-10 19:43:50 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2009-06-10 19:43:50 +0200 |
commit | eb9719ed4f95c81b3e1ccd4cae63b7c09baddcaf (patch) | |
tree | cd091599f6c127d5931fb097ed64743249ba3e30 /src/game/Creature.cpp | |
parent | 7445ddad0520fd9a55234a0c22dca56e4e7c00d0 (diff) | |
parent | 926747b57ec6e8439d5397c57b37d2b2c3ba7b70 (diff) |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
-rw-r--r-- | src/game/Creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index e8916aad70a..f31dcbf4df7 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -140,7 +140,7 @@ m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_A m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL), m_summonMask(SUMMON_MASK_NONE) , m_AlreadySearchedAssistance(false) -, m_creatureData(NULL) +, m_creatureData(NULL), m_PlayerDamageReq(0) { m_regenTimer = 200; m_valuesCount = UNIT_END; |