From 953198dbfb6ae4cc169c34099e28e3b7539daa35 Mon Sep 17 00:00:00 2001 From: nothere Date: Thu, 27 Nov 2003 15:48:48 +0000 Subject: [PATCH] =?utf8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=83=BB=E3=82=A8?= =?utf8?q?=E3=83=AA=E3=82=A2=E3=81=A7=E5=85=89=E3=81=8C=E9=80=9A=E3=82=8B?= =?utf8?q?=E6=9D=A1=E4=BB=B6=E3=82=92PROJECT=E3=81=A7=E3=81=AF=E3=81=AA?= =?utf8?q?=E3=81=8FLOS=E3=81=AB=E6=88=BB=E3=81=97=E3=81=9F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/spells2.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/spells2.c b/src/spells2.c index 2a019b2f2..e7a3eeb61 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -6152,11 +6152,6 @@ static void cave_temp_room_unlite(void) } -#define cave_pass_lite_bold(Y,X) \ - (cave_los_bold((Y), (X)) && \ - have_flag(f_flags_bold((Y), (X)), FF_PROJECT)) - - /* * Determine how much contiguous open space this grid is next to */ @@ -6175,7 +6170,7 @@ static int next_to_open(int cy, int cx) x = cx + ddx_cdd[i % 8]; /* Found a wall, break the length */ - if (!cave_pass_lite_bold(y, x)) + if (!cave_los_bold(y, x)) { /* Track best length */ if (len > blen) @@ -6208,7 +6203,7 @@ static int next_to_walls_adj(int cy, int cx) y = cy + ddy_ddd[i]; x = cx + ddx_ddd[i]; - if (!cave_pass_lite_bold(y, x)) c++; + if (!cave_los_bold(y, x)) c++; } return c; @@ -6248,7 +6243,7 @@ static void cave_temp_room_aux(int y, int x, bool only_room) * properly. * This leaves only a check for 6 bounding walls! */ - if (in_bounds(y, x) && cave_pass_lite_bold(y, x) && + if (in_bounds(y, x) && cave_los_bold(y, x) && (next_to_walls_adj(y, x) == 6) && (next_to_open(y, x) <= 1)) return; } @@ -6299,7 +6294,7 @@ void lite_room(int y1, int x1) x = temp_x[i], y = temp_y[i]; /* Walls get lit, but stop light */ - if (!cave_pass_lite_bold(y, x)) continue; + if (!cave_los_bold(y, x)) continue; /* Spread adjacent */ cave_temp_lite_room_aux(y + 1, x); @@ -6335,7 +6330,7 @@ void unlite_room(int y1, int x1) x = temp_x[i], y = temp_y[i]; /* Walls get dark, but stop darkness */ - if (!cave_pass_lite_bold(y, x)) continue; + if (!cave_los_bold(y, x)) continue; /* Spread adjacent */ cave_temp_unlite_room_aux(y + 1, x); -- 2.11.0