nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

disable fixed camera fix (#6106)

Browse Source
This commit is contained in:
Jordyn Hardyman
2026-01-05 20:09:58 -05:00
committed by GitHub
parent 5b0d8be484
commit 708bd0739a
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp
View File

@@ -45,6 +45,8 @@ static int16_t sSetNormalCam = -1;
static bool sIsCamApplied = false; static bool sIsCamApplied = false;
static int sCheckItemCamState = -1; static int sCheckItemCamState = -1;
static s16 sStoreLastCamType = -1; static s16 sStoreLastCamType = -1;
static bool sWasEnabled = false;
static bool sWaitForSceneChange = false;
extern "C" void DisableFixedCamera_CheckCameraState(PlayState* play); extern "C" void DisableFixedCamera_CheckCameraState(PlayState* play);
@@ -62,6 +64,8 @@ static void DisableFixedCamera_ResetState() {
sIsCamApplied = false; sIsCamApplied = false;
sCheckItemCamState = -1; sCheckItemCamState = -1;
sStoreLastCamType = -1; sStoreLastCamType = -1;
sWasEnabled = false;
sWaitForSceneChange = false;
} }
static void DisableFixedCamera_RestoreAllCameraData() { static void DisableFixedCamera_RestoreAllCameraData() {
@@ -144,10 +148,25 @@ extern "C" void DisableFixedCamera_SetNormalCamera(PlayState* play) {
extern "C" void DisableFixedCamera_CheckCameraState(PlayState* play) { extern "C" void DisableFixedCamera_CheckCameraState(PlayState* play) {
const bool disableFixedCamEnabled = CVarGetInteger(CVAR_DISABLE_FIXED_CAMERA_NAME, 0) != 0; const bool disableFixedCamEnabled = CVarGetInteger(CVAR_DISABLE_FIXED_CAMERA_NAME, 0) != 0;
if (!disableFixedCamEnabled) { if (!disableFixedCamEnabled) {
CollisionHeader* colHeader = BgCheck_GetCollisionHeader(&play->colCtx, BGCHECK_SCENE); DisableFixedCamera_RestoreAllCameraData();
DisableFixedCamera_RestoreCameraData(colHeader); DisableFixedCamera_ResetState();
return; return;
} }
if (!sWasEnabled) {
sWasEnabled = true;
sWaitForSceneChange = true;
sSetNormalCam = play->sceneNum;
sIsCamApplied = true;
}
if (sWaitForSceneChange) {
if (play->sceneNum == sSetNormalCam) {
return;
}
sWaitForSceneChange = false;
sIsCamApplied = false;
sCheckItemCamState = -1;
sStoreLastCamType = -1;
}
// prevents normal cam from taking effect during open cutscene to avoid crash // prevents normal cam from taking effect during open cutscene to avoid crash
if (play->sceneNum == SCENE_LINKS_HOUSE && gSaveContext.cutsceneIndex == 0xFFF1) { if (play->sceneNum == SCENE_LINKS_HOUSE && gSaveContext.cutsceneIndex == 0xFFF1) {
return; return;
@@ -160,11 +179,8 @@ extern "C" void DisableFixedCamera_CheckCameraState(PlayState* play) {
sSetNormalCam = play->sceneNum; sSetNormalCam = play->sceneNum;
sIsCamApplied = false; sIsCamApplied = false;
sStoreLastCamType = -1; sStoreLastCamType = -1;
// Clean up backups when leaving fixed camera scenes // Restore camera data when leaving fixed camera scenes
for (auto& [key, backup] : sCamDataBackups) { DisableFixedCamera_RestoreAllCameraData();
delete[] backup.copy;
}
sCamDataBackups.clear();
} }
DisableFixedCamera_RestoreCameraData(BgCheck_GetCollisionHeader(&play->colCtx, BGCHECK_SCENE)); DisableFixedCamera_RestoreCameraData(BgCheck_GetCollisionHeader(&play->colCtx, BGCHECK_SCENE));
return; return;