[Refactor] #2141 feature_type *f_ptrの宣言をautoに差し替えた

diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp
index 2593829..0c87800 100644 (file)
--- a/src/action/movement-execution.cpp
+++ b/src/action/movement-execution.cpp
@@ -152,7 +152,7 @@ void exe_movement(PlayerType *player_ptr, DIRECTION dir, bool do_pickup, bool br
     if (player_ptr->inventory_list[INVEN_SUB_HAND].name1 == ART_STORMBRINGER)
         stormbringer = true;
 
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     bool p_can_kill_walls = has_kill_wall(player_ptr) && f_ptr->flags.has(FloorFeatureType::HURT_DISI) && (!p_can_enter || f_ptr->flags.has_not(FloorFeatureType::LOS)) && f_ptr->flags.has_not(FloorFeatureType::PERMANENT);
     GAME_TEXT m_name[MAX_NLEN];
     bool can_move = true;

diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
index 17a6fdf..b78b22d 100644 (file)
--- a/src/action/open-close-execution.cpp
+++ b/src/action/open-close-execution.cpp
@@ -40,7 +40,7 @@
 bool exe_open(PlayerType *player_ptr, POSITION y, POSITION x)
 {
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     PlayerEnergy(player_ptr).set_player_turn_energy(100);
     if (f_ptr->flags.has_not(FloorFeatureType::OPEN)) {
         msg_format(_("%sはがっちりと閉じられているようだ。", "The %s appears to be stuck."), f_info[g_ptr->get_feat_mimic()].name.c_str());
@@ -135,7 +135,7 @@ bool easy_open_door(PlayerType *player_ptr, POSITION y, POSITION x)
 {
     int i, j;
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     if (!is_closed_door(player_ptr, g_ptr->feat))
         return false;
 
@@ -246,7 +246,7 @@ bool exe_disarm_chest(PlayerType *player_ptr, POSITION y, POSITION x, OBJECT_IDX
 bool exe_disarm(PlayerType *player_ptr, POSITION y, POSITION x, DIRECTION dir)
 {
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     concptr name = f_ptr->name.c_str();
     int power = f_ptr->power;
     bool more = false;
@@ -298,7 +298,7 @@ bool exe_disarm(PlayerType *player_ptr, POSITION y, POSITION x, DIRECTION dir)
 bool exe_bash(PlayerType *player_ptr, POSITION y, POSITION x, DIRECTION dir)
 {
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     int bash = adj_str_blow[player_ptr->stat_index[A_STR]];
     int temp = f_ptr->power;
     bool more = false;

diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp
index 8e8c3ad..bd448c9 100644 (file)
--- a/src/action/run-execution.cpp
+++ b/src/action/run-execution.cpp
@@ -69,7 +69,7 @@ static bool see_wall(PlayerType *player_ptr, DIRECTION dir, POSITION y, POSITION
         return false;
 
     int16_t feat = g_ptr->get_feat_mimic();
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
     if (!player_can_enter(player_ptr, feat, 0))
         return f_ptr->flags.has_not(FloorFeatureType::DOOR);
 

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index d6a4f81..eb01b2e 100644 (file)
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -69,7 +69,7 @@ void do_cmd_go_up(PlayerType *player_ptr)
 {
     bool go_up = false;
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     int up_num = 0;
     PlayerClass(player_ptr).break_samurai_stance({ SamuraiStanceType::MUSOU });
 
@@ -180,7 +180,7 @@ void do_cmd_go_down(PlayerType *player_ptr)
     PlayerClass(player_ptr).break_samurai_stance({ SamuraiStanceType::MUSOU });
 
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     if (f_ptr->flags.has_not(FloorFeatureType::MORE)) {
         msg_print(_("ここには下り階段が見当たらない。", "I see no down staircase here."));
         return;

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 5f60213..e67ebc4 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -253,7 +253,7 @@ bool do_cmd_riding(PlayerType *player_ptr, bool force)
 
         if (!can_player_ride_pet(player_ptr, g_ptr, true)) {
             /* Feature code (applying "mimic" field) */
-            feature_type *f_ptr = &f_info[g_ptr->get_feat_mimic()];
+            auto *f_ptr = &f_info[g_ptr->get_feat_mimic()];
 #ifdef JP
             msg_format("そのモンスターは%sの%sにいる。", f_ptr->name.c_str(),
                 (f_ptr->flags.has_none_of({ FloorFeatureType::MOVE, FloorFeatureType::CAN_FLY }) || f_ptr->flags.has_none_of({ FloorFeatureType::LOS, FloorFeatureType::TREE })) ? "中" : "上");

diff --git a/src/cmd-action/cmd-travel.cpp b/src/cmd-action/cmd-travel.cpp
index fb7ad7c..1dabff0 100644 (file)
--- a/src/cmd-action/cmd-travel.cpp
+++ b/src/cmd-action/cmd-travel.cpp
@@ -27,7 +27,7 @@ static int travel_flow_cost(PlayerType *player_ptr, POSITION y, POSITION x)
 {
     int cost = 1;
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     if (f_ptr->flags.has(FloorFeatureType::AVOID_RUN))
         cost += 1;
 
@@ -71,7 +71,7 @@ static void travel_flow_aux(PlayerType *player_ptr, POSITION y, POSITION x, int
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
     auto *g_ptr = &floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     if (!in_bounds(floor_ptr, y, x))
         return;
 
@@ -115,7 +115,7 @@ static void travel_flow(PlayerType *player_ptr, POSITION ty, POSITION tx)
 {
     flow_head = flow_tail = 0;
     bool wall = false;
-    feature_type *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x].feat];
+    auto *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x].feat];
     if (f_ptr->flags.has_not(FloorFeatureType::MOVE))
         wall = true;
 

diff --git a/src/cmd-visual/cmd-visuals.cpp b/src/cmd-visual/cmd-visuals.cpp
index 61e3316..c05dbaa 100644 (file)
--- a/src/cmd-visual/cmd-visuals.cpp
+++ b/src/cmd-visual/cmd-visuals.cpp
@@ -336,7 +336,7 @@ void do_cmd_visuals(PlayerType *player_ptr)
             static IDX lighting_level = F_LIT_STANDARD;
             prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
             while (true) {
-                feature_type *f_ptr = &f_info[f];
+                auto *f_ptr = &f_info[f];
                 int c;
                 IDX t;
 

diff --git a/src/effect/effect-feature.cpp b/src/effect/effect-feature.cpp
index 3271b06..94099e6 100644 (file)
--- a/src/effect/effect-feature.cpp
+++ b/src/effect/effect-feature.cpp
@@ -66,7 +66,7 @@ bool affect_feature(PlayerType *player_ptr, MONSTER_IDX who, POSITION r, POSITIO
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
     auto *g_ptr = &floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
 
     bool obvious = false;
     bool known = player_has_los_bold(player_ptr, y, x);

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index 39d47a8..35c7646 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -75,7 +75,7 @@ void night_falls(PlayerType *player_ptr)
         for (POSITION y = 0; y < floor_ptr->height; y++) {
             for (POSITION x = 0; x < floor_ptr->width; x++) {
                 auto *g_ptr = &floor_ptr->grid_array[y][x];
-                feature_type *f_ptr = &f_info[g_ptr->get_feat_mimic()];
+                auto *f_ptr = &f_info[g_ptr->get_feat_mimic()];
                 if (g_ptr->is_mirror() || f_ptr->flags.has(FloorFeatureType::QUEST_ENTER) || f_ptr->flags.has(FloorFeatureType::ENTRANCE))
                     continue;
 

diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp
index 6228769..ce9e411 100644 (file)
--- a/src/floor/floor-leaver.cpp
+++ b/src/floor/floor-leaver.cpp
@@ -149,7 +149,7 @@ static void locate_connected_stairs(PlayerType *player_ptr, floor_type *floor_pt
     for (POSITION y = 0; y < floor_ptr->height; y++) {
         for (POSITION x = 0; x < floor_ptr->width; x++) {
             auto *g_ptr = &floor_ptr->grid_array[y][x];
-            feature_type *f_ptr = &f_info[g_ptr->feat];
+            auto *f_ptr = &f_info[g_ptr->feat];
             bool ok = false;
             if (floor_mode & CFM_UP) {
                 if (f_ptr->flags.has_all_of({ FloorFeatureType::LESS, FloorFeatureType::STAIRS }) && f_ptr->flags.has_not(FloorFeatureType::SPECIAL)) {
@@ -279,7 +279,7 @@ static void set_grid_by_leaving_floor(PlayerType *player_ptr, grid_type **g_ptr)
         return;
 
     *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
-    feature_type *f_ptr = &f_info[(*g_ptr)->feat];
+    auto *f_ptr = &f_info[(*g_ptr)->feat];
     if ((*g_ptr)->special && f_ptr->flags.has_not(FloorFeatureType::SPECIAL) && get_sf_ptr((*g_ptr)->special))
         new_floor_id = (*g_ptr)->special;
 

diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp
index afd35c4..7033b27 100644 (file)
--- a/src/floor/floor-streams.cpp
+++ b/src/floor/floor-streams.cpp
@@ -207,7 +207,7 @@ void add_river(floor_type *floor_ptr, dun_data_type *dd_ptr)
     }
 
     if (feat1) {
-        feature_type *f_ptr = &f_info[feat1];
+        auto *f_ptr = &f_info[feat1];
 
         /* Only add river if matches lake type or if have no lake at all */
         if (!(((dd_ptr->laketype == LAKE_T_LAVA) && f_ptr->flags.has(FloorFeatureType::LAVA)) || ((dd_ptr->laketype == LAKE_T_WATER) && f_ptr->flags.has(FloorFeatureType::WATER))

diff --git a/src/floor/object-allocator.cpp b/src/floor/object-allocator.cpp
index ced6891..9c11f1a 100644 (file)
--- a/src/floor/object-allocator.cpp
+++ b/src/floor/object-allocator.cpp
@@ -75,7 +75,7 @@ static bool alloc_stairs_aux(PlayerType *player_ptr, POSITION y, POSITION x, int
 bool alloc_stairs(PlayerType *player_ptr, FEAT_IDX feat, int num, int walls)
 {
     int shaft_num = 0;
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
     auto *floor_ptr = player_ptr->current_floor_ptr;
     if (f_ptr->flags.has(FloorFeatureType::LESS)) {
         if (ironman_downward || !floor_ptr->dun_level)

diff --git a/src/grid/feature.cpp b/src/grid/feature.cpp
index cf36bbc..dda2069 100644 (file)
--- a/src/grid/feature.cpp
+++ b/src/grid/feature.cpp
@@ -136,7 +136,7 @@ bool is_closed_door(PlayerType *player_ptr, FEAT_IDX feat)
 {
        /* 関数ポインタの都合 */
        (void)player_ptr;
-       feature_type *f_ptr = &f_info[feat];
+       auto *f_ptr = &f_info[feat];
 
        return (f_ptr->flags.has(FloorFeatureType::OPEN) || f_ptr->flags.has(FloorFeatureType::BASH)) &&
                f_ptr->flags.has_not(FloorFeatureType::MOVE);
@@ -273,7 +273,7 @@ void cave_set_feat(PlayerType *player_ptr, POSITION y, POSITION x, FEAT_IDX feat
 
 FEAT_IDX conv_dungeon_feat(floor_type *floor_ptr, FEAT_IDX newfeat)
 {
-    feature_type *f_ptr = &f_info[newfeat];
+    auto *f_ptr = &f_info[newfeat];
     if (f_ptr->flags.has_not(FloorFeatureType::CONVERT))
         return newfeat;
 

diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index abb3a1b..719a4f8 100644 (file)
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -338,7 +338,7 @@ void note_spot(PlayerType *player_ptr, POSITION y, POSITION x)
     /* Hack -- memorize grids */
     if (!g_ptr->is_mark()) {
         /* Feature code (applying "mimic" field) */
-        feature_type *f_ptr = &f_info[g_ptr->get_feat_mimic()];
+        auto *f_ptr = &f_info[g_ptr->get_feat_mimic()];
 
         /* Memorize some "boring" grids */
         if (f_ptr->flags.has_not(FloorFeatureType::REMEMBER)) {
@@ -734,7 +734,7 @@ void update_flow(PlayerType *player_ptr)
  */
 FEAT_IDX feat_state(floor_type *floor_ptr, FEAT_IDX feat, FloorFeatureType action)
 {
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
     int i;
 
     /* Get the new feature */
@@ -771,7 +771,7 @@ void cave_alter_feat(PlayerType *player_ptr, POSITION y, POSITION x, FloorFeatur
 
     if (!(feature_action_flags[enum2i(action)] & FAF_NO_DROP)) {
         feature_type *old_f_ptr = &f_info[oldfeat];
-        feature_type *f_ptr = &f_info[newfeat];
+        auto *f_ptr = &f_info[newfeat];
         bool found = false;
 
         /* Handle gold */
@@ -840,7 +840,7 @@ bool cave_monster_teleportable_bold(PlayerType *player_ptr, MONSTER_IDX m_idx, P
 {
     auto *m_ptr = &player_ptr->current_floor_ptr->m_list[m_idx];
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
 
     /* Require "teleportable" space */
     if (f_ptr->flags.has_not(FloorFeatureType::TELEPORTABLE))
@@ -876,7 +876,7 @@ bool cave_monster_teleportable_bold(PlayerType *player_ptr, MONSTER_IDX m_idx, P
 bool cave_player_teleportable_bold(PlayerType *player_ptr, POSITION y, POSITION x, teleport_flags mode)
 {
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
 
     /* Require "teleportable" space */
     if (f_ptr->flags.has_not(FloorFeatureType::TELEPORTABLE))
@@ -935,7 +935,7 @@ bool is_open(PlayerType *player_ptr, FEAT_IDX feat)
  */
 bool player_can_enter(PlayerType *player_ptr, FEAT_IDX feature, BIT_FLAGS16 mode)
 {
-    feature_type *f_ptr = &f_info[feature];
+    auto *f_ptr = &f_info[feature];
 
     if (player_ptr->riding)
         return monster_can_cross_terrain(
@@ -999,7 +999,7 @@ void place_grid(PlayerType *player_ptr, grid_type *g_ptr, grid_bold_type gb_type
         break;
     }
     case GB_OUTER_NOPERM: {
-        feature_type *f_ptr = &f_info[feat_wall_outer];
+        auto *f_ptr = &f_info[feat_wall_outer];
         if (permanent_wall(f_ptr)) {
             g_ptr->feat = (int16_t)feat_state(player_ptr->current_floor_ptr, feat_wall_outer, FloorFeatureType::UNPERM);
         } else {
@@ -1023,7 +1023,7 @@ void place_grid(PlayerType *player_ptr, grid_type *g_ptr, grid_bold_type gb_type
         break;
     }
     case GB_SOLID_NOPERM: {
-        feature_type *f_ptr = &f_info[feat_wall_solid];
+        auto *f_ptr = &f_info[feat_wall_solid];
         if ((g_ptr->info & CAVE_VAULT) && permanent_wall(f_ptr))
             g_ptr->feat = (int16_t)feat_state(player_ptr->current_floor_ptr, feat_wall_solid, FloorFeatureType::UNPERM);
         else

diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp
index 3b82366..7a08e9d 100644 (file)
--- a/src/grid/trap.cpp
+++ b/src/grid/trap.cpp
@@ -389,7 +389,7 @@ void hit_trap(PlayerType *player_ptr, bool break_trap)
     int i, num, dam;
     POSITION x = player_ptr->x, y = player_ptr->y;
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     TrapType trap_feat_type = f_ptr->flags.has(FloorFeatureType::TRAP) ? i2enum<TrapType>(f_ptr->subtype) : TrapType::NOT_TRAP;
     concptr name = _("トラップ", "a trap");
 

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index 7ba59b7..7297f9c 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -65,7 +65,7 @@
 static bool deal_damege_by_feat(PlayerType *player_ptr, grid_type *g_ptr, concptr msg_levitation, concptr msg_normal,
     std::function<PERCENTAGE(PlayerType *)> damage_rate, std::function<void(PlayerType *, int)> additional_effect)
 {
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     int damage = 0;
 
     if (f_ptr->flags.has(FloorFeatureType::DEEP)) {
@@ -110,7 +110,7 @@ static bool deal_damege_by_feat(PlayerType *player_ptr, grid_type *g_ptr, concpt
 void process_player_hp_mp(PlayerType *player_ptr)
 {
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     bool cave_no_regen = false;
     int upkeep_factor = 0;
     int regen_amount = PY_REGEN_NORMAL;

diff --git a/src/info-reader/feature-reader.cpp b/src/info-reader/feature-reader.cpp
index a12525b..c877514 100644 (file)
--- a/src/info-reader/feature-reader.cpp
+++ b/src/info-reader/feature-reader.cpp
@@ -432,7 +432,7 @@ static FEAT_IDX search_real_feat(std::string feat)
 void retouch_f_info(angband_header *head)
 {
     for (int i = 0; i < head->info_num; i++) {
-        feature_type *f_ptr = &f_info[i];
+        auto *f_ptr = &f_info[i];
         FEAT_IDX k = search_real_feat(f_ptr->mimic_tag);
         f_ptr->mimic = k < 0 ? f_ptr->mimic : k;
         k = search_real_feat(f_ptr->destroyed_tag);

diff --git a/src/knowledge/knowledge-features.cpp b/src/knowledge/knowledge-features.cpp
index 7a23bc8..4bec621 100644 (file)
--- a/src/knowledge/knowledge-features.cpp
+++ b/src/knowledge/knowledge-features.cpp
@@ -59,7 +59,7 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
     for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++) {
         TERM_COLOR attr;
         FEAT_IDX f_idx = feat_idx[feat_top + i];
-        feature_type *f_ptr = &f_info[f_idx];
+        auto *f_ptr = &f_info[f_idx];
         int row_i = row + i;
         attr = ((i + feat_top == feat_cur) ? TERM_L_BLUE : TERM_WHITE);
         c_prt(attr, f_ptr->name.c_str(), row_i, col);
@@ -125,7 +125,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f
 
         feat_cnt = 0;
     } else {
-        feature_type *f_ptr = &f_info[direct_f_idx];
+        auto *f_ptr = &f_info[direct_f_idx];
 
         feat_idx[0] = direct_f_idx;
         feat_cnt = 1;

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index 58b381c..c6da490 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -291,7 +291,7 @@ bool hayagake(PlayerType *player_ptr)
     }
 
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
 
     if (f_ptr->flags.has_not(FloorFeatureType::PROJECT) || (!player_ptr->levitation && f_ptr->flags.has(FloorFeatureType::DEEP))) {
         msg_print(_("ここでは素早く動けない。", "You cannot run in here."));

diff --git a/src/monster/monster-info.cpp b/src/monster/monster-info.cpp
index 1355734..6bc1b1a 100644 (file)
--- a/src/monster/monster-info.cpp
+++ b/src/monster/monster-info.cpp
@@ -54,7 +54,7 @@ void set_friendly(monster_type *m_ptr)
  */
 bool monster_can_cross_terrain(PlayerType *player_ptr, FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode)
 {
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
 
     if (f_ptr->flags.has(FloorFeatureType::PATTERN)) {
         if (!(mode & CEM_RIDING)) {

diff --git a/src/monster/monster-util.cpp b/src/monster/monster-util.cpp
index 0f6a1dd..a91177f 100644 (file)
--- a/src/monster/monster-util.cpp
+++ b/src/monster/monster-util.cpp
@@ -288,7 +288,7 @@ monsterrace_hook_type get_monster_hook(PlayerType *player_ptr)
  */
 monsterrace_hook_type get_monster_hook2(PlayerType *player_ptr, POSITION y, POSITION x)
 {
-    feature_type *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[y][x].feat];
+    auto *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[y][x].feat];
     if (f_ptr->flags.has(FloorFeatureType::WATER))
         return f_ptr->flags.has(FloorFeatureType::DEEP) ? (monsterrace_hook_type)mon_hook_deep_water : (monsterrace_hook_type)mon_hook_shallow_water;
 

diff --git a/src/mspell/mspell-lite.cpp b/src/mspell/mspell-lite.cpp
index d511554..d03beb2 100644 (file)
--- a/src/mspell/mspell-lite.cpp
+++ b/src/mspell/mspell-lite.cpp
@@ -79,7 +79,7 @@ void decide_lite_range(PlayerType *player_ptr, msa_type *msa_ptr)
     msa_ptr->y_br_lite = msa_ptr->y;
     msa_ptr->x_br_lite = msa_ptr->x;
     if (los(player_ptr, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx, msa_ptr->y_br_lite, msa_ptr->x_br_lite)) {
-        feature_type *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[msa_ptr->y_br_lite][msa_ptr->x_br_lite].feat];
+        auto *f_ptr = &f_info[player_ptr->current_floor_ptr->grid_array[msa_ptr->y_br_lite][msa_ptr->x_br_lite].feat];
         if (f_ptr->flags.has_not(FloorFeatureType::LOS) && f_ptr->flags.has(FloorFeatureType::PROJECT) && one_in_(2))
             msa_ptr->ability_flags.reset(MonsterAbilityType::BR_LITE);
     } else if (!adjacent_grid_check(player_ptr, msa_ptr->m_ptr, &msa_ptr->y_br_lite, &msa_ptr->x_br_lite, FloorFeatureType::LOS, los))
@@ -94,7 +94,7 @@ void decide_lite_range(PlayerType *player_ptr, msa_type *msa_ptr)
 
 static void feature_projection(floor_type *floor_ptr, msa_type *msa_ptr)
 {
-    feature_type *f_ptr = &f_info[floor_ptr->grid_array[msa_ptr->y][msa_ptr->x].feat];
+    auto *f_ptr = &f_info[floor_ptr->grid_array[msa_ptr->y][msa_ptr->x].feat];
     if (f_ptr->flags.has(FloorFeatureType::PROJECT))
         return;
 

diff --git a/src/player-base/player-race.cpp b/src/player-base/player-race.cpp
index 7d98376..c01d7f3 100644 (file)
--- a/src/player-base/player-race.cpp
+++ b/src/player-base/player-race.cpp
@@ -143,7 +143,7 @@ int16_t PlayerRace::speed() const
 
     if (PlayerRace(this->player_ptr).equals(PlayerRaceType::MERFOLK)) {
         auto *floor_ptr = this->player_ptr->current_floor_ptr;
-        feature_type *f_ptr = &f_info[floor_ptr->grid_array[this->player_ptr->y][this->player_ptr->x].feat];
+        auto *f_ptr = &f_info[floor_ptr->grid_array[this->player_ptr->y][this->player_ptr->x].feat];
         if (f_ptr->flags.has(FloorFeatureType::WATER)) {
             result += (2 + this->player_ptr->lev / 10);
         } else if (!this->player_ptr->levitation) {

diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index afb8cb0..e569dd6 100644 (file)
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -126,7 +126,7 @@ bool move_player_effect(PlayerType *player_ptr, POSITION ny, POSITION nx, BIT_FL
     auto *floor_ptr = player_ptr->current_floor_ptr;
     auto *g_ptr = &floor_ptr->grid_array[ny][nx];
     grid_type *oc_ptr = &floor_ptr->grid_array[oy][ox];
-    feature_type *f_ptr = &f_info[g_ptr->feat];
+    auto *f_ptr = &f_info[g_ptr->feat];
     feature_type *of_ptr = &f_info[oc_ptr->feat];
 
     if (!(mpe_mode & MPE_STAYING)) {
@@ -274,7 +274,7 @@ bool move_player_effect(PlayerType *player_ptr, POSITION ny, POSITION nx, BIT_FL
  */
 bool trap_can_be_ignored(PlayerType *player_ptr, FEAT_IDX feat)
 {
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
     if (f_ptr->flags.has_not(FloorFeatureType::TRAP))
         return true;
 

diff --git a/src/view/display-map.cpp b/src/view/display-map.cpp
index 07a288c..1a010d5 100644 (file)
--- a/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@ -143,7 +143,7 @@ void map_info(PlayerType *player_ptr, POSITION y, POSITION x, TERM_COLOR *ap, SY
     auto *floor_ptr = player_ptr->current_floor_ptr;
     auto *g_ptr = &floor_ptr->grid_array[y][x];
     FEAT_IDX feat = g_ptr->get_feat_mimic();
-    feature_type *f_ptr = &f_info[feat];
+    auto *f_ptr = &f_info[feat];
     TERM_COLOR a;
     SYMBOL_CODE c;
     if (f_ptr->flags.has_not(FloorFeatureType::REMEMBER)) {

diff --git a/src/window/display-sub-windows.cpp b/src/window/display-sub-windows.cpp
index f38bcfd..7ad9085 100644 (file)
--- a/src/window/display-sub-windows.cpp
+++ b/src/window/display-sub-windows.cpp
@@ -418,7 +418,7 @@ static void display_dungeon(PlayerType *player_ptr)
             TERM_COLOR a;
             SYMBOL_CODE c;
             if (!in_bounds2(player_ptr->current_floor_ptr, y, x)) {
-                feature_type *f_ptr = &f_info[feat_none];
+                auto *f_ptr = &f_info[feat_none];
                 a = f_ptr->x_attr[F_LIT_STANDARD];
                 c = f_ptr->x_char[F_LIT_STANDARD];
                 term_queue_char(x - player_ptr->x + Term->wid / 2 - 1, y - player_ptr->y + Term->hgt / 2 - 1, a, c, ta, tc);