Bugfix, child Hookshot first person in Hylia lab#6847
Open
djevangelia wants to merge 1 commit into
Open
Conversation
serprex
reviewed
Jul 2, 2026
Comment on lines
5840
to
+5852
| bool shouldUseBowCamera = LINK_IS_ADULT; | ||
|
|
||
| if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || | ||
| CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) { | ||
| shouldUseBowCamera = this->heldItemAction != PLAYER_IA_SLINGSHOT; | ||
| } | ||
|
|
||
| camMode = shouldUseBowCamera ? CAM_MODE_BOWARROW : CAM_MODE_SLINGSHOT; | ||
|
|
||
| // Fix child Hookshot first person in lab (CAM_MODE_SLINGSHOT is invalid there) | ||
| if (play->sceneNum == SCENE_LAKESIDE_LABORATORY && CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), false)) { | ||
| camMode = CAM_MODE_BOWARROW; | ||
| } |
Member
There was a problem hiding this comment.
bool shouldUseBowCamera = GameInteractor_Should(VB_USE_BOW_CAMERA, LINK_IS_ADULT, this);
camMode = shouldUseBowCamera ? CAM_MODE_BOWARROW : CAM_MODE_SLINGSHOT;maybe VB has better name, but would prefer to see this logic extracted to hook
maybe need to update some code with upstream? seeing as this isn't CAM_MODE_AIM_ADULT/CAM_MODE_AIM_CHILD
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2975.
CAM_MODE_AIM_CHILDis invalid in Lakeside Laboratory water for some reason. So just useCAM_MODE_AIM_ADULTinstead. I didn't dig into why this could be, but my old notes on ranged first person check function say:"CAM_MODE_AIM_CHILD and CAM_MODE_AIM_BOOMERANG are valid for all camera settings where CAM_MODE_AIM_ADULT is valid (except Normal 3 which seems to be underwater + horse where child can't aim), so only check for adult."
If there are more places where child cannot enter first person with Hookshot it might be worth going into the camera settings but if lab is the odd one out this is ok I think.
Before and after: https://www.youtube.com/watch?v=kgfZAiaHGBA
Build Artifacts