[Refactor] #40467 Separated base-status-types.h from player-status.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 5256e0e..de58dd0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -960,6 +960,7 @@
     <ClInclude Include="..\..\src\object-activation\activation-resistance.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-teleport.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-util.h" />\r
+    <ClInclude Include="..\..\src\player-info\base-status-types.h" />\r
     <ClInclude Include="..\..\src\player-info\self-info-util.h" />\r
     <ClInclude Include="..\..\src\room\vault-builder.h" />\r
     <ClInclude Include="..\..\src\specific-object\blade-turner.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5a2b20c..56fd9cd 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -4609,6 +4609,9 @@
     <ClInclude Include="..\..\src\player-info\avatar.h">
       <Filter>player-info</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-info\base-status-types.h">
+      <Filter>player-info</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c3fa01..13a28dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -631,6 +631,7 @@ hengband_SOURCES = \
        player-attack/player-attack.c player-attack/player-attack.h \
        \
        player-info/avatar.h player-info/avatar.c \
+       player-info/base-status-types.h \
        player-info/self-info.c player-info/self-info.h \
        player-info/self-info-util.c player-info/self-info-util.h \
        \

diff --git a/src/player-info/base-status-types.h b/src/player-info/base-status-types.h
new file mode 100644 (file)
index 0000000..9e2cb62
--- /dev/null
+++ b/src/player-info/base-status-types.h
@@ -0,0 +1,11 @@
+#pragma once
+
+typedef enum base_status_type {
+       A_STR = 0,
+    A_INT = 1,
+    A_WIS = 2,
+    A_DEX = 3,
+    A_CON = 4,
+    A_CHR = 5,
+    A_MAX = 6,
+} base_status_type;

diff --git a/src/player-info/self-info.c b/src/player-info/self-info.c
index 18dbf12..43c3114 100644 (file)
--- a/src/player-info/self-info.c
+++ b/src/player-info/self-info.c
@@ -82,7 +82,7 @@ void self_knowledge(player_type *creature_ptr)
     }
 
     si_ptr->info[si_ptr->line++] = _("能力の最大値", "Limits of maximum stats");
-    for (int v_nr = 0; v_nr < A_MAX; v_nr++) {
+    for (base_status_type v_nr = 0; v_nr < A_MAX; v_nr++) {
         char stat_desc[80];
         sprintf(stat_desc, "%s 18/%d", stat_names[v_nr], creature_ptr->stat_max_max[v_nr] - 18);
         strcpy(si_ptr->s_string[v_nr], stat_desc);

diff --git a/src/player/player-status.h b/src/player/player-status.h
index e020504..3bcc248 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -3,6 +3,7 @@
 #include "system/angband.h"
 
 /* 人畜無害なenumヘッダを先に読み込む */
+#include "player-info/base-status-types.h"
 #include "player/player-classes-types.h"
 #include "player/player-personalities-types.h"
 #include "player/player-race-types.h"
@@ -23,17 +24,6 @@
  * whenever anything important changes.
  */
 
-/*
- * Player constants
- */
-#define A_STR 0
-#define A_INT 1
-#define A_WIS 2
-#define A_DEX 3
-#define A_CON 4
-#define A_CHR 5
-#define A_MAX 6
-
 #define PY_MAX_EXP 99999999L /*!< プレイヤー経験値の最大値 / Maximum exp */
 #define PY_MAX_GOLD 999999999L /*!< プレイヤー所持金の最大値 / Maximum gold */
 #define PY_MAX_LEVEL 50 /*!< プレイヤーレベルの最大値 / Maximum level */