[Refactor] #38997 forget_lite() に floor_type * 引数を追加． / Add floor_type * argument...

diff --git a/src/bldg.c b/src/bldg.c
index b301b3b..b80487c 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4148,7 +4148,7 @@ void do_cmd_bldg(void)
                p_ptr->oldpx = p_ptr->x;
        }
 
-       forget_lite();
+       forget_lite(current_floor_ptr);
        forget_view();
 
        /* Hack -- Increase "icky" depth */

diff --git a/src/core.c b/src/core.c
index 8d51ab0..3407328 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5620,7 +5620,7 @@ void play_game(bool new_game)
                /* Cancel the health bar */
                health_track(0);
 
-               forget_lite();
+               forget_lite(current_floor_ptr);
                forget_view();
                clear_mon_lite(current_floor_ptr);
 

diff --git a/src/files.c b/src/files.c
index bacdf47..bebbbe1 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6932,7 +6932,7 @@ static void handle_signal_simple(int sig)
                /* Mark the savefile */
                (void)strcpy(p_ptr->died_from, _("強制終了", "Abortion"));
 
-               forget_lite();
+               forget_lite(current_floor_ptr);
                forget_view();
                clear_mon_lite(current_floor_ptr);
 
@@ -6949,7 +6949,7 @@ static void handle_signal_simple(int sig)
                /* Cause of "death" */
                (void)strcpy(p_ptr->died_from, _("強制終了中", "Interrupting"));
 
-               forget_lite();
+               forget_lite(current_floor_ptr);
                forget_view();
                clear_mon_lite(current_floor_ptr);
 
@@ -7025,7 +7025,7 @@ static void handle_signal_abort(int sig)
        if (!current_world_ptr->character_generated || current_world_ptr->character_saved) quit(NULL);
 
 
-       forget_lite();
+       forget_lite(current_floor_ptr);
        forget_view();
        clear_mon_lite(current_floor_ptr);
 

diff --git a/src/floor-events.c b/src/floor-events.c
index 6fa8ea2..417d403 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -367,28 +367,28 @@ void glow_deep_lava_and_bldg(floor_type *floor_ptr)
 /*
  * Actually erase the entire "lite" array, redrawing every grid
  */
-void forget_lite(void)
+void forget_lite(floor_type *floor_ptr)
 {
        int i;
        POSITION x, y;
 
        /* None to forget */
-       if (!current_floor_ptr->lite_n) return;
+       if (!floor_ptr->lite_n) return;
 
        /* Clear them all */
-       for (i = 0; i < current_floor_ptr->lite_n; i++)
+       for (i = 0; i < floor_ptr->lite_n; i++)
        {
-               y = current_floor_ptr->lite_y[i];
-               x = current_floor_ptr->lite_x[i];
+               y = floor_ptr->lite_y[i];
+               x = floor_ptr->lite_x[i];
 
                /* Forget "LITE" flag */
-               current_floor_ptr->grid_array[y][x].info &= ~(CAVE_LITE);
+               floor_ptr->grid_array[y][x].info &= ~(CAVE_LITE);
 
                /* lite_spot(y, x); Perhaps don't need? */
        }
 
        /* None left */
-       current_floor_ptr->lite_n = 0;
+       floor_ptr->lite_n = 0;
 }
 
 

diff --git a/src/floor-events.h b/src/floor-events.h
index cd0e86d..f8a6b70 100644 (file)
--- a/src/floor-events.h
+++ b/src/floor-events.h
@@ -5,7 +5,7 @@ extern MONSTER_NUMBER count_all_hostile_monsters(floor_type *floor_ptr);
 extern byte get_dungeon_feeling(floor_type *floor_ptr);
 extern void update_dungeon_feeling(player_type *subject_ptr, floor_type *floor_ptr);
 extern void glow_deep_lava_and_bldg(floor_type *floor_ptr);
-extern void forget_lite(void);
+extern void forget_lite(floor_type *floor_ptr);
 extern void update_lite(player_type *p_ptr);
 extern void forget_view(void);
 extern void update_view(player_type *subject_ptr, floor_type *floor_ptr);

diff --git a/src/floor-save.c b/src/floor-save.c
index 535422d..0215f8c 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -1066,7 +1066,7 @@ void leave_floor(player_type *creature_ptr, BIT_FLAGS floor_mode)
                /* Record the last visit current_world_ptr->game_turn of current floor */
                sf_ptr->last_visit = current_world_ptr->game_turn;
 
-               forget_lite();
+               forget_lite(current_floor_ptr);
                forget_view();
                clear_mon_lite(current_floor_ptr);
 

diff --git a/src/main-win.c b/src/main-win.c
index d97c82b..15fec72 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3940,7 +3940,7 @@ static void process_menus(WORD wCmd)
                                /* Hack -- Forget messages */
                                msg_flag = FALSE;
 
-                               forget_lite();
+                               forget_lite(current_floor_ptr);
                                forget_view();
                                clear_mon_lite(current_floor_ptr);
 
@@ -4837,7 +4837,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
                                /* Hack -- Forget messages */
                                msg_flag = FALSE;
 
-                               forget_lite();
+                               forget_lite(current_floor_ptr);
                                forget_view();
                                clear_mon_lite(current_floor_ptr);
 

diff --git a/src/player-status.c b/src/player-status.c
index a58273b..008e5bb 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5045,7 +5045,7 @@ void update_creature(player_type *creature_ptr)
        if (creature_ptr->update & (PU_UN_LITE))
        {
                creature_ptr->update &= ~(PU_UN_LITE);
-               forget_lite();
+               forget_lite(current_floor_ptr);
        }
 
        if (creature_ptr->update & (PU_UN_VIEW))

diff --git a/src/save.c b/src/save.c
index e6eecd7..118a8ea 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1116,7 +1116,7 @@ static bool wr_dungeon(void)
        saved_floor_type *cur_sf_ptr;
        int i;
 
-       forget_lite();
+       forget_lite(current_floor_ptr);
        forget_view();
        clear_mon_lite(current_floor_ptr);
 

diff --git a/src/store.c b/src/store.c
index 3793340..78494bc 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5762,7 +5762,7 @@ void do_cmd_store(void)
                town_info[p_ptr->town_num].store[which].last_visit = current_world_ptr->game_turn;
        }
 
-       forget_lite();
+       forget_lite(current_floor_ptr);
        forget_view();
 
        /* Hack -- Character is in "icky" mode */