Switch to using ElunaMgr (#26)

Implements ElunaLuaEngine/Eluna@4008d28

Author: Foereaper

src/server/game/LuaEngine

@@ -284,12 +284,12 @@ i_scriptLock(false), _respawnTimes(std::make_unique<RespawnListContainer>()), _r
 {
     m_parentMap = (_parent ? _parent : this);
 #ifdef ELUNA
-    // lua state begins uninitialized
-    eluna = nullptr;
-
     if (sElunaConfig->IsElunaEnabled() && sElunaConfig->ShouldMapLoadEluna(id))
         if (!IsParentMap() || (IsParentMap() && !Instanceable()))
-            eluna = std::make_unique<Eluna>(this);
+        {
+            _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.cpp

@@ -40,6 +40,7 @@
 #include <mutex>
 #ifdef ELUNA
 #include "LuaValue.h"
+#include "ElunaMgr.h"
 #endif
 
 class Battleground;
@@ -788,8 +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 eluna.get(); }
-
+        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
-        std::unique_ptr<Eluna> eluna;
+        ElunaInfo _elunaInfo;
 #endif
 };
 

src/server/game/Maps/Map.h

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

src/server/game/World/World.cpp

@@ -29,6 +29,9 @@
 #include "ObjectGuid.h"
 #include "SharedDefines.h"
 #include "Timer.h"
+#ifdef ELUNA
+#include "ElunaMgr.h"
+#endif
 
 #include <atomic>
 #include <list>
@@ -775,8 +778,7 @@ class TC_GAME_API World
         bool IsGuidAlert() { return _guidAlert; }
 
 #ifdef ELUNA
-        Eluna* GetEluna() const { return eluna.get(); }
-        std::unique_ptr<Eluna> eluna;
+        Eluna* GetEluna() const { return sElunaMgr->Get(_elunaInfo); }
 #endif
     protected:
         void _UpdateGameTime();
@@ -891,7 +893,9 @@ class TC_GAME_API World
         bool _guidAlert;
         uint32 _warnDiff;
         time_t _warnShutdownTime;
-
+#ifdef ELUNA
+        ElunaInfo _elunaInfo;
+#endif
     friend class debug_commandscript;
 };