Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fire piranha plant out of bounds read when behavior params > 0x00010000

This commit is contained in:
U-DESKTOP-F0TJMO2\Utilisateur 2023-11-20 19:45:09 +01:00
parent 791d44b1ee
commit 03ead560c7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/game/behaviors/fire_piranha_plant.inc.c
View File

@ -10,11 +10,6 @@ struct ObjectHitbox sFirePiranhaPlantHitbox = {
/* hurtboxHeight: */ 150, /* hurtboxHeight: */ 150,
}; };
f32 D_80331B5C[] = {
0.5f,
2.0f,
};
struct ObjectHitbox sPiranhaPlantFireHitbox = { struct ObjectHitbox sPiranhaPlantFireHitbox = {
/* interactType: */ INTERACT_FLAME, /* interactType: */ INTERACT_FLAME,
/* downOffset: */ 10, /* downOffset: */ 10,
@ -30,11 +25,15 @@ struct ObjectHitbox sPiranhaPlantFireHitbox = {
s32 sNumActiveFirePiranhaPlants; s32 sNumActiveFirePiranhaPlants;
s32 sNumKilledFirePiranhaPlants; s32 sNumKilledFirePiranhaPlants;
inline static u8 is_giant_fire_piranha_plant() {
return (o->oBehParams & 0x00FF0000) != 0;
}
void bhv_fire_piranha_plant_init(void) { void bhv_fire_piranha_plant_init(void) {
o->oFirePiranhaPlantNeutralScale = D_80331B5C[(u16)(o->oBehParams >> 16)]; o->oFirePiranhaPlantNeutralScale = (is_giant_fire_piranha_plant() ? 2.f : 0.5f);
obj_set_hitbox(o, &sFirePiranhaPlantHitbox); obj_set_hitbox(o, &sFirePiranhaPlantHitbox);
if ((u16)(o->oBehParams >> 16) != 0) { if (is_giant_fire_piranha_plant()) {
o->oFlags |= 0x00004000; o->oFlags |= 0x00004000;
o->oHealth = 1; o->oHealth = 1;
@ -72,7 +71,7 @@ static void fire_piranha_plant_act_hide(void) {
sNumActiveFirePiranhaPlants -= 1; sNumActiveFirePiranhaPlants -= 1;
o->oFirePiranhaPlantActive = FALSE; o->oFirePiranhaPlantActive = FALSE;
if ((u16)(o->oBehParams >> 16) != 0 && o->oHealth == 0) { if (is_giant_fire_piranha_plant() && o->oHealth == 0) {
if (++sNumKilledFirePiranhaPlants == 5) { if (++sNumKilledFirePiranhaPlants == 5) {
f32* starPos = gLevelValues.starPositions.BigPiranhasStarPos; f32* starPos = gLevelValues.starPositions.BigPiranhasStarPos;
spawn_default_star(starPos[0], starPos[1], starPos[2]); spawn_default_star(starPos[0], starPos[1], starPos[2]);