[Refactor] #37287 #37353 型の置換。 / Type replacement.

diff --git a/src/bldg.c b/src/bldg.c
index 39583d8..b5af412 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4679,7 +4679,7 @@ static cptr find_quest[] =
  * @brief クエストの導入メッセージを表示する / Discover quest
  * @param q_idx 開始されたクエストのID
  */
-void quest_discovery(int q_idx)
+void quest_discovery(QUEST_IDX q_idx)
 {
        quest_type      *q_ptr = &quest[q_idx];
        monster_race    *r_ptr = &r_info[q_ptr->r_idx];
@@ -4732,9 +4732,9 @@ void quest_discovery(int q_idx)
  * @param level 検索対象になる階
  * @return クエストIDを返す。該当がない場合0を返す。
  */
-IDX quest_number(DEPTH level)
+QUEST_IDX quest_number(DEPTH level)
 {
-       IDX i;
+       QUEST_IDX i;
 
        /* Check quests */
        if (p_ptr->inside_quest)
@@ -4760,9 +4760,9 @@ IDX quest_number(DEPTH level)
  * @param level 検索対象になる階
  * @return クエストIDを返す。該当がない場合0を返す。
  */
-IDX random_quest_number(DEPTH level)
+QUEST_IDX random_quest_number(DEPTH level)
 {
-       IDX i;
+       QUEST_IDX i;
 
        if (dungeon_type != DUNGEON_ANGBAND) return 0;
 

diff --git a/src/externs.h b/src/externs.h
index 418fe3d..7202285 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1046,7 +1046,7 @@ extern bool ident_spell(bool only_equip);
 extern bool mundane_spell(bool only_equip);
 extern bool identify_item(object_type *o_ptr);
 extern bool identify_fully(bool only_equip);
-extern bool recharge(int num);
+extern bool recharge(int power);
 extern bool bless_weapon(void);
 extern bool pulish_shield(void);
 extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx);
@@ -1095,9 +1095,9 @@ extern bool get_nightmare(MONRACE_IDX r_idx);
 extern void battle_monsters(void);
 extern void do_cmd_bldg(void);
 extern void do_cmd_quest(void);
-extern void quest_discovery(int q_idx);
-extern IDX quest_number(DEPTH level);
-extern IDX random_quest_number(DEPTH level);
+extern void quest_discovery(QUEST_IDX q_idx);
+extern QUEST_IDX quest_number(DEPTH level);
+extern QUEST_IDX random_quest_number(DEPTH level);
 extern bool tele_town(void);
 extern HIT_POINT calc_crit_ratio_shot(HIT_POINT plus_ammo, HIT_POINT plus_bow);
 extern HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, HIT_POINT dam);

diff --git a/src/spells3.c b/src/spells3.c
index 99cbbd8..5d5bc9f 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2745,7 +2745,7 @@ bool identify_fully(bool only_equip)
 bool recharge(int power)
 {
        OBJECT_IDX item;
-       int lev;
+       DEPTH lev;
        int recharge_strength;
        TIME_EFFECT recharge_amount;
 
@@ -2790,7 +2790,7 @@ bool recharge(int power)
        if (o_ptr->tval == TV_ROD)
        {
                /* Extract a recharge strength by comparing object level to power. */
-               recharge_strength = ((power > lev/2) ? (power - lev/2) : 0) / 5;
+               recharge_strength = ((power > lev / 2) ? (power - lev / 2) : 0) / 5;
 
 
                /* Back-fire */
@@ -2822,12 +2822,10 @@ bool recharge(int power)
                 * Divide up a stack of wands' charges to calculate charge penalty.
                 */
                if ((o_ptr->tval == TV_WAND) && (o_ptr->number > 1))
-                       recharge_strength = (100 + power - lev -
-                       (8 * o_ptr->pval / o_ptr->number)) / 15;
+                       recharge_strength = (100 + power - lev - (8 * o_ptr->pval / o_ptr->number)) / 15;
 
                /* All staffs, unstacked wands. */
-               else recharge_strength = (100 + power - lev -
-                       (8 * o_ptr->pval)) / 15;
+               else recharge_strength = (100 + power - lev - (8 * o_ptr->pval)) / 15;
 
                /* Paranoia */
                if (recharge_strength < 0) recharge_strength = 0;