<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
<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" />
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 \
#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"
/*!
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
/*
#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"
#include "permanent-resistances.h"
-#include "player/player-personality.h"
+#include "player/player-personalities-table.h"
#include "player/player-races-table.h"
/*!
#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"
#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"
#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"
--- /dev/null
+#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;
#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;
#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"
#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"