mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'projectilefix' into 'master'

Browse Source 
Fix for projectile movement simulation (#6526 and probably #6434)

See merge request OpenMW/openmw!1518
This commit is contained in:
Alexei Kotov 2022-02-23 05:34:35 +00:00
commit 087084abdc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwphysics/mtphysics.cpp
View File

@ -224,7 +224,8 @@ namespace
}
void operator()(const LockedProjectileSimulation& sim) const
{
MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
if (sim.first->isActive())
MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
}
};

1
apps/openmw/mwphysics/projectile.cpp
View File

@ -33,6 +33,7 @@ Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, f
mPosition = position;
mPreviousPosition = position;
mSimulationPosition = position;
setCaster(caster);
const int collisionMask = CollisionType_World | CollisionType_HeightMap |