nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix freezard graphics crash with enemy health scaling (#5232)

Browse Source
This commit is contained in:
Archez
2025-03-28 04:30:56 -04:00
committed by GitHub
parent 32923d83f2
commit b66623c152
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c
View File

@@ -720,6 +720,15 @@ void EnFz_Draw(Actor* thisx, PlayState* play) {
index = (6 - this->actor.colChkInfo.health) >> 1; index = (6 - this->actor.colChkInfo.health) >> 1;
// SOH [Enhancement] - With enemy health scaling, the Freezards health could cause an index out of bounds for the
// displayLists, so we need to recompute the index based on the scaled health (using the maximum health value) and
// clamp the final result for safety.
if (CVarGetInteger(CVAR_ENHANCEMENT("EnemySizeScalesHealth"), 0)) {
u8 scaledHealth = (u8)(((f32)this->actor.colChkInfo.health / this->actor.maximumHealth) * 6);
index = (6 - scaledHealth) >> 1;
index = CLAMP(index, 0, 2);
}
OPEN_DISPS(play->state.gfxCtx); OPEN_DISPS(play->state.gfxCtx);
if (this->actor.colChkInfo.health == 0) { if (this->actor.colChkInfo.health == 0) {