diff --git a/apps/openmw/mwlua/engineevents.cpp b/apps/openmw/mwlua/engineevents.cpp index f29aa79b9a..7591f68b20 100644 --- a/apps/openmw/mwlua/engineevents.cpp +++ b/apps/openmw/mwlua/engineevents.cpp @@ -17,12 +17,12 @@ namespace MWLua class EngineEvents::Visitor { public: - explicit Visitor(GlobalScripts* globalScripts) + explicit Visitor(GlobalScripts& globalScripts) : mGlobalScripts(globalScripts) { } - void operator()(const OnNewGame&) const { mGlobalScripts->newGameStarted(); } + void operator()(const OnNewGame&) const { mGlobalScripts.newGameStarted(); } void operator()(const OnActive& event) const { @@ -30,15 +30,15 @@ namespace MWLua if (ptr.isEmpty()) return; if (ptr.getCellRef().getRefId() == "player") - mGlobalScripts->playerAdded(GObject(ptr)); + mGlobalScripts.playerAdded(GObject(ptr)); else { - mGlobalScripts->objectActive(GObject(ptr)); + mGlobalScripts.objectActive(GObject(ptr)); const MWWorld::Class& objClass = ptr.getClass(); if (objClass.isActor()) - mGlobalScripts->actorActive(GObject(ptr)); + mGlobalScripts.actorActive(GObject(ptr)); if (objClass.isItem(ptr)) - mGlobalScripts->itemActive(GObject(ptr)); + mGlobalScripts.itemActive(GObject(ptr)); } if (auto* scripts = getLocalScripts(ptr)) scripts->setActive(true); @@ -89,7 +89,7 @@ namespace MWLua LocalScripts* getLocalScripts(const ESM::RefNum& id) const { return getLocalScripts(getPtr(id)); } - GlobalScripts* mGlobalScripts; + GlobalScripts& mGlobalScripts; bool mLuaDebug = Settings::Manager::getBool("lua debug", "Lua"); MWWorld::WorldModel* mWorldModel = MWBase::Environment::get().getWorldModel(); }; diff --git a/apps/openmw/mwlua/engineevents.hpp b/apps/openmw/mwlua/engineevents.hpp index f6d21b509a..93b3c16164 100644 --- a/apps/openmw/mwlua/engineevents.hpp +++ b/apps/openmw/mwlua/engineevents.hpp @@ -12,7 +12,7 @@ namespace MWLua class EngineEvents { public: - explicit EngineEvents(GlobalScripts* globalScripts) + explicit EngineEvents(GlobalScripts& globalScripts) : mGlobalScripts(globalScripts) { } @@ -47,7 +47,7 @@ namespace MWLua private: class Visitor; - GlobalScripts* mGlobalScripts; + GlobalScripts& mGlobalScripts; std::vector mQueue; }; diff --git a/apps/openmw/mwlua/luaevents.cpp b/apps/openmw/mwlua/luaevents.cpp index 2013bfe6b0..37828d4b13 100644 --- a/apps/openmw/mwlua/luaevents.cpp +++ b/apps/openmw/mwlua/luaevents.cpp @@ -35,10 +35,10 @@ namespace MWLua void LuaEvents::callEventHandlers() { - for (Global& e : mGlobalEventBatch) - mGlobalScripts->receiveEvent(e.mEventName, e.mEventData); + for (const Global& e : mGlobalEventBatch) + mGlobalScripts.receiveEvent(e.mEventName, e.mEventData); mGlobalEventBatch.clear(); - for (Local& e : mLocalEventBatch) + for (const Local& e : mLocalEventBatch) { MWWorld::Ptr ptr = MWBase::Environment::get().getWorldModel()->getPtr(e.mDest); LocalScripts* scripts = ptr.isEmpty() ? nullptr : ptr.getRefData().getLuaScripts(); diff --git a/apps/openmw/mwlua/luaevents.hpp b/apps/openmw/mwlua/luaevents.hpp index 9cc9d5b399..5eeae46538 100644 --- a/apps/openmw/mwlua/luaevents.hpp +++ b/apps/openmw/mwlua/luaevents.hpp @@ -27,7 +27,7 @@ namespace MWLua class LuaEvents { public: - explicit LuaEvents(GlobalScripts* globalScripts) + explicit LuaEvents(GlobalScripts& globalScripts) : mGlobalScripts(globalScripts) { } @@ -56,7 +56,7 @@ namespace MWLua void save(ESM::ESMWriter& esm) const; private: - GlobalScripts* mGlobalScripts; + GlobalScripts& mGlobalScripts; std::vector mNewGlobalEventBatch; std::vector mNewLocalEventBatch; std::vector mGlobalEventBatch; diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp index 717dfe4af9..a6955ff307 100644 --- a/apps/openmw/mwlua/luamanagerimp.hpp +++ b/apps/openmw/mwlua/luamanagerimp.hpp @@ -172,8 +172,8 @@ namespace MWLua MWWorld::Ptr mPlayer; - LuaEvents mLuaEvents{ &mGlobalScripts }; - EngineEvents mEngineEvents{ &mGlobalScripts }; + LuaEvents mLuaEvents{ mGlobalScripts }; + EngineEvents mEngineEvents{ mGlobalScripts }; std::vector mInputEvents; std::unique_ptr mGlobalSerializer;