[Refactor] #40014 Moved monster's info-related functions from monster2.c/h to monster...

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 3bee62f..9ee0922 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -13,6 +13,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index f6bbf46..c5d692d 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -15,6 +15,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
+#include "monster/monster-info.h"
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index dbe2f63..50d4531 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -1,6 +1,7 @@
 #include "effect/effect-item.h"
 #include "autopick/autopick.h"
 #include "floor/floor-object.h"
+#include "monster/monster-info.h"
 #include "monster/place-monster-types.h"
 #include "monster/monster2.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/effect/effect-monster-util.c b/src/effect/effect-monster-util.c
index d9db9db..1650d2b 100644 (file)
--- a/src/effect/effect-monster-util.c
+++ b/src/effect/effect-monster-util.c
@@ -7,8 +7,8 @@
 #include "effect/effect-monster-util.h"
 #include "floor/floor.h"
 #include "monster/monster-death.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 
 /*!
  * @brief affect_monster() に亘ってきた引数をeffect_monster_type構造体に代入する

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 04756b9..2f47e69 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -6,6 +6,7 @@
 #include "grid/grid.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "perception/object-perception.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 6ecc9a8..3d82896 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -15,8 +15,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object/object-flavor.h"
 #include "object/object-info.h"

diff --git a/src/io/load.c b/src/io/load.c
index de35a4c..5ad0871 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -68,6 +68,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "mutation/mutation.h"
 #include "object-enchant/artifact.h"

diff --git a/src/io/save.c b/src/io/save.c
index cffb0b1..4668926 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -26,6 +26,7 @@
 #include "io/report.h"
 #include "io/uid-checker.h"
 #include "monster-race/monster-race.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "object-enchant/artifact.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index dba3301..a7ed183 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -30,9 +30,9 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index f4fb1d7..0512ef5 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -18,8 +18,8 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "term/term-color-types.h"
 #include "view/display-main-window.h" // 暫定、後で消す.

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index 95c9a12..982312f 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -22,6 +22,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-death.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"

diff --git a/src/monster-lore/lore-store.c b/src/monster-lore/lore-store.c
index 0af1809..de05205 100644 (file)
--- a/src/monster-lore/lore-store.c
+++ b/src/monster-lore/lore-store.c
@@ -1,7 +1,7 @@
 #include "monster-lore/lore-store.h"
 #include "floor/floor.h"
 #include "monster-race/race-flags1.h"
-#include "monster/monster2.h" // todo 依存しているのは気持ち悪い。後で消したい.
+#include "monster/monster-info.h"
 #include "system/monster-type-definition.h"
 
 /*!

diff --git a/src/monster/monster-death.c b/src/monster/monster-death.c
index 8cc0317..9742ca0 100644 (file)
--- a/src/monster/monster-death.c
+++ b/src/monster/monster-death.c
@@ -22,6 +22,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/monster/monster-describer.c b/src/monster/monster-describer.c
index b7a3488..974ee9e 100644 (file)
--- a/src/monster/monster-describer.c
+++ b/src/monster/monster-describer.c
@@ -4,7 +4,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster2.h" // todo 相互参照している.
+#include "monster/monster-info.h"
 
 /*!
  * @brief モンスターの呼称を作成する / Build a string describing a monster in some way.

diff --git a/src/monster/monster-info.c b/src/monster/monster-info.c
index fd14564..d84d8eb 100644 (file)
--- a/src/monster/monster-info.c
+++ b/src/monster/monster-info.c
@@ -1,5 +1,4 @@
 /*!
- * @file monster1.c
  * @brief モンスター情報の記述 / describe monsters (using monster memory)
  * @date 2013/12/11
  * @author
@@ -14,13 +13,14 @@
 #include "dungeon/quest.h"
 #include "floor/wild.h"
 #include "monster-race/race-flags-resistance.h"
+#include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
+#include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster2.h" // todo 相互参照している、いずれ消す.
 #include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 
@@ -281,3 +281,32 @@ bool is_original_ap_and_seen(player_type *player_ptr, monster_type *m_ptr)
 {
        return m_ptr->ml && !player_ptr->image && (m_ptr->ap_r_idx == m_ptr->r_idx);
 }
+
+/*  Determine monster race appearance index is same as race index */
+bool is_original_ap(monster_type *m_ptr) { return m_ptr->ap_r_idx == m_ptr->r_idx; }
+
+bool is_friendly(monster_type *m_ptr) { return (m_ptr->smart & SM_FRIENDLY) != 0; }
+
+bool is_pet(monster_type *m_ptr) { return (m_ptr->smart & SM_PET) != 0; }
+
+bool is_hostile(monster_type *m_ptr) { return !is_friendly(m_ptr) && !is_pet(m_ptr); }
+
+/*!
+ * @brief モンスターの真の種族を返す / Extract monster race pointer of a monster's true form
+ * @param m_ptr モンスターの参照ポインタ
+ * @return 本当のモンスター種族参照ポインタ
+ */
+monster_race *real_r_ptr(monster_type *m_ptr) { return &r_info[real_r_idx(m_ptr)]; }
+
+MONRACE_IDX real_r_idx(monster_type *m_ptr)
+{
+    monster_race *r_ptr = &r_info[m_ptr->r_idx];
+    if (m_ptr->mflag2 & MFLAG2_CHAMELEON) {
+        if (r_ptr->flags1 & RF1_UNIQUE)
+            return MON_CHAMELEON_K;
+        else
+            return MON_CHAMELEON;
+    }
+
+    return m_ptr->r_idx;
+}

diff --git a/src/monster/monster-info.h b/src/monster/monster-info.h
index b2a67f2..81ecf30 100644 (file)
--- a/src/monster/monster-info.h
+++ b/src/monster/monster-info.h
@@ -18,3 +18,11 @@ bool monster_can_enter(player_type *player_ptr, POSITION y, POSITION x, monster_
 bool are_enemies(player_type *player_ptr, monster_type *m_ptr1, monster_type *m_ptr2);
 bool monster_has_hostile_align(player_type *player_ptr, monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
 bool is_original_ap_and_seen(player_type *player_ptr, monster_type *m_ptr);
+
+bool is_friendly(monster_type *m_ptr);
+bool is_pet(monster_type *m_ptr);
+bool is_hostile(monster_type *m_ptr);
+bool is_original_ap(monster_type *m_ptr);
+
+monster_race *real_r_ptr(monster_type *m_ptr);
+MONRACE_IDX real_r_idx(monster_type *m_ptr);

diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c
index 317b9f5..ac98eab 100644 (file)
--- a/src/monster/monster-object.c
+++ b/src/monster/monster-object.c
@@ -11,7 +11,7 @@
 #include "monster-race/race-flags3.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
-#include "monster/monster2.h"
+#include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"

diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index d6e07dd..0424aae 100644 (file)
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -11,6 +11,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-move.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index cdf06d3..ad1a094 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -78,26 +78,6 @@ void set_target(monster_type *m_ptr, POSITION y, POSITION x)
 void reset_target(monster_type *m_ptr) { set_target(m_ptr, 0, 0); }
 
 /*!
- * @brief モンスターの真の種族を返す / Extract monster race pointer of a monster's true form
- * @param m_ptr モンスターの参照ポインタ
- * @return 本当のモンスター種族参照ポインタ
- */
-monster_race *real_r_ptr(monster_type *m_ptr) { return &r_info[real_r_idx(m_ptr)]; }
-
-MONRACE_IDX real_r_idx(monster_type *m_ptr)
-{
-    monster_race *r_ptr = &r_info[m_ptr->r_idx];
-    if (m_ptr->mflag2 & MFLAG2_CHAMELEON) {
-        if (r_ptr->flags1 & RF1_UNIQUE)
-            return MON_CHAMELEON_K;
-        else
-            return MON_CHAMELEON;
-    }
-
-    return m_ptr->r_idx;
-}
-
-/*!
  * @brief モンスター配列からモンスターを消去する / Delete a monster by index.
  * @param i 消去するモンスターのID
  * @return なし
@@ -2416,11 +2396,3 @@ int get_monster_crowd_number(player_type *player_ptr, MONSTER_IDX m_idx)
 
     return count;
 }
-
-bool is_original_ap(monster_type *m_ptr) { return m_ptr->ap_r_idx == m_ptr->r_idx; }
-
-bool is_friendly(monster_type *m_ptr) { return (m_ptr->smart & SM_FRIENDLY) != 0; }
-
-bool is_pet(monster_type *m_ptr) { return (m_ptr->smart & SM_PET) != 0; }
-
-bool is_hostile(monster_type *m_ptr) { return !is_friendly(m_ptr) && !is_pet(m_ptr); }

diff --git a/src/monster/monster2.h b/src/monster/monster2.h
index f132d69..504a765 100644 (file)
--- a/src/monster/monster2.h
+++ b/src/monster/monster2.h
@@ -5,8 +5,6 @@
 
 void set_target(monster_type *m_ptr, POSITION y, POSITION x);
 void reset_target(monster_type *m_ptr);
-monster_race *real_r_ptr(monster_type *m_ptr);
-MONRACE_IDX real_r_idx(monster_type *m_ptr);
 void delete_monster_idx(player_type *player_ptr, MONSTER_IDX i);
 void compact_monsters(player_type *player_ptr, int size);
 void wipe_monsters_list(player_type *player_ptr);
@@ -21,12 +19,6 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what);
 void choose_new_monster(player_type *player_ptr, MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
 SPEED get_mspeed(player_type *player_ptr, monster_race *r_ptr);
 void monster_drop_carried_objects(player_type *player_ptr, monster_type *m_ptr);
-bool is_friendly(monster_type *m_ptr);
-bool is_pet(monster_type *m_ptr);
-bool is_hostile(monster_type *m_ptr);
-
-/*  Determine monster race appearance index is same as race index */
-bool is_original_ap(monster_type *m_ptr);
 
 int get_monster_crowd_number(player_type *player_ptr, MONSTER_IDX m_idx);
 void message_pain(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam);

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index d4fa195..23cf0e0 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -4,6 +4,7 @@
 #include "monster-race/race-flags2.h"
 #include "monster/monster-death.h"
 #include "monster/monster-describer.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index 0dbf009..d7f37be 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -13,6 +13,7 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-death.h"
 #include "monster/monster-describer.h"
+#include "monster/monster-info.h"
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 0823683..8de8187 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -4,6 +4,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 39554be..605707b 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -27,6 +27,7 @@
 #include "monster-race/race-flags3.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-description-types.h"
 #include "monster/place-monster-types.h"
 #include "monster/monster2.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index f8c87f1..7d2c03c 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -10,8 +10,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags4.h"
 #include "monster-race/race-indice-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"

diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c
index ac5b444..7c60e2a 100644 (file)
--- a/src/player/eldritch-horror.c
+++ b/src/player/eldritch-horror.c
@@ -13,9 +13,10 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster/horror-descriptions.h"
 #include "monster/monster-describer.h"
-#include "monster/smart-learn-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
+#include "monster/smart-learn-types.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "player/mimic-info-table.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 5df0f24..daba4fc 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -28,6 +28,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster2.h"

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 9894a2b..2b6d76b 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -9,9 +9,9 @@
 #include "monster-race/race-flags2.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c
index 670c87d..e1bb0e3 100644 (file)
--- a/src/spell-kind/spells-detection.c
+++ b/src/spell-kind/spells-detection.c
@@ -8,9 +8,9 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-song-numbers.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index 8d49141..e25faef 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -20,8 +20,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/spell-kind/spells-pet.c b/src/spell-kind/spells-pet.c
index accdde3..28041d8 100644 (file)
--- a/src/spell-kind/spells-pet.c
+++ b/src/spell-kind/spells-pet.c
@@ -5,6 +5,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "spell/process-effect.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index 22dec36..cb5ec7c 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -8,6 +8,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 2fca0da..140e456 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -4,6 +4,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "monster-race/race-indice-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index cc8b060..8216511 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -40,6 +40,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 65f488f..42c4a81 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -32,9 +32,9 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"

diff --git a/src/view/display-monster-status.c b/src/view/display-monster-status.c
index 084190b..26880ae 100644 (file)
--- a/src/view/display-monster-status.c
+++ b/src/view/display-monster-status.c
@@ -1,7 +1,7 @@
 #include "view/display-monster-status.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster2.h"
+#include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
 
 /*

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 6119d76..f355a2e 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -33,8 +33,9 @@
 #include "monster/monster-status.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-describer.h"
-#include "monster/place-monster-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster2.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mutation/mutation.h"