Merge branch 'develop' into macos-develop

diff --cc src/save/save.cpp
index 395b212,682fb1b..a937417
--- 1/src/save/save.cpp
--- 2/src/save/save.cpp
+++ b/src/save/save.cpp
@@@ -265,11 -265,10 +265,11 @@@ static bool save_player_aux(PlayerType 
      if (fd >= 0) {
          (void)fd_close(fd);
          safe_setuid_grab();
 -        saving_savefile = angband_fopen(path, FileOpenMode::WRITE, true);
 +        saving_savefile = angband_fopen(path, FileOpenMode::WRITE, true,
 +            FileOpenType::SAVE);
          safe_setuid_drop();
          if (saving_savefile) {
-             if (wr_savefile_new(player_ptr, type)) {
+             if (wr_savefile_new(player_ptr)) {
                  is_save_successful = true;
              }