AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 12:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2017-08-12 22:19:33 -10:00
parent e25d2a423d 11d4aad746
commit 02f8f77b57
177 changed files with 830 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/World/CScriptActor.cpp
View File

@@ -185,7 +185,8 @@ zeus::CAABox CScriptActor::GetSortingBounds(const CStateManager& mgr) const
}
EWeaponCollisionResponseTypes
CScriptActor::GetCollisionResponseType(const zeus::CVector3f& v1, const zeus::CVector3f& v2, CWeaponMode& wMode, s32 w)
CScriptActor::GetCollisionResponseType(const zeus::CVector3f& v1, const zeus::CVector3f& v2, const
CWeaponMode& wMode, int w) const
{
const CDamageVulnerability* dVuln = GetDamageVulnerability();
if (dVuln->GetVulnerability(wMode, false) == EVulnerability::Reflect)