Skip to content

fix dark link softlock#5027

Merged
Archez merged 1 commit intoHarbourMasters:developfrom
briaguya0:fix-dark-link-softlock
Feb 9, 2025
Merged

fix dark link softlock#5027
Archez merged 1 commit intoHarbourMasters:developfrom
briaguya0:fix-dark-link-softlock

Conversation

@briaguya0
Copy link
Contributor

@briaguya0 briaguya0 commented Feb 9, 2025

@briaguya0 briaguya0 force-pushed the fix-dark-link-softlock branch from 32ed6eb to 76d0bb0 Compare February 9, 2025 09:31
Comment on lines -98 to +97
Player* player = GET_PLAYER(gPlayState);
Player* player = va_arg(args, Player*);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this make a difference?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. this is what caused the bug in the first place. GET_PLAYER always gets link

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to elaborate on this:

we make it in here as both link and dark link. the previous logic (before moving this to shipinit) had both link and dark link running both the actionfunc and usetunicboots. by using GET_PLAYER, we were running both the actionfunc and usetunicboots as link for both link and dark link.

so we need to know if we're in here because of link or dark link

i could switch to passing in the actor id instead and then using GET_PLAYER if you'd prefer that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope that's fine, I just misunderstood what was happening.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we had to do something similar in a 2ship hook because of player common being used by Kafei and Link.

@Archez Archez merged commit 29cecd8 into HarbourMasters:develop Feb 9, 2025
5 checks passed
@briaguya0 briaguya0 deleted the fix-dark-link-softlock branch February 15, 2025 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug} Using Specific Settings, Spawning Dark Link Soft Locks the Player

3 participants