[Fix] 属性への免疫を唱えた時のメッセージ

[hengbandforosx/hengbandosx.git] / src / autopick / autopick-command-menu.cpp

diff --git a/src/autopick/autopick-command-menu.cpp b/src/autopick/autopick-command-menu.cpp
index 81012b7..7a79eba 100644 (file)
--- a/src/autopick/autopick-command-menu.cpp
+++ b/src/autopick/autopick-command-menu.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @brief 自動拾いエディタのコマンドを受け付ける
  * @date 2020/04/26
  * @author Hourier
@@ -25,8 +25,9 @@
  */
 static void redraw_edit_command_menu(bool *redraw, int level, int start, char *linestr, byte *menu_key, int max_len)
 {
-    if (!*redraw)
+    if (!*redraw) {
         return;
+    }
 
     int col0 = 5 + level * 7;
     int row0 = 1 + level * 3;
@@ -36,9 +37,9 @@ static void redraw_edit_command_menu(bool *redraw, int level, int start, char *l
     *menu_key = 0;
     for (int i = start; menu_data[i].level >= level; i++) {
         char com_key_str[3];
-        concptr str;
-        if (menu_data[i].level > level)
+        if (menu_data[i].level > level) {
             continue;
+        }
 
         if (menu_data[i].com_id == -1) {
             strcpy(com_key_str, _("▼", ">"));
@@ -50,7 +51,7 @@ static void redraw_edit_command_menu(bool *redraw, int level, int start, char *l
             com_key_str[0] = '\0';
         }
 
-        str = format("| %c) %-*s %2s | ", *menu_key + 'a', max_len, menu_data[i].name, com_key_str);
+        const auto str = format("| %c) %-*s %2s | ", *menu_key + 'a', max_len, menu_data[i].name, com_key_str);
 
         term_putstr(col0, row1++, -1, TERM_WHITE, str);
 
@@ -71,12 +72,14 @@ int do_command_menu(int level, int start)
     byte menu_key = 0;
     for (int i = start; menu_data[i].level >= level; i++) {
         /* Ignore lower level sub menus */
-        if (menu_data[i].level > level)
+        if (menu_data[i].level > level) {
             continue;
+        }
 
         int len = strlen(menu_data[i].name);
-        if (len > max_len)
+        if (len > max_len) {
             max_len = len;
+        }
 
         menu_id_list[menu_key] = i;
         menu_key++;
@@ -102,8 +105,9 @@ int do_command_menu(int level, int start)
         redraw_edit_command_menu(&redraw, level, start, linestr, &menu_key, max_len);
         prt(format(_("(a-%c) コマンド:", "(a-%c) Command:"), menu_key + 'a' - 1), 0, 0);
         char key = inkey();
-        if (key == ESCAPE)
+        if (key == ESCAPE) {
             return 0;
+        }
 
         int com_id;
         bool is_alphabet = key >= 'a' && key <= 'z';
@@ -117,16 +121,18 @@ int do_command_menu(int level, int start)
         }
 
         int menu_id = menu_id_list[key - 'a'];
-        if (menu_id < 0)
+        if (menu_id < 0) {
             continue;
+        }
 
         com_id = menu_data[menu_id].com_id;
         if (com_id == -1) {
             com_id = do_command_menu(level + 1, menu_id + 1);
-            if (com_id)
+            if (com_id) {
                 return com_id;
-            else
+            } else {
                 redraw = true;
+            }
         } else if (com_id) {
             return com_id;
         }