From 2f17600f434d57d4cf754565bae1ca80fa29e4f4 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Sat, 20 Sep 2014 18:44:28 +0300 Subject: [PATCH] Eluna: ObjectGuid is now used by all cores --- ElunaUtility.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ElunaUtility.h b/ElunaUtility.h index 6d9eac6..32df7d8 100644 --- a/ElunaUtility.h +++ b/ElunaUtility.h @@ -9,13 +9,13 @@ #include "Common.h" #include "SharedDefines.h" +#include "ObjectGuid.h" #ifdef TRINITY #include "QueryResult.h" #ifdef CATA #include "Object.h" #endif #else -#include "ObjectGuid.h" #include "Database/QueryResult.h" #endif @@ -32,9 +32,6 @@ #ifdef TRINITY typedef QueryResult ElunaQuery; -#ifndef CATA -typedef uint64 ObjectGuid; -#endif #define ELUNA_LOG_INFO(...) TC_LOG_INFO("eluna", __VA_ARGS__); #define ELUNA_LOG_ERROR(...) TC_LOG_ERROR("eluna", __VA_ARGS__); #define ELUNA_LOG_DEBUG(...) TC_LOG_DEBUG("eluna", __VA_ARGS__);