[Refactor] #37353 性格定義ID を player-personality.h へ移動．

diff --git a/src/artifact.c b/src/artifact.c
index c1604ce..3515b10 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -32,6 +32,7 @@
 #include "monster.h"
 #include "view-mainwindow.h"
 #include "player-class.h"
+#include "player-personality.h"
 
  /*
   * The artifact arrays

diff --git a/src/bldg.c b/src/bldg.c
index cb18dda..a086cb2 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -50,6 +50,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "scores.h"
 #include "shoot.h"
 #include "view-mainwindow.h"

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index ff9fc2e..26576f8 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -41,6 +41,7 @@
 #include "player-move.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "objectkind.h"
 #include "object-broken.h"
 #include "object-flavor.h"

diff --git a/src/cmd-item.c b/src/cmd-item.c
index ffdc0e4..0e1184c 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -38,6 +38,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "monster.h"
 #include "view-mainwindow.h"
 #include "spells.h"

diff --git a/src/core.c b/src/core.c
index f90a425..68066a4 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -62,6 +62,7 @@
 #include "player-status.h"
 #include "player-class.h"
 #include "player-race.h"
+#include "player-personality.h"
 #include "cmd-spell.h"
 #include "realm-hex.h"
 #include "objectkind.h"

diff --git a/src/defines.h b/src/defines.h
index a5c9b1c..c868ebc 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -180,21 +180,6 @@
 #define SEX_FEMALE              0
 #define SEX_MALE                1
 
-
-#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
-
 /*** Screen Locations ***/
 
 #define VER_INFO_ROW 3   //!< タイトル表記(行)

diff --git a/src/floor-save.c b/src/floor-save.c
index 4a8163e..e870ffd 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -33,6 +33,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "world.h"
 #include "spells.h"
 #include "cmd-dump.h"

diff --git a/src/melee1.c b/src/melee1.c
index 7247669..6561497 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -40,6 +40,7 @@
 #include "player-status.h"
 #include "player-race.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "view-mainwindow.h"
 #include "world.h"
 

diff --git a/src/monster-status.c b/src/monster-status.c
index 3be563e..b5cfcb4 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -19,6 +19,7 @@
 #include "avatar.h"
 #include "files.h"
 #include "player-effects.h"
+#include "player-personality.h"
 #include "view-mainwindow.h"
 #include "world.h"
 #include "report.h"

diff --git a/src/monster1.c b/src/monster1.c
index 4d5bf86..d30e183 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -19,6 +19,7 @@
 #include "cmd-pet.h"
 #include "floor.h"
 #include "objectkind-hook.h"
+#include "player-personality.h"
 #include "monster.h"
 #include "monster-spell.h"
 #include "monsterrace-hook.h"

diff --git a/src/monster2.c b/src/monster2.c
index 9c2d8e9..f5c71bf 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -29,6 +29,7 @@
 #include "player-status.h"
 #include "player-race.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "wild.h"
 #include "warning.h"
 #include "monster-spell.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 9eb85c6..7417eb6 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -15,6 +15,7 @@
 #include "artifact.h"
 #include "player-status.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "realm-hex.h"
 #include "player-move.h"
 #include "monster-spell.h"

diff --git a/src/mutation.c b/src/mutation.c
index f923b86..38a5690 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -23,6 +23,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-personality.h"
 #include "player-class.h"
 #include "spells-status.h"
 #include "object-hook.h"

diff --git a/src/object2.c b/src/object2.c
index ec3031e..ef0e5f9 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -37,6 +37,7 @@
 #include "player-move.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object-ego.h"

diff --git a/src/player-damage.c b/src/player-damage.c
index be9927c..b834574 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -3,6 +3,7 @@
 
 #include "realm-song.h"
 #include "player-damage.h"
+#include "player-personality.h"
 #include "artifact.h"
 #include "object-flavor.h"
 #include "object-hook.h"

diff --git a/src/player-move.c b/src/player-move.c
index 2d96595..4f3ce8d 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -156,6 +156,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "spells-floor.h"
 #include "feature.h"
 #include "warning.h"

diff --git a/src/player-personality.h b/src/player-personality.h
index 0d1bb72..69d59c7 100644 (file)
--- a/src/player-personality.h
+++ b/src/player-personality.h
@@ -1,5 +1,19 @@
 #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
+
 typedef struct player_seikaku player_seikaku;
 struct player_seikaku
 {

diff --git a/src/quest.c b/src/quest.c
index ffa270b..fcd5202 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -10,6 +10,7 @@
 #include "monsterrace-hook.h"
 #include "monster.h"
 #include "player-status.h"
+#include "player-personality.h"
 #include "artifact.h"
 #include "feature.h"
 #include "world.h"

diff --git a/src/shoot.c b/src/shoot.c
index c04e50a..b36fd6d 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -11,6 +11,7 @@
 #include "player-status.h"
 #include "player-skill.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "object-hook.h"
 #include "floor.h"
 #include "grid.h"

diff --git a/src/spells3.c b/src/spells3.c
index c93ff27..030161a 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -47,6 +47,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "player-skill.h"
+#include "player-personality.h"
 #include "view-mainwindow.h"
 #include "mind.h"
 #include "wild.h"

diff --git a/src/trap.c b/src/trap.c
index fca32fc..99c97c7 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -7,6 +7,7 @@
 #include "player-move.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-personality.h"
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"