diff options
author | Killyana <morphone1@gmail.com> | 2018-02-16 18:39:50 +0100 |
---|---|---|
committer | Killyana <morphone1@gmail.com> | 2018-02-16 18:39:50 +0100 |
commit | 8aa10f6c65ba7fc8363a663b305fede95d0ccb58 (patch) | |
tree | ff0272def29a4ce6ee23a496fcbaad0a3e99a8cd /src | |
parent | 72affd679dae7e12a8251b36d88dceb898d10565 (diff) |
Core/SAI: Move enum to the correct file
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Object/Object.h | 6 | ||||
-rw-r--r-- | src/server/game/Entities/Object/ObjectDefines.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 42a061e641e..fd4b34d7892 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -255,12 +255,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 0cf743fb5f3..571bf36936c 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -64,6 +64,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)); |