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

[hengband/hengband.git] / src / bldg.c

diff --git a/src/bldg.c b/src/bldg.c
index eef5b9a..eb15269 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1465,7 +1465,6 @@ static bool vault_aux_battle(MONRACE_IDX r_idx)
        }
        if (!dam && !(r_ptr->flags4 & (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_BREATH_MASK)) && !(r_ptr->a_ability_flags1 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_BREATH_MASK)) && !(r_ptr->a_ability_flags2 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_BREATH_MASK))) return (FALSE);
 
-       /* Okay */
        return (TRUE);
 }
 
@@ -1744,7 +1743,7 @@ static void tsuchinoko(void)
 static void shoukinkubi(void)
 {
        int i;
-       int y = 0;
+       TERM_LEN y = 0;
 
        clear_bldg(4,18);
        prt(_("死体を持ち帰れば報酬を差し上げます。", "Offer a prize when you bring a wanted monster's corpse"),4 ,10);
@@ -2000,7 +1999,6 @@ static bool kankin(void)
                                 */
                                item_new = inven_carry(&forge);
 
-                               /* Describe the object */
                                object_desc(o_name, &forge, 0);
                                msg_format(_("%s(%c)を貰った。", "You get %s (%c). "), o_name, index_to_label(item_new));
 
@@ -2358,7 +2356,7 @@ HIT_POINT calc_crit_ratio_shot(HIT_POINT plus_ammo, HIT_POINT plus_bow)
  * @param dam 基本ダメージ量
  * @return ダメージ期待値
  */
-HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo, int plus_bow,  HIT_POINT dam)
+HIT_POINT calc_expect_crit_shot(WEIGHT weight, int plus_ammo, int plus_bow,  HIT_POINT dam)
 {
        u32b num;
        int i, k, crit;
@@ -2400,7 +2398,7 @@ HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo, int plus_bow,  HIT_PO
  * @param dokubari 毒針処理か否か
  * @return ダメージ期待値
  */
-HIT_POINT calc_expect_crit(int weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari)
+HIT_POINT calc_expect_crit(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari)
 {
        u32b k, num;
        int i;
@@ -2479,7 +2477,7 @@ static HIT_POINT calc_slaydam(HIT_POINT dam, int mult, int div, bool force)
  * @param vorpal_div 切れ味倍率（割り算部分）
  * @return ダメージ期待値
  */
-static u32b calc_expect_dice(u32b dam, int mult, int div, bool force, int weight, int plus, s16b meichuu, bool dokubari, int vorpal_mult, int vorpal_div)
+static u32b calc_expect_dice(u32b dam, int mult, int div, bool force, WEIGHT weight, int plus, s16b meichuu, bool dokubari, int vorpal_mult, int vorpal_div)
 {
        dam = calc_slaydam(dam, mult, div, force);
        dam = calc_expect_crit(weight, plus, dam, meichuu, dokubari);
@@ -2947,7 +2945,6 @@ static PRICE compare_weapons(PRICE bcost)
        /* Restore the screen */
        screen_load();
 
-       /* Done */
        return (total);
 }
 
@@ -3046,7 +3043,6 @@ static bool eval_ac(ARMOUR_CLASS iAC)
        (void)inkey();
        screen_load();
 
-       /* Done */
        return (TRUE);
 }
 
@@ -3120,7 +3116,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        object_type *o_ptr, *mo_ptr; /* broken weapon and material weapon */
        object_kind *k_ptr;
        int i, dd_bonus, ds_bonus;
-       IDX k_idx;
+       KIND_OBJECT_IDX k_idx;
        char basenm[MAX_NLEN];
        cptr q, s; /* For get_item prompt */
        int row = 7;
@@ -3128,11 +3124,9 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        /* Clear screen */
        clear_bldg(0, 22);
 
-       /* Notice */
        prt(_("修復には材料となるもう1つの武器が必要です。", "Hand one material weapon to repair a broken weapon."), row, 2);
        prt(_("材料に使用した武器はなくなります！", "The material weapon will disappear after repairing!!"), row+1, 2);
 
-       /* Get an item */
        q = _("どの折れた武器を修復しますか？", "Repair which broken weapon? ");
        s = _("修復できる折れた武器がありません。", "You have no broken weapon to repair.");
 
@@ -3162,7 +3156,6 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        object_desc(basenm, o_ptr, OD_NAME_ONLY);
        prt(format(_("修復する武器　： %s", "Repairing: %s"), basenm), row+3, 2);
 
-       /* Get an item */
        q = _("材料となる武器は？", "Which weapon for material? ");
        s = _("材料となる武器がありません。", "You have no material to repair.");
 
@@ -3407,7 +3400,6 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C
 
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムを改良しますか？", "Improve which item? ");
        s = _("改良できるものがありません。", "You have nothing to improve.");
 
@@ -3466,12 +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();
-
-               /* Message */
                msg_print(_("改良に失敗した。", "The improvement failed."));
-
                return (FALSE);
        }
        else
@@ -3527,7 +3515,6 @@ static void building_recharge(void)
        /* Only accept legal items */
        item_tester_hook = item_tester_hook_recharge;
 
-       /* Get an item */
        q = _("どのアイテムに魔力を充填しますか? ", "Recharge which item? ");
        s = _("魔力を充填すべきアイテムがない。", "You have nothing to recharge.");
        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
@@ -3712,7 +3699,6 @@ if (get_check(format("そのロッドを＄%d で再充填しますか？",
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 
        /* Pay the price */
@@ -3858,7 +3844,6 @@ static void building_recharge_all(void)
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 
        /* Pay the price */
@@ -4224,7 +4209,7 @@ static void bldg_process_command(building_type *bldg, int i)
        bool paid = FALSE;
        int amt;
 
-       /* Flush messages XXX XXX XXX */
+       /* Flush messages */
        msg_flag = FALSE;
        msg_print(NULL);
 
@@ -4617,7 +4602,7 @@ void do_cmd_bldg(void)
 
        select_floor_music();
 
-       /* Flush messages XXX XXX XXX */
+       /* Flush messages */
        msg_flag = FALSE;
        msg_print(NULL);
 
@@ -4639,7 +4624,6 @@ void do_cmd_bldg(void)
        /* Redraw entire screen */
        p_ptr->redraw |= (PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP);
 
-       /* Window stuff */
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -4759,6 +4743,5 @@ QUEST_IDX random_quest_number(DEPTH level)
                }
        }
 
-       /* Nope */
        return 0;
 }