mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-09 13:08:03 -05:00
Code Issues Projects Releases Wiki Activity

Prevent autosave when first loading a file (#1792)

Browse Source
This commit is contained in:
Josh Bodner 2022-11-14 17:02:07 -08:00 committed by GitHub
parent 8571545bf2
commit e7597bae30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/src/code/z_play.c
View File

@ -159,6 +159,12 @@ void Play_Destroy(GameState* thisx) {
PlayState* play = (PlayState*)thisx; PlayState* play = (PlayState*)thisx;
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
// Only initialize the frame counter when exiting the title screen
if (gSaveContext.fileNum == 0xFF) {
play->gameplayFrames = 0;
}
// In ER, remove link from epona when entering somewhere that doesn't support epona // In ER, remove link from epona when entering somewhere that doesn't support epona
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) { if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
Entrance_HandleEponaState(); Entrance_HandleEponaState();
@ -844,7 +850,9 @@ void Play_Update(PlayState* play) {
} }
// Don't autosave in grottos or cutscenes // Don't autosave in grottos or cutscenes
if (CVar_GetS32("gAutosave", 0) && (play->sceneNum != SCENE_YOUSEI_IZUMI_TATE) && (play->sceneNum != SCENE_KAKUSIANA) && (gSaveContext.cutsceneIndex == 0)) { // Also don't save when you first load a file
if (CVar_GetS32("gAutosave", 0) && (gSaveContext.cutsceneIndex == 0) && (play->gameplayFrames > 60) &&
(play->sceneNum != SCENE_YOUSEI_IZUMI_TATE) && (play->sceneNum != SCENE_KAKUSIANA)) {
Play_PerformSave(play); Play_PerformSave(play);
} }
} }