Prevents autosave during Ganon fight. (#2163)

* Prevents autosave during Ganon fight.

* Removes unnecessary switch case.
This commit is contained in:
Christopher Leggett 2022-12-12 20:50:13 -05:00 committed by GitHub
parent 0b24f3274a
commit f80091af77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2717,7 +2717,7 @@ u8 Item_CheckObtainability(u8 item) {
// Save when receiving an item, unless it's purchased from a shop // Save when receiving an item, unless it's purchased from a shop
void PerformAutosave(PlayState* play, u8 item) { void PerformAutosave(PlayState* play, u8 item) {
if (CVar_GetS32("gAutosave", 0) && (play != NULL) && (play->sceneNum != SCENE_KENJYANOMA) && (gSaveContext.pendingSale == ITEM_NONE)) { if (CVar_GetS32("gAutosave", 0) && (play != NULL) && (play->sceneNum != SCENE_KENJYANOMA) && (gSaveContext.pendingSale == ITEM_NONE) && (play->sceneNum != SCENE_GANON_DEMO)) {
if (CVar_GetS32("gAutosaveAllItems", 0)) { if (CVar_GetS32("gAutosaveAllItems", 0)) {
Play_PerformSave(play); Play_PerformSave(play);
} else if (CVar_GetS32("gAutosaveMajorItems", 1)) { } else if (CVar_GetS32("gAutosaveMajorItems", 1)) {
@ -2754,10 +2754,6 @@ void PerformAutosave(PlayState* play, u8 item) {
case ITEM_ARROWS_LARGE: case ITEM_ARROWS_LARGE:
case ITEM_SEEDS_30: case ITEM_SEEDS_30:
break; break;
case ITEM_SWORD_MASTER:
if (play->sceneNum == SCENE_GANON_DEMO) {
break;
}
case ITEM_BOMBCHU: case ITEM_BOMBCHU:
case ITEM_BOMBCHUS_5: case ITEM_BOMBCHUS_5:
case ITEM_BOMBCHUS_20: case ITEM_BOMBCHUS_20: