AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CParticleGenInfoGeneric: Check for kInvalidUniqueId in SetParticleEmission

This commit is contained in:
Luke Street 2020-09-16 04:38:09 -04:00
parent 3d68fc0bfc
commit d7b5587e48
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Character/CParticleGenInfo.cpp
View File

@ -48,7 +48,7 @@ CParticleGenInfoGeneric::CParticleGenInfoGeneric(const SObjectTag& part, const s
x88_lightId = _initializeLight(system, stateMgr, areaId, lightId); x88_lightId = _initializeLight(system, stateMgr, areaId, lightId);
} }
void CParticleGenInfoGeneric::AddToRenderer() { g_Renderer->AddParticleGen(*x84_system.get()); } void CParticleGenInfoGeneric::AddToRenderer() { g_Renderer->AddParticleGen(*x84_system); }
void CParticleGenInfoGeneric::Render() { x84_system->Render(); } void CParticleGenInfoGeneric::Render() { x84_system->Render(); }
@ -117,6 +117,10 @@ void CParticleGenInfoGeneric::SetGlobalScale(const zeus::CVector3f& scale) { x84
void CParticleGenInfoGeneric::SetParticleEmission(bool isActive, CStateManager& stateMgr) { void CParticleGenInfoGeneric::SetParticleEmission(bool isActive, CStateManager& stateMgr) {
x84_system->SetParticleEmission(isActive); x84_system->SetParticleEmission(isActive);
if (x88_lightId == kInvalidUniqueId) {
return;
}
if (const TCastToPtr<CGameLight> gl = stateMgr.ObjectById(x88_lightId)) { if (const TCastToPtr<CGameLight> gl = stateMgr.ObjectById(x88_lightId)) {
gl->SetActive(isActive); gl->SetActive(isActive);
} }