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

diff --git a/src/externs.h b/src/externs.h
index 52c5ebc..458923f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -220,7 +220,7 @@ extern bool closing_flag;
 extern POSITION panel_row_min, panel_row_max;
 extern POSITION panel_col_min, panel_col_max;
 extern POSITION panel_col_prt, panel_row_prt;
-extern IDX target_who;
+extern MONSTER_IDX target_who;
 extern POSITION target_col;
 extern POSITION target_row;
 extern int player_uid;
@@ -268,7 +268,7 @@ extern const concptr angband_sound_name[SOUND_MAX];
 extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
 extern cave_type *cave[MAX_HGT];
 extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
-extern s16b max_floor_id;
+extern FLOOR_IDX max_floor_id;
 extern u32b saved_floor_file_sign;
 extern object_type *o_list;
 extern monster_type *m_list;

diff --git a/src/spells3.c b/src/spells3.c
index e269d48..a1b0d41 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -423,7 +423,7 @@ void teleport_player_away(MONSTER_IDX m_idx, POSITION dis)
        {
                for (yy = -1; yy < 2; yy++)
                {
-                       IDX tmp_m_idx = cave[oy+yy][ox+xx].m_idx;
+                       MONSTER_IDX tmp_m_idx = cave[oy+yy][ox+xx].m_idx;
 
                        /* A monster except your mount or caster may follow */
                        if (tmp_m_idx && (p_ptr->riding != tmp_m_idx) && (m_idx != tmp_m_idx))

diff --git a/src/variable.c b/src/variable.c
index fe31bb7..e41d844 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -25,7 +25,6 @@ const concptr copyright[5] =
        "are included in all such copies."
 };
 
-
 int max_macrotrigger = 0; /*!< 現在登録中のマクロ(トリガー)の数 */
 concptr macro_template = NULL; /*!< Angband設定ファイルのT: タグ情報から読み込んだ長いTコードを処理するために利用する文字列ポインタ */
 concptr macro_modifier_chr; /*!< &x# で指定されるマクロトリガーに関する情報を記録する文字列ポインタ */
@@ -46,7 +45,7 @@ autopick_type *autopick_list = NULL; /*!< 自動拾い/破壊設定構造体の
 /*
  * Savefile version
  */
-byte h_ver_major;       /* Savefile version for Hengband 1.1.1 and later */
+byte h_ver_major; /* Savefile version for Hengband 1.1.1 and later */
 byte h_ver_minor;
 byte h_ver_patch;
 byte h_ver_extra;
@@ -195,7 +194,7 @@ POSITION panel_col_prt, panel_row_prt;
 /*
  * Targetting variables
  */
-IDX target_who;
+MONSTER_IDX target_who;
 POSITION target_col;
 POSITION target_row;
 
@@ -478,7 +477,7 @@ saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 /*
  * Number of floor_id used from birth
  */
-s16b max_floor_id;
+FLOOR_IDX max_floor_id;
 
 
 /*