AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-08 16:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix samus not taking damage from CSpankWeed

Browse Source
This commit is contained in:
Phillip Stephens 2018-12-03 18:48:40 -08:00
parent 0ec9f1f4eb
commit eafe1d54a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CSpankWeed.cpp
View File

@ -115,7 +115,7 @@ void CSpankWeed::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CState
{ {
if (TCastToPtr<CPlayer> player = mgr.ObjectById(colAct->GetLastTouchedObject())) if (TCastToPtr<CPlayer> player = mgr.ObjectById(colAct->GetLastTouchedObject()))
{ {
if (x420_curDamageRemTime < 0.f && x5b4_ != 4 && x5b4_ != 6) if (x420_curDamageRemTime <= 0.f && x5b4_ != 4 && x5b4_ != 6)
{ {
mgr.ApplyDamage(GetUniqueId(), player->GetUniqueId(), GetUniqueId(), GetContactDamage(), mgr.ApplyDamage(GetUniqueId(), player->GetUniqueId(), GetUniqueId(), GetContactDamage(),
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), {}); CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), {});