aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-06 10:38:46 -0500
committermegamage <none@none>2009-08-06 10:38:46 -0500
commite8330e4162f044b928f26d91e71db986e59978ef (patch)
tree1a66383fdc99a7fa56bc9c9ff8939bb729cf9e37 /src/game/Object.h
parente64592775957c8394ade11e95f851f95827a9ca2 (diff)
*Update creature damamge formula. Use damage mod in config as total_pct modifier.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.h')
-rw-r--r--src/game/Object.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 98103384ac7..c44dd4fd65c 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -160,7 +160,7 @@ class TRINITY_DLL_SPEC Object
uint32 GetEntry() const { return GetUInt32Value(OBJECT_FIELD_ENTRY); }
void SetEntry(uint32 entry) { SetUInt32Value(OBJECT_FIELD_ENTRY, entry); }
- uint8 GetTypeId() const { return m_objectTypeId; }
+ TypeID GetTypeId() const { return m_objectTypeId; }
bool isType(uint16 mask) const { return (mask & m_objectType); }
virtual void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
@@ -337,7 +337,7 @@ class TRINITY_DLL_SPEC Object
uint16 m_objectType;
- uint8 m_objectTypeId;
+ TypeID m_objectTypeId;
uint16 m_updateFlag;
union