[Refactor] #40392 Separated player-personalities-table.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 2741e3e..c1a6a84 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -458,6 +458,7 @@
     <ClInclude Include="..\..\src\mspell\mspell-type.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-util.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-ball.h" />\r
+    <ClInclude Include="..\..\src\player\player-personalities-table.h" />\r
     <ClInclude Include="..\..\src\player\player-races-table.h" />\r
     <ClInclude Include="..\..\src\player\player-classes-table.h" />\r
     <ClInclude Include="..\..\src\spell\spells-detection.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8207eb8..a206ca3 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1921,6 +1921,9 @@
     <ClInclude Include="..\..\src\player\player-classes-table.h">
       <Filter>player</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player\player-personalities-table.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index f2f4124..e44e5ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,6 +200,7 @@ hengband_SOURCES = \
        player/player-race.c player/player-race.h \
        player/player-races-table.h \
        player/player-classes-table.h \
+       player/player-personalities-table.h \
        player/patron.h player/patron.c \
        player/player-personality.c player/player-personality.h \
        player/player-sex.c player/player-sex.h player/selfinfo.c player/selfinfo.h \

diff --git a/src/birth/birth-body-spec.c b/src/birth/birth-body-spec.c
index 44d0223..f4c2f43 100644 (file)
--- a/src/birth/birth-body-spec.c
+++ b/src/birth/birth-body-spec.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "birth/birth-body-spec.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 
 /*!

diff --git a/src/birth/birth-stat.c b/src/birth/birth-stat.c
index 61648d5..fc5de73 100644 (file)
Binary files a/src/birth/birth-stat.c and b/src/birth/birth-stat.c differ

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index 15910ff..23a3463 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "birth/inventory-initializer.h"
 #include "monster/monsterrace-hook.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "birth/initial-equipments-table.h"
 #include "object/object-ego.h"
 #include "object/object-kind.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 07703fa..09f4de5 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -36,7 +36,7 @@
 #include "grid/grid.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-broken.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 6568747..fe604e0 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -41,7 +41,7 @@
 
 #include "world/world.h"
 #include "view/display-player.h" // 暫定。後で消す.
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
 #include "floor/floor-town.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index e1e97a2..beeeb98 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -37,7 +37,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "monster/monster.h"
 #include "view/display-main-window.h"
 #include "spell/spells3.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index d661dbe..834567d 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -42,7 +42,7 @@
 #include "player/player-status.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "spell/spells-floor.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 26c6d2d..f01399d 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -12,7 +12,7 @@
 #include "player/player-status.h"
 #include "player/player-skill.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 51032cf..45f5a1d 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -35,7 +35,7 @@
 #include "object/object-flavor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 #include "player/player-skill.h"
 #include "player/process-name.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 0684a44..866a014 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -12,7 +12,7 @@
 #include "monster/monsterrace-hook.h"
 #include "monster/monster.h"
 #include "player/player-status.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "object/artifact.h"
 #include "grid/feature.h"
 #include "world/world.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 644450d..ba0c8f5 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -37,7 +37,7 @@
 #include "io/files.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "world/world.h"
 #include "spell/spells2.h"
 #include "io/write-diary.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 4c694bf..925c973 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -10,7 +10,7 @@
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "spell/spells-summon.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"

diff --git a/src/market/building.c b/src/market/building.c
index 8f63036..8f827e6 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -55,7 +55,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "inventory/player-inventory.h"
 #include "core/scores.h"
 #include "shoot.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 0a0c44a..f91f4b0 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -23,7 +23,7 @@
 #include "player/avatar.h"
 #include "io/files.h"
 #include "player/player-effects.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "io/report.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 35b2791..944a1e5 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -21,7 +21,7 @@
 #include "cmd-pet.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-kind-hook.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "monster/monster.h"
 #include "mspell/monster-spell.h"
 #include "monster/monsterrace-hook.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 42ce493..e82d74f 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -32,7 +32,7 @@
 #include "player/player-status.h"
 #include "player/player-race.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "floor/wild.h"
 #include "object/warning.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 6876d28..de0e4a3 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -10,7 +10,7 @@
 #include "spell/spells2.h"
 #include "monster/monster-status.h"
 #include "player/player-move.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "object/artifact.h"
 #include "spell/spells-type.h"
 #include "mspell/mspell-util.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index 335f574..e83e6e9 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -12,7 +12,7 @@
 #include "player/player-move.h"
 #include "monster/monster-status.h"
 #include "spell/spells-type.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "object/artifact.h"
 #include "player/player-effects.h"
 #include "mspell/mspell-damage-calculator.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index eb68db1..48aee72 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -25,7 +25,7 @@
 #include "player/avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "spell/spells-status.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index ea4658c..17cd507 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -32,7 +32,7 @@
 #include "monster/monster.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "world/world.h"
 
  /*

diff --git a/src/object/object2.c b/src/object/object2.c
index 08ebe3d..c233abb 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -39,7 +39,7 @@
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"
 #include "object/object-ego.h"

diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c
index 345621e..ca00e87 100644 (file)
--- a/src/player/permanent-resistances.c
+++ b/src/player/permanent-resistances.c
@@ -1,5 +1,5 @@
 #include "permanent-resistances.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 
 /*!

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 3c83a32..bda388a 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -19,7 +19,7 @@
 #include "object/object-broken.h"
 #include "player/player-move.h"
 #include "player/player-damage.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index bbb998b..526f9c2 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -42,6 +42,7 @@
 #include "player/race-info-table.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-sex.h"
 #include "player/player-damage.h"
 #include "monster/monster-status.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index d87b63c..92c97c7 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -160,7 +160,7 @@
 #include "player/player-races-table.h"
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "spell/spells-floor.h"
 #include "grid/feature.h"
 #include "object/warning.h"

diff --git a/src/player/player-personalities-table.h b/src/player/player-personalities-table.h
new file mode 100644 (file)
index 0000000..57452a7
--- /dev/null
+++ b/src/player/player-personalities-table.h
@@ -0,0 +1,17 @@
+#pragma once
+
+typedef enum player_personality_table {
+       SEIKAKU_FUTUU = 0,
+    SEIKAKU_CHIKARA = 1,
+    SEIKAKU_KIREMONO = 2,
+    SEIKAKU_SHIAWASE = 3,
+    SEIKAKU_SUBASI = 4,
+    SEIKAKU_INOCHI = 5,
+    SEIKAKU_COMBAT = 6,
+    SEIKAKU_NAMAKE = 7,
+    SEIKAKU_SEXY = 8,
+    SEIKAKU_LUCKY = 9,
+    SEIKAKU_GAMAN = 10,
+    SEIKAKU_MUNCHKIN = 11,
+    SEIKAKU_CHARGEMAN = 12,
+} player_personality_table;

diff --git a/src/player/player-personality.h b/src/player/player-personality.h
index 7062c6d..579457a 100644 (file)
--- a/src/player/player-personality.h
+++ b/src/player/player-personality.h
@@ -1,19 +1,5 @@
 #pragma once
 
-#define SEIKAKU_FUTUU   0
-#define SEIKAKU_CHIKARA         1
-#define SEIKAKU_KIREMONO 2
-#define SEIKAKU_SHIAWASE 3
-#define SEIKAKU_SUBASI  4
-#define SEIKAKU_INOCHI  5
-#define SEIKAKU_COMBAT  6
-#define SEIKAKU_NAMAKE  7
-#define SEIKAKU_SEXY    8
-#define SEIKAKU_LUCKY   9
-#define SEIKAKU_GAMAN   10
-#define SEIKAKU_MUNCHKIN 11
-#define SEIKAKU_CHARGEMAN 12
-
 #define MAX_SEIKAKU     13 /*!< 性格の最大定義数 */
 
 typedef struct player_seikaku player_seikaku;

diff --git a/src/player/player-status.c b/src/player/player-status.c
index eabc93b..9812b86 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -13,6 +13,7 @@
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "player/player-damage.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index d22cc33..6ebba8b 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -55,7 +55,7 @@
 #include "io/files.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
 #include "view/display-main-window.h"
 #include "mind/mind.h"
 #include "floor/wild.h"