[Refactor] #2127 条件内容部分をjouken_naiyouからclass_conditionに修正した

diff --git a/src/cmd-io/cmd-menu-content-table.cpp b/src/cmd-io/cmd-menu-content-table.cpp
index 8599d61..b87c6a1 100644 (file)
--- a/src/cmd-io/cmd-menu-content-table.cpp
+++ b/src/cmd-io/cmd-menu-content-table.cpp
@@ -3,12 +3,12 @@
 #include "util/enum-converter.h"
 #include "util/int-char-converter.h"
 
-SpecialMenuContent::SpecialMenuContent(concptr name, byte window, byte number, SpecialMenuType menu_condition, PlayerClassType jouken_naiyou)
+SpecialMenuContent::SpecialMenuContent(concptr name, byte window, byte number, SpecialMenuType menu_condition, PlayerClassType class_condition)
     : name(name)
     , window(window)
     , number(number)
     , menu_condition(menu_condition)
-    , jouken_naiyou(jouken_naiyou)
+    , class_condition(class_condition)
 {
 }
 

diff --git a/src/cmd-io/cmd-menu-content-table.h b/src/cmd-io/cmd-menu-content-table.h
index 5a2bb8f..9d24d5c 100644 (file)
--- a/src/cmd-io/cmd-menu-content-table.h
+++ b/src/cmd-io/cmd-menu-content-table.h
@@ -18,12 +18,12 @@ enum class SpecialMenuType {
 enum class PlayerClassType : short;
 class SpecialMenuContent {
 public:
-    SpecialMenuContent(concptr name, byte window, byte number, SpecialMenuType menu_condition, PlayerClassType jouken_naiyou);
+    SpecialMenuContent(concptr name, byte window, byte number, SpecialMenuType menu_condition, PlayerClassType class_condition);
     concptr name;
     byte window;
     byte number;
     SpecialMenuType menu_condition;
-    PlayerClassType jouken_naiyou;
+    PlayerClassType class_condition;
 };
 
 #define MAX_COMMAND_PER_SCREEN 10

diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index 1549f14..e623fe6 100644 (file)
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -367,7 +367,7 @@ std::string InputKeyRequestor::switch_special_menu_condition(SpecialMenuContent
     case SpecialMenuType::NONE:
         return "";
     case SpecialMenuType::CLASS:
-        if (PlayerClass(this->player_ptr).equals(special_menu.jouken_naiyou)) {
+        if (PlayerClass(this->player_ptr).equals(special_menu.class_condition)) {
             return std::string(special_menu.name);
         }
 
@@ -378,7 +378,7 @@ std::string InputKeyRequestor::switch_special_menu_condition(SpecialMenuContent
             return "";
         }
 
-        auto can_do_in_wilderness = enum2i(special_menu.jouken_naiyou) > 0;
+        auto can_do_in_wilderness = enum2i(special_menu.class_condition) > 0;
         if (this->player_ptr->wild_mode == can_do_in_wilderness) {
             return std::string(special_menu.name);
         }