Skip to content

Disable Fixed Camera Enhancement#6083

Merged
serprex merged 6 commits intoHarbourMasters:developfrom
Jameriquiah:camera2
Jan 3, 2026
Merged

Disable Fixed Camera Enhancement#6083
serprex merged 6 commits intoHarbourMasters:developfrom
Jameriquiah:camera2

Conversation

@Jameriquiah
Copy link
Contributor

@Jameriquiah Jameriquiah commented Jan 3, 2026

Adds an enhancement to disable the fixed cam used by prerendered background scenes. Intended for mods that replace these scenes with fully modeled areas. It requires Disable 2D Pre-Rendered Scenes to be enabled first. I did not include shops as the lack of a doors at the entrance makes them look really wonky when exiting, link just falls through the ground on his way out. It includes the Market, ToT Exterior, Back Alley, all houses, Granny's Potion Shop (because it actually has a door), and the Shooting Gallery Building.

Only minor issue I've spotted is disabling the enhancement while in a scene this enhancement effects, makes the ocarina cam not zoom into the player like it should, this fixes itself after a scene change.

Big thanks to @PurpleHato for giving my code a good look through and doing some needed cleanups! And thank you to @OtherBlue for giving me the tip about VBs.

Some screenshots using Djipi's 3DS Experience:
backalley
carpenterhouse
impashouse
market
marketruins
totexterior

Build Artifacts

Jameriquiah and others added 3 commits January 2, 2026 14:13
* Refactor DisableFixedCamera for memory safety

- Add IsFixedCameraType() helper to reduce code duplication
- Inline trivial wrapper functions (StoreCamType/RestoreCamType)
- Early-exit when enhancement is disabled before computing player state
- Cache CVAR value to avoid repeated CVarGetInteger calls
- Fix memory leak by cleaning up allocated backups on scene change
- Simplify player null checks (player && vs player != nullptr)
- Reorganize control flow for better readability

* c lang
also fixed guard for opening cutscene
@Jameriquiah
Copy link
Contributor Author

implemented suggestions, and fixed links house guard to be specific to just the opening cutscene

@serprex serprex merged commit 9af262c into HarbourMasters:develop Jan 3, 2026
6 checks passed
@Jameriquiah Jameriquiah deleted the camera2 branch January 10, 2026 03:14
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.

3 participants