[Refactor] #define ALLOW_REPEAT による分岐処理削除 / Delete #define branch by ALLOW_REPEAT.

[hengbandforosx/hengbandosx.git] / src / xtra2.c

diff --git a/src/xtra2.c b/src/xtra2.c
index 820a8ab..f0ee49c 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -4085,8 +4085,6 @@ bool get_aim_dir(DIRECTION *dp)
        /* Hack -- auto-target if requested */
        if (use_old_target && target_okay()) dir = 5;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        if (repeat_pull(&code))
        {
                /* Confusion? */
@@ -4100,8 +4098,6 @@ bool get_aim_dir(DIRECTION *dp)
        }
        *dp = (DIRECTION)code;
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Ask until satisfied */
        while (!dir)
        {
@@ -4189,13 +4185,9 @@ bool get_aim_dir(DIRECTION *dp)
        /* Save direction */
        (*dp) = dir;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
 /*     repeat_push(dir); */
        repeat_push((COMMAND_CODE)command_dir);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* A "valid" direction was entered */
        return (TRUE);
 }
@@ -4212,8 +4204,6 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
        /* Global direction */
        dir = command_dir;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        if (repeat_pull(&code))
        {
                dir = (DIRECTION)code;
@@ -4221,8 +4211,6 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
        }
        *dp = (DIRECTION)code;
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        if (allow_under)
        {
                prompt = _("方向 ('.'足元, ESCで中断)? ", "Direction ('.' at feet, Escape to cancel)? ");
@@ -4327,13 +4315,9 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
        /* Save direction */
        (*dp) = dir;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        /*      repeat_push(dir); */
        repeat_push((COMMAND_CODE)command_dir);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Success */
        return (TRUE);
 }
@@ -4365,8 +4349,6 @@ bool get_rep_dir(DIRECTION *dp, bool under)
        /* Global direction */
        dir = command_dir;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        if (repeat_pull(&code))
        {
                dir = (DIRECTION)code;
@@ -4374,8 +4356,6 @@ bool get_rep_dir(DIRECTION *dp, bool under)
        }
        *dp = (DIRECTION)code;
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        if (under)
        {
                prompt = _("方向 ('.'足元, ESCで中断)? ", "Direction ('.' at feet, Escape to cancel)? ");
@@ -4480,13 +4460,9 @@ bool get_rep_dir(DIRECTION *dp, bool under)
        /* Save direction */
        (*dp) = dir;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
 /*     repeat_push(dir); */
        repeat_push((COMMAND_CODE)command_dir);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Success */
        return (TRUE);
 }