[Refactor] #40457 Renamed avatar.c/h from player/ to player-info/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index e3532fc..5256e0e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -546,7 +546,7 @@
     <ClCompile Include="..\..\src\specific-object\death-scythe.c" />\r
     <ClCompile Include="..\..\src\specific-object\torch.c" />\r
     <ClCompile Include="..\..\src\pet\pet-util.c" />\r
-    <ClCompile Include="..\..\src\player\avatar.c" />\r
+    <ClCompile Include="..\..\src\player-info\avatar.c" />\r
     <ClCompile Include="..\..\src\birth\character-builder.c" />\r
     <ClCompile Include="..\..\src\birth\birth-explanations-table.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-autopick.c" />\r
@@ -1274,7 +1274,7 @@
     <ClInclude Include="..\..\src\object-enchant\tr-types.h" />\r
     <ClInclude Include="..\..\src\object-enchant\trc-types.h" />\r
     <ClInclude Include="..\..\src\object\tval-types.h" />\r
-    <ClInclude Include="..\..\src\player\avatar.h" />\r
+    <ClInclude Include="..\..\src\player-info\avatar.h" />\r
     <ClInclude Include="..\..\src\birth\character-builder.h" />\r
     <ClInclude Include="..\..\src\birth\birth-explanations-table.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-autopick.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 21581d7..5a2b20c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -464,9 +464,6 @@
     <ClCompile Include="..\..\src\grid\feature.c">
       <Filter>grid</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player\avatar.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monster\horror-descriptions.c">
       <Filter>monster</Filter>
     </ClCompile>
@@ -2129,6 +2126,9 @@
     <ClCompile Include="..\..\src\player-info\self-info.c">
       <Filter>player-info</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player-info\avatar.c">
+      <Filter>player-info</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -2635,9 +2635,6 @@
     <ClInclude Include="..\..\src\grid\trap.h">
       <Filter>grid</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player\avatar.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster\horror-descriptions.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -4609,6 +4606,9 @@
     <ClInclude Include="..\..\src\player-info\self-info.h">
       <Filter>player-info</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-info\avatar.h">
+      <Filter>player-info</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 68b519f..3c3fa01 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -598,7 +598,6 @@ hengband_SOURCES = \
        pet/pet-util.c pet/pet-util.h \
        \
        player/attack-defense-types.h \
-       player/avatar.h player/avatar.c \
        player/eldritch-horror.c player/eldritch-horror.h \
        player/mimic-info-table.c player/mimic-info-table.h \
        player/patron.c player/patron.h \
@@ -631,6 +630,7 @@ hengband_SOURCES = \
        player-attack/blood-sucking-processor.c player-attack/blood-sucking-processor.h \
        player-attack/player-attack.c player-attack/player-attack.h \
        \
+       player-info/avatar.h player-info/avatar.c \
        player-info/self-info.c player-info/self-info.h \
        player-info/self-info-util.c player-info/self-info-util.h \
        \

diff --git a/src/action/tunnel-execution.c b/src/action/tunnel-execution.c
index dc68bc8..6664b5a 100644 (file)
--- a/src/action/tunnel-execution.c
+++ b/src/action/tunnel-execution.c
@@ -5,7 +5,7 @@
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-move.h"
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/artifact/random-art-generator.c b/src/artifact/random-art-generator.c
index d51ac12..a17423b 100644 (file)
--- a/src/artifact/random-art-generator.c
+++ b/src/artifact/random-art-generator.c
@@ -27,7 +27,7 @@
 #include "object/object-value-calc.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/birth/birth-wizard.c b/src/birth/birth-wizard.c
index bcbacde..bc63656 100644 (file)
--- a/src/birth/birth-wizard.c
+++ b/src/birth/birth-wizard.c
@@ -20,7 +20,7 @@
 #include "io/input-key-acceptor.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/patron.h"
 #include "player/player-class.h"
 #include "player/player-race.h"

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index e547d42..7c50e8d 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -32,7 +32,7 @@
 #include "object/item-use-flags.h"
 #include "player-attack/player-attack.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-skill.h"
 #include "player/player-status-flags.h"

diff --git a/src/cmd-action/cmd-move.c b/src/cmd-action/cmd-move.c
index 3f29ad0..1ff2045 100644 (file)
--- a/src/cmd-action/cmd-move.c
+++ b/src/cmd-action/cmd-move.c
@@ -23,7 +23,7 @@
 #include "io/write-diary.h"
 #include "mind/mind-ninja.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-move.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index b3685fa..7fc0c20 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -32,7 +32,7 @@
 #include "object/item-use-flags.h"
 #include "player-info/self-info.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/eldritch-horror.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index fccc2d5..1f37b38 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -54,7 +54,7 @@
 #include "object-hook/hook-bow.h"
 #include "object-hook/hook-weapon.h"
 #include "object/item-tester-hooker.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-personalities-types.h"
 #include "player/player-status.h"
 #include "spell-kind/spells-perception.h"

diff --git a/src/cmd-item/cmd-destroy.c b/src/cmd-item/cmd-destroy.c
index fce562a..a89ae7a 100644 (file)
--- a/src/cmd-item/cmd-destroy.c
+++ b/src/cmd-item/cmd-destroy.c
@@ -21,7 +21,7 @@
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/special-defense-types.h"
 #include "racial/racial-android.h"
 #include "realm/realm-names-table.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 7f83982..ce745b7 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -25,7 +25,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"

diff --git a/src/cmd-item/cmd-equipment.c b/src/cmd-item/cmd-equipment.c
index e99b820..688bebc 100644 (file)
--- a/src/cmd-item/cmd-equipment.c
+++ b/src/cmd-item/cmd-equipment.c
@@ -30,7 +30,7 @@
 #include "object/object-mark-types.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/special-defense-types.h"
 #include "racial/racial-android.h"
 #include "spell-kind/spells-perception.h"

diff --git a/src/cmd-item/cmd-magiceat.c b/src/cmd-item/cmd-magiceat.c
index ebefaf4..0219688 100644 (file)
--- a/src/cmd-item/cmd-magiceat.c
+++ b/src/cmd-item/cmd-magiceat.c
@@ -68,7 +68,7 @@
 #include "object/object-kind.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-rod-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "spell/spell-info.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index b78e1d8..e2ba84d 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -17,7 +17,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 73bf283..914c8b8 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -12,7 +12,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "player/special-defense-types.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 7c0998a..9528904 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -14,7 +14,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "player/special-defense-types.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 4d2234b..e9dc4e2 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -45,7 +45,7 @@
 #include "object/object-info.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-types.h"
 #include "player/player-skill.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index cc739fc..039346c 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -15,7 +15,7 @@
 #include "object-enchant/object-ego.h"
 #include "object-enchant/trc-types.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index fde5d2a..d995b42 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -16,7 +16,7 @@
 #include "monster/monster-status.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "status/bad-status-setter.h"
 #include "spell/spells-diceroll.h"
 #include "system/floor-type-definition.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index 4c9e8b1..cd39ee8 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -10,7 +10,7 @@
 #include "monster/monster-status.h"
 #include "monster-floor/monster-generator.h"
 #include "monster/monster-info.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index fc2f977..0b581a7 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -26,7 +26,7 @@
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "spell-kind/spells-genocide.h"
 #include "spell/spell-types.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 7021d2a..370da83 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -35,7 +35,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell-kind/blood-curse.h"
 #include "spell-kind/spells-polymorph.h"
 #include "spell-kind/spells-teleport.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 5ed98ea..524dd53 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -23,7 +23,7 @@
 #include "monster/smart-learn-types.h"
 #include "object/object-info.h"
 #include "pet/pet-util.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/race-info-table.h"
 #include "player/player-status-flags.h"
 #include "realm/realm-names-table.h"

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index 450aeda..9c807f0 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -11,7 +11,7 @@
 #include "floor/floor-town.h"
 #include "info-reader/fixed-map-parser.h"
 #include "io-dump/dump-util.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/race-info-table.h"
 #include "store/store-util.h"

diff --git a/src/load/load-zangband.c b/src/load/load-zangband.c
index ef5b1e7..0518dbf 100644 (file)
--- a/src/load/load-zangband.c
+++ b/src/load/load-zangband.c
@@ -9,7 +9,7 @@
 #include "monster-race/monster-race.h"
 #include "pet/pet-util.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/patron.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"

diff --git a/src/load/store-loader.c b/src/load/store-loader.c
index 16149f4..68eb490 100644 (file)
--- a/src/load/store-loader.c
+++ b/src/load/store-loader.c
@@ -6,7 +6,7 @@
 #include "load/load-util.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "store/store.h"
 #include "util/object-sort.h"
 

diff --git a/src/market/bounty.c b/src/market/bounty.c
index e806a86..31f58c7 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -26,7 +26,7 @@
 #include "object/object-info.h"
 #include "object/object-kind-hook.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/floor-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c
index d485a17..0f5536a 100644 (file)
--- a/src/market/play-gamble.c
+++ b/src/market/play-gamble.c
@@ -5,7 +5,7 @@
 #include "market/building-actions-table.h"
 #include "market/building-util.h"
 #include "market/poker.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "view/display-fruit.h"

diff --git a/src/mind/mind-blue-mage.c b/src/mind/mind-blue-mage.c
index 036e69e..779657d 100644 (file)
--- a/src/mind/mind-blue-mage.c
+++ b/src/mind/mind-blue-mage.c
@@ -11,7 +11,7 @@
 #include "main/sound-of-music.h"
 #include "mspell/monster-power-table.h"
 #include "mspell/mspell-type.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "realm/realm-types.h"
 #include "spell/spell-info.h"
 #include "status/bad-status-setter.h"

diff --git a/src/mind/mind-force-trainer.c b/src/mind/mind-force-trainer.c
index c69fbc3..0726803 100644 (file)
--- a/src/mind/mind-force-trainer.c
+++ b/src/mind/mind-force-trainer.c
@@ -18,7 +18,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"

diff --git a/src/mind/mind-mindcrafter.c b/src/mind/mind-mindcrafter.c
index ec696ef..d6b9409 100644 (file)
--- a/src/mind/mind-mindcrafter.c
+++ b/src/mind/mind-mindcrafter.c
@@ -18,7 +18,7 @@
 #include "object/object-mark-types.h"
 #include "perception/object-perception.h"
 #include "perception/simple-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-fetcher.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/mind/mind-samurai.c b/src/mind/mind-samurai.c
index c1ae819..9e85779 100644 (file)
--- a/src/mind/mind-samurai.c
+++ b/src/mind/mind-samurai.c
@@ -23,7 +23,7 @@
 #include "monster/monster-status.h"
 #include "object-enchant/tr-types.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "status/action-setter.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/monster-attack/monster-eating.c b/src/monster-attack/monster-eating.c
index 1d599ca..9ce3386 100644 (file)
--- a/src/monster-attack/monster-eating.c
+++ b/src/monster-attack/monster-eating.c
@@ -18,7 +18,7 @@
 #include "object/object-generator.h"
 #include "object/object-info.h"
 #include "object/object-mark-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/mimic-info-table.h"
 #include "status/experience.h"
 #include "system/floor-type-definition.h"

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index 07eaaa8..3388a92 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -52,7 +52,7 @@
 #include "mspell/mspell-judgement.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-move.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/monster/monster-status-setter.c b/src/monster/monster-status-setter.c
index ab62d61..cc00c1d 100644 (file)
--- a/src/monster/monster-status-setter.c
+++ b/src/monster/monster-status-setter.c
@@ -17,7 +17,7 @@
 #include "monster/monster-status.h" // todo 相互依存. 後で何とかする.
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 8a91896..7d0f77e 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -45,7 +45,7 @@
 #include "monster/smart-learn-types.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "object-enchant/object-curse.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-personalities-types.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-random.h"

diff --git a/src/mutation/mutation-investor-remover.c b/src/mutation/mutation-investor-remover.c
index be568a9..53d2beb 100644 (file)
--- a/src/mutation/mutation-investor-remover.c
+++ b/src/mutation/mutation-investor-remover.c
@@ -6,7 +6,7 @@
 #include "mutation/mutation-flag-types.h"
 #include "mutation/mutation-util.h"
 #include "mutation/mutation-calculator.h" // todo calc_mutant_regenerate_mod() が相互依存している、後で消す.
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "view/display-messages.h"
 
 static void sweep_gain_mutation(player_type *creature_ptr, glm_type *gm_ptr)

diff --git a/src/object-activation/activation-others.c b/src/object-activation/activation-others.c
index 272e5aa..9b15a22 100644 (file)
--- a/src/object-activation/activation-others.c
+++ b/src/object-activation/activation-others.c
@@ -16,7 +16,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-status.h"
 #include "player-attack/player-attack.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/magic-item-recharger.h"

diff --git a/src/object-use/quaff-execution.c b/src/object-use/quaff-execution.c
index 4f37eb2..6b510df 100644 (file)
--- a/src/object-use/quaff-execution.c
+++ b/src/object-use/quaff-execution.c
@@ -22,7 +22,7 @@
 #include "perception/object-perception.h"
 #include "player-info/self-info.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/eldritch-horror.h"
 #include "player/mimic-info-table.h"

diff --git a/src/object-use/read-execution.c b/src/object-use/read-execution.c
index a61fd92..18d8ba4 100644 (file)
--- a/src/object-use/read-execution.c
+++ b/src/object-use/read-execution.c
@@ -26,7 +26,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"
 #include "spell-kind/magic-item-recharger.h"

diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c
index cd16e86..65dcac0 100644 (file)
--- a/src/perception/simple-perception.c
+++ b/src/perception/simple-perception.c
@@ -22,7 +22,7 @@
 #include "object-hook/hook-enchant.h"
 #include "object/object-info.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "view/display-messages.h"
 #include "player/player-status-flags.h"
 

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index 6cd8654..4ea268b 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -34,7 +34,7 @@
 #include "player-attack/attack-chaos-effect.h"
 #include "player-attack/blood-sucking-processor.h"
 #include "player-attack/player-attack-util.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-skill.h"
 #include "player/player-status-flags.h"

diff --git a/src/player/avatar.c b/src/player-info/avatar.c
similarity index 99%
rename from src/player/avatar.c
rename to src/player-info/avatar.c
index 74f5907..3493ad4 100644 (file)
--- a/src/player/avatar.c
+++ b/src/player-info/avatar.c
@@ -12,7 +12,7 @@
  * included in all such copies.
  */
 
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "core/player-update-types.h"
 #include "player/player-class.h"
 #include "player/player-race-types.h"

diff --git a/src/player/avatar.h b/src/player-info/avatar.h
similarity index 100%
rename from src/player/avatar.h
rename to src/player-info/avatar.h

diff --git a/src/player-info/self-info.c b/src/player-info/self-info.c
index 774b4c9..be8e788 100644 (file)
--- a/src/player-info/self-info.c
+++ b/src/player-info/self-info.c
@@ -22,7 +22,7 @@
 #include "object/object-flags.h"
 #include "player-info/self-info-util.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index ca15aaa..7bc2f92 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -7,7 +7,7 @@
 #include "floor/wild.h"
 #include "game-option/disturbance-options.h"
 #include "object-enchant/trc-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "player/special-defense-types.h"
 #include "status/bad-status-setter.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 1a5ef83..bd163c4 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -41,7 +41,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/object-broken.h"
 #include "object/object-flags.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-types.h"
 #include "player/player-race-types.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 79b14ef..a248fe5 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -62,7 +62,7 @@
 #include "perception/object-perception.h"
 #include "pet/pet-util.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/mimic-info-table.h"
 #include "player/patron.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 2db6caf..345b195 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -3,7 +3,7 @@
 #include "core/asking-player.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "spell-kind/spells-beam.h"
 #include "spell-kind/spells-detection.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index a6a7450..20d0551 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -3,7 +3,7 @@
 #include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"
 #include "player/player-race.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 952fff8..7ef942e 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -10,7 +10,7 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "player-attack/player-attack.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 70c6e01..92b64ba 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -2,7 +2,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "core/asking-player.h"
 #include "player-info/self-info.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell-kind/magic-item-recharger.h"
 #include "spell-kind/spells-charm.h"
 #include "spell-kind/spells-detection.h"

diff --git a/src/spell-kind/spells-enchant.c b/src/spell-kind/spells-enchant.c
index aeb050b..843cdb0 100644 (file)
--- a/src/spell-kind/spells-enchant.c
+++ b/src/spell-kind/spells-enchant.c
@@ -13,7 +13,7 @@
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
 #include "object/object-generator.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "racial/racial-android.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"

diff --git a/src/spell-kind/spells-equipment.c b/src/spell-kind/spells-equipment.c
index 348242e..f000d52 100644 (file)
--- a/src/spell-kind/spells-equipment.c
+++ b/src/spell-kind/spells-equipment.c
@@ -7,7 +7,7 @@
 #include "object-hook/hook-enchant.h"
 #include "object-hook/hook-weapon.h"
 #include "object/object-info.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "racial/racial-android.h"
 #include "system/object-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 43ecf24..dbaf394 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -20,7 +20,7 @@
 #include "monster/monster-status-setter.h"
 #include "monster-floor/monster-remover.h"
 #include "monster/monster-status.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/spell-kind/spells-perception.c b/src/spell-kind/spells-perception.c
index 7e5c74b..ce70a11 100644 (file)
--- a/src/spell-kind/spells-perception.c
+++ b/src/spell-kind/spells-perception.c
@@ -22,7 +22,7 @@
 #include "object/object-mark-types.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "system/object-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/spell-kind/spells-random.c b/src/spell-kind/spells-random.c
index 0a0be8b..8f3a5d8 100644 (file)
--- a/src/spell-kind/spells-random.c
+++ b/src/spell-kind/spells-random.c
@@ -11,7 +11,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "mutation/mutation-investor-remover.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-equipment.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index 542d212..5f83261 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -20,7 +20,7 @@
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
 #include "monster/smart-learn-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell/spell-types.h"
 #include "system/floor-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index 60e58c7..decc05a 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -28,7 +28,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-move.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"

diff --git a/src/spell-realm/spells-trump.c b/src/spell-realm/spells-trump.c
index 14e3b6c..d512e13 100644 (file)
--- a/src/spell-realm/spells-trump.c
+++ b/src/spell-realm/spells-trump.c
@@ -2,7 +2,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "mutation/mutation-investor-remover.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-charm.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 00d9db7..afd918d 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -45,7 +45,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-status.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 38b328c..88cb296 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -27,7 +27,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index f00a3fa..8ca5ca1 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -14,7 +14,7 @@
 #include "monster/smart-learn-types.h"
 #include "object/item-use-flags.h"
 #include "object/item-tester-hooker.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell/spells-diceroll.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-floor.h"

diff --git a/src/status/bad-status-setter.c b/src/status/bad-status-setter.c
index 8e25d44..306089e 100644 (file)
--- a/src/status/bad-status-setter.c
+++ b/src/status/bad-status-setter.c
@@ -7,7 +7,7 @@
 #include "game-option/disturbance-options.h"
 #include "mind/mind-sniper.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-race.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/status/base-status.c b/src/status/base-status.c
index 3fb79c8..ba889ed 100644 (file)
--- a/src/status/base-status.c
+++ b/src/status/base-status.c
@@ -7,7 +7,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "spell-kind/spells-floor.h"
 #include "system/object-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/status/body-improvement.c b/src/status/body-improvement.c
index 814038c..41d2684 100644 (file)
--- a/src/status/body-improvement.c
+++ b/src/status/body-improvement.c
@@ -6,7 +6,7 @@
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
 #include "game-option/disturbance-options.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "realm/realm-song-numbers.h"
 #include "view/display-messages.h"
 

diff --git a/src/status/buff-setter.c b/src/status/buff-setter.c
index 6562d3d..60abaf6 100644 (file)
--- a/src/status/buff-setter.c
+++ b/src/status/buff-setter.c
@@ -4,7 +4,7 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "realm/realm-song-numbers.h"
 #include "view/display-messages.h"
 

diff --git a/src/status/shape-changer.c b/src/status/shape-changer.c
index a37f161..78ec67a 100644 (file)
--- a/src/status/shape-changer.c
+++ b/src/status/shape-changer.c
@@ -11,7 +11,7 @@
 #include "game-option/disturbance-options.h"
 #include "grid/grid.h"
 #include "mutation/mutation-investor-remover.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-personality.h"

diff --git a/src/store/home.c b/src/store/home.c
index 1a04e8d..38c00d5 100644 (file)
--- a/src/store/home.c
+++ b/src/store/home.c
@@ -5,7 +5,7 @@
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "object/object-generator.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "store/store-util.h"
 #include "util/object-sort.h"
 

diff --git a/src/store/purchase-order.c b/src/store/purchase-order.c
index 32b9e4d..ff8228f 100644 (file)
--- a/src/store/purchase-order.c
+++ b/src/store/purchase-order.c
@@ -18,7 +18,7 @@
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "perception/object-perception.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/race-info-table.h"
 #include "store/home.h"
 #include "store/owner-insults.h"

diff --git a/src/store/say-comments.c b/src/store/say-comments.c
index e1887af..0adca12 100644 (file)
--- a/src/store/say-comments.c
+++ b/src/store/say-comments.c
@@ -3,7 +3,7 @@
 #include "main/sound-of-music.h"
 #include "store/store-owner-comments.h"
 #include "store/store-util.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "store/rumor.h"
 #include "view/display-messages.h"
 

diff --git a/src/store/sell-order.c b/src/store/sell-order.c
index df08230..4bcc51b 100644 (file)
--- a/src/store/sell-order.c
+++ b/src/store/sell-order.c
@@ -22,7 +22,7 @@
 #include "object/object-info.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "racial/racial-android.h"
 #include "spell-kind/spells-perception.h"
 #include "store/home.h"