cleanup

Author: Foereaper

src/server/game/Maps/Map.cpp

@@ -288,8 +288,8 @@ i_scriptLock(false), _respawnTimes(std::make_unique<RespawnListContainer>()), _r
     if (sElunaConfig->IsElunaEnabled() && sElunaConfig->ShouldMapLoadEluna(id))
         if (!IsParentMap() || (IsParentMap() && !Instanceable()))
         {
-            elunaInfo.key = ElunaInfoKey::MakeKey(GetId(), GetInstanceId());
-            sElunaMgr->Create(this, elunaInfo);
+            _elunaInfo = { ElunaInfoKey::MakeKey(GetId(), GetInstanceId()) };
+            sElunaMgr->Create(this, _elunaInfo);
         }
 #endif
     for (unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)

src/server/game/Maps/Map.h

@@ -789,7 +789,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
         void AddFarSpellCallback(FarSpellCallback&& callback);
         bool IsParentMap() const { return GetParent() == this; }
 #ifdef ELUNA
-        Eluna* GetEluna() const { return sElunaMgr->Get(elunaInfo.key); }
+        Eluna* GetEluna() const { return sElunaMgr->Get(_elunaInfo); }
         LuaVal lua_data = LuaVal({});
 #endif
     private:
@@ -872,7 +872,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
 
         MPSCQueue<FarSpellCallback> _farSpellCallbacks;
 #ifdef ELUNA
-        ElunaInfo elunaInfo;
+        ElunaInfo _elunaInfo;
 #endif
 };
 

src/server/game/World/World.cpp

@@ -2131,8 +2131,8 @@ void World::SetInitialWorldSettings()
     if (sElunaConfig->IsElunaEnabled())
     {
         TC_LOG_INFO("server.loading", "Starting Eluna world state...");
-        elunaInfo.key = ElunaInfoKey::MakeGlobalKey(0);
-        sElunaMgr->Create(nullptr, elunaInfo);
+        _elunaInfo = { ElunaInfoKey::MakeGlobalKey(0) };
+        sElunaMgr->Create(nullptr, _elunaInfo);
     }
 #endif
 

src/server/game/World/World.h

@@ -778,7 +778,7 @@ class TC_GAME_API World
         bool IsGuidAlert() { return _guidAlert; }
 
 #ifdef ELUNA
-        Eluna* GetEluna() const { return sElunaMgr->Get(elunaInfo.key); }
+        Eluna* GetEluna() const { return sElunaMgr->Get(_elunaInfo); }
 #endif
     protected:
         void _UpdateGameTime();
@@ -894,7 +894,7 @@ class TC_GAME_API World
         uint32 _warnDiff;
         time_t _warnShutdownTime;
 #ifdef ELUNA
-        ElunaInfo elunaInfo;
+        ElunaInfo _elunaInfo;
 #endif
     friend class debug_commandscript;
 };