From f6f098171f0744682e6fde2840aa3044bd3eceb8 Mon Sep 17 00:00:00 2001 From: Killyana Date: Fri, 16 Feb 2018 18:39:50 +0100 Subject: Core/SAI: Move enum to the correct file (cherry picked from commit 8aa10f6c65ba7fc8363a663b305fede95d0ccb58) --- src/server/game/Entities/Object/Object.h | 6 ------ src/server/game/Entities/Object/ObjectDefines.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index d451b0a5720..5d204dad234 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -393,12 +393,6 @@ class FlaggedValuesArray32 T_FLAGS m_flags; }; -enum GOSummonType -{ - GO_SUMMON_TIMED_OR_CORPSE_DESPAWN = 0, // despawns after a specified time OR when the summoner dies - GO_SUMMON_TIMED_DESPAWN = 1 // despawns after a specified time -}; - class TC_GAME_API WorldObject : public Object, public WorldLocation { protected: diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 43f2ea15a4d..8dc65873ecb 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -80,6 +80,12 @@ enum NotifyFlags NOTIFY_ALL = 0xFF }; +enum GOSummonType +{ + GO_SUMMON_TIMED_OR_CORPSE_DESPAWN = 0, // despawns after a specified time OR when the summoner dies + GO_SUMMON_TIMED_DESPAWN = 1 // despawns after a specified time +}; + inline uint64 MAKE_PAIR64(uint32 l, uint32 h) { return uint64(l | (uint64(h) << 32)); -- cgit v1.2.3