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

CDamageInfo fixes, initial CPuffer

Browse Source
This commit is contained in:
Phillip Stephens
2018-11-13 20:16:11 -08:00
parent 660e7cd239
commit a7e81073ae
9 changed files with 354 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptTrigger.cpp
View File

@@ -126,7 +126,7 @@ void CScriptTrigger::UpdateInhabitants(float dt, CStateManager& mgr)
sendInside = true;
InhabitantIdle(*act, mgr);
if (act->HealthInfo(mgr) && x100_damageInfo.GetDamage() > 0.f)
mgr.ApplyDamage(GetUniqueId(), act->GetUniqueId(), GetUniqueId(), x100_damageInfo,
mgr.ApplyDamage(GetUniqueId(), act->GetUniqueId(), GetUniqueId(), {x100_damageInfo, dt},
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}),
zeus::CVector3f::skZero);