From e7f520f2f6ee81a86807af74d5d8888a523a25fc Mon Sep 17 00:00:00 2001 From: nothere Date: Tue, 27 Jan 2004 11:58:17 +0000 Subject: [PATCH] =?utf8?q?=E5=89=A3=E8=A1=93/=E5=BF=8D=E8=A1=93=20"?= =?utf8?q?=E5=85=A5=E8=BA=AB"=20=E3=81=A7=E3=83=A2=E3=83=B3=E3=82=B9?= =?utf8?q?=E3=82=BF=E3=83=BC=E3=82=92=E5=80=92=E3=81=97=E3=81=A6=E3=83=97?= =?utf8?q?=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E3=81=8C=E5=AE=9F=E9=9A=9B?= =?utf8?q?=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7?= =?utf8?q?=E3=81=AE=20=E9=96=93=E3=81=AB=E8=A1=80=E3=81=AE=E5=91=AA?= =?utf8?q?=E3=81=84=E3=82=84=E3=82=AB=E3=82=AA=E3=82=B9=E3=81=AE=E5=AE=88?= =?utf8?q?=E8=AD=B7=E6=82=AA=E9=AD=94=E3=81=AE=E5=A0=B1=E9=85=AC=E3=81=AA?= =?utf8?q?=E3=81=A9=E3=81=A7=E3=83=86=E3=83=AC=E3=83=9D=E3=83=BC=E3=83=88?= =?utf8?q?=E3=81=99=E3=82=8B=E3=81=A8,=20=E3=83=86=E3=83=AC=E3=83=9D?= =?utf8?q?=E3=83=BC=20=E3=83=88=E7=9B=B4=E5=BE=8C=E3=81=AB=E5=85=83?= =?utf8?q?=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=81=AB=E6=88=BB=E3=81=A3=E3=81=A6?= =?utf8?q?=E3=81=8F=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/spells2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/spells2.c b/src/spells2.c index ace5f5303..f91b8c298 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -7417,6 +7417,7 @@ bool rush_attack(bool *mdeath) u16b path_g[32]; int path_n, i; bool tmp_mdeath = FALSE; + bool moved = FALSE; if (mdeath) *mdeath = FALSE; @@ -7518,12 +7519,14 @@ bool rush_attack(bool *mdeath) #endif } + if (!player_bold(ty, tx)) teleport_player_to(ty, tx, FALSE, FALSE); + moved = TRUE; tmp_mdeath = py_attack(ny, nx, HISSATSU_NYUSIN); break; } - if (!player_bold(ty, tx)) teleport_player_to(ty, tx, FALSE, FALSE); + if (!moved && !player_bold(ty, tx)) teleport_player_to(ty, tx, FALSE, FALSE); if (mdeath) *mdeath = tmp_mdeath; return TRUE; -- 2.11.0