[Refactor] #2628 Renamed object-type-definition.cpp/h to item-entity.cpp/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 8e485f8..45c28da 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -594,7 +594,7 @@
     <ClCompile Include="..\..\src\store\service-checker.cpp" />\r
     <ClCompile Include="..\..\src\system\angband-version.cpp" />\r
     <ClCompile Include="..\..\src\system\monster-type-definition.cpp" />\r
-    <ClCompile Include="..\..\src\system\object-type-definition.cpp" />\r
+    <ClCompile Include="..\..\src\system\item-entity.cpp" />\r
     <ClCompile Include="..\..\src\system\player-type-definition.cpp" />\r
     <ClCompile Include="..\..\src\system\terrain-type-definition.cpp" />\r
     <ClCompile Include="..\..\src\target\grid-selector.cpp" />\r
@@ -1561,7 +1561,7 @@
     <ClInclude Include="..\..\src\system\building-type-definition.h" />\r
     <ClInclude Include="..\..\src\system\game-option-types.h" />\r
     <ClInclude Include="..\..\src\system\monster-race-definition.h" />\r
-    <ClInclude Include="..\..\src\system\object-type-definition.h" />\r
+    <ClInclude Include="..\..\src\system\item-entity.h" />\r
     <ClInclude Include="..\..\src\object-enchant\old-ego-extra-values.h" />\r
     <ClInclude Include="..\..\src\object-enchant\special-object-flags.h" />\r
     <ClInclude Include="..\..\src\realm\realm-hex-numbers.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5a4b026..92042cc 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2202,7 +2202,7 @@
     <ClCompile Include="..\..\src\view\display-scores.cpp">\r
       <Filter>view</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\system\object-type-definition.cpp">\r
+    <ClCompile Include="..\..\src\system\item-entity.cpp">\r
       <Filter>system</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\object\object-index-list.cpp">\r
@@ -3683,7 +3683,7 @@
     <ClInclude Include="..\..\src\core\speed-table.h">\r
       <Filter>core</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\system\object-type-definition.h">\r
+    <ClInclude Include="..\..\src\system\item-entity.h">\r
       <Filter>system</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\monster\monster-util.h">\r

diff --git a/src/Makefile.am b/src/Makefile.am
index badc331..758c8e5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -917,9 +917,9 @@ hengband_SOURCES = \
        system/game-option-types.h \
        system/h-basic.h system/h-config.h \
        system/h-system.h system/h-type.h \
+       system/item-entity.cpp system/item-entity.h \
        system/monster-race-definition.h \
        system/monster-type-definition.cpp system/monster-type-definition.h \
-       system/object-type-definition.cpp system/object-type-definition.h \
        system/player-type-definition.cpp system/player-type-definition.h \
        system/system-variables.cpp system/system-variables.h \
        system/terrain-type-definition.cpp system/terrain-type-definition.h \

diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp
index 881fff8..4d00cc5 100644 (file)
--- a/src/action/activation-execution.cpp
+++ b/src/action/activation-execution.cpp
@@ -40,8 +40,8 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "term/screen-processor.h"

diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp
index b63f999..d380cb4 100644 (file)
--- a/src/action/movement-execution.cpp
+++ b/src/action/movement-execution.cpp
@@ -40,9 +40,9 @@
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-confusion.h"

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index 76a2f23..0f5b063 100644 (file)
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -48,9 +48,9 @@
 #include "status/shape-changer.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
index 58acabf..510549d 100644 (file)
--- a/src/action/open-close-execution.cpp
+++ b/src/action/open-close-execution.cpp
@@ -24,7 +24,7 @@
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/action/open-util.cpp b/src/action/open-util.cpp
index 4c7be53..f4a4781 100644 (file)
--- a/src/action/open-util.cpp
+++ b/src/action/open-util.cpp
@@ -10,7 +10,7 @@
 #include "perception/object-perception.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/action/racial-execution.cpp b/src/action/racial-execution.cpp
index 969628f..4aebfbc 100644 (file)
--- a/src/action/racial-execution.cpp
+++ b/src/action/racial-execution.cpp
@@ -14,7 +14,7 @@
 #include "player-status/player-energy.h"
 #include "racial/racial-switcher.h"
 #include "racial/racial-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "timed-effect/player-confusion.h"

diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp
index b927d0e..a73f437 100644 (file)
--- a/src/action/run-execution.cpp
+++ b/src/action/run-execution.cpp
@@ -19,8 +19,8 @@
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/action/weapon-shield.cpp b/src/action/weapon-shield.cpp
index 4d8b9ae..2294f40 100644 (file)
--- a/src/action/weapon-shield.cpp
+++ b/src/action/weapon-shield.cpp
@@ -11,7 +11,7 @@
 #include "object-hook/hook-weapon.h"
 #include "player-info/equipment-info.h"
 #include "player-status/player-hand-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/artifact/artifact-info.cpp b/src/artifact/artifact-info.cpp
index df1e592..bb050a3 100644 (file)
--- a/src/artifact/artifact-info.cpp
+++ b/src/artifact/artifact-info.cpp
@@ -11,7 +11,7 @@
 #include "smith/object-smith.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 

diff --git a/src/artifact/fixed-art-generator.cpp b/src/artifact/fixed-art-generator.cpp
index 35c1f1f..fbeca66 100644 (file)
--- a/src/artifact/fixed-art-generator.cpp
+++ b/src/artifact/fixed-art-generator.cpp
@@ -27,7 +27,7 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/artifact/random-art-activation.cpp b/src/artifact/random-art-activation.cpp
index 9ef112a..0919da1 100644 (file)
--- a/src/artifact/random-art-activation.cpp
+++ b/src/artifact/random-art-activation.cpp
@@ -8,7 +8,7 @@
 #include "artifact/random-art-effects.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/tr-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 

diff --git a/src/artifact/random-art-characteristics.cpp b/src/artifact/random-art-characteristics.cpp
index 44654e5..cda90b8 100644 (file)
--- a/src/artifact/random-art-characteristics.cpp
+++ b/src/artifact/random-art-characteristics.cpp
@@ -11,7 +11,7 @@
 #include "object-enchant/trc-types.h"
 #include "object/object-flags.h"
 #include "player-base/player-class.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "wizard/wizard-messages.h"

diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
index 11dbd72..5447862 100644 (file)
--- a/src/artifact/random-art-generator.cpp
+++ b/src/artifact/random-art-generator.cpp
@@ -32,7 +32,7 @@
 #include "perception/object-perception.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/artifact/random-art-misc.cpp b/src/artifact/random-art-misc.cpp
index e3c457b..f93c599 100644 (file)
--- a/src/artifact/random-art-misc.cpp
+++ b/src/artifact/random-art-misc.cpp
@@ -8,7 +8,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-hook/hook-armor.h"
 #include "object/tval-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/artifact/random-art-pval-investor.cpp b/src/artifact/random-art-pval-investor.cpp
index ba61537..1e80cdc 100644 (file)
--- a/src/artifact/random-art-pval-investor.cpp
+++ b/src/artifact/random-art-pval-investor.cpp
@@ -11,7 +11,7 @@
 #include "object-hook/hook-weapon.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-armor-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 
 static bool random_art_bias_strength(ItemEntity *o_ptr)

diff --git a/src/artifact/random-art-resistance.cpp b/src/artifact/random-art-resistance.cpp
index a4673fe..ec98e3a 100644 (file)
--- a/src/artifact/random-art-resistance.cpp
+++ b/src/artifact/random-art-resistance.cpp
@@ -7,7 +7,7 @@
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/tval-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 
 /*!

diff --git a/src/artifact/random-art-slay.cpp b/src/artifact/random-art-slay.cpp
index 87d28e7..4d340b9 100644 (file)
--- a/src/artifact/random-art-slay.cpp
+++ b/src/artifact/random-art-slay.cpp
@@ -8,7 +8,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 
 static bool random_art_slay_bow(ItemEntity *o_ptr)

diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp
index 9f9b54c..30667f2 100644 (file)
--- a/src/autopick/autopick-destroyer.cpp
+++ b/src/autopick/autopick-destroyer.cpp
@@ -27,8 +27,8 @@
 #include "player-info/race-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-wand-types.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"

diff --git a/src/autopick/autopick-entry.cpp b/src/autopick/autopick-entry.cpp
index bf17a27..e2cc033 100644 (file)
--- a/src/autopick/autopick-entry.cpp
+++ b/src/autopick/autopick-entry.cpp
@@ -21,8 +21,8 @@
 #include "player-base/player-class.h"
 #include "player/player-realm.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/quarks.h"
 #include "util/string-processor.h"

diff --git a/src/autopick/autopick-finder.cpp b/src/autopick/autopick-finder.cpp
index 89fb5b0..14b6f3c 100644 (file)
--- a/src/autopick/autopick-finder.cpp
+++ b/src/autopick/autopick-finder.cpp
@@ -17,7 +17,7 @@
 #include "io/input-key-acceptor.h"
 #include "main/sound-of-music.h"
 #include "object/item-use-flags.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/autopick/autopick-matcher.cpp b/src/autopick/autopick-matcher.cpp
index fedc734..4273061 100644 (file)
--- a/src/autopick/autopick-matcher.cpp
+++ b/src/autopick/autopick-matcher.cpp
@@ -25,8 +25,8 @@
 #include "player/player-realm.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/string-processor.h"
 

diff --git a/src/autopick/autopick-registry.cpp b/src/autopick/autopick-registry.cpp
index d3fc545..79fa07d 100644 (file)
--- a/src/autopick/autopick-registry.cpp
+++ b/src/autopick/autopick-registry.cpp
@@ -16,7 +16,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
 #include "perception/object-perception.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/autopick/autopick-util.cpp b/src/autopick/autopick-util.cpp
index e6835bd..f47f990 100644 (file)
--- a/src/autopick/autopick-util.cpp
+++ b/src/autopick/autopick-util.cpp
@@ -6,7 +6,7 @@
 #include "main/sound-of-music.h"
 #include "monster-race/race-indice-types.h"
 #include "object-enchant/item-feeling.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/quarks.h"
 

diff --git a/src/autopick/autopick.cpp b/src/autopick/autopick.cpp
index e5fe7a5..0734787 100644 (file)
--- a/src/autopick/autopick.cpp
+++ b/src/autopick/autopick.cpp
@@ -28,7 +28,7 @@
 #include "object/object-mark-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp
index bb64031..093dc17 100644 (file)
--- a/src/birth/game-play-initializer.cpp
+++ b/src/birth/game-play-initializer.cpp
@@ -19,6 +19,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "util/enum-range.h"

diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp
index 5dc487a..fd53bcb 100644 (file)
--- a/src/birth/inventory-initializer.cpp
+++ b/src/birth/inventory-initializer.cpp
@@ -29,7 +29,7 @@
 #include "sv-definition/sv-wand-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include <tuple>

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
index 83ec36b..0840339 100644 (file)
--- a/src/cmd-action/cmd-attack.cpp
+++ b/src/cmd-action/cmd-attack.cpp
@@ -47,9 +47,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-confusion.h"
 #include "timed-effect/player-fear.h"

diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp
index dd208b3..720638f 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.cpp
+++ b/src/cmd-action/cmd-hissatsu.cpp
@@ -36,7 +36,7 @@
 #include "spell/spells-execution.h"
 #include "spell/technic-info-table.h"
 #include "status/action-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index 95cf4aa..e91eebc 100644 (file)
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -55,9 +55,9 @@
 #include "status/buff-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index 598d804..ba03f66 100644 (file)
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -23,7 +23,7 @@
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-getter.h"

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 9cdbc67..79c2ca0 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -50,9 +50,9 @@
 #include "status/action-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/cmd-action/cmd-shoot.cpp b/src/cmd-action/cmd-shoot.cpp
index 3f76257..623105c 100644 (file)
--- a/src/cmd-action/cmd-shoot.cpp
+++ b/src/cmd-action/cmd-shoot.cpp
@@ -14,7 +14,7 @@
 #include "status/action-setter.h"
 #include "status/bad-status-setter.h"
 #include "sv-definition/sv-bow-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index 518ffb8..f76719c 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -59,7 +59,7 @@
 #include "status/base-status.h"
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/cmd-building/cmd-building.cpp b/src/cmd-building/cmd-building.cpp
index 98360bb..971a563 100644 (file)
--- a/src/cmd-building/cmd-building.cpp
+++ b/src/cmd-building/cmd-building.cpp
@@ -60,7 +60,7 @@
 #include "system/building-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/cmd-io/cmd-autopick.cpp b/src/cmd-io/cmd-autopick.cpp
index f626e1b..493ab28 100644 (file)
--- a/src/cmd-io/cmd-autopick.cpp
+++ b/src/cmd-io/cmd-autopick.cpp
@@ -14,7 +14,7 @@
 #include "cmd-io/cmd-save.h"
 #include "io/input-key-acceptor.h"
 #include "io/read-pref-file.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"
 #include "world/world.h"

diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp
index 84e38f1..52db196 100644 (file)
--- a/src/cmd-item/cmd-destroy.cpp
+++ b/src/cmd-item/cmd-destroy.cpp
@@ -30,7 +30,7 @@
 #include "realm/realm-names-table.h"
 #include "status/action-setter.h"
 #include "status/experience.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index b064551..aa36122 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -45,8 +45,8 @@
 #include "sv-definition/sv-food-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index 0c6da96..b739275 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -45,7 +45,7 @@
 #include "spell-kind/spells-perception.h"
 #include "status/action-setter.h"
 #include "status/shape-changer.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp
index c49682d..8fc7a81 100644 (file)
--- a/src/cmd-item/cmd-item.cpp
+++ b/src/cmd-item/cmd-item.cpp
@@ -60,7 +60,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-types.h"
 #include "status/action-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/cmd-item/cmd-read.cpp b/src/cmd-item/cmd-read.cpp
index 38e7dc0..3520787 100644 (file)
--- a/src/cmd-item/cmd-read.cpp
+++ b/src/cmd-item/cmd-read.cpp
@@ -18,7 +18,7 @@
 #include "player/attack-defense-types.h"
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/cmd-item/cmd-refill.cpp b/src/cmd-item/cmd-refill.cpp
index 65d8eca..2c3b4ec 100644 (file)
--- a/src/cmd-item/cmd-refill.cpp
+++ b/src/cmd-item/cmd-refill.cpp
@@ -17,7 +17,7 @@
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
 #include "sv-definition/sv-lite-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp
index c5db005..074f70d 100644 (file)
--- a/src/cmd-item/cmd-throw.cpp
+++ b/src/cmd-item/cmd-throw.cpp
@@ -15,7 +15,7 @@
 #include "player/special-defense-types.h"
 #include "specific-object/torch.h"
 #include "status/action-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 ThrowCommand::ThrowCommand(PlayerType *player_ptr)

diff --git a/src/cmd-item/cmd-zaprod.cpp b/src/cmd-item/cmd-zaprod.cpp
index 5adcf48..f517827 100644 (file)
--- a/src/cmd-item/cmd-zaprod.cpp
+++ b/src/cmd-item/cmd-zaprod.cpp
@@ -29,7 +29,7 @@
 #include "status/experience.h"
 #include "status/shape-changer.h"
 #include "sv-definition/sv-rod-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/cmd-item/cmd-zapwand.cpp b/src/cmd-item/cmd-zapwand.cpp
index 8d5ddd2..b2c904d 100644 (file)
--- a/src/cmd-item/cmd-zapwand.cpp
+++ b/src/cmd-item/cmd-zapwand.cpp
@@ -34,7 +34,7 @@
 #include "status/experience.h"
 #include "sv-definition/sv-wand-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "term/screen-processor.h"

diff --git a/src/cmd-visual/cmd-visuals.cpp b/src/cmd-visual/cmd-visuals.cpp
index 2f00d1a..18afb7c 100644 (file)
--- a/src/cmd-visual/cmd-visuals.cpp
+++ b/src/cmd-visual/cmd-visuals.cpp
@@ -17,8 +17,8 @@
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/combat/attack-accuracy.cpp b/src/combat/attack-accuracy.cpp
index e72cac2..1cb3355 100644 (file)
--- a/src/combat/attack-accuracy.cpp
+++ b/src/combat/attack-accuracy.cpp
@@ -12,9 +12,9 @@
 #include "player/player-status-flags.h"
 #include "specific-object/death-scythe.h"
 #include "sv-definition/sv-weapon-types.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/attack-criticality.cpp b/src/combat/attack-criticality.cpp
index 7310ba3..8da61c0 100644 (file)
--- a/src/combat/attack-criticality.cpp
+++ b/src/combat/attack-criticality.cpp
@@ -10,9 +10,9 @@
 #include "player-base/player-class.h"
 #include "player-info/equipment-info.h"
 #include "sv-definition/sv-weapon-types.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/aura-counterattack.cpp b/src/combat/aura-counterattack.cpp
index 2ef6a08..4e3f6d1 100644 (file)
--- a/src/combat/aura-counterattack.cpp
+++ b/src/combat/aura-counterattack.cpp
@@ -25,9 +25,9 @@
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 731a05e..6a0681e 100644 (file)
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -59,6 +59,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/combat/slaying.cpp b/src/combat/slaying.cpp
index 21e9829..a49623f 100644 (file)
--- a/src/combat/slaying.cpp
+++ b/src/combat/slaying.cpp
@@ -18,9 +18,9 @@
 #include "realm/realm-hex-numbers.h"
 #include "specific-object/torch.h"
 #include "spell-realm/spells-hex.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp
index c8a30be..164bf88 100644 (file)
--- a/src/core/game-play.cpp
+++ b/src/core/game-play.cpp
@@ -83,9 +83,9 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/angband-version.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "term/gameterm.h"

diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index 2506f58..2b04494 100644 (file)
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -6,11 +6,10 @@
 #include "grid/grid.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
-
 #include <algorithm>
 
 /*!

diff --git a/src/dungeon/quest-completion-checker.cpp b/src/dungeon/quest-completion-checker.cpp
index 7ae6e6b..f54e69f 100644 (file)
--- a/src/dungeon/quest-completion-checker.cpp
+++ b/src/dungeon/quest-completion-checker.cpp
@@ -14,9 +14,9 @@
 #include "object-enchant/object-ego.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
index 651d7da..0d8f514 100644 (file)
--- a/src/dungeon/quest.cpp
+++ b/src/dungeon/quest.cpp
@@ -30,6 +30,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp
index 534c081..bd41cc8 100644 (file)
--- a/src/effect/effect-item.cpp
+++ b/src/effect/effect-item.cpp
@@ -19,12 +19,11 @@
 #include "sv-definition/sv-scroll-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
-
 #include <set>
 
 /*!

diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp
index 9a67629..17f4a8f 100644 (file)
--- a/src/effect/effect-monster.cpp
+++ b/src/effect/effect-monster.cpp
@@ -48,9 +48,9 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-player-resist-hurt.cpp b/src/effect/effect-player-resist-hurt.cpp
index 4e4535c..db6ba61 100644 (file)
--- a/src/effect/effect-player-resist-hurt.cpp
+++ b/src/effect/effect-player-resist-hurt.cpp
@@ -28,7 +28,7 @@
 #include "status/element-resistance.h"
 #include "status/experience.h"
 #include "status/shape-changer.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp
index 4efcb70..7f63491 100644 (file)
--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -33,7 +33,7 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/flavor/flavor-util.cpp b/src/flavor/flavor-util.cpp
index b33c108..64988dd 100644 (file)
--- a/src/flavor/flavor-util.cpp
+++ b/src/flavor/flavor-util.cpp
@@ -8,7 +8,7 @@
 #include "sv-definition/sv-food-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/quarks.h"

diff --git a/src/flavor/named-item-describer.cpp b/src/flavor/named-item-describer.cpp
index 184ced8..f048efe 100644 (file)
--- a/src/flavor/named-item-describer.cpp
+++ b/src/flavor/named-item-describer.cpp
@@ -12,6 +12,7 @@
 #include "object/object-flags.h"
 #include "perception/object-perception.h"
 #include "system/artifact-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/flavor/tval-description-switcher.cpp b/src/flavor/tval-description-switcher.cpp
index cd96b66..08bf9a7 100644 (file)
--- a/src/flavor/tval-description-switcher.cpp
+++ b/src/flavor/tval-description-switcher.cpp
@@ -11,8 +11,8 @@
 #include "object-enchant/trg-types.h"
 #include "object/tval-types.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "util/enum-converter.h"
 #ifdef JP
 #else

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index cb8f70c..82fb5ef 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -31,6 +31,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp
index 07c7f59..1ebfe42 100644 (file)
--- a/src/floor/floor-changer.cpp
+++ b/src/floor/floor-changer.cpp
@@ -38,8 +38,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index e61d03d..845098b 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -35,9 +35,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index a9732b9..7fda8a4 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -42,9 +42,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp
index 7697b6f..64d63c3 100644 (file)
--- a/src/floor/floor-leaver.cpp
+++ b/src/floor/floor-leaver.cpp
@@ -25,6 +25,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index d51c698..5267e04 100644 (file)
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -32,8 +32,8 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp
index 9a2485a..9e42178 100644 (file)
--- a/src/floor/floor-streams.cpp
+++ b/src/floor/floor-streams.cpp
@@ -35,6 +35,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
@@ -217,9 +218,12 @@ void add_river(FloorType *floor_ptr, dun_data_type *dd_ptr)
 
     if (feat1) {
         auto *f_ptr = &terrains_info[feat1];
-
-        /* Only add river if matches lake type or if have no lake at all */
-        if (!(((dd_ptr->laketype == LAKE_T_LAVA) && f_ptr->flags.has(TerrainCharacteristics::LAVA)) || ((dd_ptr->laketype == LAKE_T_WATER) && f_ptr->flags.has(TerrainCharacteristics::WATER)) || !dd_ptr->laketype)) {
+        auto is_lava = dd_ptr->laketype == LAKE_T_LAVA;
+        is_lava &= f_ptr->flags.has(TerrainCharacteristics::LAVA);
+        auto is_water = dd_ptr->laketype == LAKE_T_WATER;
+        is_water &= f_ptr->flags.has(TerrainCharacteristics::WATER);
+        const auto should_add_river = !is_lava && !is_water && (dd_ptr->laketype != 0);
+        if (should_add_river) {
             return;
         }
     }
@@ -345,7 +349,8 @@ void build_streamer(PlayerType *player_ptr, FEAT_IDX feat, int chance)
                 }
             }
 
-            if (g_ptr->m_idx && !(streamer_ptr->flags.has(TerrainCharacteristics::PLACE) && monster_can_cross_terrain(player_ptr, feat, &monraces_info[floor_ptr->m_list[g_ptr->m_idx].r_idx], 0))) {
+            auto *r_ptr = &monraces_info[floor_ptr->m_list[g_ptr->m_idx].r_idx];
+            if (g_ptr->m_idx && !(streamer_ptr->flags.has(TerrainCharacteristics::PLACE) && monster_can_cross_terrain(player_ptr, feat, r_ptr, 0))) {
                 /* Delete the monster (if any) */
                 delete_monster(player_ptr, ty, tx);
             }

diff --git a/src/floor/floor-town.cpp b/src/floor/floor-town.cpp
index 4b22c88..023920e 100644 (file)
--- a/src/floor/floor-town.cpp
+++ b/src/floor/floor-town.cpp
@@ -1,6 +1,5 @@
 #include "floor/floor-town.h"
-#include "store/store-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /* Maximum number of towns */
 int16_t max_towns;

diff --git a/src/floor/floor-town.h b/src/floor/floor-town.h
index 712d074..b3ad0dc 100644 (file)
--- a/src/floor/floor-town.h
+++ b/src/floor/floor-town.h
@@ -1,10 +1,9 @@
 #pragma once
 
+#include "store/store-util.h"
 #include "system/angband.h"
 #include <vector>
 
-struct store_type;
-
 /*
  * A structure describing a town with
  * stores and buildings

diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index 2eeed66..2fd1f43 100644 (file)
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -18,6 +18,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/floor/object-scanner.cpp b/src/floor/object-scanner.cpp
index 09ae7ca..f585bb9 100644 (file)
--- a/src/floor/object-scanner.cpp
+++ b/src/floor/object-scanner.cpp
@@ -9,7 +9,7 @@
 #include "object/object-mark-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index 3099bd8..8c210f4 100644 (file)
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -48,9 +48,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/gameterm.h"

diff --git a/src/grid/object-placer.cpp b/src/grid/object-placer.cpp
index dc32cfd..94f8747 100644 (file)
--- a/src/grid/object-placer.cpp
+++ b/src/grid/object-placer.cpp
@@ -5,7 +5,7 @@
 #include "system/artifact-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "world/world-object.h"
 

diff --git a/src/grid/stair.cpp b/src/grid/stair.cpp
index daf6abe..6d267c3 100644 (file)
--- a/src/grid/stair.cpp
+++ b/src/grid/stair.cpp
@@ -7,7 +7,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index 03963bd..dd5c51a 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -38,9 +38,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-cut.h"

diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp
index 8bedd14..9f483ac 100644 (file)
--- a/src/hpmp/hp-mp-regenerator.cpp
+++ b/src/hpmp/hp-mp-regenerator.cpp
@@ -14,9 +14,9 @@
 #include "player/player-status-table.h"
 #include "player/special-defense-types.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/inventory/floor-item-getter.cpp b/src/inventory/floor-item-getter.cpp
index f30a845..e51347e 100644 (file)
--- a/src/inventory/floor-item-getter.cpp
+++ b/src/inventory/floor-item-getter.cpp
@@ -25,7 +25,7 @@
 #include "player/player-status-flags.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/inventory/inventory-curse.cpp b/src/inventory/inventory-curse.cpp
index d64ae1b..04c109c 100644 (file)
--- a/src/inventory/inventory-curse.cpp
+++ b/src/inventory/inventory-curse.cpp
@@ -28,7 +28,7 @@
 #include "status/bad-status-setter.h"
 #include "status/buff-setter.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/inventory/inventory-damage.cpp b/src/inventory/inventory-damage.cpp
index b1b20ca..bcd4dea 100644 (file)
--- a/src/inventory/inventory-damage.cpp
+++ b/src/inventory/inventory-damage.cpp
@@ -10,7 +10,7 @@
 #include "object/object-stack.h"
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/inventory/inventory-describer.cpp b/src/inventory/inventory-describer.cpp
index ce0e7de..b4dfaa0 100644 (file)
--- a/src/inventory/inventory-describer.cpp
+++ b/src/inventory/inventory-describer.cpp
@@ -3,7 +3,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "player/player-status-flags.h"
 #include "player/player-status-table.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp
index 0b88334..da4939e 100644 (file)
--- a/src/inventory/inventory-object.cpp
+++ b/src/inventory/inventory-object.cpp
@@ -11,7 +11,7 @@
 #include "object/object-value.h"
 #include "player-info/equipment-info.h"
 #include "spell-realm/spells-craft.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/object-sort.h"
 #include "view/display-messages.h"

diff --git a/src/inventory/inventory-util.cpp b/src/inventory/inventory-util.cpp
index abd7ee2..91f5486 100644 (file)
--- a/src/inventory/inventory-util.cpp
+++ b/src/inventory/inventory-util.cpp
@@ -13,7 +13,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/int-char-converter.h"
 #include "util/quarks.h"

diff --git a/src/inventory/item-getter.cpp b/src/inventory/item-getter.cpp
index f916e98..0a23814 100644 (file)
--- a/src/inventory/item-getter.cpp
+++ b/src/inventory/item-getter.cpp
@@ -19,7 +19,7 @@
 #include "player/player-status-flags.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/inventory/pack-overflow.cpp b/src/inventory/pack-overflow.cpp
index 5c57e1d..2a4c6aa 100644 (file)
--- a/src/inventory/pack-overflow.cpp
+++ b/src/inventory/pack-overflow.cpp
@@ -7,7 +7,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object/object-info.h"
 #include "player/player-status.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/inventory/player-inventory.cpp b/src/inventory/player-inventory.cpp
index 87a36ef..31e4545 100644 (file)
--- a/src/inventory/player-inventory.cpp
+++ b/src/inventory/player-inventory.cpp
@@ -28,7 +28,7 @@
 #include "spell-kind/spells-perception.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "view/display-messages.h"

diff --git a/src/inventory/recharge-processor.cpp b/src/inventory/recharge-processor.cpp
index b59ae24..19447d6 100644 (file)
--- a/src/inventory/recharge-processor.cpp
+++ b/src/inventory/recharge-processor.cpp
@@ -8,7 +8,7 @@
 #include "object/tval-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/quarks.h"
 #include "util/string-processor.h"

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 00680ea..2401d85 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -1,5 +1,4 @@
-#include <string>
-
+#include "io-dump/character-dump.h"
 #include "artifact/fixed-art-types.h"
 #include "avatar/avatar.h"
 #include "cmd-building/cmd-building.h"
@@ -9,7 +8,6 @@
 #include "game-option/birth-options.h"
 #include "game-option/game-play-options.h"
 #include "inventory/inventory-slot-types.h"
-#include "io-dump/character-dump.h"
 #include "io-dump/player-status-dump.h"
 #include "io-dump/special-class-dump.h"
 #include "io/mutations-dump.h"
@@ -37,9 +35,9 @@
 #include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include "util/int-char-converter.h"
@@ -47,8 +45,8 @@
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 #include "world/world.h"
-
 #include <numeric>
+#include <string>
 
 /*!
  * @brief プレイヤーのペット情報をファイルにダンプする

diff --git a/src/io-dump/random-art-info-dumper.cpp b/src/io-dump/random-art-info-dumper.cpp
index 0f8a7a6..ec490da 100644 (file)
--- a/src/io-dump/random-art-info-dumper.cpp
+++ b/src/io-dump/random-art-info-dumper.cpp
@@ -4,7 +4,7 @@
 #include "io/files-util.h"
 #include "perception/object-perception.h"
 #include "store/store-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index f32bd65..e1ed2cc 100644 (file)
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -15,7 +15,7 @@
 #include "player-base/player-class.h"
 #include "save/save.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h" //!< @todo 相互依存している、後で何とかする.
 #include "util/int-char-converter.h"

diff --git a/src/knowledge/knowledge-inventory.cpp b/src/knowledge/knowledge-inventory.cpp
index 353e06c..ab78c4f 100644 (file)
--- a/src/knowledge/knowledge-inventory.cpp
+++ b/src/knowledge/knowledge-inventory.cpp
@@ -21,7 +21,7 @@
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index b3185fa..2ecce81 100644 (file)
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -24,6 +24,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/knowledge/knowledge-quests.cpp b/src/knowledge/knowledge-quests.cpp
index 5c35653..0f9990e 100644 (file)
--- a/src/knowledge/knowledge-quests.cpp
+++ b/src/knowledge/knowledge-quests.cpp
@@ -20,6 +20,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/knowledge/knowledge-self.cpp b/src/knowledge/knowledge-self.cpp
index 13ef0f8..37652a2 100644 (file)
--- a/src/knowledge/knowledge-self.cpp
+++ b/src/knowledge/knowledge-self.cpp
@@ -19,7 +19,7 @@
 #include "player/race-info-table.h"
 #include "realm/realm-names-table.h"
 #include "store/store-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "util/buffer-shaper.h"

diff --git a/src/load/floor-loader.cpp b/src/load/floor-loader.cpp
index 11fcace..daa42f6 100644 (file)
--- a/src/load/floor-loader.cpp
+++ b/src/load/floor-loader.cpp
@@ -22,8 +22,8 @@
 #include "system/angband-version.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "world/world-object.h"

diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp
index 3ddf618..a1bc4b1 100644 (file)
--- a/src/load/inventory-loader.cpp
+++ b/src/load/inventory-loader.cpp
@@ -4,7 +4,7 @@
 #include "load/load-util.h"
 #include "load/old/item-loader-savefile50.h"
 #include "object/object-mark-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/load/item/item-loader-base.h b/src/load/item/item-loader-base.h
index f9b1364..56eb9cc 100644 (file)
--- a/src/load/item/item-loader-base.h
+++ b/src/load/item/item-loader-base.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "system/object-type-definition.h"
-
+class ItemEntity;
 class ItemLoaderBase {
 public:
     virtual ~ItemLoaderBase() = default;

diff --git a/src/load/old/item-loader-savefile50.cpp b/src/load/old/item-loader-savefile50.cpp
index e7f5469..229a270 100644 (file)
--- a/src/load/old/item-loader-savefile50.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -13,7 +13,7 @@
 #include "sv-definition/sv-lite-types.h"
 #include "system/angband.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 3289ca5..e461713 100644 (file)
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -44,8 +44,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index 0717754..e02bf97 100644 (file)
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -9,7 +9,7 @@
 #include "object/object-value.h"
 #include "store/store-owners.h"
 #include "store/store.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/object-sort.h"
 #include <stdint.h>

diff --git a/src/main/game-data-initializer.cpp b/src/main/game-data-initializer.cpp
index 6999a30..138dc61 100644 (file)
--- a/src/main/game-data-initializer.cpp
+++ b/src/main/game-data-initializer.cpp
@@ -15,9 +15,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "util/angband-files.h"

diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index 6c0ee00..f9d6749 100644 (file)
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -29,8 +29,8 @@
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp
index 22c3ac2..0fb9358 100644 (file)
--- a/src/market/building-craft-fix.cpp
+++ b/src/market/building-craft-fix.cpp
@@ -24,7 +24,7 @@
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/market/building-craft-weapon.cpp b/src/market/building-craft-weapon.cpp
index 99ba030..04e9b1d 100644 (file)
--- a/src/market/building-craft-weapon.cpp
+++ b/src/market/building-craft-weapon.cpp
@@ -19,7 +19,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell-realm/spells-hex.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/market/building-enchanter.cpp b/src/market/building-enchanter.cpp
index 3099406..15aa7ae 100644 (file)
--- a/src/market/building-enchanter.cpp
+++ b/src/market/building-enchanter.cpp
@@ -8,7 +8,7 @@
 #include "object/item-use-flags.h"
 #include "racial/racial-android.h"
 #include "spell/spells-object.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/market/building-initializer.cpp b/src/market/building-initializer.cpp
index 3ef0346..d86a7bb 100644 (file)
--- a/src/market/building-initializer.cpp
+++ b/src/market/building-initializer.cpp
@@ -9,7 +9,7 @@
 #include "system/angband.h"
 #include "system/baseitem-info-definition.h"
 #include "system/building-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include <vector>
 
 /*!

diff --git a/src/market/building-recharger.cpp b/src/market/building-recharger.cpp
index 8c91809..dd1c420 100644 (file)
--- a/src/market/building-recharger.cpp
+++ b/src/market/building-recharger.cpp
@@ -15,7 +15,7 @@
 #include "perception/object-perception.h"
 #include "spell-kind/spells-perception.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/mind/mind-archer.cpp b/src/mind/mind-archer.cpp
index 07ffc78..9d3b85e 100644 (file)
--- a/src/mind/mind-archer.cpp
+++ b/src/mind/mind-archer.cpp
@@ -20,7 +20,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-getter.h"

diff --git a/src/mind/mind-chaos-warrior.cpp b/src/mind/mind-chaos-warrior.cpp
index bd2134a..6a36dc2 100644 (file)
--- a/src/mind/mind-chaos-warrior.cpp
+++ b/src/mind/mind-chaos-warrior.cpp
@@ -6,7 +6,7 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 void acquire_chaos_weapon(PlayerType *player_ptr)

diff --git a/src/mind/mind-hobbit.cpp b/src/mind/mind-hobbit.cpp
index e9502c4..34367a1 100644 (file)
--- a/src/mind/mind-hobbit.cpp
+++ b/src/mind/mind-hobbit.cpp
@@ -3,7 +3,7 @@
 #include "object/object-kind-hook.h"
 #include "sv-definition/sv-food-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind-mage.cpp b/src/mind/mind-mage.cpp
index 388574e..98b8288 100644 (file)
--- a/src/mind/mind-mage.cpp
+++ b/src/mind/mind-mage.cpp
@@ -16,7 +16,7 @@
 #include "object/item-use-flags.h"
 #include "player-base/player-class.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind-magic-eater.cpp b/src/mind/mind-magic-eater.cpp
index 2206439..67ec521 100644 (file)
--- a/src/mind/mind-magic-eater.cpp
+++ b/src/mind/mind-magic-eater.cpp
@@ -10,7 +10,7 @@
 #include "player-info/magic-eater-data-type.h"
 #include "player-status/player-energy.h"
 #include "sv-definition/sv-staff-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind-mindcrafter.cpp b/src/mind/mind-mindcrafter.cpp
index f95e5f6..bb16564 100644 (file)
--- a/src/mind/mind-mindcrafter.cpp
+++ b/src/mind/mind-mindcrafter.cpp
@@ -33,7 +33,7 @@
 #include "status/buff-setter.h"
 #include "status/element-resistance.h"
 #include "status/sight-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index 572a303..56ff474 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -50,9 +50,9 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/mind/mind-priest.cpp b/src/mind/mind-priest.cpp
index 549f651..f954220 100644 (file)
--- a/src/mind/mind-priest.cpp
+++ b/src/mind/mind-priest.cpp
@@ -13,7 +13,7 @@
 #include "object/item-use-flags.h"
 #include "object/object-flags.h"
 #include "racial/racial-android.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/mind/mind-samurai.cpp b/src/mind/mind-samurai.cpp
index eb138ea..a9bbd61 100644 (file)
--- a/src/mind/mind-samurai.cpp
+++ b/src/mind/mind-samurai.cpp
@@ -31,9 +31,9 @@
 #include "player/attack-defense-types.h"
 #include "status/action-setter.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "timed-effect/player-cut.h"

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 3798383..94d8cfd 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -29,9 +29,9 @@
 #include "player-base/player-class.h"
 #include "player-info/sniper-data-type.h"
 #include "player-status/player-energy.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/mind/mind-weaponsmith.cpp b/src/mind/mind-weaponsmith.cpp
index 75f0ffb..b669a03 100644 (file)
--- a/src/mind/mind-weaponsmith.cpp
+++ b/src/mind/mind-weaponsmith.cpp
@@ -19,7 +19,7 @@
 #include "player-status/player-energy.h"
 #include "smith/object-smith.h"
 #include "smith/smith-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/monster-attack/monster-attack-player.cpp b/src/monster-attack/monster-attack-player.cpp
index 5ffde7d..60cc5a4 100644 (file)
--- a/src/monster-attack/monster-attack-player.cpp
+++ b/src/monster-attack/monster-attack-player.cpp
@@ -49,9 +49,9 @@
 #include "system/angband.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-cut.h"
 #include "timed-effect/player-hallucination.h"

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index b814d83..845c92b 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -26,8 +26,8 @@
 #include "status/base-status.h"
 #include "status/element-resistance.h"
 #include "status/experience.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-acceleration.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index 8430b55..f48635d 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -26,8 +26,8 @@
 #include "status/experience.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/player-paralysis.h"

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index 85e77ef..d9ab4d1 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -40,6 +40,7 @@
 #include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp
index cd6acf2..0bbfdb0 100644 (file)
--- a/src/monster-floor/monster-object.cpp
+++ b/src/monster-floor/monster-object.cpp
@@ -24,9 +24,9 @@
 #include "object/object-mark-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/monster-floor/monster-remover.cpp b/src/monster-floor/monster-remover.cpp
index 903866d..4864e65 100644 (file)
--- a/src/monster-floor/monster-remover.cpp
+++ b/src/monster-floor/monster-remover.cpp
@@ -13,9 +13,9 @@
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 

diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp
index 4a17e7d..84d758f 100644 (file)
--- a/src/monster-floor/special-death-switcher.cpp
+++ b/src/monster-floor/special-death-switcher.cpp
@@ -38,9 +38,9 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/monster/monster-compaction.cpp b/src/monster/monster-compaction.cpp
index 8b76056..eb2ccf7 100644 (file)
--- a/src/monster/monster-compaction.cpp
+++ b/src/monster/monster-compaction.cpp
@@ -11,9 +11,9 @@
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "view/display-messages.h"

diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index 38008a4..f49f0a0 100644 (file)
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -49,9 +49,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/mspell/mspell-damage-calculator.cpp b/src/mspell/mspell-damage-calculator.cpp
index a7fcdd5..8e4df06 100644 (file)
--- a/src/mspell/mspell-damage-calculator.cpp
+++ b/src/mspell/mspell-damage-calculator.cpp
@@ -7,9 +7,9 @@
 #include "monster/monster-status.h"
 #include "player-info/equipment-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index 430a925..5bcb125 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -43,9 +43,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-setter.h"

diff --git a/src/object-activation/activation-breath.cpp b/src/object-activation/activation-breath.cpp
index ab1060a..4bef7ec 100644 (file)
--- a/src/object-activation/activation-breath.cpp
+++ b/src/object-activation/activation-breath.cpp
@@ -9,7 +9,7 @@
 #include "spell-realm/spells-song.h"
 #include "status/element-resistance.h"
 #include "sv-definition/sv-ring-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/object-activation/activation-others.cpp b/src/object-activation/activation-others.cpp
index e19719d..03dd139 100644 (file)
--- a/src/object-activation/activation-others.cpp
+++ b/src/object-activation/activation-others.cpp
@@ -48,9 +48,9 @@
 #include "status/buff-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/object-activation/activation-resistance.cpp b/src/object-activation/activation-resistance.cpp
index e79dc89..5a2ea89 100644 (file)
--- a/src/object-activation/activation-resistance.cpp
+++ b/src/object-activation/activation-resistance.cpp
@@ -7,7 +7,7 @@
 #include "status/element-resistance.h"
 #include "status/temporary-resistance.h"
 #include "sv-definition/sv-ring-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "view/display-messages.h"

diff --git a/src/object-activation/activation-util.cpp b/src/object-activation/activation-util.cpp
index 2412c64..d019b07 100644 (file)
--- a/src/object-activation/activation-util.cpp
+++ b/src/object-activation/activation-util.cpp
@@ -1,7 +1,7 @@
 #include "object-activation/activation-util.h"
 #include "object/object-info.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 ae_type *initialize_ae_type(PlayerType *player_ptr, ae_type *ae_ptr, const INVENTORY_IDX item)

diff --git a/src/object-enchant/enchanter-factory.cpp b/src/object-enchant/enchanter-factory.cpp
index d834ce4..76585e3 100644 (file)
--- a/src/object-enchant/enchanter-factory.cpp
+++ b/src/object-enchant/enchanter-factory.cpp
@@ -26,7 +26,7 @@
 #include "object-enchant/weapon/apply-magic-polearm.h"
 #include "object-enchant/weapon/apply-magic-sword.h"
 #include "object/tval-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 std::unique_ptr<EnchanterBase> EnchanterFactory::create_enchanter(PlayerType *player_ptr, ItemEntity *o_ptr, int lev, int power)
 {

diff --git a/src/object-enchant/item-magic-applier.cpp b/src/object-enchant/item-magic-applier.cpp
index f8887fc..210901d 100644 (file)
--- a/src/object-enchant/item-magic-applier.cpp
+++ b/src/object-enchant/item-magic-applier.cpp
@@ -16,6 +16,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "world/world.h"

diff --git a/src/object-enchant/object-boost.cpp b/src/object-enchant/object-boost.cpp
index 2d11216..d8abf43 100644 (file)
--- a/src/object-enchant/object-boost.cpp
+++ b/src/object-enchant/object-boost.cpp
@@ -4,7 +4,7 @@
 #include "player-ability/player-ability-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 

diff --git a/src/object-enchant/object-curse.cpp b/src/object-enchant/object-curse.cpp
index aa0f1ad..fef9997 100644 (file)
--- a/src/object-enchant/object-curse.cpp
+++ b/src/object-enchant/object-curse.cpp
@@ -9,7 +9,7 @@
 #include "object-hook/hook-armor.h"
 #include "object-hook/hook-weapon.h"
 #include "object/object-flags.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/object-enchant/object-ego.cpp b/src/object-enchant/object-ego.cpp
index 3cd0ffd..77e8b94 100644 (file)
--- a/src/object-enchant/object-ego.cpp
+++ b/src/object-enchant/object-ego.cpp
@@ -13,7 +13,7 @@
 #include "object/tval-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/probability-table.h"

diff --git a/src/object-enchant/others/apply-magic-amulet.cpp b/src/object-enchant/others/apply-magic-amulet.cpp
index e46c9d4..25bfefc 100644 (file)
--- a/src/object-enchant/others/apply-magic-amulet.cpp
+++ b/src/object-enchant/others/apply-magic-amulet.cpp
@@ -12,7 +12,7 @@
 #include "object-enchant/trc-types.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object-enchant/others/apply-magic-lite.cpp b/src/object-enchant/others/apply-magic-lite.cpp
index cfc719d..e1eeb2d 100644 (file)
--- a/src/object-enchant/others/apply-magic-lite.cpp
+++ b/src/object-enchant/others/apply-magic-lite.cpp
@@ -3,7 +3,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-lite-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 LiteEnchanter::LiteEnchanter(PlayerType *player_ptr, ItemEntity *o_ptr, int power)

diff --git a/src/object-enchant/others/apply-magic-others.cpp b/src/object-enchant/others/apply-magic-others.cpp
index 543cbac..d5c81d3 100644 (file)
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -23,8 +23,8 @@
 #include "sv-definition/sv-other-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/object-enchant/others/apply-magic-ring.cpp b/src/object-enchant/others/apply-magic-ring.cpp
index 1eb8920..47139b3 100644 (file)
--- a/src/object-enchant/others/apply-magic-ring.cpp
+++ b/src/object-enchant/others/apply-magic-ring.cpp
@@ -12,7 +12,7 @@
 #include "object-enchant/trc-types.h"
 #include "sv-definition/sv-ring-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object-enchant/protector/abstract-protector-enchanter.cpp b/src/object-enchant/protector/abstract-protector-enchanter.cpp
index ff7c3de..93eef77 100644 (file)
--- a/src/object-enchant/protector/abstract-protector-enchanter.cpp
+++ b/src/object-enchant/protector/abstract-protector-enchanter.cpp
@@ -6,7 +6,7 @@
 
 #include "object-enchant/protector/abstract-protector-enchanter.h"
 #include "object-enchant/object-boost.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-armor.cpp b/src/object-enchant/protector/apply-magic-armor.cpp
index 13bc9e3..6047b0b 100644 (file)
--- a/src/object-enchant/protector/apply-magic-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-armor.cpp
@@ -10,7 +10,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object/object-kind-hook.h"
 #include "object/tval-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "view/display-messages.h"
 
 /*

diff --git a/src/object-enchant/protector/apply-magic-boots.cpp b/src/object-enchant/protector/apply-magic-boots.cpp
index 49f1219..f871c5e 100644 (file)
--- a/src/object-enchant/protector/apply-magic-boots.cpp
+++ b/src/object-enchant/protector/apply-magic-boots.cpp
@@ -11,7 +11,7 @@
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-cloak.cpp b/src/object-enchant/protector/apply-magic-cloak.cpp
index f4d5deb..45d42e0 100644 (file)
--- a/src/object-enchant/protector/apply-magic-cloak.cpp
+++ b/src/object-enchant/protector/apply-magic-cloak.cpp
@@ -9,7 +9,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-crown.cpp b/src/object-enchant/protector/apply-magic-crown.cpp
index 12e42f2..ffa1c0c 100644 (file)
--- a/src/object-enchant/protector/apply-magic-crown.cpp
+++ b/src/object-enchant/protector/apply-magic-crown.cpp
@@ -9,7 +9,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-ego.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-dragon-armor.cpp b/src/object-enchant/protector/apply-magic-dragon-armor.cpp
index c4c724a..d40719a 100644 (file)
--- a/src/object-enchant/protector/apply-magic-dragon-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-dragon-armor.cpp
@@ -7,7 +7,7 @@
 #include "object-enchant/protector/apply-magic-dragon-armor.h"
 #include "artifact/random-art-generator.h"
 #include "object-enchant/protector/abstract-protector-enchanter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*

diff --git a/src/object-enchant/protector/apply-magic-gloves.cpp b/src/object-enchant/protector/apply-magic-gloves.cpp
index 72d8126..70f2386 100644 (file)
--- a/src/object-enchant/protector/apply-magic-gloves.cpp
+++ b/src/object-enchant/protector/apply-magic-gloves.cpp
@@ -11,7 +11,7 @@
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-helm.cpp b/src/object-enchant/protector/apply-magic-helm.cpp
index 476e9aa..12a1dce 100644 (file)
--- a/src/object-enchant/protector/apply-magic-helm.cpp
+++ b/src/object-enchant/protector/apply-magic-helm.cpp
@@ -11,7 +11,7 @@
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-shield.cpp b/src/object-enchant/protector/apply-magic-shield.cpp
index f6661c1..b5e9019 100644 (file)
--- a/src/object-enchant/protector/apply-magic-shield.cpp
+++ b/src/object-enchant/protector/apply-magic-shield.cpp
@@ -11,7 +11,7 @@
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-ego.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * @brief コンストラクタ

diff --git a/src/object-enchant/protector/apply-magic-soft-armor.cpp b/src/object-enchant/protector/apply-magic-soft-armor.cpp
index 5710295..b7a624f 100644 (file)
--- a/src/object-enchant/protector/apply-magic-soft-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-soft-armor.cpp
@@ -9,7 +9,7 @@
 #include "object/tval-types.h"
 #include "sv-definition/sv-armor-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*

diff --git a/src/object-enchant/vorpal-weapon.cpp b/src/object-enchant/vorpal-weapon.cpp
index ee0a7a2..5b3e669 100644 (file)
--- a/src/object-enchant/vorpal-weapon.cpp
+++ b/src/object-enchant/vorpal-weapon.cpp
@@ -7,9 +7,9 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "player-attack/player-attack-util.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
index eccaf8d..551a8b5 100644 (file)
--- a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
@@ -2,7 +2,7 @@
 #include "object-enchant/object-boost.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 AbstractWeaponEnchanter::AbstractWeaponEnchanter(ItemEntity *o_ptr, DEPTH level, int power)
     : o_ptr(o_ptr)

diff --git a/src/object-enchant/weapon/apply-magic-arrow.cpp b/src/object-enchant/weapon/apply-magic-arrow.cpp
index 72f17ff..49a3c4a 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-arrow.cpp
+++ b/src/object-enchant/weapon/apply-magic-arrow.cpp
@@ -8,7 +8,7 @@
 #include "artifact/random-art-generator.h"
 #include "floor/floor-base-definitions.h"
 #include "inventory/inventory-slot-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/object-enchant/weapon/apply-magic-bow.cpp b/src/object-enchant/weapon/apply-magic-bow.cpp
index 10483e2..ad4b146 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-bow.cpp
+++ b/src/object-enchant/weapon/apply-magic-bow.cpp
@@ -7,7 +7,7 @@
 #include "object-enchant/weapon/apply-magic-bow.h"
 #include "artifact/random-art-generator.h"
 #include "inventory/inventory-slot-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*!
  * @brief 弓強化クラスのコンストラクタ

diff --git a/src/object-enchant/weapon/apply-magic-digging.cpp b/src/object-enchant/weapon/apply-magic-digging.cpp
index 128d521..9d23aa7 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-digging.cpp
+++ b/src/object-enchant/weapon/apply-magic-digging.cpp
@@ -6,7 +6,7 @@
 
 #include "object-enchant/weapon/apply-magic-digging.h"
 #include "artifact/random-art-generator.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/object-enchant/weapon/apply-magic-hafted.cpp b/src/object-enchant/weapon/apply-magic-hafted.cpp
index d4e4d53..6f333d2 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-hafted.cpp
+++ b/src/object-enchant/weapon/apply-magic-hafted.cpp
@@ -9,7 +9,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-boost.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*!
  * @brief 鈍器強化クラスのコンストラクタ

diff --git a/src/object-enchant/weapon/apply-magic-polearm.cpp b/src/object-enchant/weapon/apply-magic-polearm.cpp
index f4f6754..9ca19db 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-polearm.cpp
+++ b/src/object-enchant/weapon/apply-magic-polearm.cpp
@@ -8,7 +8,7 @@
 #include "floor/floor-base-definitions.h"
 #include "inventory/inventory-slot-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*!
  * @brief 長柄/斧強化クラスのコンストラクタ

diff --git a/src/object-enchant/weapon/apply-magic-sword.cpp b/src/object-enchant/weapon/apply-magic-sword.cpp
index c8dae93..3861a77 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-sword.cpp
+++ b/src/object-enchant/weapon/apply-magic-sword.cpp
@@ -9,7 +9,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-boost.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "view/display-messages.h"
 
 /*!

diff --git a/src/object-enchant/weapon/melee-weapon-enchanter.cpp b/src/object-enchant/weapon/melee-weapon-enchanter.cpp
index 7bf0562..093b16f 100644 (file)
--- a/src/object-enchant/weapon/melee-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/melee-weapon-enchanter.cpp
@@ -6,7 +6,7 @@
 
 #include "object-enchant/weapon/melee-weapon-enchanter.h"
 #include "artifact/random-art-generator.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 MeleeWeaponEnchanter::MeleeWeaponEnchanter(PlayerType *player_ptr, ItemEntity *o_ptr, DEPTH level, int power)
     : AbstractWeaponEnchanter(o_ptr, level, power)

diff --git a/src/object-hook/hook-armor.cpp b/src/object-hook/hook-armor.cpp
index 9b3721e..b968bff 100644 (file)
--- a/src/object-hook/hook-armor.cpp
+++ b/src/object-hook/hook-armor.cpp
@@ -3,7 +3,7 @@
 #include "object/object-info.h"
 #include "player/player-sex.h"
 #include "sv-definition/sv-armor-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/object-hook/hook-expendable.cpp b/src/object-hook/hook-expendable.cpp
index c4763ca..bdd83e7 100644 (file)
--- a/src/object-hook/hook-expendable.cpp
+++ b/src/object-hook/hook-expendable.cpp
@@ -12,8 +12,8 @@
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/string-processor.h"
 

diff --git a/src/object-hook/hook-magic.cpp b/src/object-hook/hook-magic.cpp
index 1242a1d..5b8bd9f 100644 (file)
--- a/src/object-hook/hook-magic.cpp
+++ b/src/object-hook/hook-magic.cpp
@@ -7,7 +7,7 @@
 #include "player-info/class-info.h"
 #include "player/player-realm.h"
 #include "realm/realm-names-table.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/object-hook/hook-perception.cpp b/src/object-hook/hook-perception.cpp
index 66d00c7..6962507 100644 (file)
--- a/src/object-hook/hook-perception.cpp
+++ b/src/object-hook/hook-perception.cpp
@@ -1,7 +1,7 @@
 #include "object-hook/hook-perception.h"
 #include "object-hook/hook-weapon.h"
 #include "perception/object-perception.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/object-hook/hook-quest.cpp b/src/object-hook/hook-quest.cpp
index d2a919e..aab9a82 100644 (file)
--- a/src/object-hook/hook-quest.cpp
+++ b/src/object-hook/hook-quest.cpp
@@ -8,8 +8,8 @@
 #include "object-enchant/trg-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include "world/world.h"

diff --git a/src/object-hook/hook-weapon.cpp b/src/object-hook/hook-weapon.cpp
index 09660e1..60edc1a 100644 (file)
--- a/src/object-hook/hook-weapon.cpp
+++ b/src/object-hook/hook-weapon.cpp
@@ -5,7 +5,7 @@
 #include "object/tval-types.h"
 #include "player/player-skill.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object-use/quaff/quaff-effects.cpp b/src/object-use/quaff/quaff-effects.cpp
index 3149971..354477d 100644 (file)
--- a/src/object-use/quaff/quaff-effects.cpp
+++ b/src/object-use/quaff/quaff-effects.cpp
@@ -35,7 +35,7 @@
 #include "status/sight-setter.h"
 #include "sv-definition/sv-potion-types.h"
 #include "system/angband.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-acceleration.h"
 #include "timed-effect/player-poison.h"

diff --git a/src/object-use/quaff/quaff-execution.cpp b/src/object-use/quaff/quaff-execution.cpp
index e4589bd..ef556ac 100644 (file)
--- a/src/object-use/quaff/quaff-execution.cpp
+++ b/src/object-use/quaff/quaff-execution.cpp
@@ -25,7 +25,7 @@
 #include "spell-realm/spells-song.h"
 #include "status/experience.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/object-use/read/parchment-read-executor.cpp b/src/object-use/read/parchment-read-executor.cpp
index a24d7ea..a02da50 100644 (file)
--- a/src/object-use/read/parchment-read-executor.cpp
+++ b/src/object-use/read/parchment-read-executor.cpp
@@ -10,7 +10,7 @@
 #include "flavor/object-flavor-types.h"
 #include "io/files-util.h"
 #include "system/angband.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/angband-files.h"

diff --git a/src/object-use/read/read-execution.cpp b/src/object-use/read/read-execution.cpp
index 54c783e..bf7e654 100644 (file)
--- a/src/object-use/read/read-execution.cpp
+++ b/src/object-use/read/read-execution.cpp
@@ -22,7 +22,7 @@
 #include "spell-realm/spells-song.h"
 #include "status/experience.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/object-use/read/read-executor-factory.cpp b/src/object-use/read/read-executor-factory.cpp
index 36f8b85..eac4db8 100644 (file)
--- a/src/object-use/read/read-executor-factory.cpp
+++ b/src/object-use/read/read-executor-factory.cpp
@@ -5,7 +5,7 @@
 #include "object-use/read/ring-power-read-executor.h"
 #include "object-use/read/scroll-read-executor.h"
 #include "object/tval-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 std::unique_ptr<ReadExecutorBase> ReadExecutorFactory::create(PlayerType *player_ptr, ItemEntity *o_ptr, bool known)
 {

diff --git a/src/object-use/read/scroll-read-executor.cpp b/src/object-use/read/scroll-read-executor.cpp
index 2cde811..c864554 100644 (file)
--- a/src/object-use/read/scroll-read-executor.cpp
+++ b/src/object-use/read/scroll-read-executor.cpp
@@ -39,7 +39,7 @@
 #include "store/rumor.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/object-use/throw-execution.cpp b/src/object-use/throw-execution.cpp
index 4395d91..1aaab46 100644 (file)
--- a/src/object-use/throw-execution.cpp
+++ b/src/object-use/throw-execution.cpp
@@ -56,8 +56,8 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-getter.h"

diff --git a/src/object-use/use-execution.cpp b/src/object-use/use-execution.cpp
index 8d83c08..8786f76 100644 (file)
--- a/src/object-use/use-execution.cpp
+++ b/src/object-use/use-execution.cpp
@@ -22,7 +22,7 @@
 #include "player-status/player-energy.h"
 #include "status/experience.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "timed-effect/player-confusion.h"

diff --git a/src/object-use/zaprod-execution.cpp b/src/object-use/zaprod-execution.cpp
index c6d6f05..f198543 100644 (file)
--- a/src/object-use/zaprod-execution.cpp
+++ b/src/object-use/zaprod-execution.cpp
@@ -21,7 +21,7 @@
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-rod-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "term/screen-processor.h"

diff --git a/src/object-use/zapwand-execution.cpp b/src/object-use/zapwand-execution.cpp
index 343546e..406a711 100644 (file)
--- a/src/object-use/zapwand-execution.cpp
+++ b/src/object-use/zapwand-execution.cpp
@@ -18,7 +18,7 @@
 #include "status/experience.h"
 #include "sv-definition/sv-wand-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "term/screen-processor.h"

diff --git a/src/object/item-tester-hooker.cpp b/src/object/item-tester-hooker.cpp
index 28bde1c..ccc978c 100644 (file)
--- a/src/object/item-tester-hooker.cpp
+++ b/src/object/item-tester-hooker.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "object/item-tester-hooker.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-describer.h"
 

diff --git a/src/object/lite-processor.cpp b/src/object/lite-processor.cpp
index 4f767de..7723918 100644 (file)
--- a/src/object/lite-processor.cpp
+++ b/src/object/lite-processor.cpp
@@ -7,7 +7,7 @@
 #include "object-enchant/object-ego.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-lite-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp
index 3fe8181..2f5f6d0 100644 (file)
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -13,7 +13,7 @@
 #include "object/tval-types.h"
 #include "sv-definition/sv-potion-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object/object-flags.cpp b/src/object/object-flags.cpp
index 9671aff..7092004 100644 (file)
--- a/src/object/object-flags.cpp
+++ b/src/object/object-flags.cpp
@@ -7,7 +7,7 @@
 #include "sv-definition/sv-lite-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object/object-index-list.cpp b/src/object/object-index-list.cpp
index 8f0e05c..a4c5b50 100644 (file)
--- a/src/object/object-index-list.cpp
+++ b/src/object/object-index-list.cpp
@@ -1,6 +1,6 @@
 #include "object/object-index-list.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 #include <algorithm>
 

diff --git a/src/object/object-info.cpp b/src/object/object-info.cpp
index 73926b5..2235757 100644 (file)
--- a/src/object/object-info.cpp
+++ b/src/object/object-info.cpp
@@ -27,8 +27,8 @@
 #include "sv-definition/sv-ring-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/object/object-stack.cpp b/src/object/object-stack.cpp
index edb300f..80271bb 100644 (file)
--- a/src/object/object-stack.cpp
+++ b/src/object/object-stack.cpp
@@ -15,7 +15,7 @@
 #include "smith/object-smith.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*!
  * @brief 魔法棒やロッドのスロット分割時に使用回数を分配する /

diff --git a/src/object/object-value-calc.cpp b/src/object/object-value-calc.cpp
index feb5f25..f948730 100644 (file)
--- a/src/object/object-value-calc.cpp
+++ b/src/object/object-value-calc.cpp
@@ -7,7 +7,7 @@
 #include "object/object-flags.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp
index 42585a4..0715c58 100644 (file)
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -5,6 +5,7 @@
 #include "object/tval-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 

diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index d67fb52..0f0c5d5 100644 (file)
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -30,9 +30,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/perception/identification.cpp b/src/perception/identification.cpp
index 8596bd7..79979e5 100644 (file)
--- a/src/perception/identification.cpp
+++ b/src/perception/identification.cpp
@@ -19,6 +19,7 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index 8e91dfa..f15ea3c 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -8,7 +8,7 @@
 #include "object-enchant/trg-types.h"
 #include "object/item-tester-hooker.h" // 暫定、このファイルへ引っ越す.
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/perception/simple-perception.cpp b/src/perception/simple-perception.cpp
index 98ee8bd..e4e5ee5 100644 (file)
--- a/src/perception/simple-perception.cpp
+++ b/src/perception/simple-perception.cpp
@@ -22,7 +22,7 @@
 #include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/player-status-flags.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-confusion.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player-attack/attack-chaos-effect.cpp b/src/player-attack/attack-chaos-effect.cpp
index ee4cef2..4da09ce 100644 (file)
--- a/src/player-attack/attack-chaos-effect.cpp
+++ b/src/player-attack/attack-chaos-effect.cpp
@@ -33,9 +33,9 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/player-attack/blood-sucking-processor.cpp b/src/player-attack/blood-sucking-processor.cpp
index e7b1746..24a85ce 100644 (file)
--- a/src/player-attack/blood-sucking-processor.cpp
+++ b/src/player-attack/blood-sucking-processor.cpp
@@ -14,8 +14,8 @@
 #include "player-attack/player-attack-util.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-realm/spells-hex.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/player-attack/player-attack.cpp b/src/player-attack/player-attack.cpp
index 98cc7ba..898dfd9 100644 (file)
--- a/src/player-attack/player-attack.cpp
+++ b/src/player-attack/player-attack.cpp
@@ -51,9 +51,9 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-cut.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player-base/player-class.cpp b/src/player-base/player-class.cpp
index 7bf1370..39f673b 100644 (file)
--- a/src/player-base/player-class.cpp
+++ b/src/player-base/player-class.cpp
@@ -26,7 +26,7 @@
 #include "player/special-defense-types.h"
 #include "realm/realm-types.h"
 #include "status/action-setter.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player-info/alignment.cpp b/src/player-info/alignment.cpp
index c44987f..5b79755 100644 (file)
--- a/src/player-info/alignment.cpp
+++ b/src/player-info/alignment.cpp
@@ -10,9 +10,9 @@
 #include "player-info/equipment-info.h"
 #include "player-info/race-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player-info/class-info.cpp b/src/player-info/class-info.cpp
index 6b9368b..7dafbce 100644 (file)
--- a/src/player-info/class-info.cpp
+++ b/src/player-info/class-info.cpp
@@ -8,7 +8,7 @@
 #include "core/player-redraw-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "player-info/race-info.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*
  * The magic info

diff --git a/src/player-info/equipment-info.cpp b/src/player-info/equipment-info.cpp
index 8ef8aed..5a07090 100644 (file)
--- a/src/player-info/equipment-info.cpp
+++ b/src/player-info/equipment-info.cpp
@@ -5,7 +5,7 @@
 #include "pet/pet-util.h"
 #include "player-base/player-class.h"
 #include "player-status/player-hand-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player-info/race-info.cpp b/src/player-info/race-info.cpp
index f26f796..a27920e 100644 (file)
--- a/src/player-info/race-info.cpp
+++ b/src/player-info/race-info.cpp
@@ -5,7 +5,7 @@
 #include "player-info/mimic-info-table.h"
 #include "player-info/race-types.h"
 #include "player/race-info-table.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/player-info/self-info-util.h b/src/player-info/self-info-util.h
index 314a751..6f1c71b 100644 (file)
--- a/src/player-info/self-info-util.h
+++ b/src/player-info/self-info-util.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 struct self_info_type {
     int line;

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index a7fe76c..f689cfb 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -24,9 +24,9 @@
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-deceleration.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player-status/player-status-base.cpp b/src/player-status/player-status-base.cpp
index 1e53343..e98acfc 100644 (file)
--- a/src/player-status/player-status-base.cpp
+++ b/src/player-status/player-status-base.cpp
@@ -2,7 +2,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object/object-flags.h"
 #include "player/player-status.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player-status/player-stealth.cpp b/src/player-status/player-stealth.cpp
index ee71a04..20ce460 100644 (file)
--- a/src/player-status/player-stealth.cpp
+++ b/src/player-status/player-stealth.cpp
@@ -13,7 +13,7 @@
 #include "player/player-status.h"
 #include "player/race-info-table.h"
 #include "spell-realm/spells-hex.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/player/patron.cpp b/src/player/patron.cpp
index 61b1c8e..0e92408 100644 (file)
--- a/src/player/patron.cpp
+++ b/src/player/patron.cpp
@@ -32,7 +32,7 @@
 #include "status/experience.h"
 #include "status/shape-changer.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/player/permanent-resistances.cpp b/src/player/permanent-resistances.cpp
index c586636..e2cca43 100644 (file)
--- a/src/player/permanent-resistances.cpp
+++ b/src/player/permanent-resistances.cpp
@@ -10,7 +10,7 @@
 #include "player/player-personality-types.h"
 #include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index f4727db..33f3ac0 100644 (file)
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -60,9 +60,9 @@
 #include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index bedd5f4..9125f4e 100644 (file)
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -42,8 +42,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/player/player-skill.cpp b/src/player/player-skill.cpp
index 5e30f7e..dc5f982 100644 (file)
--- a/src/player/player-skill.cpp
+++ b/src/player/player-skill.cpp
@@ -7,9 +7,9 @@
 #include "player/player-realm.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index bdde507..2eb3d99 100644 (file)
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -41,9 +41,9 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player/player-status-resist.cpp b/src/player/player-status-resist.cpp
index ec50796..c5a8d15 100644 (file)
--- a/src/player/player-status-resist.cpp
+++ b/src/player/player-status-resist.cpp
@@ -25,8 +25,8 @@
 #include "status/element-resistance.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 0d97b44..15617fa 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -105,9 +105,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/player/process-death.cpp b/src/player/process-death.cpp
index 398fe77..f20bf96 100644 (file)
--- a/src/player/process-death.cpp
+++ b/src/player/process-death.cpp
@@ -23,7 +23,7 @@
 #include "store/store-util.h"
 #include "store/store.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/player/race-resistances.cpp b/src/player/race-resistances.cpp
index 3fff497..505f2a5 100644 (file)
--- a/src/player/race-resistances.cpp
+++ b/src/player/race-resistances.cpp
@@ -9,7 +9,7 @@
 #include "player-info/race-info.h"
 #include "player-info/samurai-data-type.h"
 #include "player/special-defense-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player/temporary-resistances.cpp b/src/player/temporary-resistances.cpp
index d8a380a..20b5822 100644 (file)
--- a/src/player/temporary-resistances.cpp
+++ b/src/player/temporary-resistances.cpp
@@ -9,7 +9,7 @@
 #include "realm/realm-types.h"
 #include "spell-realm/spells-hex.h"
 #include "status/element-resistance.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index 3217c53..19c4b30 100644 (file)
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -16,7 +16,7 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "view/display-messages.h"

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index c4174af..68fe778 100644 (file)
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -44,7 +44,7 @@
 #include "status/action-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/target-getter.h"

diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp
index 1739a37..6145a2e 100644 (file)
--- a/src/realm/realm-hissatsu.cpp
+++ b/src/realm/realm-hissatsu.cpp
@@ -44,9 +44,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/realm/realm-nature.cpp b/src/realm/realm-nature.cpp
index 16ea469..2deccc1 100644 (file)
--- a/src/realm/realm-nature.cpp
+++ b/src/realm/realm-nature.cpp
@@ -37,7 +37,7 @@
 #include "status/element-resistance.h"
 #include "sv-definition/sv-food-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "view/display-messages.h"

diff --git a/src/save/floor-writer.cpp b/src/save/floor-writer.cpp
index fdae096..a65470b 100644 (file)
--- a/src/save/floor-writer.cpp
+++ b/src/save/floor-writer.cpp
@@ -15,7 +15,7 @@
 #include "save/save-util.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/angband-files.h"
 #include "util/sort.h"
 

diff --git a/src/save/info-writer.cpp b/src/save/info-writer.cpp
index b5f3148..46f5335 100644 (file)
--- a/src/save/info-writer.cpp
+++ b/src/save/info-writer.cpp
@@ -10,7 +10,7 @@
 #include "save/save.h"
 #include "store/store-util.h"
 #include "system/angband.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index 9e0921b..5cba301 100644 (file)
--- a/src/save/item-writer.cpp
+++ b/src/save/item-writer.cpp
@@ -3,7 +3,7 @@
 #include "load/old/item-flag-types-savefile50.h"
 #include "save/save-util.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/quarks.h"

diff --git a/src/save/save.cpp b/src/save/save.cpp
index 96efe9f..9b6a01d 100644 (file)
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -36,6 +36,7 @@
 #include "system/angband-version.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"

diff --git a/src/smith/object-smith.cpp b/src/smith/object-smith.cpp
index 9099b97..3fdae9e 100644 (file)
--- a/src/smith/object-smith.cpp
+++ b/src/smith/object-smith.cpp
@@ -10,9 +10,8 @@
 #include "smith/smith-info.h"
 #include "smith/smith-tables.h"
 #include "smith/smith-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
-
 #include <algorithm>
 #include <optional>
 #include <sstream>

diff --git a/src/smith/smith-info.cpp b/src/smith/smith-info.cpp
index 853887a..731c00e 100644 (file)
--- a/src/smith/smith-info.cpp
+++ b/src/smith/smith-info.cpp
@@ -4,7 +4,7 @@
 #include "object/tval-types.h"
 #include "smith/smith-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 ISmithInfo::ISmithInfo(SmithEffectType effect, concptr name, SmithCategoryType category, std::vector<SmithEssenceType> need_essences, int consumption)

diff --git a/src/specific-object/bloody-moon.cpp b/src/specific-object/bloody-moon.cpp
index 171c1ba..bd9c7e3 100644 (file)
--- a/src/specific-object/bloody-moon.cpp
+++ b/src/specific-object/bloody-moon.cpp
@@ -6,7 +6,7 @@
 #include "player-base/player-race.h"
 #include "racial/racial-android.h"
 #include "system/artifact-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/specific-object/bow.cpp b/src/specific-object/bow.cpp
index d721e64..ef43ada 100644 (file)
--- a/src/specific-object/bow.cpp
+++ b/src/specific-object/bow.cpp
@@ -1,7 +1,7 @@
 #include "specific-object/bow.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-bow-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 /*!
  * @brief 射撃武器に対応する矢/弾薬のベースアイテムIDを返す /

diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp
index 01cdc1e..af74d37 100644 (file)
--- a/src/specific-object/chest.cpp
+++ b/src/specific-object/chest.cpp
@@ -23,7 +23,7 @@
 #include "status/element-resistance.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/specific-object/death-crimson.cpp b/src/specific-object/death-crimson.cpp
index cb60804..77c91d5 100644 (file)
--- a/src/specific-object/death-crimson.cpp
+++ b/src/specific-object/death-crimson.cpp
@@ -5,7 +5,7 @@
 #include "effect/effect-processor.h"
 #include "floor/geometry.h"
 #include "player-base/player-class.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-getter.h"

diff --git a/src/specific-object/death-scythe.cpp b/src/specific-object/death-scythe.cpp
index 3d80de1..d4c2e9e 100644 (file)
--- a/src/specific-object/death-scythe.cpp
+++ b/src/specific-object/death-scythe.cpp
@@ -20,7 +20,7 @@
 #include "player/player-damage.h"
 #include "player/player-status-flags.h"
 #include "status/element-resistance.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/specific-object/monster-ball.cpp b/src/specific-object/monster-ball.cpp
index 5fc3562..f5d13ac 100644 (file)
--- a/src/specific-object/monster-ball.cpp
+++ b/src/specific-object/monster-ball.cpp
@@ -14,9 +14,9 @@
 #include "racial/racial-android.h"
 #include "spell-kind/spells-launcher.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/flag-group.h"

diff --git a/src/specific-object/muramasa.cpp b/src/specific-object/muramasa.cpp
index fbe59f4..b1bad06 100644 (file)
--- a/src/specific-object/muramasa.cpp
+++ b/src/specific-object/muramasa.cpp
@@ -3,7 +3,7 @@
 #include "core/asking-player.h"
 #include "spell/spells-object.h"
 #include "status/base-status.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/specific-object/torch.cpp b/src/specific-object/torch.cpp
index dd4c9db..e83c0e3 100644 (file)
--- a/src/specific-object/torch.cpp
+++ b/src/specific-object/torch.cpp
@@ -14,7 +14,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/point-2d.h"

diff --git a/src/spell-kind/magic-item-recharger.cpp b/src/spell-kind/magic-item-recharger.cpp
index 8281608..ffa2ef6 100644 (file)
--- a/src/spell-kind/magic-item-recharger.cpp
+++ b/src/spell-kind/magic-item-recharger.cpp
@@ -22,7 +22,7 @@
 #include "object/item-use-flags.h"
 #include "player-base/player-class.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-curse-removal.cpp b/src/spell-kind/spells-curse-removal.cpp
index b116167..cf8d614 100644 (file)
--- a/src/spell-kind/spells-curse-removal.cpp
+++ b/src/spell-kind/spells-curse-removal.cpp
@@ -5,7 +5,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trc-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-detection.cpp b/src/spell-kind/spells-detection.cpp
index 52b4e5e..1d8fe9c 100644 (file)
--- a/src/spell-kind/spells-detection.cpp
+++ b/src/spell-kind/spells-detection.cpp
@@ -22,8 +22,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/string-processor.h"

diff --git a/src/spell-kind/spells-enchant.cpp b/src/spell-kind/spells-enchant.cpp
index 22b1dd4..5346431 100644 (file)
--- a/src/spell-kind/spells-enchant.cpp
+++ b/src/spell-kind/spells-enchant.cpp
@@ -13,7 +13,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
 #include "racial/racial-android.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/spell-kind/spells-equipment.cpp b/src/spell-kind/spells-equipment.cpp
index 725acb0..af73b45 100644 (file)
--- a/src/spell-kind/spells-equipment.cpp
+++ b/src/spell-kind/spells-equipment.cpp
@@ -8,7 +8,7 @@
 #include "object-hook/hook-weapon.h"
 #include "object/object-info.h"
 #include "racial/racial-android.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-fetcher.cpp b/src/spell-kind/spells-fetcher.cpp
index 34ce13e..6ff197e 100644 (file)
--- a/src/spell-kind/spells-fetcher.cpp
+++ b/src/spell-kind/spells-fetcher.cpp
@@ -15,9 +15,9 @@
 #include "monster/monster-update.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index fec4585..a1b3d84 100644 (file)
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -48,6 +48,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/spell-kind/spells-perception.cpp b/src/spell-kind/spells-perception.cpp
index c7282b1..1297cb9 100644 (file)
--- a/src/spell-kind/spells-perception.cpp
+++ b/src/spell-kind/spells-perception.cpp
@@ -22,12 +22,11 @@
 #include "object/object-mark-types.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 #include "world/world.h"
-
 #include <memory>
 
 /*!

diff --git a/src/spell-kind/spells-polymorph.cpp b/src/spell-kind/spells-polymorph.cpp
index 0db43ba..648bca9 100644 (file)
--- a/src/spell-kind/spells-polymorph.cpp
+++ b/src/spell-kind/spells-polymorph.cpp
@@ -13,9 +13,9 @@
 #include "monster/monster-util.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell-kind/spells-teleport.cpp b/src/spell-kind/spells-teleport.cpp
index 332b94c..47f70ed 100644 (file)
--- a/src/spell-kind/spells-teleport.cpp
+++ b/src/spell-kind/spells-teleport.cpp
@@ -35,9 +35,9 @@
 #include "spell-kind/spells-launcher.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/target-checker.h"

diff --git a/src/spell-realm/spells-arcane.cpp b/src/spell-realm/spells-arcane.cpp
index 4c7c2cb..b9421ad 100644 (file)
--- a/src/spell-realm/spells-arcane.cpp
+++ b/src/spell-realm/spells-arcane.cpp
@@ -3,7 +3,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "object/tval-types.h"
 #include "sv-definition/sv-lite-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp
index 096468b..7fe8f4b 100644 (file)
--- a/src/spell-realm/spells-craft.cpp
+++ b/src/spell-realm/spells-craft.cpp
@@ -19,7 +19,7 @@
 #include "racial/racial-android.h"
 #include "spell/spells-object.h"
 #include "sv-definition/sv-protector-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/spell-realm/spells-nature.cpp b/src/spell-realm/spells-nature.cpp
index 69332c5..446fbf0 100644 (file)
--- a/src/spell-realm/spells-nature.cpp
+++ b/src/spell-realm/spells-nature.cpp
@@ -7,7 +7,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
 #include "racial/racial-android.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/spell-realm/spells-sorcery.cpp b/src/spell-realm/spells-sorcery.cpp
index 0974afb..cebe77f 100644 (file)
--- a/src/spell-realm/spells-sorcery.cpp
+++ b/src/spell-realm/spells-sorcery.cpp
@@ -10,7 +10,7 @@
 #include "object-hook/hook-expendable.h"
 #include "object/item-use-flags.h"
 #include "object/object-value.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index a6d275b..26951e4 100644 (file)
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -38,8 +38,8 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index 1fbd82f..80788dd 100644 (file)
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -47,8 +47,8 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "timed-effect/player-acceleration.h"

diff --git a/src/spell/spells-summon.cpp b/src/spell/spells-summon.cpp
index b0dc60e..ffad53e 100644 (file)
--- a/src/spell/spells-summon.cpp
+++ b/src/spell/spells-summon.cpp
@@ -28,9 +28,9 @@
 #include "status/bad-status-setter.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/status/base-status.cpp b/src/status/base-status.cpp
index a25e2ec..b12fcae 100644 (file)
--- a/src/status/base-status.cpp
+++ b/src/status/base-status.cpp
@@ -10,7 +10,7 @@
 #include "perception/object-perception.h"
 #include "player/player-status-flags.h"
 #include "spell-kind/spells-floor.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/store/black-market.cpp b/src/store/black-market.cpp
index 881bb05..a55eae5 100644 (file)
--- a/src/store/black-market.cpp
+++ b/src/store/black-market.cpp
@@ -2,7 +2,7 @@
 #include "floor/floor-town.h"
 #include "store/store-owners.h"
 #include "store/store-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 8ba5445..2b8687e 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -25,7 +25,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/store/home.cpp b/src/store/home.cpp
index 5ed01c4..f02d80a 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -7,7 +7,7 @@
 #include "object/object-value.h"
 #include "object/tval-types.h"
 #include "store/store-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/object-sort.h"
 

diff --git a/src/store/museum.cpp b/src/store/museum.cpp
index d0257a1..38bde31 100644 (file)
--- a/src/store/museum.cpp
+++ b/src/store/museum.cpp
@@ -4,7 +4,7 @@
 #include "store/home.h"
 #include "store/store-util.h"
 #include "store/store.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "view/display-messages.h"
 #include "view/display-store.h"
 

diff --git a/src/store/pricing.cpp b/src/store/pricing.cpp
index b4270b9..ab57864 100644 (file)
--- a/src/store/pricing.cpp
+++ b/src/store/pricing.cpp
@@ -5,7 +5,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 

diff --git a/src/store/purchase-order.cpp b/src/store/purchase-order.cpp
index 4268435..a8f4fe2 100644 (file)
--- a/src/store/purchase-order.cpp
+++ b/src/store/purchase-order.cpp
@@ -26,7 +26,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index f405b61..e2da0e4 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -10,8 +10,8 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/store/sell-order.cpp b/src/store/sell-order.cpp
index c7d614e..8f5acdc 100644 (file)
--- a/src/store/sell-order.cpp
+++ b/src/store/sell-order.cpp
@@ -32,7 +32,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/store/service-checker.cpp b/src/store/service-checker.cpp
index 3008057..984c324 100644 (file)
--- a/src/store/service-checker.cpp
+++ b/src/store/service-checker.cpp
@@ -10,8 +10,8 @@
 #include "sv-definition/sv-rod-types.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "sv-definition/sv-weapon-types.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index e7a118a..938c78d 100644 (file)
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -10,7 +10,7 @@
 #include "object/object-value.h"
 #include "object/tval-types.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 
 store_type *st_ptr = nullptr;
 

diff --git a/src/store/store.cpp b/src/store/store.cpp
index 06ef9d1..f508f76 100644 (file)
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -27,7 +27,7 @@
 #include "store/store-util.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-scroll-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/system/artifact-type-definition.h b/src/system/artifact-type-definition.h
index 46f16bd..89cfc15 100644 (file)
--- a/src/system/artifact-type-definition.h
+++ b/src/system/artifact-type-definition.h
@@ -4,7 +4,6 @@
 #include "object-enchant/trg-types.h"
 #include "system/angband.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
 #include "util/flag-group.h"
 #include <map>
 #include <string>

diff --git a/src/system/object-type-definition.cpp b/src/system/item-entity.cpp
similarity index 99%
rename from src/system/object-type-definition.cpp
rename to src/system/item-entity.cpp
index fa8999b..f6f9fb2 100644 (file)
--- a/src/system/object-type-definition.cpp
+++ b/src/system/item-entity.cpp
@@ -1,11 +1,11 @@
 /*
- * @file object-type-definition.h
+ * @file item-entity.cpp
  * @brief アイテム定義の構造体とエンティティ処理実装
  * @author Hourier
  * @date 2022/10/09
  */
 
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "artifact/fixed-art-types.h"
 #include "artifact/random-art-effects.h"
 #include "monster-race/monster-race.h"

diff --git a/src/system/object-type-definition.h b/src/system/item-entity.h
similarity index 99%
rename from src/system/object-type-definition.h
rename to src/system/item-entity.h
index 31d0248..22422c6 100644 (file)
--- a/src/system/object-type-definition.h
+++ b/src/system/item-entity.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * @file object-type-definition.h
+ * @file item-entity.h
  * @brief アイテム定義の構造体とエンティティ処理定義
  * @author Hourier
  * @date 2021/05/02

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 75d25c7..1c97b18 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -29,9 +29,9 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/target/target-preparation.cpp b/src/target/target-preparation.cpp
index de8ed74..82ba953 100644 (file)
--- a/src/target/target-preparation.cpp
+++ b/src/target/target-preparation.cpp
@@ -10,9 +10,9 @@
 #include "object/object-mark-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index fe42f49..54ba961 100644 (file)
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -10,8 +10,8 @@
 #include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player/player-realm.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/view/display-characteristic.cpp b/src/view/display-characteristic.cpp
index 45af562..4087e51 100644 (file)
--- a/src/view/display-characteristic.cpp
+++ b/src/view/display-characteristic.cpp
@@ -17,7 +17,7 @@
 #include "player/permanent-resistances.h"
 #include "player/race-resistances.h"
 #include "player/temporary-resistances.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-inventory.cpp b/src/view/display-inventory.cpp
index a40b18f..9e0479b 100644 (file)
--- a/src/view/display-inventory.cpp
+++ b/src/view/display-inventory.cpp
@@ -10,7 +10,7 @@
 #include "object/item-use-flags.h"
 #include "object/object-info.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/view/display-map.cpp b/src/view/display-map.cpp
index 34f5f22..ef7108c 100644 (file)
--- a/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@ -16,9 +16,9 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-player-middle.cpp b/src/view/display-player-middle.cpp
index d120f6f..458e541 100644 (file)
--- a/src/view/display-player-middle.cpp
+++ b/src/view/display-player-middle.cpp
@@ -20,8 +20,8 @@
 #include "player/player-status.h"
 #include "sv-definition/sv-bow-types.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/term-color-types.h"
 #include "timed-effect/player-deceleration.h"

diff --git a/src/view/display-player-stat-info.cpp b/src/view/display-player-stat-info.cpp
index c28c2f9..96d7c3e 100644 (file)
--- a/src/view/display-player-stat-info.cpp
+++ b/src/view/display-player-stat-info.cpp
@@ -18,7 +18,7 @@
 #include "player/player-personality.h"
 #include "player/player-status-table.h"
 #include "player/player-status.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-player.cpp b/src/view/display-player.cpp
index 67deaaf..69d5bf7 100644 (file)
--- a/src/view/display-player.cpp
+++ b/src/view/display-player.cpp
@@ -29,7 +29,7 @@
 #include "realm/realm-names-table.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-store.cpp b/src/view/display-store.cpp
index ba32aef..3adb86c 100644 (file)
--- a/src/view/display-store.cpp
+++ b/src/view/display-store.cpp
@@ -12,7 +12,7 @@
 #include "store/store-util.h"
 #include "store/store.h" //!< @todo 相互依存している、こっちは残す？.
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/gameterm.h"

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index c6dc9fe..5fa5301 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -8,7 +8,7 @@
 #include "player-base/player-class.h"
 #include "realm/realm-names-table.h"
 #include "spell/spell-info.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/term-color-types.h"
 #include "view/display-messages.h"

diff --git a/src/view/status-first-page.cpp b/src/view/status-first-page.cpp
index 2c49a9d..c723a74 100644 (file)
--- a/src/view/status-first-page.cpp
+++ b/src/view/status-first-page.cpp
@@ -24,7 +24,7 @@
 #include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
 #include "sv-definition/sv-weapon-types.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/window/display-sub-window-items.cpp b/src/window/display-sub-window-items.cpp
index 04290c4..0dc18cf 100644 (file)
--- a/src/window/display-sub-window-items.cpp
+++ b/src/window/display-sub-window-items.cpp
@@ -3,7 +3,7 @@
 #include "game-option/text-display-options.h"
 #include "object-enchant/special-object-flags.h"
 #include "perception/object-perception.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/quarks.h"
 #include "util/string-processor.h"

diff --git a/src/window/display-sub-windows.cpp b/src/window/display-sub-windows.cpp
index 1f18b6d..b567265 100644 (file)
--- a/src/window/display-sub-windows.cpp
+++ b/src/window/display-sub-windows.cpp
@@ -25,9 +25,9 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-describer.h"

diff --git a/src/window/main-window-equipments.cpp b/src/window/main-window-equipments.cpp
index bc44bf0..5e4da77 100644 (file)
--- a/src/window/main-window-equipments.cpp
+++ b/src/window/main-window-equipments.cpp
@@ -12,7 +12,7 @@
 #include "object/object-info.h"
 #include "player/player-status-flags.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/window/main-window-util.cpp b/src/window/main-window-util.cpp
index 894d24b..815514a 100644 (file)
--- a/src/window/main-window-util.cpp
+++ b/src/window/main-window-util.cpp
@@ -10,8 +10,8 @@
 #include "monster-race/race-indice-types.h"
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/screen-processor.h"

diff --git a/src/wizard/artifact-analyzer.cpp b/src/wizard/artifact-analyzer.cpp
index b7c65e6..504ac00 100644 (file)
--- a/src/wizard/artifact-analyzer.cpp
+++ b/src/wizard/artifact-analyzer.cpp
@@ -8,7 +8,7 @@
 #include "object/object-flags.h"
 #include "object/object-info.h"
 #include "system/artifact-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/enum-range.h"

diff --git a/src/wizard/cmd-wizard.cpp b/src/wizard/cmd-wizard.cpp
index fdbbe3e..2badd80 100644 (file)
--- a/src/wizard/cmd-wizard.cpp
+++ b/src/wizard/cmd-wizard.cpp
@@ -24,7 +24,7 @@
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/wizard/fixed-artifacts-spoiler.cpp b/src/wizard/fixed-artifacts-spoiler.cpp
index 7fce99f..a2a5f12 100644 (file)
--- a/src/wizard/fixed-artifacts-spoiler.cpp
+++ b/src/wizard/fixed-artifacts-spoiler.cpp
@@ -4,7 +4,7 @@
 #include "system/angband-version.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/wizard/items-spoiler.cpp b/src/wizard/items-spoiler.cpp
index 4482298..885daa0 100644 (file)
--- a/src/wizard/items-spoiler.cpp
+++ b/src/wizard/items-spoiler.cpp
@@ -7,7 +7,7 @@
 #include "object/object-value.h"
 #include "system/angband-version.h"
 #include "system/baseitem-info-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index 092f8e1..aaea4a2 100644 (file)
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -32,7 +32,7 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "term/screen-processor.h"

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 3231b9d..0195136 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -84,8 +84,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/grid-selector.h"

diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 2918920..a18ca67 100644 (file)
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -26,8 +26,8 @@
 #include "spell/spells-util.h"
 #include "system/angband-version.h"
 #include "system/baseitem-info-definition.h"
+#include "system/item-entity.h"
 #include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/angband-files.h"

diff --git a/src/world/world-object.cpp b/src/world/world-object.cpp
index 2e7d131..7ba001a 100644 (file)
--- a/src/world/world-object.cpp
+++ b/src/world/world-object.cpp
@@ -6,7 +6,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "util/probability-table.h"
 #include "view/display-messages.h"