From b94818b24a1502603525ab2bc7bdbb2ca125ce93 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Thu, 10 Nov 2022 17:24:58 +0100 Subject: [PATCH] Tweak message and temporarily set model ttl to 0 --- apps/openmw/mwscript/miscextensions.cpp | 8 ++++++-- components/resource/resourcemanager.hpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp index 445fe61f89..3898afd36d 100644 --- a/apps/openmw/mwscript/miscextensions.cpp +++ b/apps/openmw/mwscript/miscextensions.cpp @@ -1614,7 +1614,10 @@ namespace MWScript public: void execute(Interpreter::Runtime& runtime) override { - runtime.getContext().report("Loading all models. This may take a while..."); + Resource::SceneManager* sceneManager + = MWBase::Environment::get().getResourceSystem()->getSceneManager(); + double delay = sceneManager->getExpiryDelay(); + sceneManager->setExpiryDelay(0.0); int count = 0; test(count); @@ -1636,8 +1639,9 @@ namespace MWScript test(count); test(count); + sceneManager->setExpiryDelay(delay); std::stringstream message; - message << "Attempted to load " << count << " models. Check the log for details."; + message << "Attempted to load models for " << count << " objects. Check the log for details."; runtime.getContext().report(message.str()); } }; diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp index 655076e65b..d53c4230f0 100644 --- a/components/resource/resourcemanager.hpp +++ b/components/resource/resourcemanager.hpp @@ -60,7 +60,7 @@ namespace Resource /// How long to keep objects in cache after no longer being referenced. void setExpiryDelay(double expiryDelay) override { mExpiryDelay = expiryDelay; } - float getExpiryDelay() const { return mExpiryDelay; } + double getExpiryDelay() const { return mExpiryDelay; } const VFS::Manager* getVFS() const { return mVFS; }