mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 15:10:08 +00:00
Code Issues Releases Wiki Activity

Don't pass MWLua::WorldView to MWLua::Action

Browse source
This commit is contained in:
Petr Mikheev 2022-12-24 02:25:39 +01:00
parent aef2e9d8de
commit 310acaeee9
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwlua/luamanagerimp.cpp
View file

@ -276,11 +276,11 @@ namespace MWLua
mInGameConsoleMessages.clear(); mInGameConsoleMessages.clear();
for (std::unique_ptr<Action>& action : mActionQueue) for (std::unique_ptr<Action>& action : mActionQueue)
action->safeApply(mWorldView); action->safeApply();
mActionQueue.clear(); mActionQueue.clear();
if (mTeleportPlayerAction) if (mTeleportPlayerAction)
mTeleportPlayerAction->safeApply(mWorldView); mTeleportPlayerAction->safeApply();
mTeleportPlayerAction.reset(); mTeleportPlayerAction.reset();
} }
@ -564,11 +564,11 @@ namespace MWLua
mCallerTraceback = state->debugTraceback(); mCallerTraceback = state->debugTraceback();
} }
void LuaManager::Action::safeApply(WorldView& w) const void LuaManager::Action::safeApply() const
{ {
try try
{ {
apply(w); apply();
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -593,7 +593,7 @@ namespace MWLua
{ {
} }
void apply(WorldView&) const override { mFn(); } void apply() const override { mFn(); }
std::string toString() const override { return "FunctionAction " + mName; } std::string toString() const override { return "FunctionAction " + mName; }
private: private:

4
apps/openmw/mwlua/luamanagerimp.hpp
View file

@ -73,8 +73,8 @@ namespace MWLua
Action(LuaUtil::LuaState* state); Action(LuaUtil::LuaState* state);
virtual ~Action() {} virtual ~Action() {}
void safeApply(WorldView&) const; void safeApply() const;
virtual void apply(WorldView&) const = 0; virtual void apply() const = 0;
virtual std::string toString() const = 0; virtual std::string toString() const = 0;
private: private:

4
apps/openmw/mwlua/objectbindings.cpp
View file

@ -61,7 +61,7 @@ namespace MWLua
{ {
} }
void apply(WorldView&) const override void apply() const override
{ {
MWWorld::WorldModel& wm = *MWBase::Environment::get().getWorldModel(); MWWorld::WorldModel& wm = *MWBase::Environment::get().getWorldModel();
MWWorld::CellStore* cell = wm.getCellByPosition(mPos, mCell); MWWorld::CellStore* cell = wm.getCellByPosition(mPos, mCell);
@ -109,7 +109,7 @@ namespace MWLua
{ {
} }
void apply(WorldView& worldView) const override void apply() const override
{ {
MWWorld::Ptr object = MWBase::Environment::get().getWorldModel()->getPtr(mObject); MWWorld::Ptr object = MWBase::Environment::get().getWorldModel()->getPtr(mObject);
if (object.isEmpty()) if (object.isEmpty())

2
apps/openmw/mwlua/postprocessingbindings.cpp
View file

@ -20,7 +20,7 @@ namespace
{ {
} }
void apply(MWLua::WorldView&) const override void apply() const override
{ {
MWBase::Environment::get().getWorld()->getPostProcessor()->setUniform(mShader, mName, mValue); MWBase::Environment::get().getWorld()->getPostProcessor()->setUniform(mShader, mName, mValue);
} }

2
apps/openmw/mwlua/stats.cpp
View file

@ -97,7 +97,7 @@ namespace MWLua
{ {
} }
void apply(WorldView& worldView) const override void apply() const override
{ {
LObject obj(mId); LObject obj(mId);
LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts(); LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();

2
apps/openmw/mwlua/types/actor.cpp
View file

@ -29,7 +29,7 @@ namespace MWLua
{ {
} }
void apply(WorldView& worldView) const override void apply() const override
{ {
MWWorld::Ptr actor = MWBase::Environment::get().getWorldModel()->getPtr(mActor); MWWorld::Ptr actor = MWBase::Environment::get().getWorldModel()->getPtr(mActor);
MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor); MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);

2
apps/openmw/mwlua/uibindings.cpp
View file

@ -35,7 +35,7 @@ namespace MWLua
{ {
} }
void apply(WorldView&) const override void apply() const override
{ {
try try
{ {