[Refactor] #1366 Removed type alias 'VAULT_IDX'

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index 45e88ec..49c5f79 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -369,7 +369,7 @@ static bool parse_qtw_M(qtwg_type *qtwg_ptr, char **zz)
     } else if (zz[0][0] == 'K') {
         max_k_idx = (KIND_OBJECT_IDX)atoi(zz[1]);
     } else if (zz[0][0] == 'V') {
-        max_v_idx = (VAULT_IDX)atoi(zz[1]);
+        max_v_idx = static_cast<int16_t>(atoi(zz[1]));
     } else if (zz[0][0] == 'F') {
         max_f_idx = (FEAT_IDX)atoi(zz[1]);
     } else if (zz[0][0] == 'A') {

diff --git a/src/room/rooms-vault.cpp b/src/room/rooms-vault.cpp
index 44d7cc9..47ec96b 100644 (file)
--- a/src/room/rooms-vault.cpp
+++ b/src/room/rooms-vault.cpp
@@ -44,7 +44,7 @@ std::vector<vault_type> v_info;
 /*
  * Maximum number of vaults in v_info.txt
  */
-VAULT_IDX max_v_idx;
+int16_t max_v_idx;
 
 /*
  * This function creates a random vault that looks like a collection of bubbles.

diff --git a/src/room/rooms-vault.h b/src/room/rooms-vault.h
index 9c85904..0dbc196 100644 (file)
--- a/src/room/rooms-vault.h
+++ b/src/room/rooms-vault.h
@@ -15,7 +15,7 @@ typedef struct vault_type {
 } vault_type;
 
 extern std::vector<vault_type> v_info;
-extern VAULT_IDX max_v_idx;
+extern int16_t max_v_idx;
 
 typedef struct dun_data_type dun_data_type;
 typedef struct player_type player_type;

diff --git a/src/system/h-type.h b/src/system/h-type.h
index 8cd573d..026a7fe 100644 (file)
--- a/src/system/h-type.h
+++ b/src/system/h-type.h
@@ -88,7 +88,6 @@ typedef int16_t QUEST_IDX; /*!< ゲーム中のクエストID型を定義 */
 typedef int16_t INVENTORY_IDX; /*!< ゲーム中の所持品ID型を定義 */
 typedef int16_t OBJECT_IDX; /*!< ゲーム中のアイテムID型を定義 */
 typedef int16_t KIND_OBJECT_IDX; /*!< ゲーム中のベースアイテムID型を定義 */
-typedef int16_t VAULT_IDX; /*!< 固定部屋のID型を定義 */
 typedef int MUTATION_IDX; /*!< 突然変異のID型を定義 */
 
 typedef int32_t POSITION; /*!< ゲーム中の座標型を定義 */