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

Merge branch 'ocd' into 'master'

Browse Source 
Assorted nitpicks

See merge request OpenMW/openmw!4194
This commit is contained in:
Evil Eye 2024-06-23 07:10:07 +00:00
commit 5cf809f39b
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwlua/types/actor.hpp
View File

@ -13,8 +13,6 @@
#include "apps/openmw/mwbase/environment.hpp" #include "apps/openmw/mwbase/environment.hpp"
#include "apps/openmw/mwworld/esmstore.hpp" #include "apps/openmw/mwworld/esmstore.hpp"
#include <components/esm3/loadclas.hpp>
#include <components/esm3/loadnpc.hpp>
#include "../context.hpp" #include "../context.hpp"
@ -57,11 +55,9 @@ namespace MWLua
sol::table travelDests(lua, sol::create); sol::table travelDests(lua, sol::create);
if (!rec.getTransport().empty()) if (!rec.getTransport().empty())
{ {
int index = 1; int index = 1;
for (const auto& dest : rec.getTransport()) for (const auto& dest : rec.getTransport())
{ {
sol::table travelDest(lua, sol::create); sol::table travelDest(lua, sol::create);
ESM::RefId cellId; ESM::RefId cellId;

2
apps/openmw/mwrender/ripplesimulation.cpp
View File

@ -243,7 +243,7 @@ namespace MWRender
} }
else else
{ {
if (mMaxNumberRipples == 0) if (mMaxNumberRipples <= 0)
return; return;
osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex()); osgParticle::ParticleSystem::ScopedWriteLock lock(*mParticleSystem->getReadWriteMutex());

9
files/settings-default.cfg
View File

@ -472,11 +472,10 @@ apply lighting to environment maps = false
# 'force per pixel lighting' is enabled. # 'force per pixel lighting' is enabled.
lighting method = shaders compatibility lighting method = shaders compatibility
# Sets the bounding sphere multiplier of light sources if 'lighting method' is # Sets the bounding sphere multiplier of light sources.
# not 'legacy'. These are used to determine if an object should receive # The bounding sphere is used to determine if an object should receive lighting.
# lighting. Higher values will allow for smoother transitions of light sources, # Higher values will allow for smoother transitions of light sources,
# but may carry a performance cost and requires a higher number of 'max lights' # but may carry a performance cost and require a higher number of 'max lights' set.
# set.
light bounds multiplier = 1.65 light bounds multiplier = 1.65
# The distance from the camera at which lights fade away completely. # The distance from the camera at which lights fade away completely.