diff --git a/librecomp/include/recomp_game.h b/librecomp/include/recomp_game.h index f9b997d..8a05802 100644 --- a/librecomp/include/recomp_game.h +++ b/librecomp/include/recomp_game.h @@ -44,10 +44,6 @@ namespace recomp { void start_game(const std::u8string& game_id); std::filesystem::path get_app_folder_path(); std::u8string current_game_id(); - - // TODO: implement both - const std::u8string& get_program_id(); - void set_program_id(const std::u8string& program_id); } #endif diff --git a/librecomp/src/recomp.cpp b/librecomp/src/recomp.cpp index d5dae17..e1d8649 100644 --- a/librecomp/src/recomp.cpp +++ b/librecomp/src/recomp.cpp @@ -49,16 +49,6 @@ std::mutex current_game_mutex; std::vector patch_data; std::unordered_map game_roms {}; -static std::u8string program_id = u8""; - -const std::u8string& recomp::get_program_id() { - return program_id; -} - -void recomp::set_program_id(const std::u8string& program_id_) { - program_id = program_id_; -} - std::u8string recomp::GameEntry::stored_filename() const { return game_id + u8".z64"; } @@ -115,7 +105,7 @@ std::filesystem::path recomp::get_app_folder_path() { PWSTR known_path = NULL; HRESULT result = SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &known_path); if (result == S_OK) { - recomp_dir = std::filesystem::path{known_path} / recomp::get_program_id(); + recomp_dir = std::filesystem::path{known_path} / recomp::current_game_id(); } CoTaskMemFree(known_path); @@ -127,7 +117,7 @@ std::filesystem::path recomp::get_app_folder_path() { } if (homedir != nullptr) { - recomp_dir = std::filesystem::path{homedir} / (std::u8string{u8".config/"} + recomp::get_program_id()); + recomp_dir = std::filesystem::path{homedir} / (std::u8string{u8".config/"} + recomp::current_game_id()); } #endif