mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-16 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hit_target_object' into 'master'

Browse Source 
Unbreak targetted spell on objects (#5811)

See merge request OpenMW/openmw!569
This commit is contained in:
Andrei Kortunov 2021-01-28 14:09:45 +00:00
commit 5382d38b9b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwphysics/projectileconvexcallback.cpp
View File

@ -55,7 +55,9 @@ namespace MWPhysics
}
default:
{
mProjectile->hit(MWWorld::Ptr(), m_hitPointWorld, m_hitNormalWorld);
auto* target = static_cast<PtrHolder*>(result.m_hitCollisionObject->getUserPointer());
auto ptr = target ? target->getPtr() : MWWorld::Ptr();
mProjectile->hit(ptr, m_hitPointWorld, m_hitNormalWorld);
break;
}
}