From 3b3300befbf7f67e6b65f29cf31d06344427b312 Mon Sep 17 00:00:00 2001
From: deskull <deskull@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Tue, 8 Mar 2011 16:54:43 +0000
Subject: [PATCH] =?utf8?q?=E4=B8=8D=E5=8F=AF=E8=83=BD=E3=81=AA=E5=9C=B0?=
 =?utf8?q?=E5=BD=A2=E4=B8=8A=E3=81=A7=E3=81=AE=E5=BF=8D=E8=80=85=E3=81=AE?=
 =?utf8?q?=E9=80=9F=E9=A7=86=E3=81=91=E7=99=BA=E5=8B=95=E7=A6=81=E6=AD=A2?=
 =?utf8?q?=E3=80=82=20=E9=80=9F=E9=A7=86=E3=81=91=E3=81=8C=E7=B5=82?=
 =?utf8?q?=E4=BA=86=E3=81=97=E3=81=9F=E7=9E=AC=E9=96=93=E3=81=AB=E3=80=81?=
 =?utf8?q?=E7=A7=BB=E5=8B=95=E6=B6=88=E8=B2=BB=E3=82=A8=E3=83=8D=E3=83=AB?=
 =?utf8?q?=E3=82=AE=E3=83=BC=E3=81=8C=E5=85=83=E3=81=AB=E6=88=BB=E3=82=8B?=
 =?utf8?q?=E3=82=88=E3=81=86=E8=A8=AD=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd6.c    |  2 +-
 src/effects.c |  1 +
 src/racial.c  | 28 ++++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/cmd6.c b/src/cmd6.c
index f8dd82ca2..27bfe1dcf 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -711,7 +711,7 @@ void do_cmd_eat_food(void)
 static void do_cmd_quaff_potion_aux(int item)
 {
 	int         ident, lev;
-	object_type	*o_ptr;
+	object_type *o_ptr;
 	object_type forge;
 	object_type *q_ptr;
 
diff --git a/src/effects.c b/src/effects.c
index b244442d3..0a818bcb8 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -87,6 +87,7 @@ void set_action(int typ)
 #else
 				msg_print("You are no longer walking extremely fast.");
 #endif
+				energy_use = 100;
 				break;
 			}
 			case ACTION_SPELL:
diff --git a/src/racial.c b/src/racial.c
index c0d3ded53..4145154fc 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -1407,11 +1407,35 @@ static bool cmd_racial_power_aux(s32b command)
 		}
 		case CLASS_NINJA:
 		{
-			if (p_ptr->action == ACTION_HAYAGAKE) set_action(ACTION_NONE);
-			else set_action(ACTION_HAYAGAKE);
+			if (p_ptr->action == ACTION_HAYAGAKE)
+			{
+				set_action(ACTION_NONE);
+			}
+			else
+			{
+				cave_type *c_ptr = &cave[py][px];
+				feature_type *f_ptr = &f_info[c_ptr->feat];
+
+				if (!have_flag(f_ptr->flags, FF_PROJECT) ||
+				    (!p_ptr->levitation && have_flag(f_ptr->flags, FF_DEEP)))
+				{
+#ifdef JP
+					msg_print("¤³¤³¤Ç¤ÏÁÇÁ᤯ư¤±¤Ê¤¤¡£");
+#else
+					msg_print("You cannot run in here.");
+#endif
+				}
+				else
+				{
+					set_action(ACTION_HAYAGAKE);
+				}
+			}
+
+
 			energy_use = 0;
 			break;
 		}
+
 		}
 	}
 	else if (p_ptr->mimic_form)
-- 
2.11.0