[Refactor] #37353 monster_desc() の宣言を monster.h に移動。

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index d7b43ed..a901365 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -3,6 +3,7 @@
 #include "sort.h"
 #include "player-status.h"
 #include "object-hook.h"
+#include "monster.h"
 #include "monster-status.h"
 
 /*!

diff --git a/src/cmd4.c b/src/cmd4.c
index fb12f88..64da996 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -50,6 +50,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "object-hook.h"
+#include "monster.h"
 #include "monster-status.h"
 
 

diff --git a/src/defines.h b/src/defines.h
index 5a70a79..5e5781b 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1935,20 +1935,6 @@
 #define PW_BORG_2       0x00008000L     /*!<サブウィンドウ描画フラグ: ボーグステータス / Display borg status */
 
 
-/* Bit flags for monster_desc() */
-#define MD_OBJECTIVE      0x00000001 /* Objective (or Reflexive) */
-#define MD_POSSESSIVE     0x00000002 /* Possessive (or Reflexive) */
-#define MD_INDEF_HIDDEN   0x00000004 /* Use indefinites for hidden monsters ("something") */
-#define MD_INDEF_VISIBLE  0x00000008 /* Use indefinites for visible monsters ("a kobold") */
-#define MD_PRON_HIDDEN    0x00000010 /* Pronominalize hidden monsters */
-#define MD_PRON_VISIBLE   0x00000020 /* Pronominalize visible monsters */
-#define MD_ASSUME_HIDDEN  0x00000040 /* Assume the monster is hidden */
-#define MD_ASSUME_VISIBLE 0x00000080 /* Assume the monster is visible */
-#define MD_TRUE_NAME      0x00000100 /* Chameleon's true name */
-#define MD_IGNORE_HALLU   0x00000200 /* Ignore hallucination, and penetrate shape change */
-
-#define MD_WRONGDOER_NAME (MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE) /* 加害明記向け */
-
 /*
  * Bit flags for object_desc()
  */

diff --git a/src/externs.h b/src/externs.h
index 9b0cbbc..2691c0d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -688,7 +688,6 @@ extern void wipe_m_list(void);
 extern MONSTER_IDX m_pop(void);
 extern errr get_mon_num_prep(monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2);
 extern MONRACE_IDX get_mon_num(DEPTH level);
-extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode);
 extern int lore_do_probe(MONRACE_IDX r_idx);
 extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold);
 extern void update_monster(MONSTER_IDX m_idx, bool full);

diff --git a/src/files.c b/src/files.c
index e4d66cb..49b6dd0 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -25,6 +25,7 @@
 #include "shoot.h"
 #include "player-move.h"
 #include "patron.h"
+#include "monster.h"
 #include "monster-status.h"
 
 

diff --git a/src/melee1.c b/src/melee1.c
index e48f72b..428927a 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -18,6 +18,7 @@
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "projection.h"
+#include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "avatar.h"

diff --git a/src/monster.h b/src/monster.h
index 0636bad..6f9ec69 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -18,3 +18,19 @@ extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool alloc_horde(POSITION y, POSITION x);
 extern bool alloc_guardian(bool def_val);
 extern bool alloc_monster(POSITION dis, BIT_FLAGS mode);
+
+
+extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode);
+/* Bit flags for monster_desc() */
+#define MD_OBJECTIVE      0x00000001 /* Objective (or Reflexive) */
+#define MD_POSSESSIVE     0x00000002 /* Possessive (or Reflexive) */
+#define MD_INDEF_HIDDEN   0x00000004 /* Use indefinites for hidden monsters ("something") */
+#define MD_INDEF_VISIBLE  0x00000008 /* Use indefinites for visible monsters ("a kobold") */
+#define MD_PRON_HIDDEN    0x00000010 /* Pronominalize hidden monsters */
+#define MD_PRON_VISIBLE   0x00000020 /* Pronominalize visible monsters */
+#define MD_ASSUME_HIDDEN  0x00000040 /* Assume the monster is hidden */
+#define MD_ASSUME_VISIBLE 0x00000080 /* Assume the monster is visible */
+#define MD_TRUE_NAME      0x00000100 /* Chameleon's true name */
+#define MD_IGNORE_HALLU   0x00000200 /* Ignore hallucination, and penetrate shape change */
+
+#define MD_WRONGDOER_NAME (MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE) /* 加害明記向け */

diff --git a/src/mspells1.c b/src/mspells1.c
index 6f1e4a3..6b5b4c1 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -45,6 +45,7 @@
 #include "realm-hex.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "monster.h"
 #include "monster-spell.h"
 
 

diff --git a/src/mspells2.c b/src/mspells2.c
index 87cbc55..0c51d95 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -16,6 +16,7 @@
 #include "quest.h"
 #include "realm-hex.h"
 #include "player-move.h"
+#include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 

diff --git a/src/player-move.c b/src/player-move.c
index 169b0c0..2ea419e 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -151,6 +151,7 @@
 #include "spells-floor.h"
 #include "feature.h"
 #include "warning.h"
+#include "monster.h"
 #include "monster-spell.h"
 
 

diff --git a/src/player-status.c b/src/player-status.c
index aa5fc51..70628e5 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5,6 +5,7 @@
 #include "avatar.h"
 #include "spells-status.h"
 #include "object-hook.h"
+#include "monster.h"
 #include "monster-status.h"
 #include "monsterrace-hook.h"
 #include "mutation.h"

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 71b5122..f0ac70c 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -4,6 +4,7 @@
 #include "monsterrace-hook.h"
 #include "projection.h"
 #include "artifact.h"
+#include "monster.h"
 #include "player-status.h"
 #include "feature.h"
 

diff --git a/src/shoot.c b/src/shoot.c
index 37da67e..2c5d36d 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "projection.h"
+#include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "artifact.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index a4e2a7b..a347462 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -4,6 +4,7 @@
 #include "spells-status.h"
 #include "projection.h"
 #include "spells.h"
+#include "monster.h"
 
 /*!
  * @brief モンスター回復処理