[Refactor] #2769 town_type::name をchar[] からstring に変えた

diff --git a/src/cmd-io/cmd-dump.cpp b/src/cmd-io/cmd-dump.cpp
index 9a6cb02..d393ee4 100644 (file)
--- a/src/cmd-io/cmd-dump.cpp
+++ b/src/cmd-io/cmd-dump.cpp
@@ -235,7 +235,7 @@ void do_cmd_feeling(PlayerType *player_ptr)
     }
 
     if (player_ptr->town_num && !floor_ref.is_in_dungeon()) {
-        if (!strcmp(towns_info[player_ptr->town_num].name, _("荒野", "wilderness"))) {
+        if (towns_info[player_ptr->town_num].name == _("荒野", "wilderness")) {
             msg_print(_("何かありそうな荒野のようだ。", "Looks like a strange wilderness."));
             return;
         }

diff --git a/src/floor/floor-town.h b/src/floor/floor-town.h
index 9769f85..6abb183 100644 (file)
--- a/src/floor/floor-town.h
+++ b/src/floor/floor-town.h
@@ -2,6 +2,7 @@
 
 #include "store/store-util.h"
 #include "system/angband.h"
+#include <string>
 #include <vector>
 
 /*
@@ -9,7 +10,7 @@
  * stores and buildings
  */
 struct town_type {
-    GAME_TEXT name[32];
+    std::string name;
     std::vector<store_type> store; /* The stores [MAX_STORES] */
 };
 

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index 3766b9d..b63bce6 100644 (file)
--- a/src/floor/wild.cpp
+++ b/src/floor/wild.cpp
@@ -743,7 +743,7 @@ parse_error_type parse_line_wilderness(PlayerType *player_ptr, char *buf, int xm
             wilderness[*y][*x].level = w_letter[id].level;
             wilderness[*y][*x].town = w_letter[id].town;
             wilderness[*y][*x].road = w_letter[id].road;
-            strcpy(towns_info[w_letter[id].town].name, w_letter[id].name);
+            towns_info[w_letter[id].town].name = w_letter[id].name;
         }
 
         (*y)++;

diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index 665cefa..8b598e1 100644 (file)
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -297,7 +297,7 @@ bool tele_town(PlayerType *player_ptr)
             continue;
         }
 
-        strnfmt(buf, sizeof(buf), "%c) %-20s", I2A(i - 1), towns_info[i].name);
+        strnfmt(buf, sizeof(buf), "%c) %-20s", I2A(i - 1), towns_info[i].name.data());
         prt(buf, 5 + i, 5);
         num++;
     }

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index a82ca48..0578630 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -167,7 +167,7 @@ void display_rumor(PlayerType *player_ptr, bool ex)
         const auto &town_name = tokens[1];
         while (true) {
             t_idx = get_rumor_num(town_name, VALID_TOWNS);
-            if (towns_info[t_idx].name[0] != '\0') {
+            if (!towns_info[t_idx].name.empty()) {
                 break;
             }
         }

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 6d07bce..c908e5e 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -490,7 +490,7 @@ static std::string decide_target_floor(PlayerType *player_ptr, eg_type *eg_ptr)
         return _("道", "road");
     }
 
-    return eg_ptr->f_ptr->name.data();
+    return eg_ptr->f_ptr->name;
 }
 
 static void describe_grid_monster_all(eg_type *eg_ptr)