[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 --HG-- branch : trunk
2008-10-29 18:06:01 -05:00
parent cca2c3a603
commit 7ea14f94f1
5 changed files with 113 additions and 105 deletions
@@ -571,6 +571,8 @@ class TRINITY_DLL_SPEC Creature : public Unit
        void SetCombatStartPosition(float x, float y, float z) { CombatStartX = x; CombatStartY = y; CombatStartZ = z; }
        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);
        bool InitEntry(uint32 entry, uint32 team=ALLIANCE, const CreatureData* data=NULL);