Fixed an issue where MakeKey, MakeGlobalKey failed to compile due to missing keyword specifier constexpr in the cpp file

NixAJ · NixAJ · commit b7370edbd8fe · 2025-09-05T08:15:21.000+02:00
Minor style adjustments
diff --git a/ElunaMgr.cpp b/ElunaMgr.cpp
@@ -24,7 +24,7 @@ ElunaMgr::~ElunaMgr()
 void ElunaMgr::Create(Map* map, ElunaInfo const& info)
 {
     // If already exists, do nothing
-    bool keyExists = (info.key != ElunaInfo::INVALID_KEY_ID) && (_elunaMap.find(info.key) != _elunaMap.end());
+    bool keyExists = info.IsValid() && (_elunaMap.find(info.key) != _elunaMap.end());
     if (keyExists)
         return;
 
@@ -66,12 +66,12 @@ ElunaInfo::~ElunaInfo()
         sElunaMgr->Destroy(key);
 }
 
-uint64 ElunaInfo::MakeKey(uint32 mapId, uint32 instanceId)
+constexpr uint64 ElunaInfo::MakeKey(uint32 mapId, uint32 instanceId)
 {
     return instanceId | (static_cast<uint64>(mapId) << 32);
 }
 
-uint64 ElunaInfo::MakeGlobalKey(uint32 instanceId)
+constexpr uint64 ElunaInfo::MakeGlobalKey(uint32 instanceId)
 {
     return MakeKey(GLOBAL_MAP_ID, instanceId);
 }
@@ -80,6 +80,7 @@ bool ElunaInfo::IsValid() const
 {
     return key != INVALID_KEY_ID;
 }
+
 bool ElunaInfo::IsGlobal() const
 {
     return IsValid() && GetMapId() == GLOBAL_MAP_ID;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ ElunaMgr::~ElunaMgr()`
`24`	`24`	`void ElunaMgr::Create(Map* map, ElunaInfo const& info)`
`25`	`25`	`{`
`26`	`26`	`// If already exists, do nothing`
`27`		`- bool keyExists = (info.key != ElunaInfo::INVALID_KEY_ID) && (_elunaMap.find(info.key) != _elunaMap.end());`
	`27`	`+ bool keyExists = info.IsValid() && (_elunaMap.find(info.key) != _elunaMap.end());`
`28`	`28`	`if (keyExists)`
`29`	`29`	`return;`
`30`	`30`
`@@ -66,12 +66,12 @@ ElunaInfo::~ElunaInfo()`
`66`	`66`	`sElunaMgr->Destroy(key);`
`67`	`67`	`}`
`68`	`68`
`69`		`-uint64 ElunaInfo::MakeKey(uint32 mapId, uint32 instanceId)`
	`69`	`+constexpr uint64 ElunaInfo::MakeKey(uint32 mapId, uint32 instanceId)`
`70`	`70`	`{`
`71`	`71`	`return instanceId \| (static_cast<uint64>(mapId) << 32);`
`72`	`72`	`}`
`73`	`73`
`74`		`-uint64 ElunaInfo::MakeGlobalKey(uint32 instanceId)`
	`74`	`+constexpr uint64 ElunaInfo::MakeGlobalKey(uint32 instanceId)`
`75`	`75`	`{`
`76`	`76`	`return MakeKey(GLOBAL_MAP_ID, instanceId);`
`77`	`77`	`}`
`@@ -80,6 +80,7 @@ bool ElunaInfo::IsValid() const`
`80`	`80`	`{`
`81`	`81`	`return key != INVALID_KEY_ID;`
`82`	`82`	`}`
	`83`	`+`
`83`	`84`	`bool ElunaInfo::IsGlobal() const`
`84`	`85`	`{`
`85`	`86`	`return IsValid() && GetMapId() == GLOBAL_MAP_ID;`