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

Fix leak of shuffled fairy bottle-swipe behavior to other actors (#6405)

Browse Source
This commit is contained in:
Christopher Leggett
2026-03-24 19:37:21 +00:00
committed by GitHub
parent 5fe4680a20
commit 5e13570b83
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
View File

@@ -106,11 +106,13 @@ void RegisterShuffleFairies() {
COND_VB_SHOULD(VB_BOTTLE_ACTOR, shouldRegister, { COND_VB_SHOULD(VB_BOTTLE_ACTOR, shouldRegister, {
Actor* actor = va_arg(args, Actor*); Actor* actor = va_arg(args, Actor*);
const auto fairyIdentity = ObjectExtension::GetInstance().Get<CheckIdentity>(actor); if (actor->id == ACTOR_EN_ELF) {
if (fairyIdentity != nullptr && fairyIdentity->randomizerInf != RAND_INF_MAX) { const auto fairyIdentity = ObjectExtension::GetInstance().Get<CheckIdentity>(actor);
Flags_SetRandomizerInf(fairyIdentity->randomizerInf); if (fairyIdentity != nullptr && fairyIdentity->randomizerInf != RAND_INF_MAX) {
actor->parent = &GET_PLAYER(gPlayState)->actor; Flags_SetRandomizerInf(fairyIdentity->randomizerInf);
*should = false; actor->parent = &GET_PLAYER(gPlayState)->actor;
*should = false;
}
} }
}); });