[Refactor] #40399 Separated object-mark-types.h from object.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 83a3868..ceba4ef 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -501,6 +501,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-util.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick.h" />\r
     <ClInclude Include="..\..\src\object\death-scythe.h" />\r
+    <ClInclude Include="..\..\src\object\object-mark-types.h" />\r
     <ClInclude Include="..\..\src\object\old-ego-extra-values.h" />\r
     <ClInclude Include="..\..\src\object\special-object-flags.h" />\r
     <ClInclude Include="..\..\src\object\tr-types.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 51a70fa..93c8384 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2152,6 +2152,9 @@
     <ClInclude Include="..\..\src\object\special-object-flags.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\object-mark-types.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a6fcc9..6eb2d7b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -206,6 +206,7 @@ hengband_SOURCES = \
        object/death-scythe.c object/death-scythe.h \
        object/tr-types.h object/tval-type.h \
        object/old-ego-extra-values.h object/special-object-flags.h \
+       object/object-mark-types.h \
        \
        inventory/simple-appraiser.c inventory/simple-appraiser.h \
        inventory/inventory-curse.c inventory/inventory-curse.h \

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index e57c61c..3406aa5 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -11,6 +11,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
+#include "object/object-mark-types.h"
 #include "object/special-object-flags.h"
 #include "player/player-move.h"
 #include "player/player-races-table.h"

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 3a9a673..f903714 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -20,6 +20,7 @@
 #include "autopick/autopick.h"
 #include "player/player-move.h"
 #include "object/object-flavor.h"
+#include "object/object-mark-types.h"
 
 /*
  *  Auto-destroy marked item

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 556fe07..15acab6 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -30,6 +30,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"
+#include "object/object-mark-types.h"
 #include "core/sort.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index 46880b2..b45d228 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -9,6 +9,7 @@
 #include "monster/monster-status.h"
 #include "object/artifact.h"
 #include "object/object-flavor.h"
+#include "object/object-mark-types.h"
 #include "realm/realm-hex.h"
 #include "spell/spells3.h"
 

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index b6a867a..2416a5b 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -20,6 +20,7 @@
 #include "monster/monster-status.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-damage.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 98e0b81..3eaede1 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -15,6 +15,7 @@
 #include "player/player-personalities-table.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
+#include "object/object-mark-types.h"
 #include "effect/effect-characteristics.h"
 #include "grid/grid.h"
 #include "object/object-flavor.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index c9fbab7..7c98128 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -7,6 +7,7 @@
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "object/tr-types.h"
+#include "object/object-mark-types.h"
 
 /*!
  * @brief 汎用的なビーム/ボルト/ボール系によるアイテムオブジェクトへの効果処理 / Handle a beam/bolt/ball causing damage to a monster.

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index f3b1c1e..abd3b47 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -9,6 +9,7 @@
 #include "monster/monster-status.h"
 #include "dungeon/quest.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "object/special-object-flags.h"
 #include "player/player-move.h"
 #include "world/world.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 718038b..df1135e 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -22,6 +22,7 @@
 #include "world/world.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
 #include "grid/grid.h"

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 7c7541a..9c8cdf9 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -8,6 +8,7 @@
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "floor/floor.h"
 #include "player/player-move.h"
 

diff --git a/src/io/load.c b/src/io/load.c
index d54c257..44e5396 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -89,6 +89,7 @@
 #include "player/player-races-table.h"
 #include "market/bounty.h"
 #include "object/tr-types.h"
+#include "object/object-mark-types.h"
 #include "object/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
 
  /*

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 526495a..8fd6483 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -22,6 +22,7 @@
 #include "dungeon/dungeon-file.h"
 #include "object/object-curse.h"
 #include "object/object-flavor.h"
+#include "object/object-mark-types.h"
 #include "monster/monster.h"
 #include "monster/monster-race-hook.h"
 #include "object/object-kind-hook.h"

diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c
index 2df19ab..6f9ac47 100644 (file)
--- a/src/monster/monster-object.c
+++ b/src/monster/monster-object.c
@@ -7,6 +7,7 @@
 #include "monster/monster-object.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "object/tr-types.h"
 
  /*!

diff --git a/src/object/object-mark-types.h b/src/object/object-mark-types.h
new file mode 100644 (file)
index 0000000..fb2f0b7
--- /dev/null
+++ b/src/object/object-mark-types.h
@@ -0,0 +1,19 @@
+/*
+ * @brief How object is marked (flags in object_type.mark)
+ * @date 2020/05/28
+ * @author Hourier
+ * @details
+ * OM_FOUND --- original boolean flag
+ * OM_NOMSG --- temporary flag to suppress messages which were
+ *              already printed in autopick_pickup_items().
+ */
+
+#pragma once
+
+typedef enum om_type {
+    OM_FOUND = 0x01, /*!< アイテムを一度でも視界に収めたことがあるか */
+    OM_NOMSG = 0x02, /* temporary flag to suppress messages */
+    OM_NO_QUERY = 0x04, /* Query for auto-pick was already answered as 'No' */
+    OM_AUTODESTROY = 0x08, /* Destroy later to avoid illegal inventry shift */
+    OM_TOUCHED = 0x10, /* Object was touched by player */
+} om_type;

diff --git a/src/object/object.h b/src/object/object.h
index a3c9384..bcd809c 100644 (file)
--- a/src/object/object.h
+++ b/src/object/object.h
@@ -78,17 +78,6 @@ struct object_type
 
        byte ident;                     /* Special flags  */
 
-       /*
-        * How object is marked (flags in object_type.mark)
-        * OM_FOUND --- original boolean flag
-        * OM_NOMSG --- temporary flag to suppress messages which were
-        *              already printed in autopick_pickup_items().
-        */
-#define OM_FOUND        0x01    /*!< アイテムを一度でも視界に収めたことがあるか */
-#define OM_NOMSG        0x02    /* temporary flag to suppress messages */
-#define OM_NO_QUERY     0x04    /* Query for auto-pick was already answered as 'No' */
-#define OM_AUTODESTROY  0x08    /* Destroy later to avoid illegal inventry shift */
-#define OM_TOUCHED      0x10    /* Object was touched by player */
        byte marked;            /* Object is marked */
 
        u16b inscription;       /* Inscription index */

diff --git a/src/object/object2.c b/src/object/object2.c
index 7e889f4..a6d9b84 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -33,6 +33,7 @@
 #include "object/object-hook.h"
 #include "object/object-curse.h"
 #include "object/object-kind-hook.h"
+#include "object/object-mark-types.h"
 #include "object/artifact.h"
 #include "object/special-object-flags.h"
 #include "grid/feature.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index ea906f1..4d3733f 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -169,6 +169,7 @@
 #include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
+#include "object/object-mark-types.h"
 #include "spell/spells-type.h"
 #include "cmd-basic.h"
 #include "view/display-main-window.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 54e6a12..37c9860 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -55,6 +55,7 @@
 #include "combat/attack-power-table.h"
 #include "mind/racial-force-trainer.h"
 #include "object/tr-types.h"
+#include "object/object-mark-types.h"
 
 /*!
  * @brief 能力値テーブル / Abbreviations of healthy stats

diff --git a/src/spell/spells-detection.c b/src/spell/spells-detection.c
index 073af03..83065a2 100644 (file)
--- a/src/spell/spells-detection.c
+++ b/src/spell/spells-detection.c
@@ -5,6 +5,7 @@
 #include "core/player-processor.h"
 #include "grid/trap.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster-race-hook.h"
 

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index d4b314c..01395be 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -9,6 +9,7 @@
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "object/special-object-flags.h"
 
 #include "io/write-diary.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 8c4ac30..491fb63 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -40,6 +40,7 @@
 #include "autopick/autopick.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-mark-types.h"
 #include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "player/player-status.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index e9532c0..cc69dbc 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -18,6 +18,7 @@
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "object/object-ego.h"
+#include "object/object-mark-types.h"
 
 #include "monster/creature.h"
 

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index c655c65..79797f6 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -24,6 +24,7 @@
 #include "world/world.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
+#include "object/object-mark-types.h"
 #include "player/avatar.h"
 #include "view/display-player.h"
 #include "player/player-status.h"