PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and link CParticleGenInfoGeneric 

Former-commit-id: 0e9d00b19b
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-17 19:02:54 +03:00
parent c7f154e26a
commit 78bf3c6826
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -113,7 +113,7 @@ LIBS = [
"MetroidPrime/CGameLight",
"MetroidPrime/Tweaks/CTweakTargeting",
"MetroidPrime/Tweaks/CTweakAutoMapper",
"MetroidPrime/CParticleGenInfoGeneric",
["MetroidPrime/CParticleGenInfoGeneric", True],
"MetroidPrime/CParticleGenInfo",
"MetroidPrime/CParticleDatabase",
"MetroidPrime/Tweaks/CTweakGunRes",

2
obj_files.mk
View File

@ -80,7 +80,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/CGameLight.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakTargeting.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakAutoMapper.o\
$(BUILD_DIR)/asm/MetroidPrime/CParticleGenInfoGeneric.o\
$(BUILD_DIR)/src/MetroidPrime/CParticleGenInfoGeneric.o\
$(BUILD_DIR)/asm/MetroidPrime/CParticleGenInfo.o\
$(BUILD_DIR)/asm/MetroidPrime/CParticleDatabase.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGunRes.o\

22
src/MetroidPrime/CParticleGenInfoGeneric.cpp
View File

@ -15,7 +15,7 @@ CParticleGenInfoGeneric::CParticleGenInfoGeneric(const SObjectTag& part,
: CParticleGenInfo(part, frames, boneName, scale, parentMode, flags, state)
, x84_system(system)
, x88_lightId(lightId == 0xffff ? kInvalidUniqueId
, x88_lightId(lightId == 0xffffffff ? kInvalidUniqueId
: _initializeLight(system, stateMgr, areaId, lightId)) {}
CParticleGenInfoGeneric::~CParticleGenInfoGeneric() {}
@ -111,30 +111,20 @@ void CParticleGenInfoGeneric::DeleteLight(CStateManager& stateMgr) {
x88_lightId = kInvalidUniqueId;
}
TUniqueId CParticleGenInfoGeneric::GetLightId() const {
return x88_lightId;
}
TUniqueId CParticleGenInfoGeneric::GetLightId() const { return x88_lightId; }
void CParticleGenInfoGeneric::SetModulationColor(const CColor& color) {
x84_system->SetModulationColor(color);
}
bool CParticleGenInfoGeneric::HasLight() const {
return x84_system->SystemHasLight();
}
bool CParticleGenInfoGeneric::HasLight() const { return x84_system->SystemHasLight(); }
void CParticleGenInfoGeneric::DestroyParticles() {
x84_system->DestroyParticles();
}
void CParticleGenInfoGeneric::DestroyParticles() { x84_system->DestroyParticles(); }
bool CParticleGenInfoGeneric::HasActiveParticles() const {
return x84_system->GetParticleCount() > 0;
}
CAABox CParticleGenInfoGeneric::GetBounds() const {
return x84_system->GetBounds();
}
CAABox CParticleGenInfoGeneric::GetBounds() const { return x84_system->GetBounds(); }
bool CParticleGenInfoGeneric::IsSystemDeletable() const {
return x84_system->IsSystemDeletable();
}
bool CParticleGenInfoGeneric::IsSystemDeletable() const { return x84_system->IsSystemDeletable(); }