OSDN Git Service

[Refactor] #3650 Grid::get_feat_mimic() から地形特性を得ていた箇所をget_terrain_mimic() に置換した
[hengbandforosx/hengbandosx.git] / src / hpmp / hp-mp-processor.cpp
index 4a2a402..1008da6 100644 (file)
@@ -89,13 +89,14 @@ static bool deal_damege_by_feat(PlayerType *player_ptr, const Grid &grid, concpt
     if (player_ptr->levitation) {
         msg_print(msg_levitation);
         constexpr auto mes = _("%sの上に浮遊したダメージ", "flying over %s");
-        take_hit(player_ptr, DAMAGE_NOESCAPE, damage, format(mes, terrains_info[grid.get_feat_mimic()].name.data()));
+        take_hit(player_ptr, DAMAGE_NOESCAPE, damage, format(mes, grid.get_terrain_mimic().name.data()));
 
         if (additional_effect != nullptr) {
             additional_effect(player_ptr, damage);
         }
     } else {
-        const auto &name = terrains_info[player_ptr->current_floor_ptr->get_grid(player_ptr->get_position()).get_feat_mimic()].name;
+        const auto p_pos = player_ptr->get_position();
+        const auto &name = player_ptr->current_floor_ptr->get_grid(p_pos).get_terrain_mimic().name;
         msg_format(_("%s%s!", "The %s %s!"), name.data(), msg_normal);
         take_hit(player_ptr, DAMAGE_NOESCAPE, damage, name);