mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 07:10:34 -05:00
Code Issues Projects Releases Wiki Activity

Added filters for the waterfall at the hook registration level and removed redundant checks.

Browse Source
This commit is contained in:
Gedof 2024-11-16 00:30:17 -03:00
parent cdc930e065
commit d152346e0b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
soh/soh/Enhancements/mods.cpp
View File

@ -1398,27 +1398,22 @@ void RegisterRandomizerCompasses() {
void RegisterKeepWaterfallOpen() {
// Keep Zora's River Waterfall open after playing lullaby
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_BG_SPOT03_TAKI, [](void* refActor) {
//Set it to open on init if already played
Actor* actor = static_cast<Actor*>(refActor);
if (CVarGetInteger(CVAR_ENHANCEMENT("KeepWaterfallOpen"), 0) && actor->id == ACTOR_BG_SPOT03_TAKI && gSaveContext.isWaterfallOpen == 1) {
BgSpot03Taki* waterfall = static_cast<BgSpot03Taki*>(refActor);
BgSpot03Taki* waterfall = static_cast<BgSpot03Taki*>(refActor);
if (CVarGetInteger(CVAR_ENHANCEMENT("KeepWaterfallOpen"), 0) && gSaveContext.isWaterfallOpen == 1) {
waterfall->state = WATERFALL_OPENED;
func_8003EBF8(gPlayState, &gPlayState->colCtx.dyna, waterfall->dyna.bgId); //remove collision
waterfall->openingAlpha = 0;
waterfall->timer = 40;
}
});
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_BG_SPOT03_TAKI, [](void* refActor) {
Actor* actor = static_cast<Actor*>(refActor);
BgSpot03Taki* waterfall = static_cast<BgSpot03Taki*>(refActor);
if (CVarGetInteger(CVAR_ENHANCEMENT("KeepWaterfallOpen"), 0) && actor->id == ACTOR_BG_SPOT03_TAKI) {
BgSpot03Taki* waterfall = static_cast<BgSpot03Taki*>(refActor);
if (CVarGetInteger(CVAR_ENHANCEMENT("KeepWaterfallOpen"), 0)) {
//Keep timer from running out if open unless toggleable and played song
if (gSaveContext.isWaterfallOpen == 1 && waterfall->timer > -1 &&