From 97ab6e743be47c3c082d699ddf862a792fe08e9b Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 30 Nov 2018 19:31:06 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=20/=20Refactor=20comments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 3 --- src/bldg.c | 3 --- src/cave.c | 1 - src/cmd-activate.c | 1 - src/cmd-item.c | 3 --- src/cmd4.c | 24 ++++++------------------ src/files.c | 1 - src/spells3.c | 14 +------------- src/store.c | 7 +------ src/util.c | 1 - src/variable.c | 37 +++++++++++-------------------------- src/wizard2.c | 5 +---- 12 files changed, 20 insertions(+), 80 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 1b7839117..484236022 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -4864,7 +4864,6 @@ static bool insert_macro_line(text_body_type *tb) /* Terminate */ buf[n] = '\0'; - /* Flush */ flush(); /* Convert the trigger */ @@ -4925,14 +4924,12 @@ static bool insert_keymap_line(text_body_type *tb) mode = KEYMAP_MODE_ORIG; } - /* Flush */ flush(); /* Get a key */ buf[0] = inkey(); buf[1] = '\0'; - /* Flush */ flush(); /* Convert the trigger */ diff --git a/src/bldg.c b/src/bldg.c index 1fb47002f..eb15269d2 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -3458,11 +3458,8 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C /* Failure */ if (!okay) { - /* Flush */ if (flush_failure) flush(); - msg_print(_("改良に失敗した。", "The improvement failed.")); - return (FALSE); } else diff --git a/src/cave.c b/src/cave.c index 815f960aa..b3d518cc6 100644 --- a/src/cave.c +++ b/src/cave.c @@ -2198,7 +2198,6 @@ void do_cmd_view_map(void) /* Note */ prt(_("お待ち下さい...", "Please wait..."), 0, 0); - /* Flush */ Term_fresh(); /* Clear the screen */ diff --git a/src/cmd-activate.c b/src/cmd-activate.c index d945be47d..46a236e9a 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -372,7 +372,6 @@ void do_cmd_activate(void) } item_tester_no_ryoute = TRUE; - /* Prepare the hook */ item_tester_hook = item_tester_hook_activate; q = _("どのアイテムを始動させますか? ", "Activate which item? "); diff --git a/src/cmd-item.c b/src/cmd-item.c index 43cd39865..07fb10057 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -1793,11 +1793,9 @@ void do_cmd_query_symbol(void) return; } - /* Prompt */ put_str(_("思い出を見ますか? (k:殺害順/y/n): ", "Recall details? (k/y/n): "), 0, _(36, 40)); - /* Query */ query = inkey(); @@ -1942,7 +1940,6 @@ void do_cmd_use(void) } item_tester_no_ryoute = TRUE; - /* Prepare the hook */ item_tester_hook = item_tester_hook_use; q = _("どれを使いますか？", "Use which item? "); diff --git a/src/cmd4.c b/src/cmd4.c index c4cd7dbe6..c16c8fd6c 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -1533,11 +1533,9 @@ static s16b toggle_frequency(s16b current) */ static void do_cmd_options_autosave(cptr info) { - char ch; - - int i, k = 0, n = 2; - - char buf[80]; + char ch; + int i, k = 0, n = 2; + char buf[80]; /* Clear screen */ @@ -1562,9 +1560,9 @@ static void do_cmd_options_autosave(cptr info) /* Display the option text */ sprintf(buf, "%-48s: %s (%s)", - autosave_info[i].o_desc, - (*autosave_info[i].o_var ? _("はい ", "yes") : _("いいえ", "no ")), - autosave_info[i].o_text); + autosave_info[i].o_desc, + (*autosave_info[i].o_var ? _("はい ", "yes") : _("いいえ", "no ")), + autosave_info[i].o_text); c_prt(a, buf, i + 2, 0); } prt(format(_("自動セーブの頻度： %d ターン毎", "Timed autosave frequency: every %d turns"), autosave_freq), 5, 0); @@ -1670,7 +1668,6 @@ void do_cmd_options_aux(int page, cptr info) if (option_info[i].o_page == page) opt[n++] = i; } - /* Clear screen */ Term_clear(); @@ -2426,7 +2423,6 @@ static void do_cmd_macro_aux(char *buf) int n = 0; char tmp[1024]; - /* Flush */ flush(); /* Do not process macros */ @@ -2454,10 +2450,8 @@ static void do_cmd_macro_aux(char *buf) /* Terminate */ buf[n] = '\0'; - /* Flush */ flush(); - /* Convert the trigger */ ascii_to_text(tmp, buf); @@ -2482,24 +2476,18 @@ static void do_cmd_macro_aux_keymap(char *buf) { char tmp[1024]; - - /* Flush */ flush(); - /* Get a key */ buf[0] = inkey(); buf[1] = '\0'; - /* Convert to ascii */ ascii_to_text(tmp, buf); /* Hack -- display the trigger */ Term_addstr(-1, TERM_WHITE, tmp); - - /* Flush */ flush(); } diff --git a/src/files.c b/src/files.c index 286d1783c..2fdc9e62e 100644 --- a/src/files.c +++ b/src/files.c @@ -7396,7 +7396,6 @@ static void handle_signal_simple(int sig) /* Display the cause */ Term_putstr(0, 0, -1, TERM_WHITE, _("熟慮の上の自殺！", "Contemplating suicide!")); - /* Flush */ Term_fresh(); } diff --git a/src/spells3.c b/src/spells3.c index 88fb914c1..8e7a21cf0 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -2225,8 +2225,7 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac) /* Description */ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); #ifdef JP -msg_format("%s は明るく輝いた！", - o_name); + msg_format("%s は明るく輝いた！", o_name); #else msg_format("%s %s glow%s brightly!", ((item >= 0) ? "Your" : "The"), o_name, @@ -2242,11 +2241,8 @@ msg_format("%s は明るく輝いた！", /* Failure */ if (!okay) { - /* Flush */ if (flush_failure) flush(); - msg_print(_("強化に失敗した。", "The enchantment failed.")); - if (one_in_(3)) chg_virtue(V_ENCHANT, -1); } else @@ -2369,18 +2365,14 @@ bool artifact_scroll(void) /* Failure */ if (!okay) { - /* Flush */ if (flush_failure) flush(); - msg_print(_("強化に失敗した。", "The enchantment failed.")); - if (one_in_(3)) chg_virtue(V_ENCHANT, -1); } else { if (record_rand_art) { - /* Description */ object_desc(o_name, o_ptr, OD_NAME_ONLY); do_cmd_write_nikki(NIKKI_ART_SCROLL, 0, o_name); } @@ -4300,14 +4292,10 @@ bool brand_bolts(void) /* Ego-item */ o_ptr->name2 = EGO_FLAME; - - /* Enchant */ enchant(o_ptr, randint0(3) + 4, ENCH_TOHIT | ENCH_TODAM); - return (TRUE); } - /* Flush */ if (flush_failure) flush(); /* Fail */ diff --git a/src/store.c b/src/store.c index ca46ca2af..51ea9c3ff 100644 --- a/src/store.c +++ b/src/store.c @@ -5037,12 +5037,7 @@ void do_cmd_store(void) } #endif /* Prompt */ -#ifdef JP - prt("コマンド:", 20 + xtra_stock, 0); -#else - prt("You may: ", 20 + xtra_stock, 0); -#endif - + prt(_("コマンド:", "You may: "), 20 + xtra_stock, 0); /* Get a command */ request_command(TRUE); diff --git a/src/util.c b/src/util.c index b7d62e86c..e1972e37f 100644 --- a/src/util.c +++ b/src/util.c @@ -2794,7 +2794,6 @@ void msg_print(cptr msg) /* Hack -- flush when requested or needed */ if (p && (!msg || ((p + n) > 72))) { - /* Flush */ msg_flush(p); /* Forget it */ diff --git a/src/variable.c b/src/variable.c index ce7718930..e661e400a 100644 --- a/src/variable.c +++ b/src/variable.c @@ -154,14 +154,14 @@ bool repair_objects; /* Hack -- optimize detect objects */ bool is_loading_now; /*!< ロード直後にcalc_bonus()時の徳変化、及びsanity_blast()による異常を抑止する */ bool hack_mutation; -s16b inven_cnt; /* Number of items in inventory */ -s16b equip_cnt; /* Number of items in equipment */ +s16b inven_cnt; /* Number of items in inventory */ +s16b equip_cnt; /* Number of items in equipment */ -s16b o_max = 1; /* Number of allocated objects */ -s16b o_cnt = 0; /* Number of live objects */ +s16b o_max = 1; /* Number of allocated objects */ +s16b o_cnt = 0; /* Number of live objects */ -MONSTER_IDX m_max = 1; /* Number of allocated monsters */ -MONSTER_IDX m_cnt = 0; /* Number of live monsters */ +MONSTER_IDX m_max = 1; /* Number of allocated monsters */ +MONSTER_IDX m_cnt = 0; /* Number of live monsters */ MONSTER_IDX hack_m_idx = 0; /* Hack -- see "process_monsters()" */ MONSTER_IDX hack_m_idx_ii = 0; @@ -220,38 +220,23 @@ char player_base[32]; char savefile[1024]; char savefile_base[40]; -/* - * Array of grids lit by player lite (see "cave.c") - */ -POSITION_IDX lite_n; +POSITION_IDX lite_n; //!< Array of grids lit by player lite (see "cave.c") POSITION lite_y[LITE_MAX]; POSITION lite_x[LITE_MAX]; -/* - * Array of grids lit by player lite (see "cave.c") - */ -POSITION_IDX mon_lite_n; +POSITION_IDX mon_lite_n; //!< Array of grids lit by player lite (see "cave.c") POSITION mon_lite_y[MON_LITE_MAX]; POSITION mon_lite_x[MON_LITE_MAX]; -/* - * Array of grids viewable to the player (see "cave.c") - */ -POSITION_IDX view_n; +POSITION_IDX view_n; //!< Array of grids viewable to the player (see "cave.c") POSITION view_y[VIEW_MAX]; POSITION view_x[VIEW_MAX]; -/* - * Array of grids for use by various functions (see "cave.c") - */ -POSITION_IDX temp_n; +POSITION_IDX temp_n; //!< Array of grids for use by various functions (see "cave.c") POSITION temp_y[TEMP_MAX]; POSITION temp_x[TEMP_MAX]; -/* - * Array of grids for delayed visual updating (see "cave.c") - */ -POSITION_IDX redraw_n = 0; +POSITION_IDX redraw_n = 0; //!< Array of grids for delayed visual updating (see "cave.c") POSITION redraw_y[REDRAW_MAX]; POSITION redraw_x[REDRAW_MAX]; diff --git a/src/wizard2.c b/src/wizard2.c index e5008e8b1..594e6c968 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1098,11 +1098,8 @@ static void wiz_statistics(object_type *o_ptr) /* Allow interupt */ if (inkey()) { - /* Flush */ flush(); - - /* Stop rolling */ - break; + break; // stop rolling } /* Dump the stats */ -- 2.11.0