AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only allow saving in synchronizedUpdateUnsafe

Browse Source
This commit is contained in:
Evil Eye 2025-09-16 22:02:23 +02:00
parent 32f54eb555
commit 6d5da282a5
5 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/openmw/mwlua/luamanagerimp.cpp
View File

@ -42,6 +42,20 @@
namespace MWLua
{
namespace
{
struct AllowSaving
{
bool& mAllowSaving;
AllowSaving(bool& allowSaving)
: mAllowSaving(allowSaving)
{
mAllowSaving = true;
}
~AllowSaving() { mAllowSaving = false; }
};
}
static LuaUtil::LuaStateSettings createLuaStateSettings()
{
@ -264,6 +278,7 @@ namespace MWLua
// can teleport the player to the starting location before the first frame is rendered.
mGlobalScripts.newGameStarted();
}
AllowSaving savingGuard(mAllowSaving);
// We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
mProcessingInputEvents = true;
@ -316,8 +331,6 @@ namespace MWLua
void LuaManager::applyDelayedActions()
{
if (mApplyingDelayedActions)
return;
mApplyingDelayedActions = true;
for (DelayedAction& action : mActionQueue)
action.apply();
@ -326,9 +339,6 @@ namespace MWLua
if (mTeleportPlayerAction)
mTeleportPlayerAction->apply();
mTeleportPlayerAction.reset();
for (DelayedAction& action : mSaveActionQueue)
action.apply();
mSaveActionQueue.clear();
mApplyingDelayedActions = false;
}
@ -829,11 +839,6 @@ namespace MWLua
mTeleportPlayerAction = DelayedAction(&mLua, std::move(action), "TeleportPlayer");
}
void LuaManager::addSaveGameAction(std::function<void()> action)
{
mSaveActionQueue.emplace_back(&mLua, std::move(action), "SaveGame");
}
void LuaManager::reportStats(unsigned int frameNumber, osg::Stats& stats) const
{
stats.setAttribute(frameNumber, "Lua UsedMemory", mLua.getTotalMemoryUsage());

5
apps/openmw/mwlua/luamanagerimp.hpp
View File

@ -127,7 +127,6 @@ namespace MWLua
// OSG Cull), so we need to queue it and apply from the main thread.
void addAction(std::function<void()> action, std::string_view name = {});
void addTeleportPlayerAction(std::function<void()> action);
void addSaveGameAction(std::function<void()> action);
// Saving
void write(ESM::ESMWriter& writer, Loading::Listener& progress) override;
@ -175,6 +174,8 @@ namespace MWLua
void sendLocalEvent(
const MWWorld::Ptr& target, const std::string& name, const std::optional<sol::table>& data = std::nullopt);
bool savingAllowed() const { return mAllowSaving; }
private:
void initConfiguration();
LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr,
@ -188,6 +189,7 @@ namespace MWLua
bool mApplyingDelayedActions = false;
bool mNewGameStarted = false;
bool mReloadAllScriptsRequested = false;
bool mAllowSaving = false;
LuaUtil::ScriptsConfiguration mConfiguration;
LuaUtil::LuaState mLua;
LuaUi::ResourceManager mUiResourceManager;
@ -235,7 +237,6 @@ namespace MWLua
};
std::vector<DelayedAction> mActionQueue;
std::optional<DelayedAction> mTeleportPlayerAction;
std::vector<DelayedAction> mSaveActionQueue;
std::vector<std::pair<std::string, MWGui::ShowInDialogueMode>> mUIMessages;
std::vector<std::pair<std::string, Misc::Color>> mInGameConsoleMessages;
std::optional<ObjectId> mDelayedUiModeChangedArg;

19
apps/openmw/mwlua/menuscripts.cpp
View File

@ -73,16 +73,15 @@ namespace MWLua
return sol::nullopt;
};
api["saveGame"] = [context](std::string description, sol::optional<std::string> slotName) {
context.mLuaManager->addSaveGameAction(
[description = std::move(description), slotName = std::move(slotName)]() {
MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
const MWState::Character* character = manager->getCurrentCharacter();
const MWState::Slot* slot = nullptr;
if (slotName)
slot = findSlot(character, *slotName);
manager->saveGame(description, slot);
});
api["saveGame"] = [context](std::string_view description, sol::optional<std::string_view> slotName) {
if (!context.mLuaManager->savingAllowed())
throw std::runtime_error("The game cannot be saved at the moment");
MWBase::StateManager* manager = MWBase::Environment::get().getStateManager();
const MWState::Character* character = manager->getCurrentCharacter();
const MWState::Slot* slot = nullptr;
if (slotName)
slot = findSlot(character, *slotName);
manager->saveGame(description, slot);
};
auto getSaves = [](sol::state_view currentState, const MWState::Character& character) {

4
components/lua/scriptscontainer.cpp
View File

@ -47,7 +47,7 @@ namespace LuaUtil
}
}
void ScriptsContainer::printError(int scriptId, std::string_view msg, const std::exception& e)
void ScriptsContainer::printError(int scriptId, std::string_view msg, const std::exception& e) const
{
Log(Debug::Error) << mNamePrefix << "[" << scriptPath(scriptId) << "] " << msg << ": " << e.what();
}
@ -408,7 +408,7 @@ namespace LuaUtil
void ScriptsContainer::save(ESM::LuaScripts& data)
{
if (UnloadedData* unloadedData = std::get_if<UnloadedData>(&mData))
if (const UnloadedData* unloadedData = std::get_if<UnloadedData>(&mData))
{
data.mScripts = unloadedData->mScripts;
return;

2
components/lua/scriptscontainer.hpp
View File

@ -271,7 +271,7 @@ namespace LuaUtil
// Returns script by id (throws an exception if doesn't exist)
Script& getScript(int scriptId);
void printError(int scriptId, std::string_view msg, const std::exception& e);
void printError(int scriptId, std::string_view msg, const std::exception& e) const;
const VFS::Path::Normalized& scriptPath(int scriptId) const
{