From: Hourier <hourier@users.sourceforge.jp>
Date: Wed, 10 Jun 2020 10:48:11 +0000 (+0900)
Subject: [Refactor] #40014 Changed macro functions to normal functions in monster2.h
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d916d38e51c29f37b2bf855e95f8f53c98595ad2;p=hengband%2Fhengband.git

[Refactor] #40014 Changed macro functions to normal functions in monster2.h
---

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 2a27fe4a8..8960fb2c4 100644
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -16,7 +16,6 @@
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-status.h"
-#include "monster/smart-learn-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "object/item-use-flags.h"
diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 29da822f0..0c764b86a 100644
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -42,7 +42,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
-#include "monster/smart-learn-types.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "object/item-use-flags.h"
diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index b625bdf9a..dbe2f63ef 100644
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -2,7 +2,6 @@
 #include "autopick/autopick.h"
 #include "floor/floor-object.h"
 #include "monster/place-monster-types.h"
-#include "monster/smart-learn-types.h"
 #include "monster/monster2.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-broken.h"
diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index 64b97e220..abd79ec80 100644
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -11,7 +11,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/avatar.h"
diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index cc4f908e1..fd9ae75bb 100644
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -7,7 +7,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 
 // Powerful monsters can resist.
diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 49eba640e..fa87de8ae 100644
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -21,7 +21,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 3dd8fd43b..04756b9f1 100644
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -8,7 +8,6 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "perception/object-perception.h"
 #include "object-enchant/object-ego.h"
 #include "object/object-hook.h"
diff --git a/src/floor/wild.c b/src/floor/wild.c
index 062b17d4b..5c7105fb5 100644
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -26,7 +26,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
-#include "monster/smart-learn-types.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"
diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index ade67acf1..afff445cd 100644
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -23,7 +23,6 @@
 #include "monster/monster-death.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-class.h"
diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index f8b863424..728ad7c8d 100644
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -13,7 +13,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "pet/pet-util.h"
 #include "spell/range-calc.h"
 
diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index 4628b60a4..f32933b80 100644
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -20,7 +20,6 @@
 #include "monster/monster-update.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "pet/pet-util.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"
diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index 901610464..6ebb40d96 100644
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -39,7 +39,6 @@
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/quantum-effect.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index 5f1d19e9c..bd6ba9930 100644
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -11,7 +11,6 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-move.h"
 
diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c
index c65ad5180..c2b655e25 100644
--- a/src/monster/monster-sweep-grid.c
+++ b/src/monster/monster-sweep-grid.c
@@ -17,7 +17,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 
  /*!
diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 8ce87bd8b..a5e27365c 100644
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -2884,3 +2884,9 @@ bool is_friendly_idx(player_type *player_ptr, MONSTER_IDX m_idx)
 }
 
 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 137d8137c..5090fd2c9 100644
--- a/src/monster/monster2.h
+++ b/src/monster/monster2.h
@@ -23,12 +23,9 @@ 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);
-
-#define is_friendly(A) (bool)(((A)->smart & SM_FRIENDLY) ? TRUE : FALSE)
-
-#define is_pet(A) (bool)(((A)->smart & SM_PET) ? TRUE : FALSE)
-
-#define is_hostile(A) (bool)((is_friendly(A) || is_pet(A)) ? FALSE : TRUE)
+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);
diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 0e86050cc..d38228ab2 100644
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -14,7 +14,6 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
-#include "monster/smart-learn-types.h"
 #include "monster/monster-info.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 9ec1c3670..cfaec98d6 100644
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -6,7 +6,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-util.h"
 #include "player/player-move.h"
diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index 5e9eb7019..915fc649b 100644
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -27,7 +27,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"
 #include "pet/pet-util.h"
diff --git a/src/object/warning.c b/src/object/warning.c
index 1c15700a4..f8c87f158 100644
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -12,7 +12,6 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
diff --git a/src/player/player-move.c b/src/player/player-move.c
index 78260a479..b003aeebb 100644
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -165,7 +165,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"
diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 1438abd76..9379eb710 100644
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -11,7 +11,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "monster/monster2.h"
-#include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "view/display-main-window.h"
diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 78de2b313..e61301d0e 100644
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -44,7 +44,6 @@
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
-#include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"