[Refactor] #38997 clear_mon_lite() に floor_type * 引数を追加．

diff --git a/src/core.c b/src/core.c
index 59d4a63..2a5cf78 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5622,7 +5622,7 @@ void play_game(bool new_game)
 
                forget_lite();
                forget_view();
-               clear_mon_lite();
+               clear_mon_lite(current_floor_ptr);
 
                /* Handle "quit and save" */
                if (!p_ptr->playing && !p_ptr->is_dead) break;

diff --git a/src/files.c b/src/files.c
index 2b9ed19..b5c6786 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6934,7 +6934,7 @@ static void handle_signal_simple(int sig)
 
                forget_lite();
                forget_view();
-               clear_mon_lite();
+               clear_mon_lite(current_floor_ptr);
 
                /* Close stuff */
                close_game();
@@ -6951,7 +6951,7 @@ static void handle_signal_simple(int sig)
 
                forget_lite();
                forget_view();
-               clear_mon_lite();
+               clear_mon_lite(current_floor_ptr);
 
                /* Stop playing */
                p_ptr->playing = FALSE;
@@ -7027,7 +7027,7 @@ static void handle_signal_abort(int sig)
 
        forget_lite();
        forget_view();
-       clear_mon_lite();
+       clear_mon_lite(current_floor_ptr);
 
        /* Clear the bottom line */
        Term_erase(0, hgt - 1, 255);

diff --git a/src/floor-events.c b/src/floor-events.c
index 8746f1f..8ecb563 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -1806,23 +1806,23 @@ void update_mon_lite(floor_type *floor_ptr)
        p_ptr->old_monlite = p_ptr->monlite;
 }
 
-void clear_mon_lite(void)
+void clear_mon_lite(floor_type *floor_ptr)
 {
        int i;
        grid_type *g_ptr;
 
        /* Clear all monster lit squares */
-       for (i = 0; i < current_floor_ptr->mon_lite_n; i++)
+       for (i = 0; i < floor_ptr->mon_lite_n; i++)
        {
                /* Point to grid */
-               g_ptr = &current_floor_ptr->grid_array[current_floor_ptr->mon_lite_y[i]][current_floor_ptr->mon_lite_x[i]];
+               g_ptr = &floor_ptr->grid_array[floor_ptr->mon_lite_y[i]][floor_ptr->mon_lite_x[i]];
 
                /* Clear monster illumination flag */
                g_ptr->info &= ~(CAVE_MNLT | CAVE_MNDK);
        }
 
        /* Empty the array */
-       current_floor_ptr->mon_lite_n = 0;
+       floor_ptr->mon_lite_n = 0;
 }
 
 

diff --git a/src/floor-events.h b/src/floor-events.h
index 1e41fc8..d79fe3a 100644 (file)
--- a/src/floor-events.h
+++ b/src/floor-events.h
@@ -10,4 +10,4 @@ extern void update_lite(void);
 extern void forget_view(void);
 extern void update_view(void);
 extern void update_mon_lite(floor_type *floor_ptr);
-extern void clear_mon_lite(void);
+extern void clear_mon_lite(floor_type *floor_ptr);

diff --git a/src/floor-save.c b/src/floor-save.c
index 0507143..0178ab8 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -1068,7 +1068,7 @@ void leave_floor(BIT_FLAGS floor_mode)
 
                forget_lite();
                forget_view();
-               clear_mon_lite();
+               clear_mon_lite(current_floor_ptr);
 
                /* Save current floor */
                if (!save_floor(sf_ptr, 0))

diff --git a/src/main-win.c b/src/main-win.c
index 70ea4f3..e4d37aa 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3942,7 +3942,7 @@ static void process_menus(WORD wCmd)
 
                                forget_lite();
                                forget_view();
-                               clear_mon_lite();
+                               clear_mon_lite(current_floor_ptr);
 
                                /* Save the game */
 #ifdef ZANGBAND
@@ -4839,7 +4839,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 
                                forget_lite();
                                forget_view();
-                               clear_mon_lite();
+                               clear_mon_lite(current_floor_ptr);
 
                                /* Save the game */
 #ifdef ZANGBAND

diff --git a/src/save.c b/src/save.c
index 44ad47a..e6eecd7 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1118,7 +1118,7 @@ static bool wr_dungeon(void)
 
        forget_lite();
        forget_view();
-       clear_mon_lite();
+       clear_mon_lite(current_floor_ptr);
 
        /* Update lite/view */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);

diff --git a/src/spells-floor.c b/src/spells-floor.c
index c269828..4ccc8ec 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -477,7 +477,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
        }
 
        /* Lose monster light */
-       if (!in_generate) clear_mon_lite();
+       if (!in_generate) clear_mon_lite(current_floor_ptr);
 
        /* Big area of affect */
        for (y = (y1 - r); y <= (y1 + r); y++)
@@ -1050,7 +1050,7 @@ bool earthquake(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
        }
 
        /* Lose monster light */
-       clear_mon_lite();
+       clear_mon_lite(current_floor_ptr);
 
        /* Examine the quaked region */
        for (dy = -r; dy <= r; dy++)