#37287 #37353 (2.2.0.89) ROOM_IDX 型を定義し、型の置換を継続中。 / Define ROOM_IDX, ongoing type...

diff --git a/src/bldg.c b/src/bldg.c
index 94796cd..094b425 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -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 */

diff --git a/src/cmd1.c b/src/cmd1.c
index 4a0fde6..3cc9c44 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -364,12 +364,12 @@ HIT_POINT critical_norm(int weight, int plus, HIT_POINT dam, s16b meichuu, int m
  * @param m_ptr 目標モンスターの構造体参照ポインタ
  * @return スレイング加味後の倍率(/10倍)
  */
-static MULTIPLY mult_slaying(MULTIPLY mult, const u32b* flgs, const monster_type* m_ptr)
+static MULTIPLY mult_slaying(MULTIPLY mult, const BIT_FLAGS* flgs, const monster_type* m_ptr)
 {
        static const struct slay_table_t {
                int slay_flag;
-               u32b affect_race_flag;
-               int slay_mult;
+               BIT_FLAGS affect_race_flag;
+               MULTIPLY slay_mult;
                size_t flag_offset;
                size_t r_flag_offset;
        } slay_table[] = {
@@ -425,12 +425,12 @@ static MULTIPLY mult_slaying(MULTIPLY mult, const u32b* flgs, const monster_type
  * @param m_ptr 目標モンスターの構造体参照ポインタ
  * @return スレイング加味後の倍率(/10倍)
  */
-static int mult_brand(int mult, const u32b* flgs, const monster_type* m_ptr)
+static MULTIPLY mult_brand(MULTIPLY mult, const BIT_FLAGS* flgs, const monster_type* m_ptr)
 {
        static const struct brand_table_t {
                int brand_flag;
-               u32b resist_mask;
-               u32b hurt_flag;
+               BIT_FLAGS resist_mask;
+               BIT_FLAGS hurt_flag;
        } brand_table[] = {
                {TR_BRAND_ACID, RFR_EFF_IM_ACID_MASK, 0U           },
                {TR_BRAND_ELEC, RFR_EFF_IM_ELEC_MASK, 0U           },

diff --git a/src/cmd5.c b/src/cmd5.c
index 60a538e..456d73f 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -1670,7 +1670,7 @@ void do_cmd_pet_dismiss(void)
        MONSTER_IDX *who;
        u16b dummy_why;
        int max_pet = 0;
-       int cu, cv;
+       bool_hack cu, cv;
 
        cu = Term->scr->cu;
        cv = Term->scr->cv;

diff --git a/src/h-type.h b/src/h-type.h
index 6254e83..75c8bc4 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -119,6 +119,7 @@ typedef s16b REALM_IDX;                     /*!< ゲーム中の魔法領域ID型を定義 */
 typedef s16b ARTIFACT_IDX;             /*!< ゲーム中のアーティファクトID型を定義 */
 typedef s16b VIRTUES_IDX;              /*!< ゲーム中の徳ID型を定義 */
 typedef s16b QUEST_IDX;                        /*!< ゲーム中のクエストID型を定義 */
+typedef byte ROOM_IDX;                 /*!< 部屋のID型を定義 */
 
 typedef s16b INVENTORY_IDX;            /*!< ゲーム中の所持品ID型を定義 */
 typedef s16b OBJECT_IDX;               /*!< ゲーム中のアイテムID型を定義 */
@@ -166,7 +167,7 @@ typedef byte RARITY;    /*!< ゲーム中の希少度の型定義 */
 
 typedef s32b GAME_TURN;     /*!< ゲーム中のターンの型定義 */
 
-typedef s16b PERCENTAGE;    /*!< ゲーム中のパーセント表記の型定義 */
+typedef s16b PERCENTAGE;    /*!< ゲーム中のパーセント表記の型定義(/100倍) */
 typedef s16b MULTIPLY;      /*!< ゲーム中の倍率の型定義(/10倍) */
 
 typedef u32b BIT_FLAGS;     /*!< 32ビットのフラグ配列の型定義 */

diff --git a/src/init1.c b/src/init1.c
index ce14046..6b43b9a 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -1307,8 +1307,8 @@ errr parse_v_info(char *buf, header *head)
                        &typ, &rat, &hgt, &wid)) return (1);
 
                /* Save the values */
-               v_ptr->typ = typ;
-               v_ptr->rat = rat;
+               v_ptr->typ = (ROOM_IDX)typ;
+               v_ptr->rat = (PROB)rat;
                v_ptr->hgt = (POSITION)hgt;
                v_ptr->wid = (POSITION)wid;
        }

diff --git a/src/types.h b/src/types.h
index bacd626..1aa4b0d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -401,8 +401,8 @@ struct vault_type
        STR_OFFSET name;        /* Name (offset) */
        STR_OFFSET text;        /* Text (offset) */
 
-       byte typ;                       /* Vault type */
-       byte rat;                       /* Vault rating */
+       ROOM_IDX typ;           /* Vault type */
+       PROB rat;                       /* Vault rating (unused) */
        POSITION hgt;           /* Vault height */
        POSITION wid;           /* Vault width */
 };