OSDN Git Service

[Fix] #963 Resolved the indication that unique_ptr<PlayerAlignment> should be PlayerA...
authorHourier <grapefox.whitelucifer.0408@gmail.com>
Fri, 30 Apr 2021 00:13:09 +0000 (09:13 +0900)
committerHourier <grapefox.whitelucifer.0408@gmail.com>
Fri, 30 Apr 2021 00:13:09 +0000 (09:13 +0900)
src/io-dump/character-dump.cpp
src/knowledge/knowledge-self.cpp
src/player/player-status.cpp
src/view/display-player.cpp
src/view/display-self-info.cpp

index 5e95f23..c9d34fc 100644 (file)
@@ -452,8 +452,7 @@ static void dump_aux_virtues(player_type *creature_ptr, FILE *fff)
             fprintf(fff, "%s ???\n", stat_names[v_nr]);
     }
 
-    std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment_description();
+    std::string alg = PlayerAlignment(creature_ptr).get_alignment_description();
     fprintf(fff, _("\n属性 : %s\n", "\nYour alignment : %s\n"), alg.c_str());
     fprintf(fff, "\n");
     dump_virtues(creature_ptr, fff);
index b53c11d..6650570 100644 (file)
@@ -36,8 +36,7 @@ void do_cmd_knowledge_virtues(player_type *creature_ptr)
     if (!open_temporary_file(&fff, file_name))
         return;
 
-    std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-    std::string alg = alignment->get_alignment_description();
+    std::string alg = PlayerAlignment(creature_ptr).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 862f539..a88346d 100644 (file)
@@ -2555,8 +2555,7 @@ void update_creature(player_type *creature_ptr)
 
     if (any_bits(creature_ptr->update, (PU_BONUS))) {
         reset_bits(creature_ptr->update, PU_BONUS);
-        std::unique_ptr<PlayerAlignment> alignment(new PlayerAlignment(creature_ptr));
-        alignment->update_alignment();
+        PlayerAlignment(creature_ptr).update_alignment();
         update_bonuses(creature_ptr);
     }
 
index 66e7981..f91c74b 100644 (file)
@@ -134,8 +134,7 @@ static void display_phisique(player_type *creature_ptr)
     display_player_one_line(ENTRY_WEIGHT, format("%d", (int)creature_ptr->wt), TERM_L_BLUE);
     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_description();
+    std::string alg = PlayerAlignment(creature_ptr).get_alignment_description();
     display_player_one_line(ENTRY_ALIGN, format("%s", alg.c_str()), TERM_L_BLUE);
 }
 
index 47f7dbc..5f664ac 100644 (file)
@@ -35,8 +35,7 @@ void display_max_base_status(player_type *creature_ptr, self_info_type *self_ptr
 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_description(true);
+    std::string alg = PlayerAlignment(creature_ptr).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];