地形を叩き開ける際に, OPENで地形が変わらない地形だった場合その地形に

めり込むバグがあったので修正. また, くさびの打たれたドアにK:OPENがな
くこのバグが出ていたので併せて修正.

diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index 7963022..adc18b3 100644 (file)
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -523,6 +523,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_1
 F:POWER_0 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -537,6 +538,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_2
 F:POWER_1 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -551,6 +553,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_3
 F:POWER_2 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -565,6 +568,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_4
 F:POWER_3 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -579,6 +583,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_5
 F:POWER_4 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -593,6 +598,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_6
 F:POWER_5 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -607,6 +613,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_7
 F:POWER_6 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |
@@ -621,6 +628,7 @@ G:+:U
 M:CLOSED_DOOR
 W:10
 K:DESTROYED:FLOOR
+K:OPEN:OPEN_DOOR
 K:BASH:BROKEN_DOOR
 K:SPIKE:JAMMED_DOOR_7
 F:POWER_7 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK |

diff --git a/src/cmd2.c b/src/cmd2.c
index 7e37994..9b876bc 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2278,14 +2278,14 @@ static bool do_cmd_bash_aux(int y, int x, int dir)
        {
                /* Message */
 #ifdef JP
-               msg_print("¥É¥¢¤ò²õ¤·¤¿¡ª");
+               msg_format("%s¤ò²õ¤·¤¿¡ª", f_name + f_ptr->name);
 #else
-               msg_print("The door crashes open!");
+               msg_format("The %s crashes open!", f_name + f_ptr->name);
 #endif
 
 
                /* Break down the door */
-               if (randint0(100) < 50)
+               if ((randint0(100) < 50) || (feat_state(c_ptr->feat, FF_OPEN) == c_ptr->feat))
                {
                        cave_alter_feat(y, x, FF_BASH);
                }

diff --git a/src/melee2.c b/src/melee2.c
index c8feb7a..d938cd1 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -3018,7 +3018,7 @@ msg_format("%^s%s", m_name, monmessage);
                        if (did_open_door || did_bash_door)
                        {
                                /* Break down the door */
-                               if (did_bash_door && (randint0(100) < 50))
+                               if (did_bash_door && ((randint0(100) < 50) || (feat_state(c_ptr->feat, FF_OPEN) == c_ptr->feat)))
                                {
                                        cave_alter_feat(ny, nx, FF_BASH);
                                }