• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision138bf2beca8dbf1f3bd3dfad8f174f36286e1d17 (tree)
Time2019-06-02 20:48:44
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/artifact.c
+++ b/src/artifact.c
@@ -32,6 +32,7 @@
3232 #include "monster.h"
3333 #include "view-mainwindow.h"
3434 #include "player-class.h"
35+#include "player-personality.h"
3536
3637 /*
3738 * The artifact arrays
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -50,6 +50,7 @@
5050 #include "player-status.h"
5151 #include "player-effects.h"
5252 #include "player-class.h"
53+#include "player-personality.h"
5354 #include "scores.h"
5455 #include "shoot.h"
5556 #include "view-mainwindow.h"
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -41,6 +41,7 @@
4141 #include "player-move.h"
4242 #include "player-effects.h"
4343 #include "player-class.h"
44+#include "player-personality.h"
4445 #include "objectkind.h"
4546 #include "object-broken.h"
4647 #include "object-flavor.h"
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -38,6 +38,7 @@
3838 #include "player-status.h"
3939 #include "player-effects.h"
4040 #include "player-class.h"
41+#include "player-personality.h"
4142 #include "monster.h"
4243 #include "view-mainwindow.h"
4344 #include "spells.h"
--- a/src/core.c
+++ b/src/core.c
@@ -62,6 +62,7 @@
6262 #include "player-status.h"
6363 #include "player-class.h"
6464 #include "player-race.h"
65+#include "player-personality.h"
6566 #include "cmd-spell.h"
6667 #include "realm-hex.h"
6768 #include "objectkind.h"
--- a/src/defines.h
+++ b/src/defines.h
@@ -180,21 +180,6 @@
180180 #define SEX_FEMALE 0
181181 #define SEX_MALE 1
182182
183-
184-#define SEIKAKU_FUTUU 0
185-#define SEIKAKU_CHIKARA 1
186-#define SEIKAKU_KIREMONO 2
187-#define SEIKAKU_SHIAWASE 3
188-#define SEIKAKU_SUBASI 4
189-#define SEIKAKU_INOCHI 5
190-#define SEIKAKU_COMBAT 6
191-#define SEIKAKU_NAMAKE 7
192-#define SEIKAKU_SEXY 8
193-#define SEIKAKU_LUCKY 9
194-#define SEIKAKU_GAMAN 10
195-#define SEIKAKU_MUNCHKIN 11
196-#define SEIKAKU_CHARGEMAN 12
197-
198183 /*** Screen Locations ***/
199184
200185 #define VER_INFO_ROW 3 //!< タイトル表記(行)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -33,6 +33,7 @@
3333 #include "files.h"
3434 #include "player-effects.h"
3535 #include "player-class.h"
36+#include "player-personality.h"
3637 #include "world.h"
3738 #include "spells.h"
3839 #include "cmd-dump.h"
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -40,6 +40,7 @@
4040 #include "player-status.h"
4141 #include "player-race.h"
4242 #include "player-class.h"
43+#include "player-personality.h"
4344 #include "view-mainwindow.h"
4445 #include "world.h"
4546
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -19,6 +19,7 @@
1919 #include "avatar.h"
2020 #include "files.h"
2121 #include "player-effects.h"
22+#include "player-personality.h"
2223 #include "view-mainwindow.h"
2324 #include "world.h"
2425 #include "report.h"
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -19,6 +19,7 @@
1919 #include "cmd-pet.h"
2020 #include "floor.h"
2121 #include "objectkind-hook.h"
22+#include "player-personality.h"
2223 #include "monster.h"
2324 #include "monster-spell.h"
2425 #include "monsterrace-hook.h"
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -29,6 +29,7 @@
2929 #include "player-status.h"
3030 #include "player-race.h"
3131 #include "player-class.h"
32+#include "player-personality.h"
3233 #include "wild.h"
3334 #include "warning.h"
3435 #include "monster-spell.h"
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -15,6 +15,7 @@
1515 #include "artifact.h"
1616 #include "player-status.h"
1717 #include "player-class.h"
18+#include "player-personality.h"
1819 #include "realm-hex.h"
1920 #include "player-move.h"
2021 #include "monster-spell.h"
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -23,6 +23,7 @@
2323 #include "avatar.h"
2424 #include "player-status.h"
2525 #include "player-effects.h"
26+#include "player-personality.h"
2627 #include "player-class.h"
2728 #include "spells-status.h"
2829 #include "object-hook.h"
--- a/src/object2.c
+++ b/src/object2.c
@@ -37,6 +37,7 @@
3737 #include "player-move.h"
3838 #include "player-effects.h"
3939 #include "player-class.h"
40+#include "player-personality.h"
4041 #include "monster.h"
4142 #include "monsterrace-hook.h"
4243 #include "object-ego.h"
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -3,6 +3,7 @@
33
44 #include "realm-song.h"
55 #include "player-damage.h"
6+#include "player-personality.h"
67 #include "artifact.h"
78 #include "object-flavor.h"
89 #include "object-hook.h"
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -156,6 +156,7 @@
156156 #include "player-status.h"
157157 #include "player-effects.h"
158158 #include "player-class.h"
159+#include "player-personality.h"
159160 #include "spells-floor.h"
160161 #include "feature.h"
161162 #include "warning.h"
--- a/src/player-personality.h
+++ b/src/player-personality.h
@@ -1,5 +1,19 @@
11 #pragma once
22
3+#define SEIKAKU_FUTUU 0
4+#define SEIKAKU_CHIKARA 1
5+#define SEIKAKU_KIREMONO 2
6+#define SEIKAKU_SHIAWASE 3
7+#define SEIKAKU_SUBASI 4
8+#define SEIKAKU_INOCHI 5
9+#define SEIKAKU_COMBAT 6
10+#define SEIKAKU_NAMAKE 7
11+#define SEIKAKU_SEXY 8
12+#define SEIKAKU_LUCKY 9
13+#define SEIKAKU_GAMAN 10
14+#define SEIKAKU_MUNCHKIN 11
15+#define SEIKAKU_CHARGEMAN 12
16+
317 typedef struct player_seikaku player_seikaku;
418 struct player_seikaku
519 {
--- a/src/quest.c
+++ b/src/quest.c
@@ -10,6 +10,7 @@
1010 #include "monsterrace-hook.h"
1111 #include "monster.h"
1212 #include "player-status.h"
13+#include "player-personality.h"
1314 #include "artifact.h"
1415 #include "feature.h"
1516 #include "world.h"
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -11,6 +11,7 @@
1111 #include "player-status.h"
1212 #include "player-skill.h"
1313 #include "player-class.h"
14+#include "player-personality.h"
1415 #include "object-hook.h"
1516 #include "floor.h"
1617 #include "grid.h"
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -47,6 +47,7 @@
4747 #include "files.h"
4848 #include "player-effects.h"
4949 #include "player-skill.h"
50+#include "player-personality.h"
5051 #include "view-mainwindow.h"
5152 #include "mind.h"
5253 #include "wild.h"
--- a/src/trap.c
+++ b/src/trap.c
@@ -7,6 +7,7 @@
77 #include "player-move.h"
88 #include "player-effects.h"
99 #include "player-class.h"
10+#include "player-personality.h"
1011 #include "spells-summon.h"
1112 #include "quest.h"
1213 #include "artifact.h"
Show on old repository browser