PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 21:45:00 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix Zoness Boss crash

Browse Source
This commit is contained in:
Sonic Dreamcaster 2024-11-16 10:07:32 -03:00
parent b64aaeb94a
commit d09f5528cc
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/overlays/ovl_i3/fox_zo.c
View File

@ -3212,10 +3212,10 @@ void Zoness_ZoSarumarine_Update(ZoSarumarine* this) {
} }
void Zoness_801986FC(ZoSarumarine* this, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot) { void Zoness_801986FC(ZoSarumarine* this, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot) {
ZoBall* actor245; ZoBall* actor245 = NULL;
Vec3f src = { 0.0f, 0.0f, 50.0f }; Vec3f src = { 0.0f, 0.0f, 50.0f };
Vec3f dest; Vec3f dest = { 0 };
s32 i; s32 i = 0;
if ((sZoSwork[ZO_BSS_0 + arg1] == 0) && (sZoSwork[ZO_BSS_11 + arg1] != 0)) { if ((sZoSwork[ZO_BSS_0 + arg1] == 0) && (sZoSwork[ZO_BSS_11 + arg1] != 0)) {
sZoSwork[ZO_BSS_0 + arg1] = 70; sZoSwork[ZO_BSS_0 + arg1] = 70;
@ -3268,9 +3268,19 @@ void Zoness_801986FC(ZoSarumarine* this, s32 arg1, f32 xOff, f32 yOff, f32 zOff,
} }
} }
if (i < ARRAY_COUNT(gActors)) { if (i >= ARRAY_COUNT(gActors)) {
actor245 = NULL;
}
if (actor245 != NULL) {
actor245->obj.status = OBJ_FREE; actor245->obj.status = OBJ_FREE;
} }
if (i < ARRAY_COUNT(gActors)) {
if (actor245 != NULL) {
actor245->obj.status = OBJ_FREE;
}
}
} }
void Zoness_801989FC(ZoSarumarine* this) { void Zoness_801989FC(ZoSarumarine* this) {