[Refactor] #37353 player-sex.c/h を作成して関連構造体と変数を移動．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index d68e968..fa4556e 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -181,6 +181,7 @@
     <ClCompile Include="..\..\src\player-effects.c" />\r
     <ClCompile Include="..\..\src\player-personality.c" />\r
     <ClCompile Include="..\..\src\player-race.c" />\r
+    <ClCompile Include="..\..\src\player-sex.c" />\r
     <ClCompile Include="..\..\src\player-skill.c" />\r
     <ClCompile Include="..\..\src\player-status.c" />\r
     <ClCompile Include="..\..\src\quest.c" />\r
@@ -343,6 +344,7 @@
     <ClInclude Include="..\..\src\player-move.h" />\r
     <ClInclude Include="..\..\src\player-personality.h" />\r
     <ClInclude Include="..\..\src\player-race.h" />\r
+    <ClInclude Include="..\..\src\player-sex.h" />\r
     <ClInclude Include="..\..\src\player-skill.h" />\r
     <ClInclude Include="..\..\src\player-status.h" />\r
     <ClInclude Include="..\..\src\quest.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 6103cc8..6f4f881 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -342,6 +342,9 @@
     <ClCompile Include="..\..\src\player-personality.c">
       <Filter>player</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player-sex.c">
+      <Filter>player</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />
@@ -650,6 +653,9 @@
     <ClInclude Include="..\..\src\player-personality.h">
       <Filter>player</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-sex.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a0b9a7..c736775 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,7 @@ hengband_SOURCES = \
        \
        player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
        player-effects.c player-effects.h player-skill.c player-skill.h player-class.c player-class.h \
-       player-race.c player-race.h player-pesonality.c player-pesonality.h \
+       player-race.c player-race.h player-pesonality.c player-pesonality.h player-sex.c player-sex.h \
        \
        quest.h quest.c\
        \

diff --git a/src/birth.c b/src/birth.c
index 3fe24ea..c239e91 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -25,6 +25,7 @@
 #include "player-class.h"
 #include "player-status.h"
 #include "player-personality.h"
+#include "player-sex.h"
 #include "spells.h"
 #include "spells-status.h"
 #include "wild.h"

diff --git a/src/externs.h b/src/externs.h
index 2abcffa..8464ce6 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -69,7 +69,6 @@ extern const byte adj_con_mhp[];
 extern const byte adj_chr_chm[];
 extern const byte blows_table[12][12];
 extern const byte extract_energy[200];
-extern const player_sex sex_info[MAX_SEXES];
 
 extern const u32b fake_spell_flags[4];
 extern const concptr realm_names[];
@@ -214,7 +213,6 @@ extern TERM_COLOR tval_to_attr[128];
 extern SYMBOL_CODE tval_to_char[128];
 extern concptr keymap_act[KEYMAP_MODES][256];
 extern player_type *p_ptr;
-extern const player_sex *sp_ptr;
 extern char *f_name;
 extern char *f_tag;
 

diff --git a/src/files.c b/src/files.c
index 4985143..d748f5d 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -28,6 +28,7 @@
 #include "player-class.h"
 #include "player-skill.h"
 #include "player-personality.h"
+#include "player-sex.h"
 #include "sort.h"
 #include "mutation.h"
 #include "quest.h"

diff --git a/src/load.c b/src/load.c
index 179f27e..6c3e083 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -71,6 +71,7 @@
 #include "player-class.h"
 #include "player-race.h"
 #include "player-personality.h"
+#include "player-sex.h"
 #include "birth.h"
 #include "world.h"
 #include "objectkind.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 4af4794..131685a 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -36,6 +36,7 @@
 #include "player-race.h"
 #include "player-class.h"
 #include "player-personality.h"
+#include "player-sex.h"
 #include "monster-status.h"
 #include "snipe.h"
 #include "files.h"

diff --git a/src/player-sex.c b/src/player-sex.c
new file mode 100644 (file)
index 0000000..0aec570
--- /dev/null
+++ b/src/player-sex.c
@@ -0,0 +1,38 @@
+#include "angband.h"
+#include "player-sex.h"
+
+/*
+ * Pointer to the player tables
+ * (sex, race, class, magic)
+ */
+const player_sex *sp_ptr;
+
+/*!
+ * @brief \90«\95Ê\95\\8bL /
+ * Player Sexes
+ * @details
+ * <pre>
+ *      Title,
+ *      Winner
+ * </pre>
+ */
+const player_sex sex_info[MAX_SEXES] =
+{
+       {
+#ifdef JP
+               "\8f\97\90«",
+               "\83N\83C\81[\83\93",
+#endif
+               "Female",
+               "Queen"
+       },
+       {
+#ifdef JP
+               "\92j\90«",
+               "\83L\83\93\83O",
+#endif
+               "Male",
+               "King"
+       }
+};
+

diff --git a/src/player-sex.h b/src/player-sex.h
new file mode 100644 (file)
index 0000000..05a0cca
--- /dev/null
+++ b/src/player-sex.h
@@ -0,0 +1,21 @@
+#pragma once
+
+/*
+ * Player sex info
+ */
+
+typedef struct player_sex player_sex;
+
+struct player_sex
+{
+       concptr title;                  /* Type of sex */
+       concptr winner;         /* Name of winner */
+#ifdef JP
+       concptr E_title;                /* \89p\8cê\90«\95Ê */
+       concptr E_winner;               /* \89p\8cê\90«\95Ê */
+#endif
+};
+
+extern const player_sex sex_info[MAX_SEXES];
+extern const player_sex *sp_ptr;
+

diff --git a/src/scores.c b/src/scores.c
index 2cf49bd..08627d9 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -17,6 +17,7 @@
 #include "player-status.h"
 #include "player-class.h"
 #include "player-personality.h"
+#include "player-sex.h"
 #include "files.h"
 #include "scores.h"
 #include "floor.h"

diff --git a/src/tables.c b/src/tables.c
index 28434e4..dc158ff 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1255,36 +1255,6 @@ const byte extract_energy[200] =
        /* Fast */    49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
 };
 
-
-/*!
- * @brief 性別表記 /
- * Player Sexes
- * @details
- * <pre>
- *      Title,
- *      Winner
- * </pre>
- */
-const player_sex sex_info[MAX_SEXES] =
-{
-       {
-#ifdef JP
-               "女性",
-               "クイーン",
-#endif
-               "Female",
-               "Queen"
-       },
-       {
-#ifdef JP
-               "男性",
-               "キング",
-#endif
-               "Male",
-               "King"
-       }
-};
-
 /*!
  * 魔法領域フラグ管理テーブル /
  * Zangband uses this array instead of the spell flags table, as there

diff --git a/src/types.h b/src/types.h
index 7d4cc82..2a871e0 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -76,24 +76,6 @@ struct magic_type
 };
 
 
-/*
- * Player sex info
- */
-
-typedef struct player_sex player_sex;
-
-struct player_sex
-{
-       concptr title;                  /* Type of sex */
-       concptr winner;         /* Name of winner */
-#ifdef JP
-       concptr E_title;                /* 英語性別 */
-       concptr E_winner;               /* 英語性別 */
-#endif
-};
-
-
-
 typedef struct kamae kamae;
 
 struct kamae

diff --git a/src/variable.c b/src/variable.c
index af9baa1..19cd193 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -447,11 +447,6 @@ player_type p_body;
  */
 player_type *p_ptr = &p_body;
 
-/*
- * Pointer to the player tables
- * (sex, race, class, magic)
- */
-const player_sex *sp_ptr;
 
 
 concptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file