[Refactor] #1752 Changed the name of player_class_type to PlayerClassType

diff --git a/src/birth/birth-select-class.cpp b/src/birth/birth-select-class.cpp
index 5461ec3..38bfacf 100644 (file)
--- a/src/birth/birth-select-class.cpp
+++ b/src/birth/birth-select-class.cpp
@@ -14,9 +14,9 @@ static const char p2 = ')';
 static TERM_COLOR birth_class_color(int cs)
 {
     if (cs < MAX_CLASS) {
-        if (is_retired_class(i2enum<player_class_type>(cs)))
+        if (is_retired_class(i2enum<PlayerClassType>(cs)))
             return TERM_L_DARK;
-        if (is_winner_class(i2enum<player_class_type>(cs)))
+        if (is_winner_class(i2enum<PlayerClassType>(cs)))
             return TERM_SLATE;
     }
     return TERM_WHITE;
@@ -190,7 +190,7 @@ bool get_player_class(player_type *player_ptr)
     if (!select_class(player_ptr, cur, sym, &k))
         return false;
 
-    player_ptr->pclass = i2enum<player_class_type>(k);
+    player_ptr->pclass = i2enum<PlayerClassType>(k);
     cp_ptr = &class_info[player_ptr->pclass];
     mp_ptr = &m_info[player_ptr->pclass];
     c_put_str(TERM_L_BLUE, cp_ptr->title, 5, 15);

diff --git a/src/birth/quick-start.h b/src/birth/quick-start.h
index 01bbe35..6e5e923 100644 (file)
--- a/src/birth/quick-start.h
+++ b/src/birth/quick-start.h
@@ -13,7 +13,7 @@
 struct birther {
     player_sex psex{}; /* Sex index */
     PlayerRaceType prace{}; /* Race index */
-    player_class_type pclass{}; /* Class index */
+    PlayerClassType pclass{}; /* Class index */
     player_personality_type ppersonality{}; /* Seikaku index */
     int16_t realm1{}; /* First magic realm */
     int16_t realm2{}; /* Second magic realm */

diff --git a/src/info-reader/general-parser.cpp b/src/info-reader/general-parser.cpp
index 5180152..c6cab5e 100644 (file)
--- a/src/info-reader/general-parser.cpp
+++ b/src/info-reader/general-parser.cpp
@@ -233,7 +233,7 @@ parse_error_type parse_line_building(char *buf)
         int n;
         n = tokenize(s + 2, MAX_CLASS, zz, 0);
         for (int i = 0; i < MAX_CLASS; i++) {
-            building[index].member_class[i] = i2enum<player_class_type>((i < n) ? atoi(zz[i]) : 1);
+            building[index].member_class[i] = i2enum<PlayerClassType>((i < n) ? atoi(zz[i]) : 1);
         }
 
         break;

diff --git a/src/knowledge/knowledge-self.cpp b/src/knowledge/knowledge-self.cpp
index 015a1ee..1c28571 100644 (file)
--- a/src/knowledge/knowledge-self.cpp
+++ b/src/knowledge/knowledge-self.cpp
@@ -139,13 +139,13 @@ static void dump_winner_classes(FILE *fff)
     std::string s = "";
     std::string l = "";
     for (int c = 0; c < MAX_CLASS; c++) {
-        if (w_ptr->sf_winner.has_not(i2enum<player_class_type>(c)))
+        if (w_ptr->sf_winner.has_not(i2enum<PlayerClassType>(c)))
             continue;
 
         auto &cl = class_info[c];
         auto t = std::string(cl.title);
 
-        if (w_ptr->sf_retired.has_not(i2enum<player_class_type>(c)))
+        if (w_ptr->sf_retired.has_not(i2enum<PlayerClassType>(c)))
             t = "(" + t + ")";
 
         if (l.size() + t.size() + 2 > max_len) {

diff --git a/src/load/birth-loader.cpp b/src/load/birth-loader.cpp
index 50dcfe3..4341d38 100644 (file)
--- a/src/load/birth-loader.cpp
+++ b/src/load/birth-loader.cpp
@@ -22,7 +22,7 @@ void load_quick_start(void)
     rd_byte(&tmp8u);
     previous_char.prace = (PlayerRaceType)tmp8u;
     rd_byte(&tmp8u);
-    previous_char.pclass = (player_class_type)tmp8u;
+    previous_char.pclass = (PlayerClassType)tmp8u;
     rd_byte(&tmp8u);
     previous_char.ppersonality = (player_personality_type)tmp8u;
     rd_byte(&tmp8u);

diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp
index 2009fe9..8da867b 100644 (file)
--- a/src/load/player-info-loader.cpp
+++ b/src/load/player-info-loader.cpp
@@ -71,7 +71,7 @@ void rd_base_info(player_type *player_ptr)
     player_ptr->prace = (PlayerRaceType)tmp8u;
 
     rd_byte(&tmp8u);
-    player_ptr->pclass = (player_class_type)tmp8u;
+    player_ptr->pclass = (PlayerClassType)tmp8u;
 
     rd_byte(&tmp8u);
     player_ptr->ppersonality = (player_personality_type)tmp8u;

diff --git a/src/player-info/class-types.h b/src/player-info/class-types.h
index 2aa8b79..acbbe58 100644 (file)
--- a/src/player-info/class-types.h
+++ b/src/player-info/class-types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-enum player_class_type {
+enum PlayerClassType {
        CLASS_WARRIOR = 0,
     CLASS_MAGE = 1,
     CLASS_PRIEST = 2,

diff --git a/src/player-info/race-info.h b/src/player-info/race-info.h
index 67ce444..b4b60d7 100644 (file)
--- a/src/player-info/race-info.h
+++ b/src/player-info/race-info.h
@@ -52,10 +52,10 @@ enum class PlayerRaceFood {
 struct player_race_condition {
     tr_type type{};
     PLAYER_LEVEL level{};
-    std::optional<player_class_type> pclass{};
+    std::optional<PlayerClassType> pclass{};
     bool not_class{};
 
-    player_race_condition(tr_type t, PLAYER_LEVEL l = 1, const std::optional<player_class_type> &c = std::nullopt, bool nc = false)
+    player_race_condition(tr_type t, PLAYER_LEVEL l = 1, const std::optional<PlayerClassType> &c = std::nullopt, bool nc = false)
         : type(t)
         , level(l)
         , pclass(c)

diff --git a/src/system/building-type-definition.h b/src/system/building-type-definition.h
index ff116fd..a5ce016 100644 (file)
--- a/src/system/building-type-definition.h
+++ b/src/system/building-type-definition.h
@@ -19,7 +19,7 @@ struct building_type {
     int16_t actions[8]; /*!< 町の施設処理における行動ID */
     int16_t action_restr[8]; /*!< 町の施設処理の規制処理ID */
 
-    player_class_type member_class[MAX_CLASS]; /* which classes are part of guild */
+    PlayerClassType member_class[MAX_CLASS]; /* which classes are part of guild */
     PlayerRaceType member_race[MAX_RACES]; /* which classes are part of guild */
     int16_t member_realm[MAX_MAGIC + 1]; /* ギルド (店主？)ごとの魔法領域ID / which realms are part of guild */
 };

diff --git a/src/system/player-type-definition.h b/src/system/player-type-definition.h
index 3141698..54d53d7 100644 (file)
--- a/src/system/player-type-definition.h
+++ b/src/system/player-type-definition.h
@@ -33,7 +33,7 @@ public:
 
     player_sex psex{}; /* Sex index */
     PlayerRaceType prace{}; /* Race index */
-    player_class_type pclass{}; /* Class index */
+    PlayerClassType pclass{}; /* Class index */
     player_personality_type ppersonality{}; /* Personality index */
     int16_t realm1{}; /* First magic realm */
     int16_t realm2{}; /* Second magic realm */

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 6fe5a43..085a926 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -690,7 +690,7 @@ void wiz_reset_class(player_type *player_ptr)
     if (tmp_int < 0 || tmp_int >= MAX_CLASS)
         return;
 
-    player_ptr->pclass = i2enum<player_class_type>(tmp_int);
+    player_ptr->pclass = i2enum<PlayerClassType>(tmp_int);
     cp_ptr = &class_info[player_ptr->pclass];
     mp_ptr = &m_info[player_ptr->pclass];
     PlayerClass(player_ptr).init_specific_data();

diff --git a/src/world/world.cpp b/src/world/world.cpp
index 4740cb3..410f6a3 100644 (file)
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -63,7 +63,7 @@ void update_playtime(void)
 /*!
  * @brief 勝利したクラスを追加する
  */
-void add_winner_class(player_class_type c)
+void add_winner_class(PlayerClassType c)
 {
     if (!w_ptr->noscore)
         w_ptr->sf_winner.set(c);
@@ -72,7 +72,7 @@ void add_winner_class(player_class_type c)
 /*!
  * @brief 引退したクラスを追加する
  */
-void add_retired_class(player_class_type c)
+void add_retired_class(PlayerClassType c)
 {
     if (!w_ptr->noscore)
         w_ptr->sf_retired.set(c);
@@ -81,7 +81,7 @@ void add_retired_class(player_class_type c)
 /*!
  * @brief 勝利したクラスか判定する
  */
-bool is_winner_class(player_class_type c)
+bool is_winner_class(PlayerClassType c)
 {
     if (c == MAX_CLASS)
         return false;
@@ -91,7 +91,7 @@ bool is_winner_class(player_class_type c)
 /*!
  * @brief 引退したクラスか判定する
  */
-bool is_retired_class(player_class_type c)
+bool is_retired_class(PlayerClassType c)
 {
     if (c == MAX_CLASS)
         return false;

diff --git a/src/world/world.h b/src/world/world.h
index f3dbc58..7e98929 100644 (file)
--- a/src/world/world.h
+++ b/src/world/world.h
@@ -49,8 +49,8 @@ struct world_type {
     uint16_t sf_lives{}; //!< このセーブファイルで何人プレイしたか / Number of past "lives" with this file
     uint16_t sf_saves{}; //!< 現在のプレイで何回セーブしたか / Number of "saves" during this life
     uint32_t sf_play_time{}; //!< このセーブファイルで遊んだ合計のプレイ時間
-    FlagGroup<player_class_type, MAX_CLASS> sf_winner{}; //!< このセーブファイルで*勝利*した職業
-    FlagGroup<player_class_type, MAX_CLASS> sf_retired{}; //!< このセーブファイルで引退した職業
+    FlagGroup<PlayerClassType, MAX_CLASS> sf_winner{}; //!< このセーブファイルで*勝利*した職業
+    FlagGroup<PlayerClassType, MAX_CLASS> sf_retired{}; //!< このセーブファイルで引退した職業
 
     bool character_generated{}; /* The character exists */
     bool character_dungeon{}; /* The character has a dungeon */
@@ -72,7 +72,7 @@ struct player_type;
 bool is_daytime(void);
 void extract_day_hour_min(player_type *player_ptr, int *day, int *hour, int *min);
 void update_playtime(void);
-void add_winner_class(player_class_type c);
-void add_retired_class(player_class_type c);
-bool is_winner_class(player_class_type c);
-bool is_retired_class(player_class_type c);
+void add_winner_class(PlayerClassType c);
+void add_retired_class(PlayerClassType c);
+bool is_winner_class(PlayerClassType c);
+bool is_retired_class(PlayerClassType c);