AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 19:47:44 +00:00
Code Issues Projects Releases Wiki Activity

Update hecl, various fixes

Browse Source
This commit is contained in:
Phillip Stephens
2018-01-15 04:36:04 -08:00
parent 533b8775d4
commit 9255f0eeb0
6 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CActor.cpp
View File

@@ -219,7 +219,11 @@ void CActor::OnScanStateChanged(EScanState state, CStateManager& mgr)
zeus::CAABox CActor::GetSortingBounds(const CStateManager&) const { return x9c_renderBounds; }
void CActor::DoUserAnimEvent(CStateManager&, CInt32POINode&, EUserEventType, float dt) {}
void CActor::DoUserAnimEvent(CStateManager&, CInt32POINode&, EUserEventType event, float)
{
if (event == EUserEventType::LoopedSoundStop)
RemoveEmitter();
}
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4,
CStateManager& mgr)
@@ -234,7 +238,11 @@ void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes
RemoveMaterial(t2, t3, mgr);
}
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr) { x68_material.Remove(t1); }
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr)
{
x68_material.Remove(t1);
RemoveMaterial(t2, mgr);
}
void CActor::RemoveMaterial(EMaterialTypes t, CStateManager& mgr)
{