• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision048b39fad5089529a82cfd193505d0d55b1918ed (tree)
Time2019-03-12 08:08:57
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/cmd-hissatsu.c
+++ b/src/cmd-hissatsu.c
@@ -83,15 +83,13 @@ static int get_hissatsu_power(SPELL_IDX *sn)
8383 }
8484
8585 /* Build a prompt (accept all spells) */
86- (void) strnfmt(out_val, 78,
87- _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
88- p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p);
86+ (void)strnfmt(out_val, 78,
87+ _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
88+ p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num - 1], p);
8989
9090 if (use_menu) screen_save();
91+ choice = always_show_list ? ESCAPE : 1;
9192
92- /* Get a spell from the user */
93-
94- choice= always_show_list ? ESCAPE:1 ;
9593 while (!flag)
9694 {
9795 if(choice==ESCAPE) choice = ' ';
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -197,11 +197,10 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
197197 "(*=List, ESC=exit) Browse which power? "));
198198 else strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの魔力を使いますか?",
199199 "(*=List, ESC=exit) Use which power? "));
200- screen_save();
200+ screen_save();
201201
202202 request_list = always_show_list;
203203
204- /* Get a spell from the user */
205204 while (!flag)
206205 {
207206 /* Show the list */
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -879,8 +879,6 @@ static void add_essence(ESSENCE_IDX mode)
879879 (void)strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの能力を付加しますか?", "(*=List, ESC=exit) Add which ability? "));
880880 if (use_menu) screen_save();
881881
882- /* Get a spell from the user */
883-
884882 choice = (always_show_list || use_menu) ? ESCAPE : 1;
885883 while (!flag)
886884 {
--- 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
368368 p, I2A(0), I2A(num - 1), prompt, p);
369369 #endif
370370
371- /* Get a spell from the user */
372-
373371 choice = (always_show_list || use_menu) ? ESCAPE : 1;
374372 while (!flag)
375373 {
--- a/src/mane.c
+++ b/src/mane.c
@@ -113,11 +113,9 @@ static int get_mane_power(int *sn, bool baigaesi)
113113 num = p_ptr->mane_num;
114114
115115 /* Build a prompt (accept all spells) */
116- (void)strnfmt(out_val, 78,
117- _("(%c-%c, '*'で一覧, ESC) どの%sをまねますか?", "(%c-%c, *=List, ESC=exit) Use which %s? "),
118- I2A(0), I2A(num - 1), p);
119-
120- /* Get a spell from the user */
116+ (void)strnfmt(out_val, 78,
117+ _("(%c-%c, '*'で一覧, ESC) どの%sをまねますか?", "(%c-%c, *=List, ESC=exit) Use which %s? "),
118+ I2A(0), I2A(num - 1), p);
121119
122120 choice= always_show_list ? ESCAPE:1 ;
123121 while (!flag)
--- a/src/mind.c
+++ b/src/mind.c
@@ -762,32 +762,32 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
762762 /* No redraw yet */
763763 redraw = FALSE;
764764
765- for (i = 0; i < MAX_MIND_POWERS; i++)
765+ for (i = 0; i < MAX_MIND_POWERS; i++)
766766 {
767- if (mind_ptr->info[i].min_lev <= plev)
768- {
769- num++;
770- }
767+ if (mind_ptr->info[i].min_lev <= plev)
768+ {
769+ num++;
770+ }
771771 }
772772
773- /* Build a prompt (accept all spells) */
774- if (only_browse)
773+ /* Build a prompt (accept all spells) */
774+ if (only_browse)
775775 {
776- (void) strnfmt(out_val, 78,
777- _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
778- p, I2A(0), I2A(num - 1), p);
776+ (void)strnfmt(out_val, 78,
777+ _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
778+ p, I2A(0), I2A(num - 1), p);
779779 }
780780 else
781781 {
782- (void) strnfmt(out_val, 78,
783- _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
784- p, I2A(0), I2A(num - 1), p);
782+ (void)strnfmt(out_val, 78,
783+ _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか?", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
784+ p, I2A(0), I2A(num - 1), p);
785785 }
786786
787787 if (use_menu && !only_browse) screen_save();
788- /* Get a spell from the user */
789788
790- choice= (always_show_list || use_menu) ? ESCAPE:1 ;
789+ choice = (always_show_list || use_menu) ? ESCAPE : 1;
790+
791791 while (!flag)
792792 {
793793 if(choice==ESCAPE) choice = ' ';
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -344,8 +344,6 @@ static bool get_learned_power(SPELL_IDX *sn)
344344
345345 if (use_menu) screen_save();
346346
347- /* Get a spell from the user */
348-
349347 choice= (always_show_list || use_menu) ? ESCAPE:1 ;
350348 while (!flag)
351349 {
--- a/src/racial.c
+++ b/src/racial.c
@@ -1805,7 +1805,6 @@ void do_cmd_racial_power(void)
18051805
18061806 if (!repeat_pull(&i) || i<0 || i>=num) {
18071807 if (use_menu) screen_save();
1808- /* Get a spell from the user */
18091808
18101809 choice = (always_show_list || use_menu) ? ESCAPE:1;
18111810 while (!flag)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -263,7 +263,6 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
263263 p, I2A(0), I2A(num), p);
264264 }
265265
266- /* Get a spell from the user */
267266 choice = always_show_list ? ESCAPE : 1;
268267 while (!flag)
269268 {
Show on old repository browser