From b0527c30251d809b42ac2ff1990f33e0adbbfbb7 Mon Sep 17 00:00:00 2001 From: James Lambert Date: Tue, 9 May 2023 20:45:11 -0600 Subject: [PATCH] cleanup unused savefile flags --- src/player/player.c | 2 -- src/savefile/savefile.c | 12 ------------ src/savefile/savefile.h | 9 --------- 3 files changed, 23 deletions(-) diff --git a/src/player/player.c b/src/player/player.c index 4285aea..c675281 100644 --- a/src/player/player.c +++ b/src/player/player.c @@ -154,8 +154,6 @@ void playerInit(struct Player* player, struct Location* startLocation, struct Ve if (gCurrentLevelIndex == 0){ player->flags &= ~PlayerHasFirstPortalGun; player->flags &= ~PlayerHasSecondPortalGun; - savefileUnsetFlags(SavefileFlagsFirstPortalGun); - savefileUnsetFlags(SavefileFlagsFirstPortalGun); } // player->flags |= PlayerHasFirstPortalGun | PlayerHasSecondPortalGun; diff --git a/src/savefile/savefile.c b/src/savefile/savefile.c index 75cb7ff..f239943 100755 --- a/src/savefile/savefile.c +++ b/src/savefile/savefile.c @@ -139,18 +139,6 @@ void savefileSave() { savefileSramSave((void*)SRAM_ADDR, &gSaveData, sizeof(gSaveData)); } -void savefileSetFlags(enum SavefileFlags flags) { - gSaveData.header.flags |= flags; -} - -void savefileUnsetFlags(enum SavefileFlags flags) { - gSaveData.header.flags &= ~flags; -} - -int savefileReadFlags(enum SavefileFlags flags) { - return gSaveData.header.flags & flags; -} - #define SAVE_SLOT_SRAM_ADDRESS(index) (SRAM_ADDR + (1 + (index)) * SAVE_SLOT_SIZE) void savefileSaveGame(Checkpoint checkpoint, u16* screenshot, int testChamberIndex, int subjectNumber, int slotIndex) { diff --git a/src/savefile/savefile.h b/src/savefile/savefile.h index 0d5fa09..440d5b2 100755 --- a/src/savefile/savefile.h +++ b/src/savefile/savefile.h @@ -26,11 +26,6 @@ #define MAX_SAVE_SLOTS ((int)(SRAM_SIZE / SAVE_SLOT_SIZE) - 1) #define MAX_USER_SAVE_SLOTS (MAX_SAVE_SLOTS - 1) -enum SavefileFlags { - SavefileFlagsFirstPortalGun = (1 << 0), - SavefileFlagsSecondPortalGun = (1 << 1), -}; - struct SaveHeader { unsigned header; unsigned char chapterProgress; @@ -75,10 +70,6 @@ extern int gCurrentTestSubject; void savefileLoad(); void savefileSave(); -void savefileSetFlags(enum SavefileFlags flags); -void savefileUnsetFlags(enum SavefileFlags flags); -int savefileReadFlags(enum SavefileFlags flags); - void savefileSaveGame(Checkpoint checkpoint, u16* screenshot, int testChamberIndex, int subjectNumber, int slotIndex); int savefileListSaves(struct SaveSlotInfo* slots, int includeAuto); int savefileNextTestSubject();