[Refactor] #2476 town_info をtowns_info に改名した

diff --git a/src/birth/character-builder.cpp b/src/birth/character-builder.cpp
index 9d98db6..8b75d31 100644 (file)
--- a/src/birth/character-builder.cpp
+++ b/src/birth/character-builder.cpp
@@ -108,7 +108,7 @@ void player_birth(PlayerType *player_ptr)
     }
 
     write_birth_diary(player_ptr);
-    for (int i = 1; i < town_info.size(); i++) {
+    for (int i = 1; i < towns_info.size(); i++) {
         for (auto sst : STORE_SALE_TYPE_LIST) {
             store_init(i, sst);
         }

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

diff --git a/src/core/turn-compensator.cpp b/src/core/turn-compensator.cpp
index dfa3838..a650571 100644 (file)
--- a/src/core/turn-compensator.cpp
+++ b/src/core/turn-compensator.cpp
@@ -64,9 +64,9 @@ void prevent_turn_overflow(PlayerType *player_ptr)
         player_ptr->feeling_turn = 1;
     }
 
-    for (int i = 1; i < town_info.size(); i++) {
+    for (int i = 1; i < towns_info.size(); i++) {
         for (int j = 0; j < MAX_STORES; j++) {
-            store_type *store_ptr = &town_info[i].store[j];
+            store_type *store_ptr = &towns_info[i].store[j];
 
             if (store_ptr->last_visit > -10L * TURNS_PER_TICK * STORE_TICKS) {
                 store_ptr->last_visit -= rollback_turns;

diff --git a/src/floor/floor-town.cpp b/src/floor/floor-town.cpp
index d4f7291..bc54036 100644 (file)
--- a/src/floor/floor-town.cpp
+++ b/src/floor/floor-town.cpp
@@ -1,5 +1,5 @@
 #include "floor/floor-town.h"
 #include "system/item-entity.h"
 
-/* The towns [town_info.size()] */
-std::vector<town_type> town_info;
+/* The towns [towns_info.size()] */
+std::vector<town_type> towns_info;

diff --git a/src/floor/floor-town.h b/src/floor/floor-town.h
index a148965..f912e1b 100644 (file)
--- a/src/floor/floor-town.h
+++ b/src/floor/floor-town.h
@@ -18,4 +18,4 @@ struct town_type {
 constexpr short VALID_TOWNS = 6; // @details 旧海底都市クエストのマップを除外する. 有効な町に差し替え完了したら不要になるので注意.
 constexpr auto SECRET_TOWN = 5; // @details ズルの町番号.
 
-extern std::vector<town_type> town_info;
+extern std::vector<town_type> towns_info;

diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index 559297d..3be1e42 100644 (file)
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -208,7 +208,7 @@ concptr map_name(PlayerType *player_ptr)
     } else if (player_ptr->phase_out) {
         return _("闘技場", "Monster Arena");
     } else if (!floor_ptr->dun_level && player_ptr->town_num) {
-        return town_info[player_ptr->town_num].name;
+        return towns_info[player_ptr->town_num].name;
     } else {
         return dungeons_info[player_ptr->dungeon_idx].name.data();
     }

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index 22e8f63..05ec7a0 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(town_info[w_letter[id].town].name, w_letter[id].name);
+            strcpy(towns_info[w_letter[id].town].name, w_letter[id].name);
         }
 
         (*y)++;

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 336b84f..15722e5 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -531,7 +531,7 @@ static void dump_aux_equipment_inventory(PlayerType *player_ptr, FILE *fff)
 static void dump_aux_home_museum(PlayerType *player_ptr, FILE *fff)
 {
     store_type *store_ptr;
-    store_ptr = &town_info[1].store[enum2i(StoreSaleType::HOME)];
+    store_ptr = &towns_info[1].store[enum2i(StoreSaleType::HOME)];
 
     GAME_TEXT o_name[MAX_NLEN];
     if (store_ptr->stock_num) {
@@ -549,7 +549,7 @@ static void dump_aux_home_museum(PlayerType *player_ptr, FILE *fff)
         fprintf(fff, "\n\n");
     }
 
-    store_ptr = &town_info[1].store[enum2i(StoreSaleType::MUSEUM)];
+    store_ptr = &towns_info[1].store[enum2i(StoreSaleType::MUSEUM)];
 
     if (store_ptr->stock_num == 0) {
         return;

diff --git a/src/io-dump/random-art-info-dumper.cpp b/src/io-dump/random-art-info-dumper.cpp
index 491d62a..d486591 100644 (file)
--- a/src/io-dump/random-art-info-dumper.cpp
+++ b/src/io-dump/random-art-info-dumper.cpp
@@ -91,13 +91,13 @@ void spoil_random_artifact(PlayerType *player_ptr, concptr fname)
                 spoil_random_artifact_aux(player_ptr, q_ptr, tval);
             }
 
-            store_ptr = &town_info[1].store[enum2i(StoreSaleType::HOME)];
+            store_ptr = &towns_info[1].store[enum2i(StoreSaleType::HOME)];
             for (int i = 0; i < store_ptr->stock_num; i++) {
                 q_ptr = &store_ptr->stock[i];
                 spoil_random_artifact_aux(player_ptr, q_ptr, tval);
             }
 
-            store_ptr = &town_info[1].store[enum2i(StoreSaleType::MUSEUM)];
+            store_ptr = &towns_info[1].store[enum2i(StoreSaleType::MUSEUM)];
             for (int i = 0; i < store_ptr->stock_num; i++) {
                 q_ptr = &store_ptr->stock[i];
                 spoil_random_artifact_aux(player_ptr, q_ptr, tval);

diff --git a/src/knowledge/knowledge-inventory.cpp b/src/knowledge/knowledge-inventory.cpp
index 417efff..d7a4ac2 100644 (file)
--- a/src/knowledge/knowledge-inventory.cpp
+++ b/src/knowledge/knowledge-inventory.cpp
@@ -260,7 +260,7 @@ static void show_holding_equipment_resistances(PlayerType *player_ptr, ItemKindT
 static void show_home_equipment_resistances(PlayerType *player_ptr, ItemKindType tval, int *label_number, FILE *fff)
 {
     store_type *store_ptr;
-    store_ptr = &town_info[1].store[enum2i(StoreSaleType::HOME)];
+    store_ptr = &towns_info[1].store[enum2i(StoreSaleType::HOME)];
     char where[32];
     strcpy(where, _("家", "H "));
     for (int i = 0; i < store_ptr->stock_num; i++) {

diff --git a/src/knowledge/knowledge-self.cpp b/src/knowledge/knowledge-self.cpp
index 4a087b7..9e04ce3 100644 (file)
--- a/src/knowledge/knowledge-self.cpp
+++ b/src/knowledge/knowledge-self.cpp
@@ -195,7 +195,7 @@ void do_cmd_knowledge_home(PlayerType *player_ptr)
     }
 
     constexpr auto home_inventory = _("我が家のアイテム", "Home Inventory");
-    const auto &store = town_info[1].store[enum2i(StoreSaleType::HOME)];
+    const auto &store = towns_info[1].store[enum2i(StoreSaleType::HOME)];
     if (store.stock_num == 0) {
         angband_fclose(fff);
         (void)show_file(player_ptr, true, file_name, home_inventory, 0, 0);

diff --git a/src/load/quest-loader.cpp b/src/load/quest-loader.cpp
index fca539f..e656589 100644 (file)
--- a/src/load/quest-loader.cpp
+++ b/src/load/quest-loader.cpp
@@ -20,7 +20,7 @@
 errr load_town(void)
 {
     auto max_towns_load = rd_u16b();
-    if (max_towns_load <= town_info.size()) {
+    if (max_towns_load <= towns_info.size()) {
         return 0;
     }
 

diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index e02bf97..58f5bbe 100644 (file)
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -72,12 +72,12 @@ static void rd_store(PlayerType *player_ptr, int town_number, int store_number)
     store_type *store_ptr;
     auto sort = false;
     if (h_older_than(0, 3, 3) && (i2enum<StoreSaleType>(store_number) == StoreSaleType::HOME)) {
-        store_ptr = &town_info[1].store[store_number];
+        store_ptr = &towns_info[1].store[store_number];
         if (store_ptr->stock_num) {
             sort = true;
         }
     } else {
-        store_ptr = &town_info[town_number].store[store_number];
+        store_ptr = &towns_info[town_number].store[store_number];
     }
 
     store_ptr->store_open = rd_s32b();

diff --git a/src/main-win/main-win-music.cpp b/src/main-win/main-win-music.cpp
index b5e4dbe..00a4c34 100644 (file)
--- a/src/main-win/main-win-music.cpp
+++ b/src/main-win/main-win-music.cpp
@@ -100,7 +100,7 @@ static concptr quest_key_at(int index, char *buf)
  */
 static concptr town_key_at(int index, char *buf)
 {
-    if (index >= static_cast<int>(town_info.size())) {
+    if (index >= static_cast<int>(towns_info.size())) {
         return nullptr;
     }
 

diff --git a/src/market/building-initializer.cpp b/src/market/building-initializer.cpp
index 169dde0..a7c1eff 100644 (file)
--- a/src/market/building-initializer.cpp
+++ b/src/market/building-initializer.cpp
@@ -47,11 +47,11 @@ static int count_town_numbers()
 void init_towns(void)
 {
     const auto town_numbers = count_town_numbers();
-    town_info = std::vector<town_type>(town_numbers);
+    towns_info = std::vector<town_type>(town_numbers);
     for (auto i = 1; i < town_numbers; i++) {
-        town_info[i].store = std::vector<store_type>(MAX_STORES);
+        towns_info[i].store = std::vector<store_type>(MAX_STORES);
         for (auto sst : STORE_SALE_TYPE_LIST) {
-            auto *store_ptr = &town_info[i].store[enum2i(sst)];
+            auto *store_ptr = &towns_info[i].store[enum2i(sst)];
             if ((i > 1) && (sst == StoreSaleType::MUSEUM || sst == StoreSaleType::HOME)) {
                 continue;
             }

diff --git a/src/player/process-death.cpp b/src/player/process-death.cpp
index ce42642..e579b0d 100644 (file)
--- a/src/player/process-death.cpp
+++ b/src/player/process-death.cpp
@@ -258,8 +258,8 @@ static void home_aware(PlayerType *player_ptr)
 {
     ItemEntity *o_ptr;
     store_type *store_ptr;
-    for (int i = 1; i < town_info.size(); i++) {
-        store_ptr = &town_info[i].store[enum2i(StoreSaleType::HOME)];
+    for (int i = 1; i < towns_info.size(); i++) {
+        store_ptr = &towns_info[i].store[enum2i(StoreSaleType::HOME)];
         for (int j = 0; j < store_ptr->stock_num; j++) {
             o_ptr = &store_ptr->stock[j];
             if (!o_ptr->bi_id) {
@@ -307,9 +307,9 @@ static bool show_dead_player_items(PlayerType *player_ptr)
  */
 static void show_dead_home_items(PlayerType *player_ptr)
 {
-    for (int l = 1; l < town_info.size(); l++) {
+    for (int l = 1; l < towns_info.size(); l++) {
         store_type *store_ptr;
-        store_ptr = &town_info[l].store[enum2i(StoreSaleType::HOME)];
+        store_ptr = &towns_info[l].store[enum2i(StoreSaleType::HOME)];
         if (store_ptr->stock_num == 0) {
             continue;
         }

diff --git a/src/save/save.cpp b/src/save/save.cpp
index fc7bfaf..574604d 100644 (file)
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -123,7 +123,7 @@ static bool wr_savefile_new(PlayerType *player_ptr, SaveType type)
         wr_perception(bi_id);
     }
 
-    tmp16u = town_info.size();
+    tmp16u = towns_info.size();
     wr_u16b(tmp16u);
 
     const auto &quest_list = QuestList::get_instance();
@@ -214,14 +214,14 @@ static bool wr_savefile_new(PlayerType *player_ptr, SaveType type)
     }
 
     wr_u16b(0xFFFF);
-    tmp16u = town_info.size();
+    tmp16u = towns_info.size();
     wr_u16b(tmp16u);
 
     tmp16u = MAX_STORES;
     wr_u16b(tmp16u);
-    for (int i = 1; i < town_info.size(); i++) {
+    for (int i = 1; i < towns_info.size(); i++) {
         for (int j = 0; j < MAX_STORES; j++) {
-            wr_store(&town_info[i].store[j]);
+            wr_store(&towns_info[i].store[j]);
         }
     }
 

diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index 9cd868f..b45b523 100644 (file)
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -288,14 +288,14 @@ bool tele_town(PlayerType *player_ptr)
 
     int i;
     int num = 0;
-    for (i = 1; i < town_info.size(); i++) {
+    for (i = 1; i < towns_info.size(); i++) {
         char buf[80];
 
         if ((i == VALID_TOWNS) || (i == SECRET_TOWN) || (i == player_ptr->town_num) || !(player_ptr->visit & (1UL << (i - 1)))) {
             continue;
         }
 
-        strnfmt(buf, sizeof(buf), "%c) %-20s", I2A(i - 1), town_info[i].name);
+        strnfmt(buf, sizeof(buf), "%c) %-20s", I2A(i - 1), towns_info[i].name);
         prt(buf, 5 + i, 5);
         num++;
     }
@@ -316,7 +316,7 @@ bool tele_town(PlayerType *player_ptr)
             return false;
         }
 
-        else if ((i < 'a') || (i > ('a' + town_info.size() - 2))) {
+        else if ((i < 'a') || (i > ('a' + towns_info.size() - 2))) {
             continue;
         } else if (((i - 'a' + 1) == player_ptr->town_num) || ((i - 'a' + 1) == VALID_TOWNS) || ((i - 'a' + 1) == SECRET_TOWN) || !(player_ptr->visit & (1UL << (i - 'a')))) {
             continue;

diff --git a/src/store/black-market.cpp b/src/store/black-market.cpp
index e7e3999..d81ce8f 100644 (file)
--- a/src/store/black-market.cpp
+++ b/src/store/black-market.cpp
@@ -40,8 +40,8 @@ bool black_market_crap(PlayerType *player_ptr, ItemEntity *o_ptr)
             continue;
         }
 
-        for (int j = 0; j < town_info[player_ptr->town_num].store[enum2i(sst)].stock_num; j++) {
-            auto *j_ptr = &town_info[player_ptr->town_num].store[enum2i(sst)].stock[j];
+        for (int j = 0; j < towns_info[player_ptr->town_num].store[enum2i(sst)].stock_num; j++) {
+            auto *j_ptr = &towns_info[player_ptr->town_num].store[enum2i(sst)].stock[j];
             if (o_ptr->bi_id == j_ptr->bi_id) {
                 return true;
             }

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 2919d6e..0563c79 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -88,20 +88,20 @@ void do_cmd_store(PlayerType *player_ptr)
     }
 
     inner_town_num = player_ptr->town_num;
-    if ((town_info[player_ptr->town_num].store[enum2i(store_num)].store_open >= w_ptr->game_turn) || ironman_shops) {
+    if ((towns_info[player_ptr->town_num].store[enum2i(store_num)].store_open >= w_ptr->game_turn) || ironman_shops) {
         msg_print(_("ドアに鍵がかかっている。", "The doors are locked."));
         player_ptr->town_num = old_town_num;
         return;
     }
 
-    int maintain_num = (w_ptr->game_turn - town_info[player_ptr->town_num].store[enum2i(store_num)].last_visit) / (TURNS_PER_TICK * STORE_TICKS);
+    int maintain_num = (w_ptr->game_turn - towns_info[player_ptr->town_num].store[enum2i(store_num)].last_visit) / (TURNS_PER_TICK * STORE_TICKS);
     if (maintain_num > 10) {
         maintain_num = 10;
     }
     if (maintain_num) {
         store_maintenance(player_ptr, player_ptr->town_num, store_num, maintain_num);
 
-        town_info[player_ptr->town_num].store[enum2i(store_num)].last_visit = w_ptr->game_turn;
+        towns_info[player_ptr->town_num].store[enum2i(store_num)].last_visit = w_ptr->game_turn;
     }
 
     forget_lite(floor_ptr);
@@ -112,7 +112,7 @@ void do_cmd_store(PlayerType *player_ptr)
     command_new = 0;
     get_com_no_macros = true;
     cur_store_feat = g_ptr->feat;
-    st_ptr = &town_info[player_ptr->town_num].store[enum2i(store_num)];
+    st_ptr = &towns_info[player_ptr->town_num].store[enum2i(store_num)];
     ot_ptr = &owners.at(store_num)[st_ptr->owner];
     store_top = 0;
     play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BUILD);

diff --git a/src/store/home.cpp b/src/store/home.cpp
index f8f43d0..5472ccd 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -184,7 +184,7 @@ bool combine_and_reorder_home(PlayerType *player_ptr, const StoreSaleType store_
     bool old_stack_force_notes = stack_force_notes;
     bool old_stack_force_costs = stack_force_costs;
     store_type *old_st_ptr = st_ptr;
-    st_ptr = &town_info[1].store[enum2i(store_num)];
+    st_ptr = &towns_info[1].store[enum2i(store_num)];
     bool flag = false;
     if (store_num != StoreSaleType::HOME) {
         stack_force_notes = false;

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index 93e10a4..bf63a23 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -170,12 +170,12 @@ 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 (town_info[t_idx].name[0] != '\0') {
+            if (towns_info[t_idx].name[0] != '\0') {
                 break;
             }
         }
 
-        strcpy(fullname, town_info[t_idx].name);
+        strcpy(fullname, towns_info[t_idx].name);
 
         int32_t visit = (1UL << (t_idx - 1));
         if ((t_idx != SECRET_TOWN) && !(player_ptr->visit & visit)) {

diff --git a/src/store/store.cpp b/src/store/store.cpp
index 8b3d280..e355843 100644 (file)
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -253,11 +253,11 @@ void store_examine(PlayerType *player_ptr, StoreSaleType store_num)
 void store_shuffle(PlayerType *player_ptr, StoreSaleType store_num)
 {
     auto owner_num = owners.at(store_num).size();
-    if ((store_num == StoreSaleType::HOME) || (store_num == StoreSaleType::MUSEUM) || (owner_num <= (uint16_t)town_info.size())) {
+    if ((store_num == StoreSaleType::HOME) || (store_num == StoreSaleType::MUSEUM) || (owner_num <= (uint16_t)towns_info.size())) {
         return;
     }
 
-    st_ptr = &town_info[player_ptr->town_num].store[enum2i(store_num)];
+    st_ptr = &towns_info[player_ptr->town_num].store[enum2i(store_num)];
     int j = st_ptr->owner;
     while (true) {
         st_ptr->owner = (byte)randint0(owner_num);
@@ -267,17 +267,17 @@ void store_shuffle(PlayerType *player_ptr, StoreSaleType store_num)
         }
 
         int i;
-        for (i = 1; i < town_info.size(); i++) {
+        for (i = 1; i < towns_info.size(); i++) {
             if (i == player_ptr->town_num) {
                 continue;
             }
 
-            if (st_ptr->owner == town_info[i].store[enum2i(store_num)].owner) {
+            if (st_ptr->owner == towns_info[i].store[enum2i(store_num)].owner) {
                 break;
             }
         }
 
-        if (i == town_info.size()) {
+        if (i == towns_info.size()) {
             break;
         }
     }
@@ -401,7 +401,7 @@ void store_maintenance(PlayerType *player_ptr, int town_num, StoreSaleType store
         return;
     }
 
-    st_ptr = &town_info[town_num].store[enum2i(store_num)];
+    st_ptr = &towns_info[town_num].store[enum2i(store_num)];
     ot_ptr = &owners.at(store_num)[st_ptr->owner];
     st_ptr->insult_cur = 0;
     if (store_num == StoreSaleType::BLACK) {
@@ -475,26 +475,26 @@ void store_maintenance(PlayerType *player_ptr, int town_num, StoreSaleType store
 void store_init(int town_num, StoreSaleType store_num)
 {
     auto owner_num = owners.at(store_num).size();
-    st_ptr = &town_info[town_num].store[enum2i(store_num)];
+    st_ptr = &towns_info[town_num].store[enum2i(store_num)];
     while (true) {
         st_ptr->owner = (byte)randint0(owner_num);
 
-        if (owner_num <= (uint16_t)town_info.size()) {
+        if (owner_num <= (uint16_t)towns_info.size()) {
             break;
         }
 
         int i;
 
-        for (i = 1; i < (uint16_t)town_info.size(); i++) {
+        for (i = 1; i < (uint16_t)towns_info.size(); i++) {
             if (i == town_num) {
                 continue;
             }
-            if (st_ptr->owner == town_info[i].store[enum2i(store_num)].owner) {
+            if (st_ptr->owner == towns_info[i].store[enum2i(store_num)].owner) {
                 break;
             }
         }
 
-        if (i == town_info.size()) {
+        if (i == towns_info.size()) {
             break;
         }
     }

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 4692d8b..8fe49b2 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -488,7 +488,7 @@ static std::string decide_target_floor(PlayerType *player_ptr, eg_type *eg_ptr)
     }
 
     if (eg_ptr->f_ptr->flags.has(TerrainCharacteristics::TOWN)) {
-        return town_info[eg_ptr->g_ptr->special].name;
+        return towns_info[eg_ptr->g_ptr->special].name;
     }
 
     if (player_ptr->wild_mode && (eg_ptr->feat == feat_floor)) {