v3.0.0 Alpha5 OSDN最終版

[hengband/hengband.git] / src / action / tunnel-execution.c

diff --git a/src/action/tunnel-execution.c b/src/action/tunnel-execution.c
index 4261a4b..4765ce6 100644 (file)
--- a/src/action/tunnel-execution.c
+++ b/src/action/tunnel-execution.c
@@ -1,11 +1,11 @@
 #include "action/tunnel-execution.h"
 #include "core/player-update-types.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/player-move.h"
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
@@ -26,7 +26,7 @@ static bool do_cmd_tunnel_test(floor_type *floor_ptr, POSITION y, POSITION x)
         return FALSE;
     }
 
-    if (!cave_have_flag_grid(g_ptr, FF_TUNNEL)) {
+    if (!cave_has_flag_grid(g_ptr, FF_TUNNEL)) {
         msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel."));
         return FALSE;
     }
@@ -62,12 +62,12 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x)
     mimic_f_ptr = &f_info[get_feat_mimic(g_ptr)];
     name = f_name + mimic_f_ptr->name;
     sound(SOUND_DIG);
-    if (have_flag(f_ptr->flags, FF_PERMANENT)) {
-        if (have_flag(mimic_f_ptr->flags, FF_PERMANENT))
+    if (has_flag(f_ptr->flags, FF_PERMANENT)) {
+        if (has_flag(mimic_f_ptr->flags, FF_PERMANENT))
             msg_print(_("この岩は硬すぎて掘れないようだ。", "This seems to be permanent rock."));
         else
             msg_print(_("そこは掘れない!", "You can't tunnel through that!"));
-    } else if (have_flag(f_ptr->flags, FF_CAN_DIG)) {
+    } else if (has_flag(f_ptr->flags, FF_CAN_DIG)) {
         if (creature_ptr->skill_dig > randint0(20 * power)) {
             msg_format(_("%sをくずした。", "You have removed the %s."), name);
             cave_alter_feat(creature_ptr, y, x, FF_TUNNEL);
@@ -77,7 +77,7 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x)
             more = TRUE;
         }
     } else {
-        bool tree = have_flag(mimic_f_ptr->flags, FF_TREE);
+        bool tree = has_flag(mimic_f_ptr->flags, FF_TREE);
         if (creature_ptr->skill_dig > power + randint0(40 * power)) {
             if (tree)
                 msg_format(_("%sを切り払った。", "You have cleared away the %s."), name);
@@ -86,7 +86,7 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x)
                 creature_ptr->update |= (PU_FLOW);
             }
 
-            if (have_flag(f_ptr->flags, FF_GLASS))
+            if (has_flag(f_ptr->flags, FF_GLASS))
                 sound(SOUND_GLASS);
 
             cave_alter_feat(creature_ptr, y, x, FF_TUNNEL);