From 388dcc5de298eb49e98ea339a22c910e2677fceb Mon Sep 17 00:00:00 2001 From: Hourier Date: Thu, 29 Apr 2021 16:02:36 +0900 Subject: [PATCH] [Refactor] #963 Renamed get_alignment() to get_alignment_description() --- src/io-dump/character-dump.cpp | 2 +- src/knowledge/knowledge-self.cpp | 2 +- src/player-info/alignment.cpp | 2 +- src/player-info/alignment.h | 8 +++++++- src/view/display-player.cpp | 2 +- src/view/display-self-info.cpp | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp index 2523144ab..5e95f2346 100644 --- a/src/io-dump/character-dump.cpp +++ b/src/io-dump/character-dump.cpp @@ -453,7 +453,7 @@ static void dump_aux_virtues(player_type *creature_ptr, FILE *fff) } std::unique_ptr 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); diff --git a/src/knowledge/knowledge-self.cpp b/src/knowledge/knowledge-self.cpp index c0a5d4e97..498a149f4 100644 --- a/src/knowledge/knowledge-self.cpp +++ b/src/knowledge/knowledge-self.cpp @@ -39,7 +39,7 @@ void do_cmd_knowledge_virtues(player_type *creature_ptr) return; std::unique_ptr 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); diff --git a/src/player-info/alignment.cpp b/src/player-info/alignment.cpp index b21cc0b35..b81378ede 100644 --- a/src/player-info/alignment.cpp +++ b/src/player-info/alignment.cpp @@ -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) diff --git a/src/player-info/alignment.h b/src/player-info/alignment.h index 322155d9e..f15068af6 100644 --- a/src/player-info/alignment.h +++ b/src/player-info/alignment.h @@ -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(); diff --git a/src/view/display-player.cpp b/src/view/display-player.cpp index bc4dab718..66e7981d2 100644 --- a/src/view/display-player.cpp +++ b/src/view/display-player.cpp @@ -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 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); } diff --git a/src/view/display-self-info.cpp b/src/view/display-self-info.cpp index 1c664077c..47f7dbc41 100644 --- a/src/view/display-self-info.cpp +++ b/src/view/display-self-info.cpp @@ -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 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]; -- 2.11.0