diff --git a/src/cart.c b/src/cart.c index 54058cf..e618fb8 100644 --- a/src/cart.c +++ b/src/cart.c @@ -514,43 +514,3 @@ void FCEU_GeniePower(void) { else geniestage = 2; } - - -void FCEU_SaveGameSave(CartInfo *LocalHWInfo) { - if (LocalHWInfo->battery && LocalHWInfo->SaveGame[0]) { - FILE *sp; - char *soot; - - soot = FCEU_MakeFName(FCEUMKF_SAV, 0, "sav"); - if ((sp = FCEUD_UTF8fopen(soot, "wb")) == NULL) { - FCEU_PrintError("WRAM file \"%s\" cannot be written to.\n", soot); - } else { - int x; - - for (x = 0; x < 4; x++) - if (LocalHWInfo->SaveGame[x]) { - fwrite(LocalHWInfo->SaveGame[x], 1, - LocalHWInfo->SaveGameLen[x], sp); - } - } - free(soot); - } -} - -void FCEU_LoadGameSave(CartInfo *LocalHWInfo) { - if (LocalHWInfo->battery && LocalHWInfo->SaveGame[0]) { - FILE *sp; - char *soot; - - soot = FCEU_MakeFName(FCEUMKF_SAV, 0, "sav"); - sp = FCEUD_UTF8fopen(soot, "rb"); - if (sp != NULL) { - int x; - for (x = 0; x < 4; x++) - if (LocalHWInfo->SaveGame[x]) - fread(LocalHWInfo->SaveGame[x], 1, LocalHWInfo->SaveGameLen[x], sp); - } - free(soot); - } -} - diff --git a/src/cart.h b/src/cart.h index 54697a1..b5211e3 100644 --- a/src/cart.h +++ b/src/cart.h @@ -23,9 +23,6 @@ typedef struct { // other code in the future. } CartInfo; -void FCEU_SaveGameSave(CartInfo *LocalHWInfo); -void FCEU_LoadGameSave(CartInfo *LocalHWInfo); - extern uint8 *Page[32], *VPage[8], *MMC5SPRVPage[8], *MMC5BGVPage[8]; void ResetCartMapping(void); diff --git a/src/ines.c b/src/ines.c index 65c07c3..c1a6c3c 100644 --- a/src/ines.c +++ b/src/ines.c @@ -80,38 +80,36 @@ static void iNES_ExecPower() { } static void iNESGI(int h) { - switch (h) { - case GI_RESETM2: - if (iNESCart.Reset) - iNESCart.Reset(); - break; - case GI_POWER: - iNES_ExecPower(); - break; - case GI_CLOSE: - { - /* FCEU_SaveGameSave(&iNESCart); */ - if (iNESCart.Close) - iNESCart.Close(); - if (ROM) { - free(ROM); - ROM = NULL; - } - if (VROM) { - free(VROM); - VROM = NULL; - } - if (trainerpoo) { - free(trainerpoo); - trainerpoo = NULL; - } - if (ExtraNTARAM) { - free(ExtraNTARAM); - ExtraNTARAM = NULL; - } - } - break; - } + switch (h) + { + case GI_RESETM2: + if (iNESCart.Reset) + iNESCart.Reset(); + break; + case GI_POWER: + iNES_ExecPower(); + break; + case GI_CLOSE: + if (iNESCart.Close) + iNESCart.Close(); + if (ROM) { + free(ROM); + ROM = NULL; + } + if (VROM) { + free(VROM); + VROM = NULL; + } + if (trainerpoo) { + free(trainerpoo); + trainerpoo = NULL; + } + if (ExtraNTARAM) { + free(ExtraNTARAM); + ExtraNTARAM = NULL; + } + break; + } } uint32 iNESGameCRC32 = 0; @@ -793,8 +791,6 @@ int iNESLoad(const char *name, FCEUFILE *fp) { if (!iNES_Init(MapperNo)) FCEU_PrintError("iNES mapper #%d is not supported at all.", MapperNo); - /* FCEU_LoadGameSave(&iNESCart); */ - GameInterface = iNESGI; FCEU_printf("\n"); diff --git a/src/unif.c b/src/unif.c index 8128364..0ce37b7 100644 --- a/src/unif.c +++ b/src/unif.c @@ -562,7 +562,6 @@ static void UNIFGI(int h) { if (UNIFchrrama) memset(UNIFchrrama, 0, 8192); break; case GI_CLOSE: - FCEU_SaveGameSave(&UNIFCart); if (UNIFCart.Close) UNIFCart.Close(); FreeUNIF(); @@ -604,7 +603,6 @@ int UNIFLoad(const char *name, FCEUFILE *fp) { if (!InitializeBoard()) goto aborto; - FCEU_LoadGameSave(&UNIFCart); GameInterface = UNIFGI; return 1; @@ -623,7 +621,6 @@ int CopyFamiLoad() { if (!InitializeBoard()) goto aborto; - FCEU_LoadGameSave(&UNIFCart); GameInterface = UNIFGI; return 1;