mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-08 18:11:25 +00:00
Code Issues 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

1
apps/openmw/mwphysics/mtphysics.cpp
View file

@ -224,6 +224,7 @@ namespace
} }
void operator()(const LockedProjectileSimulation& sim) const void operator()(const LockedProjectileSimulation& sim) const
{ {
if (sim.first->isActive())
MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld); 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; mPosition = position;
mPreviousPosition = position; mPreviousPosition = position;
mSimulationPosition = position;
setCaster(caster); setCaster(caster);
const int collisionMask = CollisionType_World | CollisionType_HeightMap | const int collisionMask = CollisionType_World | CollisionType_HeightMap |