Changeset 135 for trunk/src/game/Creature.h

Timestamp:

11/19/08 13:39:16 (17 years ago)

Author:

yumileroy

Message:

[svn] Merge from mangos.
Wed Oct 29 15:06:00 http://github.com/mangos/mangos/commit/034b8a34a9b621443e97d0ac4b667b603ba31ef1
Mon Oct 27 14:36:42 http://github.com/mangos/mangos/commit/fa072d15107b44344af8c9ef686839984e241a1b

Original author: megamage
Date: 2008-10-29 18:06:01-05:00

Files:

• trunk/src/game/Creature.h (modified) (1 diff)

trunk/src/game/Creature.h

@@ -572 +572 @@
         void GetCombatStartPosition(float &x, float &y, float &z) { x = CombatStartX; y = CombatStartY; z = CombatStartZ; }
 
+        uint32 GetGlobalCooldown() const { return m_GlobalCooldown; }
+
     protected:
         bool CreateFromProto(uint32 guidlow,uint32 Entry,uint32 team, const CreatureData *data = NULL);