mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-26 08:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put saves in ./mkxp-z/Saves/ in libretro save directory

Browse source 
Since the libretro save directory isn't guaranteed to be private for
each core, or even private for just saves, we'd better create a
directory structure in the libretro save directory for our saves.
This commit is contained in:
刘皓 2025-05-07 18:35:25 -04:00
parent c85e9554ec
commit 66256e9156
No known key found for this signature in database
GPG key ID: 7901753DB465B711
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core.cpp
View file

@ -161,7 +161,9 @@ template <> struct atomic<uint64_t> {
int mkxp_physfs_allow_duplicates = false;
struct physfs_allow_duplicates_guard {
physfs_allow_duplicates_guard() {
bool old_value;
physfs_allow_duplicates_guard() : old_value(mkxp_physfs_allow_duplicates) {
mkxp_physfs_allow_duplicates = true;
}
@ -174,7 +176,7 @@ struct physfs_allow_duplicates_guard {
struct physfs_allow_duplicates_guard &operator=(struct physfs_allow_duplicates_guard &&guard) noexcept = delete;
~physfs_allow_duplicates_guard() {
mkxp_physfs_allow_duplicates = false;
mkxp_physfs_allow_duplicates = old_value;
}
};
@ -403,13 +405,13 @@ static bool init_sandbox() {
{
const char *save_path;
if (environment(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &save_path)) {
if (environment(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &save_path) && save_path != nullptr) {
// Save to the subdirectory of the save directory corresponding to the game's name set in Game.ini
std::string save_path_subdir(save_path);
#ifdef _WIN32
save_path_subdir.push_back('\\');
save_path_subdir.append("\\mkxp-z\\Saves\\");
#else
save_path_subdir.push_back('/');
save_path_subdir.append("/mkxp-z/Saves/");
#endif // _WIN32
if (!conf->windowTitle.empty()) {
save_path_subdir.append(conf->windowTitle);
@ -420,7 +422,7 @@ static bool init_sandbox() {
}
// Sanitize forbidden characters in the game name
for (size_t i = std::strlen(save_path) + 1; i < save_path_subdir.length(); ++i) {
for (size_t i = std::strlen(save_path) + (sizeof "/mkxp-z/Saves/" - 1); i < save_path_subdir.length(); ++i) {
if (save_path_subdir[i] < 32 || save_path_subdir[i] == '/' || save_path_subdir[i] == '\\' || save_path_subdir[i] == '*' || save_path_subdir[i] == '?' || save_path_subdir[i] == '|' || ((save_path_subdir[i] == ' ' || save_path_subdir[i] == '.') && i + 1 == save_path_subdir.length())) {
save_path_subdir[i] = '_';
} else if (save_path_subdir[i] == '"') {