[Refactor] #37353 hack_m_idx, hack_m_idx_ii を monster2.c / monster.h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 8143ec9..700d20e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -56,8 +56,6 @@ extern s16b command_new;
 
 extern bool repair_monsters;
 extern bool repair_objects;
-extern MONSTER_IDX hack_m_idx;
-extern MONSTER_IDX hack_m_idx_ii;
 extern int total_friends;
 extern bool reinit_wilderness;
 

diff --git a/src/monster-process.c b/src/monster-process.c
index 9059501..cb701af 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3274,7 +3274,6 @@ void process_monsters(void)
                /* Use up "some" energy */
                m_ptr->energy_need += ENERGY_NEED();
 
-
                /* Save global index */
                hack_m_idx = i;
 

diff --git a/src/monster.h b/src/monster.h
index 4ccdca1..4fb2c2a 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -3,6 +3,9 @@
 
 typedef bool(*monsterrace_hook_type)(MONRACE_IDX r_idx);
 
+extern MONSTER_IDX hack_m_idx;
+extern MONSTER_IDX hack_m_idx_ii;
+
 /*
  * Monster information, for a specific monster.
  * Note: fy, fx constrain dungeon size to 256x256

diff --git a/src/monster2.c b/src/monster2.c
index 3df3c81..154c32d 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -41,6 +41,8 @@
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */
 
+MONSTER_IDX hack_m_idx = 0;    /* Hack -- see "process_monsters()" */
+MONSTER_IDX hack_m_idx_ii = 0;
 
 /*!
  * @brief モンスターの目標地点をセットする / Set the target of counter attack

diff --git a/src/mspells4.c b/src/mspells4.c
index 06accd3..b19a5ea 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -1912,7 +1912,7 @@ void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
 */
 HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
 {
-       monster_type    *m_ptr = &current_floor_ptr->m_list[m_idx];
+       monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
        MONSTER_IDX who = 0;
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);

diff --git a/src/variable.c b/src/variable.c
index 6bf3323..35d0ee5 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -29,9 +29,6 @@ s16b command_new;             /* Command chaining from inven/equip view */
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */
 
-MONSTER_IDX hack_m_idx = 0;    /* Hack -- see "process_monsters()" */
-MONSTER_IDX hack_m_idx_ii = 0;
-
 int total_friends = 0;
 
 bool reinit_wilderness = FALSE;