[Refactor] #39077 IDX の *_IDX への移行。

diff --git a/src/artifact.c b/src/artifact.c
index 3b4297b..e96b5d4 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2272,7 +2272,7 @@ bool make_artifact(object_type *o_ptr)
  */
 bool make_artifact_special(object_type *o_ptr)
 {
-       IDX i;
+       ARTIFACT_IDX i;
        KIND_OBJECT_IDX k_idx = 0;
 
        /*! @note 地上ではキャンセルする / No artifacts in the town */

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index db4375a..2893538 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -418,7 +418,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
                if (hex_spelling_any()) stop_hex_spell_all();
 
                {
-                       IDX pet_ctr, i;
+                       MONSTER_IDX pet_ctr, i;
                        MONSTER_IDX *who;
                        int max_pet = 0;
                        u16b dummy_why;

diff --git a/src/cmd2.c b/src/cmd2.c
index 5457e7d..37e966e 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -600,7 +600,7 @@ static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
  * @details Return the number of features around (or under) the character.
  * Usually look for doors and floor traps.
  */
-static int count_dt(POSITION *y, POSITION *x, bool (*test)(IDX feat), bool under)
+static int count_dt(POSITION *y, POSITION *x, bool (*test)(FEAT_IDX feat), bool under)
 {
        DIRECTION d;
        int count;

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 37937c2..be76c6c 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -172,7 +172,7 @@ static bool alloc_stairs_aux(POSITION y, POSITION x, int walls)
  * @param walls 最低減隣接させたい外壁の数
  * @return 規定数通りに生成に成功したらTRUEを返す。
  */
-static bool alloc_stairs(IDX feat, int num, int walls)
+static bool alloc_stairs(FEAT_IDX feat, int num, int walls)
 {
        int i;
        int shaft_num = 0;

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 72f8fb2..b2364c8 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -157,7 +157,7 @@ static void recursive_river(POSITION x1, POSITION y1, POSITION x2, POSITION y2,
  * @param feat2 境界部地形ID
  * @return なし
  */
-void add_river(IDX feat1, IDX feat2)
+void add_river(FEAT_IDX feat1, FEAT_IDX feat2)
 {
        POSITION y2, x2;
        POSITION y1 = 0, x1 = 0;
@@ -228,10 +228,11 @@ void add_river(IDX feat1, IDX feat2)
  * hidden gold types are currently unused.
  * </pre>
  */
-void build_streamer(IDX feat, int chance)
+void build_streamer(FEAT_IDX feat, int chance)
 {
-       int             i, tx, ty;
-       int             y, x, dir;
+       int i;
+       POSITION y, x, tx, ty;
+       DIRECTION dir;
        int dummy = 0;
 
        grid_type *g_ptr;

diff --git a/src/floor-streams.h b/src/floor-streams.h
index 24dd63b..9786a56 100644 (file)
--- a/src/floor-streams.h
+++ b/src/floor-streams.h
@@ -14,7 +14,7 @@
 
 /* Externs */
 
-extern void add_river(IDX feat1, IDX feat2);
-extern void build_streamer(IDX feat, int chance);
+extern void add_river(FEAT_IDX feat1, FEAT_IDX feat2);
+extern void build_streamer(FEAT_IDX feat, int chance);
 extern void place_trees(POSITION x, POSITION y);
 extern void destroy_level(void);