mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-13 15:33:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

SwitchAge: prevent Link walking without collision for a bit (#7286)

Browse Source
This commit is contained in:
Philip Dubé
2026-10-03 14:33:49 +00:00
committed by GitHub
parent 45b9321593
commit e4f019f561
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/SwitchAge.cpp
+5
View File
@@ -28,6 +28,7 @@ void SwitchAge() {
gSaveContext.respawn[RESPAWN_MODE_DOWN].roomIndex = gPlayState->roomCtx.curRoom.num;
gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = player->actor.world.pos;
gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = player->actor.shape.rot.y;
gSaveContext.entranceSpeed = 0.0f;
if (gPlayState->roomCtx.curRoom.behaviorType2 < 4) {
gSaveContext.respawn[RESPAWN_MODE_DOWN].playerParams = 0x0DFF;
@@ -58,8 +59,12 @@ void SwitchAge() {
}
static HOOK_ID hookId = 0;
if (hookId != 0) {
GameInteractor::Instance->UnregisterGameHookForID<GameInteractor::OnVanillaBehavior>(hookId);
}
hookId = REGISTER_VB_SHOULD(VB_INFLICT_VOID_DAMAGE, {
*should = false;
GameInteractor::Instance->UnregisterGameHookForID<GameInteractor::OnVanillaBehavior>(hookId);
hookId = 0;
});
}