From 86350a916bf9a987bb863bff74da6e4a96af7d05 Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 16 Oct 2019 20:31:07 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20cave=5Flite=5Fhack()=20?= =?utf8?q?=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20floor=5Ftype=20*=20argum?= =?utf8?q?ent=20to=20cave=5Flite=5Fhack().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-events.c | 52 ++++++++++++++++++++++++++-------------------------- src/grid.h | 10 +++++----- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/floor-events.c b/src/floor-events.c index b97972568..815ef8823 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -468,19 +468,19 @@ void update_lite(player_type *subject_ptr) if (p >= 1) { /* Player grid */ - cave_lite_hack(subject_ptr->y, subject_ptr->x); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y, subject_ptr->x); /* Adjacent grid */ - cave_lite_hack(subject_ptr->y + 1, subject_ptr->x); - cave_lite_hack(subject_ptr->y - 1, subject_ptr->x); - cave_lite_hack(subject_ptr->y, subject_ptr->x + 1); - cave_lite_hack(subject_ptr->y, subject_ptr->x - 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 1, subject_ptr->x); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 1, subject_ptr->x); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y, subject_ptr->x + 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y, subject_ptr->x - 1); /* Diagonal grids */ - cave_lite_hack(subject_ptr->y + 1, subject_ptr->x + 1); - cave_lite_hack(subject_ptr->y + 1, subject_ptr->x - 1); - cave_lite_hack(subject_ptr->y - 1, subject_ptr->x + 1); - cave_lite_hack(subject_ptr->y - 1, subject_ptr->x - 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 1, subject_ptr->x + 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 1, subject_ptr->x - 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 1, subject_ptr->x + 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 1, subject_ptr->x - 1); } /* Radius 2 -- lantern radius */ @@ -489,33 +489,33 @@ void update_lite(player_type *subject_ptr) /* South of the player */ if (cave_los_bold(subject_ptr->y + 1, subject_ptr->x)) { - cave_lite_hack(subject_ptr->y + 2, subject_ptr->x); - cave_lite_hack(subject_ptr->y + 2, subject_ptr->x + 1); - cave_lite_hack(subject_ptr->y + 2, subject_ptr->x - 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 2, subject_ptr->x); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 2, subject_ptr->x + 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 2, subject_ptr->x - 1); } /* North of the player */ if (cave_los_bold(subject_ptr->y - 1, subject_ptr->x)) { - cave_lite_hack(subject_ptr->y - 2, subject_ptr->x); - cave_lite_hack(subject_ptr->y - 2, subject_ptr->x + 1); - cave_lite_hack(subject_ptr->y - 2, subject_ptr->x - 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 2, subject_ptr->x); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 2, subject_ptr->x + 1); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 2, subject_ptr->x - 1); } /* East of the player */ if (cave_los_bold(subject_ptr->y, subject_ptr->x + 1)) { - cave_lite_hack(subject_ptr->y, subject_ptr->x + 2); - cave_lite_hack(subject_ptr->y + 1, subject_ptr->x + 2); - cave_lite_hack(subject_ptr->y - 1, subject_ptr->x + 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y, subject_ptr->x + 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 1, subject_ptr->x + 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 1, subject_ptr->x + 2); } /* West of the player */ if (cave_los_bold(subject_ptr->y, subject_ptr->x - 1)) { - cave_lite_hack(subject_ptr->y, subject_ptr->x - 2); - cave_lite_hack(subject_ptr->y + 1, subject_ptr->x - 2); - cave_lite_hack(subject_ptr->y - 1, subject_ptr->x - 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y, subject_ptr->x - 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 1, subject_ptr->x - 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 1, subject_ptr->x - 2); } } @@ -530,25 +530,25 @@ void update_lite(player_type *subject_ptr) /* South-East of the player */ if (cave_los_bold(subject_ptr->y + 1, subject_ptr->x + 1)) { - cave_lite_hack(subject_ptr->y + 2, subject_ptr->x + 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 2, subject_ptr->x + 2); } /* South-West of the player */ if (cave_los_bold(subject_ptr->y + 1, subject_ptr->x - 1)) { - cave_lite_hack(subject_ptr->y + 2, subject_ptr->x - 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y + 2, subject_ptr->x - 2); } /* North-East of the player */ if (cave_los_bold(subject_ptr->y - 1, subject_ptr->x + 1)) { - cave_lite_hack(subject_ptr->y - 2, subject_ptr->x + 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 2, subject_ptr->x + 2); } /* North-West of the player */ if (cave_los_bold(subject_ptr->y - 1, subject_ptr->x - 1)) { - cave_lite_hack(subject_ptr->y - 2, subject_ptr->x - 2); + cave_lite_hack(subject_ptr->current_floor_ptr, subject_ptr->y - 2, subject_ptr->x - 2); } /* Maximal north */ @@ -588,7 +588,7 @@ void update_lite(player_type *subject_ptr) if (subject_ptr->current_floor_ptr->grid_array[y][x].info & CAVE_VIEW) { /* This grid is "torch lit" */ - cave_lite_hack(y, x); + cave_lite_hack(subject_ptr->current_floor_ptr, y, x); } } } diff --git a/src/grid.h b/src/grid.h index 77c08657e..122bded63 100644 --- a/src/grid.h +++ b/src/grid.h @@ -440,13 +440,13 @@ extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode * have already been placed into the "lite" array, and we are never * called when the "lite" array is full. */ -#define cave_lite_hack(Y,X) \ +#define cave_lite_hack(F, Y,X) \ {\ - if (!(p_ptr->current_floor_ptr->grid_array[Y][X].info & (CAVE_LITE))) \ + if (!((F)->grid_array[Y][X].info & (CAVE_LITE))) \ { \ - p_ptr->current_floor_ptr->grid_array[Y][X].info |= (CAVE_LITE); \ - p_ptr->current_floor_ptr->lite_y[p_ptr->current_floor_ptr->lite_n] = (Y); \ - p_ptr->current_floor_ptr->lite_x[p_ptr->current_floor_ptr->lite_n++] = (X); \ + (F)->grid_array[Y][X].info |= (CAVE_LITE); \ + (F)->lite_y[p_ptr->current_floor_ptr->lite_n] = (Y); \ + (F)->lite_x[p_ptr->current_floor_ptr->lite_n++] = (X); \ } \ } -- 2.11.0