mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'ulfricstormcloakjarlofwindhelm' into 'master'

Browse source 
Revise storm wind effect on velocity (bug #8206)

Closes #8206

See merge request OpenMW/openmw!4426
This commit is contained in:
Evil Eye 2024-10-28 15:33:46 +00:00
commit b288448893
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -198,6 +198,7 @@
Bug #8172: Openmw-cs crashes when viewing `Dantooine, Sea` Bug #8172: Openmw-cs crashes when viewing `Dantooine, Sea`
Bug #8187: Intervention effects should use Chebyshev distance to determine the closest marker Bug #8187: Intervention effects should use Chebyshev distance to determine the closest marker
Bug #8191: NiRollController does not work for sheath meshes Bug #8191: NiRollController does not work for sheath meshes
Bug #8206: Moving away from storm wind origin should make you faster
Bug #8207: Using hand-to-hand while sneaking plays the critical hit sound when the target is not getting hurt Bug #8207: Using hand-to-hand while sneaking plays the critical hit sound when the target is not getting hurt
Bug #8208: The launcher's view distance option's minimum value isn't capped to Vanilla's minimum Bug #8208: The launcher's view distance option's minimum value isn't capped to Vanilla's minimum
Feature #1415: Infinite fall failsafe Feature #1415: Infinite fall failsafe

13
apps/openmw/mwphysics/movementsolver.cpp
View file

@ -178,15 +178,10 @@ namespace MWPhysics
// Now that we have the effective movement vector, apply wind forces to it // Now that we have the effective movement vector, apply wind forces to it
if (worldData.mIsInStorm && velocity.length() > 0) if (worldData.mIsInStorm && velocity.length() > 0)
{ {
osg::Vec3f stormDirection = worldData.mStormDirection; const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
float angleDegrees = osg::RadiansToDegrees( const float fStromWalkMult = store.get<ESM::GameSetting>().find("fStromWalkMult")->mValue.getFloat();
std::acos(stormDirection * velocity / (stormDirection.length() * velocity.length()))); const float angleCos = worldData.mStormDirection * velocity / velocity.length();
static const float fStromWalkMult = MWBase::Environment::get() velocity *= 1.f + fStromWalkMult * angleCos;
.getESMStore()
->get<ESM::GameSetting>()
.find("fStromWalkMult")
->mValue.getFloat();
velocity *= 1.f - (fStromWalkMult * (angleDegrees / 180.f));
} }
Stepper stepper(collisionWorld, actor.mCollisionObject); Stepper stepper(collisionWorld, actor.mCollisionObject);