From 1834cef9c9582f093a28560f33145797d2f86664 Mon Sep 17 00:00:00 2001 From: Sonic Dreamcaster Date: Tue, 22 Jul 2025 19:24:12 -0300 Subject: [PATCH] Pak.cpp: cleanup --- librecomp/src/pak.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/librecomp/src/pak.cpp b/librecomp/src/pak.cpp index f5751da..e77fb1c 100644 --- a/librecomp/src/pak.cpp +++ b/librecomp/src/pak.cpp @@ -158,17 +158,6 @@ extern "C" void osPfsInitPak_recomp(uint8_t* rdram, recomp_context* ctx) { extern "C" void osPfsFreeBlocks_recomp(uint8_t* rdram, recomp_context* ctx) { s32* bytes_not_used = _arg<1, s32*>(rdram, ctx); - ControllerPak pak; - - pak.header.open("controllerPak_header.sav", std::ios::binary | std::ios::in | std::ios::out); - - if (!pak.header.good()) { - assert(false); - } - if (!pak.header.is_open()) { - assert(false); - } - s32 usedSpace = 0; for (size_t i = 0; i < MAX_FILES; i++) { u32 file_size = 0; @@ -186,8 +175,6 @@ extern "C" void osPfsFreeBlocks_recomp(uint8_t* rdram, recomp_context* ctx) { } } - pak.header.close(); - *bytes_not_used = (123 - usedSpace) << 8; ctx->r2 = 0; // PFS_NO_ERROR @@ -206,8 +193,6 @@ extern "C" void osPfsAllocateFile_recomp(uint8_t* rdram, recomp_context* ctx) { return; } - ControllerPak pak; - /* Search for a free slot */ u8 freeFileIndex = 0; for (size_t i = 0; i < MAX_FILES; i++) { @@ -229,6 +214,8 @@ extern "C" void osPfsAllocateFile_recomp(uint8_t* rdram, recomp_context* ctx) { /* Create empty file */ + ControllerPak pak; + char filename[100]; sprintf(filename, "controllerPak_file_%d.sav", freeFileIndex); pak.file.open(filename, std::ios::binary | std::ios::in | std::ios::out | std::ios::trunc); @@ -263,7 +250,7 @@ extern "C" void osPfsFileState_recomp(uint8_t* rdram, recomp_context* ctx) { // should pass the state of the requested file_no to the incoming state pointer, // games call this function 16 times, once per file // fills the incoming state with the information inside the header of the pak. - // If a header file doesn't exist, create it. + char filename[100]; sprintf(filename, "controllerPak_file_%d.sav", file_no); if (!std::filesystem::exists(filename)) { @@ -295,8 +282,6 @@ extern "C" void osPfsFindFile_recomp(uint8_t* rdram, recomp_context* ctx) { u8* ext_name = TO_PTR(u8, MEM_W(0x10, ctx->r29)); s32* file_no = TO_PTR(s32, MEM_W(0x14, ctx->r29)); - ControllerPak pak; - for (size_t i = 0; i < MAX_FILES; i++) { u32 file_size_ = 0; u32 game_code_ = 0;