Fix Compilation Issues

Author: NixAJ

ElunaMgr.cpp

@@ -55,16 +55,6 @@ void ElunaMgr::Destroy(ElunaInfo const& info)
     Destroy(info.key);
 }
 
-ElunaInfoKey::ElunaInfoKey(uint32 mapId, uint32 instanceId)
-{
-    value = MakeKey(mapId, instanceId).value;
-}
-
-bool ElunaInfoKey::operator==(const ElunaInfoKey& other) const
-{
-    return value == other.value;
-}
-
 constexpr ElunaInfoKey ElunaInfoKey::MakeKey(uint32 mapId, uint32 instanceId)
 {
     return ElunaInfoKey(instanceId | (static_cast<uint64>(mapId) << 32));
@@ -75,26 +65,6 @@ constexpr ElunaInfoKey ElunaInfoKey::MakeGlobalKey(uint32 instanceId)
     return MakeKey(GLOBAL_MAP_ID, instanceId);
 }
 
-bool ElunaInfoKey::IsValid() const
-{
-    return value != INVALID_KEY_VALUE;
-}
-
-bool ElunaInfoKey::IsGlobal() const
-{
-    return IsValid() && GetMapId() == GLOBAL_MAP_ID;
-}
-
-uint32 ElunaInfoKey::GetMapId() const
-{
-    return value >> 32;
-}
-
-uint32 ElunaInfoKey::GetInstanceId() const
-{
-    return value & 0xFFFFFFFF;
-}
-
 ElunaInfo::ElunaInfo(uint32 mapId, uint32 instanceId)
 {
     key = ElunaInfoKey::MakeKey(mapId, instanceId);

ElunaMgr.h

@@ -16,23 +16,22 @@ class Eluna;
 struct ElunaInfoKey
 {
 public:
-    ElunaInfoKey() : value(INVALID_KEY_VALUE) {}
-    ElunaInfoKey(uint64 key) : value(key) {}
-    ElunaInfoKey(uint32 mapId, uint32 instanceId);
+    constexpr ElunaInfoKey() : value(INVALID_KEY_VALUE) {}
+    constexpr ElunaInfoKey(uint64 key) : value(key) {}
     ~ElunaInfoKey() {}
 
-    bool operator==(const ElunaInfoKey& other) const;
+    constexpr bool operator==(const ElunaInfoKey& other) const { return value == other.value; }
 
 public:
     static constexpr ElunaInfoKey MakeKey(uint32 mapId, uint32 instanceId);
     static constexpr ElunaInfoKey MakeGlobalKey(uint32 instanceId);
 
-    bool IsValid() const;
-    bool IsGlobal() const;
+    constexpr bool IsValid() const { return value != INVALID_KEY_VALUE; };
+    constexpr bool IsGlobal() const { return IsValid() && GetMapId() == GLOBAL_MAP_ID; };
+
+    constexpr uint32 GetMapId() const { return value >> 32; };
+    constexpr uint32 GetInstanceId() const { return value & 0xFFFFFFFF; };
 
-    uint32 GetMapId() const;
-    uint32 GetInstanceId() const;
-    
 public:
     static uint64 const INVALID_KEY_VALUE = std::numeric_limits<uint64>().max();
     static uint32 const GLOBAL_MAP_ID = std::numeric_limits<uint32>().max();