Mac fixes

Author: garrettjoecox

src/port/Rando/CheckTracker/CheckTracker.cpp

@@ -12,10 +12,22 @@ namespace GhostshipGui {
 extern std::shared_ptr<Rando::CheckTracker::CheckTrackerWindow> mRandoCheckTrackerWindow;
 }
 
-#define DEFAULT_LOGIC_COLOR Color_RGBA8(200, 200, 200, 255)
-#define DEFAULT_COLLECTED_COLOR Color_RGBA8(100, 255, 100, 255)
-#define DEFAULT_SKIPPED_COLOR Color_RGBA8(255, 100, 255, 255)
-#define DEFAULT_ITEM_COLOR Color_RGBA8(79, 0, 221, 255)
+#define DEFAULT_LOGIC_COLOR \
+    Color_RGBA8 {            \
+        200, 200, 200, 255   \
+    }
+#define DEFAULT_COLLECTED_COLOR \
+    Color_RGBA8 {               \
+        100, 255, 100, 255      \
+    }
+#define DEFAULT_SKIPPED_COLOR \
+    Color_RGBA8 {             \
+        255, 100, 255, 255    \
+    }
+#define DEFAULT_ITEM_COLOR \
+    Color_RGBA8 {          \
+        79, 0, 221, 255    \
+    }
 
 #define CVAR_NAME_SHOW_CHECK_TRACKER "gWindows.CheckTracker"
 #define CVAR_NAME_CHECK_TRACKER_OPACITY "gRando.CheckTracker.Opacity"

src/port/Rando/Rando.cpp

@@ -12,12 +12,12 @@
 namespace fs = std::filesystem;
 
 int16_t selectedFileNum = 0;
+const fs::path randomizerFolderPath(Ship::Context::GetPathRelativeToAppDirectory("randomizer", "sm64"));
 
 // Entry point for the module, run once on game boot
 void Rando::Init() {
-    fs::path dir("randomizer");
-    if (!fs::exists(dir)) {
-        fs::create_directory(dir);
+    if (!fs::exists(randomizerFolderPath)) {
+        fs::create_directory(randomizerFolderPath);
     }
 
     Rando::Spoiler::RefreshSpoilerLogs();

src/port/data/Saves.cpp

@@ -10,11 +10,12 @@ namespace fs = std::filesystem;
 
 extern "C" struct SaveBuffer gSaveBuffer;
 
+const fs::path savesPath(Ship::Context::GetPathRelativeToAppDirectory("saves", "sm64"));
+
 static void Init() {
     // Create saves directory if it doesn't exist
-    fs::path dir("saves");
-    if (!fs::exists(dir)) {
-        fs::create_directory(dir);
+    if (!fs::exists(savesPath)) {
+        fs::create_directory(savesPath);
     }
 }
 
@@ -33,7 +34,7 @@ void RestoreSaveFileData(int32_t fileIndex, int32_t srcSlot) {
 }
 
 void SaveFileDoSave(int32_t fileIndex) {
-    std::ofstream file(fs::path("saves/save_" + std::to_string(fileIndex) + ".json"), std::ios::out);
+    std::ofstream file(savesPath / ("save_" + std::to_string(fileIndex) + ".json"), std::ios::out);
     if (!file.is_open()) {
         return;
     }
@@ -44,24 +45,23 @@ void SaveFileDoSave(int32_t fileIndex) {
 }
 
 bool ShouldLoadOldSaveFile(void) {
-    fs::path save("default.sav");
-    return fs::exists(save);
+    return fs::exists(Ship::Context::GetPathRelativeToAppDirectory("default.sav"));
 }
 
 void SaveFileLoadAll(void) {
-    fs::path save("default.sav");
-    if (fs::exists(save)) {
+    auto oldSave = Ship::Context::GetPathRelativeToAppDirectory("default.sav");
+    if (fs::exists(oldSave)) {
         for (int32_t fileIndex = 0; fileIndex < NUM_SAVE_FILES; fileIndex++) {
             SaveFileDoSave(fileIndex);
         }
         // Move old save files to backup
-        fs::rename(save, "default.sav.bak");
+        fs::rename(oldSave, Ship::Context::GetPathRelativeToAppDirectory("default.sav.bak"));
         return;
     }
 
     // Read save files
     for (int32_t fileIndex = 0; fileIndex < NUM_SAVE_FILES; fileIndex++) {
-        fs::path filepath = fs::path("saves/save_" + std::to_string(fileIndex) + ".json");
+        fs::path filepath = savesPath / ("save_" + std::to_string(fileIndex) + ".json");
         if (!fs::exists(filepath)) {
             continue;
         }
@@ -84,7 +84,7 @@ void SaveFileLoadAll(void) {
     }
 
     // Read global save file
-    fs::path globalpath = fs::path("saves/global.json");
+    fs::path globalpath = savesPath / "global.json";
     if (fs::exists(globalpath)) {
         std::ifstream file(globalpath, std::ios::in);
         if (file.is_open()) {
@@ -97,7 +97,7 @@ void SaveFileLoadAll(void) {
 }
 
 void SaveMainMenuData(void) {
-    std::ofstream file(fs::path("saves/global.json"), std::ios::out);
+    std::ofstream file(savesPath / "global.json", std::ios::out);
     if (!file.is_open()) {
         return;
     }