Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions workspace/all/minarch/minarch.c
Original file line number Diff line number Diff line change
Expand Up @@ -825,27 +825,14 @@ static void SRAM_read(void) {
void* sram = core.get_memory_data(RETRO_MEMORY_SAVE_RAM);

#ifdef HAS_SRM
// TODO: rzipstream_open can also handle uncompressed, else branch is probably unnecessary
// srm, potentially compressed
if (CFG_getSaveFormat() == SAVE_FORMAT_SRM) {
rzipstream_t* sram_file = rzipstream_open(filename, RETRO_VFS_FILE_ACCESS_READ);
if(!sram_file) return;

if (!sram || rzipstream_read(sram_file, sram, sram_size) < 0)
LOG_error("rzipstream: Error reading SRAM data\n");

rzipstream_close(sram_file);
}
// uncompressed
else {
RFILE* sram_file = filestream_open(filename, RETRO_VFS_FILE_ACCESS_READ, 0);
if(!sram_file) return;
rzipstream_t* sram_file = rzipstream_open(filename, RETRO_VFS_FILE_ACCESS_READ);
if(!sram_file) return;

if (!sram || filestream_read(sram_file, sram, sram_size) < 0)
LOG_error("filestream: Error reading SRAM data\n");
if (!sram || rzipstream_read(sram_file, sram, sram_size) < 0)
LOG_error("rzipstream: Error reading SRAM data\n");

filestream_close(sram_file);
}
rzipstream_close(sram_file);
#else
FILE *sram_file = fopen(filename, "r");
if (!sram_file) return;
Expand Down
Loading