[Refactor] #37353 コメント整理。 / Refactor comments.

diff --git a/src/cmd-hissatsu.c b/src/cmd-hissatsu.c
index b40d9a0..a7f6e03 100644 (file)
--- a/src/cmd-hissatsu.c
+++ b/src/cmd-hissatsu.c
@@ -83,15 +83,13 @@ static int get_hissatsu_power(SPELL_IDX *sn)
        }
 
        /* Build a prompt (accept all spells) */
-       (void) strnfmt(out_val, 78, 
-                      _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                      p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p);
+       (void)strnfmt(out_val, 78,
+               _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+               p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num - 1], p);
 
        if (use_menu) screen_save();
+       choice = always_show_list ? ESCAPE : 1;
 
-       /* Get a spell from the user */
-
-       choice= always_show_list ? ESCAPE:1 ;
        while (!flag)
        {
                if(choice==ESCAPE) choice = ' '; 

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index 75a8cc2..3ae7aae 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -197,11 +197,10 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                                                                                        "(*=List, ESC=exit) Browse which power? "));
        else strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの魔力を使いますか？",
                                                                "(*=List, ESC=exit) Use which power? "));
-               screen_save();
+       screen_save();
 
        request_list = always_show_list;
 
-       /* Get a spell from the user */
        while (!flag)
        {
                /* Show the list */

diff --git a/src/cmd-smith.c b/src/cmd-smith.c
index 2ec8653..873a9b1 100644 (file)
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -879,8 +879,6 @@ static void add_essence(ESSENCE_IDX mode)
                (void)strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの能力を付加しますか？", "(*=List, ESC=exit) Add which ability? "));
                if (use_menu) screen_save();
 
-               /* Get a spell from the user */
-
                choice = (always_show_list || use_menu) ? ESCAPE : 1;
                while (!flag)
                {

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 39c8b39..99e9236 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -368,8 +368,6 @@ static int get_spell(SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, b
                p, I2A(0), I2A(num - 1), prompt, p);
 #endif
 
-       /* Get a spell from the user */
-
        choice = (always_show_list || use_menu) ? ESCAPE : 1;
        while (!flag)
        {

diff --git a/src/mane.c b/src/mane.c
index dbb4cae..b5eb1d1 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -113,11 +113,9 @@ static int get_mane_power(int *sn, bool baigaesi)
        num = p_ptr->mane_num;
 
        /* Build a prompt (accept all spells) */
-       (void)strnfmt(out_val, 78, 
-                     _("(%c-%c, '*'で一覧, ESC) どの%sをまねますか？", "(%c-%c, *=List, ESC=exit) Use which %s? "),
-                     I2A(0), I2A(num - 1), p);
-
-       /* Get a spell from the user */
+       (void)strnfmt(out_val, 78,
+               _("(%c-%c, '*'で一覧, ESC) どの%sをまねますか？", "(%c-%c, *=List, ESC=exit) Use which %s? "),
+               I2A(0), I2A(num - 1), p);
 
        choice= always_show_list ? ESCAPE:1 ;
        while (!flag)

diff --git a/src/mind.c b/src/mind.c
index 86cc00d..49b3183 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -762,32 +762,32 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
     /* No redraw yet */
     redraw = FALSE;
 
-    for (i = 0; i < MAX_MIND_POWERS; i++)
+       for (i = 0; i < MAX_MIND_POWERS; i++)
        {
-         if (mind_ptr->info[i].min_lev <= plev)
-           {
-             num++;
-           }
+               if (mind_ptr->info[i].min_lev <= plev)
+               {
+                       num++;
+               }
        }
 
-    /* Build a prompt (accept all spells) */
-    if (only_browse)
+       /* Build a prompt (accept all spells) */
+       if (only_browse)
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                      p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
        else
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                               p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
 
        if (use_menu && !only_browse) screen_save();
-       /* Get a spell from the user */
 
-       choice= (always_show_list || use_menu) ? ESCAPE:1 ;
+       choice = (always_show_list || use_menu) ? ESCAPE : 1;
+
        while (!flag)
        {
                if(choice==ESCAPE) choice = ' '; 

diff --git a/src/mspells3.c b/src/mspells3.c
index 7aa7298..14a155f 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -344,8 +344,6 @@ static bool get_learned_power(SPELL_IDX *sn)
 
        if (use_menu) screen_save();
 
-       /* Get a spell from the user */
-
        choice= (always_show_list || use_menu) ? ESCAPE:1 ;
        while (!flag)
        {

diff --git a/src/racial.c b/src/racial.c
index 571e126..0bf03f3 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -1805,7 +1805,6 @@ void do_cmd_racial_power(void)
 
 if (!repeat_pull(&i) || i<0 || i>=num) {
        if (use_menu) screen_save();
-        /* Get a spell from the user */
 
        choice = (always_show_list || use_menu) ? ESCAPE:1;
        while (!flag)

diff --git a/src/snipe.c b/src/snipe.c
index 88221d4..4040029 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -263,7 +263,6 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
                                        p, I2A(0), I2A(num), p);
        }
 
-       /* Get a spell from the user */
        choice = always_show_list ? ESCAPE : 1;
        while (!flag)
        {