From aa97a5d6a1d07bc766a63b61473e8a63bfc9e484 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Sun, 11 Apr 2021 11:26:11 -0400 Subject: [PATCH] Revert "Only migrate savedata if "saves" was created", need this for levels too This reverts commit fcb09f85cbf2f8e231b511a4d2720805621691ea. --- desktop_version/src/FileSystemUtils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp index d47e6a70..741fbf79 100644 --- a/desktop_version/src/FileSystemUtils.cpp +++ b/desktop_version/src/FileSystemUtils.cpp @@ -55,7 +55,7 @@ static const PHYSFS_Allocator allocator = { int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath) { char output[MAX_PATH]; - int saveDirCreated; + int mkdirResult; int retval; const char* pathSep = PHYSFS_getDirSeparator(); char* basePath; @@ -81,7 +81,7 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath) } /* Create base user directory, mount */ - PHYSFS_mkdir(output); + mkdirResult = PHYSFS_mkdir(output); /* Mount our base user directory */ PHYSFS_mount(output, NULL, 0); @@ -89,8 +89,8 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath) printf("Base directory: %s\n", output); /* Create the save/level folders */ - saveDirCreated = PHYSFS_mkdir("saves"); - PHYSFS_mkdir("levels"); + mkdirResult |= PHYSFS_mkdir("saves"); + mkdirResult |= PHYSFS_mkdir("levels"); /* Store full save directory */ SDL_snprintf(saveDir, sizeof(saveDir), "%s%s%s", @@ -109,7 +109,7 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath) printf("Level directory: %s\n", levelDir); /* We didn't exist until now, migrate files! */ - if (saveDirCreated != 0) + if (mkdirResult == 0) { PLATFORM_migrateSaveData(output); }