[Refactor] #56 Renamed v_info.txt to VaultDefinitions.txt

diff --git a/lib/edit/Makefile.am b/lib/edit/Makefile.am
index 9d99786..470555f 100644 (file)
--- a/lib/edit/Makefile.am
+++ b/lib/edit/Makefile.am
@@ -4,7 +4,7 @@ angband_files = \
        ArtifactDefinitions.txt BaseItemDefinitions.txt ClassMagicDefinitions.txt \
        ClassSkillDefinitions.txt DungeonDefinitions.txt EgoDefinitions.txt \
        GridFeatureDefinitions.txt MonsterRaceDefinitions.txt QuestDefinitionList.txt \
-       TownDefinitionList.txt WildernessDefinition.txt \
+       TownDefinitionList.txt VaultDefinitions.txt WildernessDefinition.txt \
        misc.txt \
        q0000001.txt q0000002.txt q0000003.txt q0000004.txt \
        q0000005.txt q0000006.txt q0000007.txt q0000019.txt \
@@ -17,8 +17,7 @@ angband_files = \
        q_pref.txt q_random.txt q_serpen.txt q_warg.txt \
        qdarkelf.txt qhaunted.txt \
        t0000001.txt t0000002.txt t0000003.txt t0000004.txt t0000005.txt \
-       t0000006.txt t_basic.txt t_lite.txt \
-       t_pref.txt v_info.txt \
+       t0000006.txt t_basic.txt t_lite.txt t_pref.txt
 
 EXTRA_DIST = \
   $(angband_files)

diff --git a/lib/edit/v_info.txt b/lib/edit/VaultDefinitions.txt
similarity index 100%
rename from lib/edit/v_info.txt
rename to lib/edit/VaultDefinitions.txt

diff --git a/src/info-reader/vault-reader.cpp b/src/info-reader/vault-reader.cpp
index bc61cbd..ba0ba9d 100644 (file)
--- a/src/info-reader/vault-reader.cpp
+++ b/src/info-reader/vault-reader.cpp
@@ -6,13 +6,12 @@
 #include "util/string-processor.h"
 
 /*!
- * @brief Vault情報(v_info)のパース関数 /
- * Initialize the "v_info" array, by parsing an ascii "template" file
+ * @brief Vault定義 (VaultDefinitions)のパース関数
  * @param buf テキスト列
  * @param head ヘッダ構造体
  * @return エラーコード
  */
-errr parse_v_info(std::string_view buf, angband_header *)
+errr parse_vaults_info(std::string_view buf, angband_header *)
 {
     static vault_type *v_ptr = nullptr;
     const auto &tokens = str_split(buf, ':', false, 5);
@@ -30,12 +29,12 @@ errr parse_v_info(std::string_view buf, angband_header *)
         if (i < error_idx) {
             return PARSE_ERROR_NON_SEQUENTIAL_RECORDS;
         }
-        if (i >= static_cast<int>(v_info.size())) {
-            v_info.resize(i + 1);
+        if (i >= static_cast<int>(vaults_info.size())) {
+            vaults_info.resize(i + 1);
         }
 
         error_idx = i;
-        v_ptr = &v_info[i];
+        v_ptr = &vaults_info[i];
         v_ptr->idx = static_cast<int16_t>(i);
         v_ptr->name = std::string(tokens[2]);
     } else if (!v_ptr) {

diff --git a/src/info-reader/vault-reader.h b/src/info-reader/vault-reader.h
index a0ee4ab..0aa58a4 100644 (file)
--- a/src/info-reader/vault-reader.h
+++ b/src/info-reader/vault-reader.h
@@ -4,4 +4,4 @@
 #include <string_view>
 
 struct angband_header;
-errr parse_v_info(std::string_view buf, angband_header *head);
+errr parse_vaults_info(std::string_view buf, angband_header *head);

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 9941e28..cdfe533 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -579,7 +579,7 @@ static concptr get_check_sum(void)
 {
     return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", terrains_header.checksum, baseitems_header.checksum,
         artifacts_header.checksum, egos_header.checksum, monraces_header.checksum, dungeons_header.checksum,
-        class_magics_header.checksum, class_skills_header.checksum, v_head.checksum);
+        class_magics_header.checksum, class_skills_header.checksum, vaults_header.checksum);
 }
 
 /*!

diff --git a/src/main/angband-headers.cpp b/src/main/angband-headers.cpp
index 945eefb..1380400 100644 (file)
--- a/src/main/angband-headers.cpp
+++ b/src/main/angband-headers.cpp
@@ -12,4 +12,4 @@ angband_header dungeons_header; /*!< ダンジョン情報のヘッダ構造体
 angband_header egos_header; /*!< アイテムエゴ情報のヘッダ構造体 */
 angband_header monraces_header; /*!< モンスター種族情報のヘッダ構造体 */
 angband_header terrains_header; /*!< 地形情報のヘッダ構造体 */
-angband_header v_head; /*!< Vault情報のヘッダ構造体 */
+angband_header vaults_header; /*!< Vault情報のヘッダ構造体 */

diff --git a/src/main/angband-headers.h b/src/main/angband-headers.h
index ad240fc..4277609 100644 (file)
--- a/src/main/angband-headers.h
+++ b/src/main/angband-headers.h
@@ -22,4 +22,4 @@ extern angband_header dungeons_header;
 extern angband_header egos_header;
 extern angband_header monraces_header;
 extern angband_header terrains_header;
-extern angband_header v_head;
+extern angband_header vaults_header;

diff --git a/src/main/angband-initializer.cpp b/src/main/angband-initializer.cpp
index 9176216..50bd99d 100644 (file)
--- a/src/main/angband-initializer.cpp
+++ b/src/main/angband-initializer.cpp
@@ -332,7 +332,7 @@ void init_angband(PlayerType *player_ptr, bool no_term)
 
     init_note(_("[配列を初期化しています... (クエスト)]", "[Initializing arrays... (quests)]"));
     QuestList::get_instance().initialize();
-    if (init_v_info()) {
+    if (init_vaults_info()) {
         quit(_("vault 初期化不能", "Cannot initialize vaults"));
     }
 

diff --git a/src/main/info-initializer.cpp b/src/main/info-initializer.cpp
index 4a57c03..bf5c924 100644 (file)
--- a/src/main/info-initializer.cpp
+++ b/src/main/info-initializer.cpp
@@ -65,17 +65,6 @@ constexpr bool is_vector_v = is_vector<T>::value;
 }
 
 /*!
- * @brief 基本情報読み込みのメインルーチン /
- * Initialize misc. values
- * @param player_ptr プレイヤーへの参照ポインタ
- * @return エラーコード
- */
-errr init_misc(PlayerType *player_ptr)
-{
-    return parse_fixed_map(player_ptr, "misc.txt", 0, 0, 0, 0);
-}
-
-/*!
  * @brief ヘッダ構造体の更新
  * Initialize the header of an *_info.raw file.
  * @param head rawファイルのヘッダ
@@ -226,15 +215,24 @@ errr init_monster_race_definitions()
 }
 
 /*!
- * @brief Vault情報読み込みのメインルーチン /
- * Initialize the "v_info" array
+ * @brief Vault情報読み込みのメインルーチン
  * @return エラーコード
  * @note
  * Note that we let each entry have a unique "name" and "text" string,
  * even if the string happens to be empty (everyone has a unique '\0').
  */
-errr init_v_info()
+errr init_vaults_info()
 {
-    init_header(&v_head);
-    return init_info("v_info.txt", v_head, v_info, parse_v_info);
+    init_header(&vaults_header);
+    return init_info("VaultDefinitions.txt", vaults_header, vaults_info, parse_vaults_info);
+}
+
+/*!
+ * @brief 基本情報読み込みのメインルーチン
+ * @param player_ptr プレイヤーへの参照ポインタ
+ * @return エラーコード
+ */
+errr init_misc(PlayerType *player_ptr)
+{
+    return parse_fixed_map(player_ptr, "misc.txt", 0, 0, 0, 0);
 }

diff --git a/src/main/info-initializer.h b/src/main/info-initializer.h
index 2adff9b..0fd7abe 100644 (file)
--- a/src/main/info-initializer.h
+++ b/src/main/info-initializer.h
@@ -13,7 +13,7 @@ errr init_class_magics_info();
 errr init_class_skills_info();
 errr init_dungeons_info();
 errr init_egos_info();
+errr init_monster_race_definitions();
 errr init_terrains_info();
+errr init_vaults_info();
 errr init_misc(PlayerType *player_ptr);
-errr init_monster_race_definitions();
-errr init_v_info();

diff --git a/src/room/rooms-vault.cpp b/src/room/rooms-vault.cpp
index c30edd4..1f07304 100644 (file)
--- a/src/room/rooms-vault.cpp
+++ b/src/room/rooms-vault.cpp
@@ -40,7 +40,7 @@
 /*
  * The vault generation arrays
  */
-std::vector<vault_type> v_info;
+std::vector<vault_type> vaults_info;
 
 /*
  * This function creates a random vault that looks like a collection of bubbles.
@@ -1005,7 +1005,7 @@ bool build_type10(PlayerType *player_ptr, dun_data_type *dd_ptr)
 }
 
 /*!
- * @brief v_info.txtからの部屋生成 / vaults from "v_info.txt"
+ * @brief VaultDefinitions からの部屋生成
  */
 bool build_fixed_room(PlayerType *player_ptr, dun_data_type *dd_ptr, int typ, bool more_space)
 {
@@ -1018,7 +1018,7 @@ bool build_fixed_room(PlayerType *player_ptr, dun_data_type *dd_ptr, int typ, bo
     ProbabilityTable<int> prob_table;
 
     /* Pick fixed room */
-    for (const auto &v_ref : v_info) {
+    for (const auto &v_ref : vaults_info) {
         if (v_ref.typ == typ) {
             prob_table.entry_item(v_ref.idx, 1);
         }
@@ -1026,7 +1026,7 @@ bool build_fixed_room(PlayerType *player_ptr, dun_data_type *dd_ptr, int typ, bo
 
     auto result = prob_table.pick_one_at_random();
 
-    v_ptr = &v_info[result];
+    v_ptr = &vaults_info[result];
 
     /* pick type of transformation (0-7) */
     transno = randint0(8);

diff --git a/src/room/rooms-vault.h b/src/room/rooms-vault.h
index 39f3005..7571712 100644 (file)
--- a/src/room/rooms-vault.h
+++ b/src/room/rooms-vault.h
@@ -16,7 +16,7 @@ struct vault_type {
     POSITION wid{}; /* Vault width */
 };
 
-extern std::vector<vault_type> v_info;
+extern std::vector<vault_type> vaults_info;
 
 struct dun_data_type;
 class PlayerType;