From b145768a08ebebf0f56276a4004c72e4871f6b07 Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sat, 27 Apr 2024 19:16:49 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20VS2022=20=E3=81=A7=E5=87=BA?=
 =?utf8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?=
 =?utf8?q?=E3=83=AB=E8=AD=A6=E5=91=8A=E3=82=92=E8=A7=A3=E6=B6=88=E3=81=97?=
 =?utf8?q?=E3=81=9F=20(v3.0.0=20=CE=B212)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/io-dump/special-class-dump.cpp | 16 ++++++----------
 src/io/interpret-pref-file.cpp     |  9 ++++-----
 src/save/save.cpp                  |  3 ++-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/io-dump/special-class-dump.cpp b/src/io-dump/special-class-dump.cpp
index 69463b474..7abc73f8a 100644
--- a/src/io-dump/special-class-dump.cpp
+++ b/src/io-dump/special-class-dump.cpp
@@ -107,7 +107,7 @@ static void dump_smith(PlayerType *player_ptr, FILE *fff)
     fprintf(fff, _("\n\n  [手に入れたエッセンス]\n\n", "\n\n  [Get Essence]\n\n"));
     fprintf(fff, _("エッセンス   個数     エッセンス   個数     エッセンス   個数", "Essence      Num      Essence      Num      Essence      Num "));
 
-    auto essences = Smith::get_essence_list();
+    const auto &essences = Smith::get_essence_list();
     auto n = essences.size();
     std::vector<int> amounts;
     std::transform(essences.begin(), essences.end(), std::back_inserter(amounts),
@@ -174,12 +174,8 @@ static void dump_blue_mage(PlayerType *player_ptr, FILE *fff)
         return;
     }
 
-    char p[60][80];
-    for (int i = 0; i < 60; i++) {
-        p[i][0] = '\0';
-    }
-
-    int col = 0;
+    char p[60][80]{};
+    auto col = 0;
     strcat(p[col], _("\n\n  [学習済みの青魔法]\n", "\n\n  [Learned Blue Magic]\n"));
 
     for (auto SpellProcessType : BLUE_MAGIC_TYPE_LIST) {
@@ -192,13 +188,13 @@ static void dump_blue_mage(PlayerType *player_ptr, FILE *fff)
         EnumClassFlagGroup<MonsterAbilityType>::get_flags(learnt_magic.ability_flags, std::back_inserter(learnt_spells));
 
         col++;
-        bool pcol = false;
+        auto pcol = false;
         strcat(p[col], "       ");
 
         for (auto spell : learnt_spells) {
             pcol = true;
-            int l1 = strlen(p[col]);
-            int l2 = strlen(monster_powers_short.at(spell));
+            auto l1 = strlen(p[col]);
+            auto l2 = strlen(monster_powers_short.at(spell));
             if ((l1 + l2) >= 75) {
                 strcat(p[col], "\n");
                 col++;
diff --git a/src/io/interpret-pref-file.cpp b/src/io/interpret-pref-file.cpp
index 84faa69af..7daf32e62 100644
--- a/src/io/interpret-pref-file.cpp
+++ b/src/io/interpret-pref-file.cpp
@@ -425,17 +425,16 @@ static errr decide_template_modifier(int tok, char **zz)
  */
 static errr interpret_macro_keycodes(int tok, char **zz)
 {
-    char buf_aux[MAX_MACRO_CHARS];
-    char *t, *s;
+    char buf_aux[MAX_MACRO_CHARS]{};
     if (max_macrotrigger >= MAX_MACRO_TRIG) {
         msg_print(_("マクロトリガーの設定が多すぎます!", "Too many macro triggers!"));
         return 1;
     }
 
-    int m = max_macrotrigger;
+    auto m = max_macrotrigger;
     max_macrotrigger++;
-    t = buf_aux;
-    s = zz[0];
+    auto *t = buf_aux;
+    auto *s = zz[0];
     while (*s) {
         if ('\\' == *s) {
             s++;
diff --git a/src/save/save.cpp b/src/save/save.cpp
index f4ff5eec2..76b82616a 100644
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -312,10 +312,11 @@ bool save_player(PlayerType *player_ptr, SaveType type)
     safe_setuid_grab();
     fd_kill(savefile_new);
     if (type == SaveType::DEBUG) {
-        const auto debug_save_dir = std::filesystem::path(debug_savefile).remove_filename();
+        const std::filesystem::path debug_save_dir = std::filesystem::path(debug_savefile).remove_filename();
         std::error_code ec;
         std::filesystem::create_directory(debug_save_dir, ec);
     }
+
     safe_setuid_drop();
     w_ptr->update_playtime();
     auto result = false;
-- 
2.11.0