OSDN Git Service

[Refactor] #963 Renamed get_alignment() to get_alignment_description()
authorHourier <grapefox.whitelucifer.0408@gmail.com>
Thu, 29 Apr 2021 07:02:36 +0000 (16:02 +0900)
committerHourier <grapefox.whitelucifer.0408@gmail.com>
Thu, 29 Apr 2021 09:39:44 +0000 (18:39 +0900)
src/io-dump/character-dump.cpp
src/knowledge/knowledge-self.cpp
src/player-info/alignment.cpp
src/player-info/alignment.h
src/view/display-player.cpp
src/view/display-self-info.cpp

index 2523144..5e95f23 100644 (file)
@@ -453,7 +453,7 @@ static void dump_aux_virtues(player_type *creature_ptr, FILE *fff)
     }
 
     std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment();
+    std::string alg = alignment->get_alignment_description();
     fprintf(fff, _("\n属性 : %s\n", "\nYour alignment : %s\n"), alg.c_str());
     fprintf(fff, "\n");
     dump_virtues(creature_ptr, fff);
index c0a5d4e..498a149 100644 (file)
@@ -39,7 +39,7 @@ void do_cmd_knowledge_virtues(player_type *creature_ptr)
         return;
 
     std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment();
+    std::string alg = alignment->get_alignment_description();
     fprintf(fff, _("現在の属性 : %s\n\n", "Your alignment : %s\n\n"), alg.c_str());
     dump_virtues(creature_ptr, fff);
     angband_fclose(fff);
index b21cc0b..b81378e 100644 (file)
@@ -35,7 +35,7 @@ concptr PlayerAlignment::alignment_label()
  * @param creature_ptr 算出するクリーチャーの参照ポインタ。
  * @return アライメントの表記を返す。
  */
-concptr PlayerAlignment::get_alignment(bool with_value)
+concptr PlayerAlignment::get_alignment_description(bool with_value)
 {
     auto s = alignment_label();
     if (with_value || show_actual_value)
index 322155d..f15068a 100644 (file)
@@ -2,13 +2,19 @@
 
 #include "system/angband.h"
 
+enum class update_alignment_type {
+    ALIGNMENT_SUBSTITUTION,
+    ALIGNMENT_ADDTION,
+    ALIGNMENT_SUBTRACTION,
+};
+
 struct player_type;
 class PlayerAlignment {
 public:
     PlayerAlignment(player_type *creature_ptr);
     PlayerAlignment() = delete;
     virtual ~PlayerAlignment() = default;
-    concptr get_alignment(bool with_value = false);
+    concptr get_alignment_description(bool with_value = false);
 private:
     player_type *creature_ptr;
     concptr alignment_label();
index bc4dab7..66e7981 100644 (file)
@@ -135,7 +135,7 @@ static void display_phisique(player_type *creature_ptr)
     display_player_one_line(ENTRY_SOCIAL, format("%d", (int)creature_ptr->sc), TERM_L_BLUE);
 #endif
     std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment();
+    std::string alg = alignment->get_alignment_description();
     display_player_one_line(ENTRY_ALIGN, format("%s", alg.c_str()), TERM_L_BLUE);
 }
 
index 1c66407..47f7dbc 100644 (file)
@@ -36,7 +36,7 @@ void display_virtue(player_type *creature_ptr, self_info_type *self_ptr)
 {
     self_ptr->info[self_ptr->line++] = "";
     std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment(true);
+    std::string alg = alignment->get_alignment_description(true);
     sprintf(self_ptr->plev_buf, _("現在の属性 : %s", "Your alignment : %s"), alg.c_str());
     strcpy(self_ptr->buf[1], self_ptr->plev_buf);
     self_ptr->info[self_ptr->line++] = self_ptr->buf[1];