mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-18 12:46:37 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dontcollidewithowncollisionbox' into 'master'

Browse source 
Don't explode spell mid-air (#5745)

See merge request OpenMW/openmw!468
This commit is contained in:
Alexei Dobrohotov 2020-12-15 21:50:24 +00:00
commit 4490f89a3d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
View file

@ -24,6 +24,10 @@ namespace MWPhysics
{ {
if (rayResult.m_collisionObject == mMe) if (rayResult.m_collisionObject == mMe)
return 1.f; return 1.f;
if (mProjectile && rayResult.m_collisionObject == mProjectile->getCollisionObject())
return 1.f;
if (!mTargets.empty()) if (!mTargets.empty())
{ {
if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end())) if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))