#37287 #37353 (2.2.0.89) ARTIFACT_IDX型とVIRTUES_IDX型を定義し、型の置換を継続中。 / Define ARTIFACT_I...

diff --git a/src/avatar.c b/src/avatar.c
index d1f4281..f9c95e1 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -143,7 +143,7 @@ static void get_random_virtue(int which)
  * @param realm 魔法領域のID
  * @return 対応する徳のID
  */
-static s16b get_realm_virtues(byte realm)
+static VIRTUES_IDX get_realm_virtues(REALM_IDX realm)
 {
        switch (realm)
        {

diff --git a/src/cmd4.c b/src/cmd4.c
index e1d06ba..c344a9f 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5806,7 +5806,8 @@ static void do_cmd_knowledge_weapon_exp(void)
  */
 static void do_cmd_knowledge_spell_exp(void)
 {
-       int i = 0, spell_exp, exp_level;
+       SPELL_IDX i = 0;
+       int spell_exp, exp_level;
 
        FILE *fff;
        const magic_type *s_ptr;

diff --git a/src/do-spell.c b/src/do-spell.c
index 98d0e11..a8a7eb5 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -9696,7 +9696,7 @@ static cptr do_hex_spell(int spell, int mode)
  * @param mode 求める処理
  * @return 各領域魔法に各種テキストを求めた場合は文字列参照ポインタ、そうでない場合はNULLポインタを返す。
  */
-cptr do_spell(REALM_IDX realm, MAGIC_NUM2 spell, int mode)
+cptr do_spell(REALM_IDX realm, SPELL_IDX spell, int mode)
 {
        switch (realm)
        {

diff --git a/src/externs.h b/src/externs.h
index dff0028..ab72034 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -613,7 +613,7 @@ extern FEAT_IDX feat_mountain;
 extern FEAT_IDX feat_swamp;
 extern FEAT_IDX feat_undetected;
 
-extern IDX dungeon_type;
+extern DUNGEON_IDX dungeon_type;
 extern DEPTH *max_dlv;
 extern FEAT_IDX feat_wall_outer;
 extern FEAT_IDX feat_wall_inner;
@@ -819,7 +819,7 @@ extern bool do_cmd_magic_eater(bool only_browse, bool powerful);
 
 /* do-spell.c */
 extern void stop_singing(void);
-extern cptr do_spell(REALM_IDX realm, MAGIC_NUM2 spell, int mode);
+extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, int mode);
 
 /* dungeon.c */
 extern void leave_quest_check(void);
@@ -1716,7 +1716,7 @@ extern bool object_is_nameless(object_type *o_ptr);
 extern bool object_allow_two_hands_wielding(object_type *o_ptr);
 
 /* wild.c */
-extern void set_floor_and_wall(byte type);
+extern void set_floor_and_wall(DUNGEON_IDX type);
 extern void wilderness_gen(void);
 extern void wilderness_gen_small(void);
 extern errr init_wilderness(void);

diff --git a/src/h-type.h b/src/h-type.h
index 3ef15de..446e6a2 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -110,6 +110,8 @@ typedef s16b MONRACE_IDX;   /*!< ゲーム中のモンスター種族ID型を定
 typedef s16b MONSTER_IDX;      /*!< ゲーム中のモンスター個体ID型を定義 */
 typedef s16b DUNGEON_IDX;      /*!< ゲーム中のダンジョンID型を定義 */
 typedef s16b REALM_IDX;                /*!< ゲーム中の魔法領域ID型を定義 */
+typedef s16b ARTIFACT_IDX;     /*!< ゲーム中のアーティファクトID型を定義 */
+typedef s16b VIRTUES_IDX;      /*!< ゲーム中の徳ID型を定義 */
 
 typedef s32b POSITION;         /*!< ゲーム中の座標型を定義 */
 typedef s32b HIT_POINT;                /*!< ゲーム中のHP/ダメージ型を定義 */

diff --git a/src/init1.c b/src/init1.c
index 0159f7f..4155590 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3018,9 +3018,9 @@ errr parse_r_info(char *buf, header *head)
 
                /* Scan for the values */
                if (3 != sscanf(buf+2, "%d:%dd%d", &id, &dd, &ds)) return (1);
-               r_ptr->reinforce_id[i] = id;
-               r_ptr->reinforce_dd[i] = dd;
-               r_ptr->reinforce_ds[i] = ds;
+               r_ptr->reinforce_id[i] = (MONRACE_IDX)id;
+               r_ptr->reinforce_dd[i] = (DICE_NUMBER)dd;
+               r_ptr->reinforce_ds[i] = (DICE_SID)ds;
        }
 
        /* Process 'B' for "Blows" (up to four lines) */
@@ -3154,7 +3154,7 @@ errr parse_r_info(char *buf, header *head)
                if (i == 4) return (1);
 
                if (3 != sscanf(buf+2, "%d:%d:%d", &id, &rarity, &per)) return (1);
-               r_ptr->artifact_id[i] = id;
+               r_ptr->artifact_id[i] = (ARTIFACT_IDX)id;
                r_ptr->artifact_rarity[i] = (RARITY)rarity;
                r_ptr->artifact_percent[i] = (PERCENTAGE)per;
        }

diff --git a/src/monster2.c b/src/monster2.c
index 8605a4f..5b21c5c 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -4050,7 +4050,8 @@ static bool summon_specific_okay(MONRACE_IDX r_idx)
  */
 bool summon_specific(int who, int y1, int x1, int lev, int type, u32b mode)
 {
-       int x, y, r_idx;
+       POSITION x, y;
+       MONRACE_IDX r_idx;
 
        if (p_ptr->inside_arena) return (FALSE);
 

diff --git a/src/types.h b/src/types.h
index eece8f7..eb46f27 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -326,11 +326,11 @@ struct monster_race
        u32b a_ability_flags4;  /* Activate Ability Flags 8 (implementing) */
 
        monster_blow blow[4];   /* Up to four blows per round */
-       IDX reinforce_id[6];
+       MONRACE_IDX reinforce_id[6];
        DICE_NUMBER reinforce_dd[6];
        DICE_SID reinforce_ds[6];
 
-       IDX artifact_id[4];     /* 特定アーティファクトドロップID */
+       ARTIFACT_IDX artifact_id[4];    /* 特定アーティファクトドロップID */
        RARITY artifact_rarity[4];      /* 特定アーティファクトレア度 */
        PERCENTAGE artifact_percent[4]; /* 特定アーティファクトドロップ率 */
 
@@ -1363,8 +1363,8 @@ struct birther
        byte prace;        /* Race index */
        byte pclass;       /* Class index */
        byte pseikaku;     /* Seikaku index */
-       byte realm1;       /* First magic realm */
-       byte realm2;       /* Second magic realm */
+       REALM_IDX realm1;       /* First magic realm */
+       REALM_IDX realm2;       /* Second magic realm */
 
        s16b age;
        s16b ht;

diff --git a/src/variable.c b/src/variable.c
index 32500f3..0f379c4 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1253,7 +1253,7 @@ FEAT_IDX feat_undetected;
 /*
  * Which dungeon ?
  */
-IDX dungeon_type;
+DUNGEON_IDX dungeon_type;
 DEPTH *max_dlv;
 
 FEAT_IDX feat_wall_outer;

diff --git a/src/wild.c b/src/wild.c
index aabfe93..057e71b 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -41,7 +41,7 @@ static void set_floor_and_wall_aux(s16b feat_type[100], feat_prob prob[DUNGEON_F
  * @param type ダンジョンID
  * @return なし
  */
-void set_floor_and_wall(byte type)
+void set_floor_and_wall(DUNGEON_IDX type)
 {
        static byte cur_type = 255;
        dungeon_info_type *d_ptr;