Mac: adapt to upstream's changes to savefile

backwardsEric · May 7, 2023 · 4fdf3e8 · 4fdf3e8
1 parent f2da429
commit 4fdf3e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/floor/floor-save.cpp b/src/floor/floor-save.cpp
@@ -63,7 +63,7 @@ static void check_saved_tmp_files(const int fd, bool *force)
 void init_saved_floors(PlayerType *player_ptr, bool force)
 {
     auto fd = -1;
-    if (savefile[0]) {
+    if (!savefile.empty()) {
         for (int i = 0; i < MAX_SAVED_FLOORS; i++) {
             saved_floor_type *sf_ptr = &saved_floors[i];
             std::string floor_savefile = get_saved_floor_name(i);

diff --git a/src/main-cocoa.mm b/src/main-cocoa.mm
@@ -3937,7 +3937,7 @@ static void set_color_for_index(int idx)
  */
 static void record_current_savefile(void)
 {
-    NSString *savefileString = [[NSString stringWithCString:savefile encoding:NSMacOSRomanStringEncoding] lastPathComponent];
+    NSString *savefileString = [[NSString stringWithCString:savefile.native().data() encoding:NSMacOSRomanStringEncoding] lastPathComponent];
     if (savefileString)
     {
         NSUserDefaults *angbandDefs = [NSUserDefaults angbandDefaults];
@@ -5641,16 +5641,20 @@ - (IBAction)openGame:sender
 	    if ([fileURLs count] > 0 && [[fileURLs objectAtIndex:0] isFileURL])
 	    {
 		NSURL* savefileURL = (NSURL *)[fileURLs objectAtIndex:0];
+		char t[1024];
+
 		/*
 		 * The path property doesn't do the right thing except for
 		 * URLs with the file scheme. We had
 		 * getFileSystemRepresentation here before, but that wasn't
 		 * introduced until OS X 10.9.
 		 */
 		selectedSomething = [[savefileURL path]
-					getCString:savefile
-					maxLength:sizeof savefile
+					getCString:t
+					maxLength:sizeof(t)
 					encoding:NSMacOSRomanStringEncoding];
+		savefile = std::filesystem::path(t,
+			std::filesystem::path::native_format);
 	    }
 	}
 
@@ -6279,11 +6283,13 @@ - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
     }
 
     /* Put it in savefile */
-    if (! [file getFileSystemRepresentation:savefile maxLength:sizeof savefile]) {
+    char t[1024];
+    if (! [file getFileSystemRepresentation:t maxLength:sizeof(t)]) {
 	[[NSApplication sharedApplication]
 	    replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
 	return;
     }
+    savefile = std::filesystem::path(t, std::filesystem::path::native_format);
 
     game_in_progress = YES;