#37353 SINGING_SONG_IDとINTERUPTING_SONG_IDを定義。 / Define SINGING_SONG_ID and INTERUPTI...

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

diff --git a/src/bldg.c b/src/bldg.c
index e3857cf..c5bc79b 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1441,7 +1441,7 @@ static bool gamble_comm(int cmd)
 static bool vault_aux_battle(MONRACE_IDX r_idx)
 {
        int i;
-       int dam = 0;
+       HIT_POINT dam = 0;
 
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -2356,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,  int dam)
+HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo, int plus_bow,  HIT_POINT dam)
 {
        u32b num;
        int i, k, crit;
@@ -2398,7 +2398,7 @@ HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo, int plus_bow,  int da
  * @param dokubari 毒針処理か否か
  * @return ダメージ期待値
  */
-HIT_POINT calc_expect_crit(int weight, int plus, int dam, s16b meichuu, bool dokubari)
+HIT_POINT calc_expect_crit(int weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari)
 {
        u32b k, num;
        int i;
@@ -3755,7 +3755,7 @@ if (get_check(format("そのロッドを＄%d で再充填しますか？",
                        max_charges = o_ptr->number * k_ptr->pval - o_ptr->pval;
 
                /* Get the quantity for staves and wands */
-               charges = get_quantity(format(_("一回分＄%d で何回分充填しますか？", "Add how many charges for %d gold? "), price), 
+               charges = (PARAMETER_VALUE)get_quantity(format(_("一回分＄%d で何回分充填しますか？", "Add how many charges for %d gold? "), price), 
                                        MIN(p_ptr->au / price, max_charges));
 
                /* Do nothing */
@@ -4293,8 +4293,8 @@ static bool research_mon(void)
  */
 static void bldg_process_command(building_type *bldg, int i)
 {
-       int bact = bldg->actions[i];
-       int bcost;
+       BACT_IDX bact = bldg->actions[i];
+       PRICE bcost;
        bool paid = FALSE;
        int amt;
 
@@ -4451,7 +4451,7 @@ static void bldg_process_command(building_type *bldg, int i)
                        else if(quest[QUEST_SERPENT].status != QUEST_STATUS_FINISHED) max_depth = 99;
                }
                amt = get_quantity(format(_("%sの何階にテレポートしますか？", "Teleport to which level of %s? "), 
-                                                       d_name + d_info[select_dungeon].name), max_depth);
+                                                       d_name + d_info[select_dungeon].name), (QUANTITY)max_depth);
 
                if (amt > 0)
                {