From 797f38367be95a84938ecdccd3bac2112e29d610 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Mon, 8 Jun 2020 21:08:02 +0900
Subject: [PATCH] [Refactor] #40014 *Genocide* inclusion for
 monster-type-definition.h from angband.h

---
 src/autopick/autopick.c                  | 1 +
 src/combat/shoot.h                       | 1 +
 src/combat/slaying.h                     | 1 +
 src/dungeon/quest.h                      | 1 +
 src/effect/effect-monster-util.h         | 1 +
 src/effect/effect-player-util.h          | 1 +
 src/floor/floor.h                        | 1 +
 src/melee/melee-util.h                   | 1 +
 src/mind/mind-sniper.h                   | 1 +
 src/monster-attack/monster-attack-util.h | 1 +
 src/monster/monster-processor-util.h     | 1 +
 src/monster/monster-status.h             | 1 +
 src/monster/monster-update.h             | 1 +
 src/monster/monster1.h                   | 1 +
 src/monster/monster2.h                   | 1 +
 src/mspell/monster-spell.h               | 1 +
 src/player-attack/player-attack-util.h   | 3 ++-
 src/player/eldritch-horror.h             | 1 +
 src/player/player-damage.h               | 1 +
 src/spell/spells-diceroll.h              | 1 +
 src/spell/spells-status.h                | 1 +
 src/system/angband.h                     | 2 --
 22 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 54e3706f9..d36f258e4 100644
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -16,6 +16,7 @@
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-methods-table.h"
+#include "floor/floor.h"
 #include "floor/floor-object.h"
 #include "inventory/inventory-object.h"
 #include "object/object-flavor.h"
diff --git a/src/combat/shoot.h b/src/combat/shoot.h
index 4d2c65054..e95c04838 100644
--- a/src/combat/shoot.h
+++ b/src/combat/shoot.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 bool test_hit_fire(player_type *shooter_ptr, int chance, monster_type *m_ptr, int vis, char* o_name);
 HIT_POINT critical_shot(player_type *shooter_ptr, WEIGHT weight, int plus_ammo, int plus_bow, HIT_POINT dam);
diff --git a/src/combat/slaying.h b/src/combat/slaying.h
index 1bd5d7da0..228376f06 100644
--- a/src/combat/slaying.h
+++ b/src/combat/slaying.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "combat/combat-options-type.h"
+#include "system/monster-type-definition.h"
 
 MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr);
 MULTIPLY mult_brand(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr);
diff --git a/src/dungeon/quest.h b/src/dungeon/quest.h
index a60ae4f59..0c0b4c6cc 100644
--- a/src/dungeon/quest.h
+++ b/src/dungeon/quest.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 /*
  * Quest constants
diff --git a/src/effect/effect-monster-util.h b/src/effect/effect-monster-util.h
index 48e6b6cd2..e043626c9 100644
--- a/src/effect/effect-monster-util.h
+++ b/src/effect/effect-monster-util.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "grid/grid.h"
+#include "system/monster-type-definition.h"
 
 typedef struct effect_monster_type {
 	grid_type *g_ptr;
diff --git a/src/effect/effect-player-util.h b/src/effect/effect-player-util.h
index 0939c067c..29b31986f 100644
--- a/src/effect/effect-player-util.h
+++ b/src/effect/effect-player-util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 typedef struct effect_player_type
 {
diff --git a/src/floor/floor.h b/src/floor/floor.h
index 1b500545a..9d655ba6b 100644
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -3,6 +3,7 @@
 #include "system/angband.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "system/monster-type-definition.h"
 #include "system/object-type-definition.h"
 #include "floor/floor-save.h"
 
diff --git a/src/melee/melee-util.h b/src/melee/melee-util.h
index 9122cfc7b..b3729e8df 100644
--- a/src/melee/melee-util.h
+++ b/src/melee/melee-util.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "spell/spells-type.h"
+#include "system/monster-type-definition.h"
 
 /* monster-attack-monster type*/
 typedef struct mam_type {
diff --git a/src/mind/mind-sniper.h b/src/mind/mind-sniper.h
index 0f36acbff..16bc5c287 100644
--- a/src/mind/mind-sniper.h
+++ b/src/mind/mind-sniper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 void reset_concentration(player_type *creature_ptr, bool msg);
 void display_snipe_list(player_type *sniper_ptr);
diff --git a/src/monster-attack/monster-attack-util.h b/src/monster-attack/monster-attack-util.h
index 8d8498604..132cfb85c 100644
--- a/src/monster-attack/monster-attack-util.h
+++ b/src/monster-attack/monster-attack-util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 /* MONster-Attack-Player、地図のMAPと紛らわしいのでmonapとした */
 typedef struct monap_type {
diff --git a/src/monster/monster-processor-util.h b/src/monster/monster-processor-util.h
index a4b8a69fe..0a6f767a0 100644
--- a/src/monster/monster-processor-util.h
+++ b/src/monster/monster-processor-util.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 typedef struct {
 	bool see_m;
diff --git a/src/monster/monster-status.h b/src/monster/monster-status.h
index 691772d2b..652b20d72 100644
--- a/src/monster/monster-status.h
+++ b/src/monster/monster-status.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 bool monster_is_powerful(floor_type *floor_ptr, MONSTER_IDX m_idx);
 DEPTH monster_level_idx(floor_type *floor_ptr, MONSTER_IDX m_idx);
diff --git a/src/monster/monster-update.h b/src/monster/monster-update.h
index 58b0e7d0f..ca5878bc8 100644
--- a/src/monster/monster-update.h
+++ b/src/monster/monster-update.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "monster/monster-processor-util.h"
+#include "system/monster-type-definition.h"
 
 bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, POSITION ny, POSITION nx);
 void update_player_type(player_type *target_ptr, turn_flags *turn_flags_ptr, monster_race *r_ptr);
diff --git a/src/monster/monster1.h b/src/monster/monster1.h
index 948ba76cd..f97425389 100644
--- a/src/monster/monster1.h
+++ b/src/monster/monster1.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 typedef bool (*monsterrace_hook_type)(MONRACE_IDX r_idx);
 
diff --git a/src/monster/monster2.h b/src/monster/monster2.h
index 09adb3c97..5bb79a69e 100644
--- a/src/monster/monster2.h
+++ b/src/monster/monster2.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "monster/monster1.h"
+#include "system/monster-type-definition.h"
 
 extern MONSTER_IDX hack_m_idx;
 extern MONSTER_IDX hack_m_idx_ii;
diff --git a/src/mspell/monster-spell.h b/src/mspell/monster-spell.h
index 0bc236034..5bb6fad57 100644
--- a/src/mspell/monster-spell.h
+++ b/src/mspell/monster-spell.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "mspell/mspell-type.h"
+#include "system/monster-type-definition.h"
 
 /* Imitator */
 typedef struct monster_power monster_power;
diff --git a/src/player-attack/player-attack-util.h b/src/player-attack/player-attack-util.h
index d0b5abf21..c00a5d68c 100644
--- a/src/player-attack/player-attack-util.h
+++ b/src/player-attack/player-attack-util.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include "system/angband.h"
-#include "grid/grid.h"
 #include "combat/combat-options-type.h"
 #include "combat/martial-arts-table.h"
+#include "grid/grid.h"
+#include "system/monster-type-definition.h"
 
 typedef enum chaotic_effect {
     CE_NONE = 0,
diff --git a/src/player/eldritch-horror.h b/src/player/eldritch-horror.h
index 6c21bfce4..675291edd 100644
--- a/src/player/eldritch-horror.h
+++ b/src/player/eldritch-horror.h
@@ -1,5 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro);
diff --git a/src/player/player-damage.h b/src/player/player-damage.h
index 84e889953..83dd711df 100644
--- a/src/player/player-damage.h
+++ b/src/player/player-damage.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 #define DAMAGE_FORCE    1
 #define DAMAGE_GENO     2
diff --git a/src/spell/spells-diceroll.h b/src/spell/spells-diceroll.h
index 195439fe1..5d78a7960 100644
--- a/src/spell/spells-diceroll.h
+++ b/src/spell/spells-diceroll.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 
 bool common_saving_throw_control(player_type *operator_ptr, HIT_POINT pow, monster_type *m_ptr);
 bool common_saving_throw_charm(player_type *operator_ptr, HIT_POINT pow, monster_type *m_ptr);
diff --git a/src/spell/spells-status.h b/src/spell/spells-status.h
index ce1c80867..9eea63f68 100644
--- a/src/spell/spells-status.h
+++ b/src/spell/spells-status.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/monster-type-definition.h"
 #include "spell/spells-util.h"
 
 bool heal_monster(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
diff --git a/src/system/angband.h b/src/system/angband.h
index eda7a1b38..1c4ee5957 100644
--- a/src/system/angband.h
+++ b/src/system/angband.h
@@ -38,8 +38,6 @@
  */
 #include "system/gamevalue.h"
 #include "cmd-io/cmd-gameoption.h"
-
-#include "system/monster-type-definition.h"
 #include "monster-race/monster-race.h"
 #include "player/player-status.h"
 
-- 
2.11.0