From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 1 Dec 2003 14:21:04 +0000 (+0000)
Subject: 走る判定のsee_wall()でドアは壁とみなさないようにした.
X-Git-Tag: v2.1.2~787
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=24f2e4187c902f4ad880c5363d326e9f03532be0;p=hengbandforosx%2Fhengbandosx.git

走る判定のsee_wall()でドアは壁とみなさないようにした.
---

diff --git a/src/cmd1.c b/src/cmd1.c
index 70233907f..eb944a583 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -4176,21 +4176,18 @@ static int see_wall(int dir, int y, int x)
 	{
 		/* Feature code (applying "mimic" field) */
 		s16b         feat = get_feat_mimic(c_ptr);
-		feature_type *f_ptr;
+		feature_type *f_ptr = &f_info[feat];
 
 		/* Wall grids are known walls */
-		if (!player_can_enter(feat, 0)) return TRUE;
-
-		f_ptr = &f_info[feat];
+		if (!player_can_enter(feat, 0)) return !have_flag(f_ptr->flags, FF_DOOR);
 
 		/* Don't run on a tree unless explicitly requested */
 		if (have_flag(f_ptr->flags, FF_AVOID_RUN) && !ignore_avoid_run)
 			return TRUE;
 
 		/* Don't run in a wall */
-		if (!have_flag(f_ptr->flags, FF_MOVE) &&
-		    !have_flag(f_ptr->flags, FF_CAN_FLY))
-			return TRUE;
+		if (!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY))
+			return !have_flag(f_ptr->flags, FF_DOOR);
 	}
 
 	return FALSE;