From 479d4931d7a9ff0e513c0cca3d1c48867b860c3a Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 21 Jun 2024 20:03:52 +0300 Subject: [PATCH 1/3] Handle negative MaxNumberRipples more sensibly --- apps/openmw/mwrender/ripplesimulation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp index b7661ca664..3e8a6fd2ec 100644 --- a/apps/openmw/mwrender/ripplesimulation.cpp +++ b/apps/openmw/mwrender/ripplesimulation.cpp @@ -243,7 +243,7 @@ namespace MWRender } else { - if (mMaxNumberRipples == 0) + if (mMaxNumberRipples <= 0) return; osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex()); From 348ef6ff2f153852411056a9440c87d7880ceae8 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 21 Jun 2024 20:05:38 +0300 Subject: [PATCH 2/3] Update settings-default.cfg light bounds multiplier comment --- files/settings-default.cfg | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/files/settings-default.cfg b/files/settings-default.cfg index 1ad5131fb0..26722268a0 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -472,11 +472,10 @@ apply lighting to environment maps = false # 'force per pixel lighting' is enabled. lighting method = shaders compatibility -# Sets the bounding sphere multiplier of light sources if 'lighting method' is -# not 'legacy'. These are used to determine if an object should receive -# lighting. Higher values will allow for smoother transitions of light sources, -# but may carry a performance cost and requires a higher number of 'max lights' -# set. +# Sets the bounding sphere multiplier of light sources. +# The bounding sphere is used to determine if an object should receive lighting. +# Higher values will allow for smoother transitions of light sources, +# but may carry a performance cost and require a higher number of 'max lights' set. light bounds multiplier = 1.65 # The distance from the camera at which lights fade away completely. From c6156011c8fc6797c5612a38e8652a80f0680966 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 21 Jun 2024 20:07:44 +0300 Subject: [PATCH 3/3] Remove unnecessary lines in actor bindings --- apps/openmw/mwlua/types/actor.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/openmw/mwlua/types/actor.hpp b/apps/openmw/mwlua/types/actor.hpp index 0ea0a89747..9cc992134c 100644 --- a/apps/openmw/mwlua/types/actor.hpp +++ b/apps/openmw/mwlua/types/actor.hpp @@ -13,8 +13,6 @@ #include "apps/openmw/mwbase/environment.hpp" #include "apps/openmw/mwworld/esmstore.hpp" -#include -#include #include "../context.hpp" @@ -57,11 +55,9 @@ namespace MWLua sol::table travelDests(lua, sol::create); if (!rec.getTransport().empty()) { - int index = 1; for (const auto& dest : rec.getTransport()) { - sol::table travelDest(lua, sol::create); ESM::RefId cellId;