From: deskull <deskull@users.sourceforge.jp>
Date: Thu, 18 Apr 2019 06:00:42 +0000 (+0900)
Subject: [Refactor] #37353 forget_lite() を floor_event() に移動。
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=ce27f10122c84604c0b896ea2e4fc5fb988e6fed

[Refactor] #37353 forget_lite() を floor_event() に移動。
---

diff --git a/src/bldg.c b/src/bldg.c
index 694179947..c75a9b5f2 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -14,6 +14,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "floor-events.h"
 #include "object-boost.h"
 #include "object-flavor.h"
 #include "object-hook.h"
diff --git a/src/externs.h b/src/externs.h
index 87d55e19c..b65446098 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -421,10 +421,8 @@ extern bool cave_valid_bold(POSITION y, POSITION x);
 extern bool no_lite(void);
 extern void move_cursor_relative(int row, int col);
 extern void print_rel(SYMBOL_CODE c, TERM_COLOR a, TERM_LEN y, TERM_LEN x);
-extern void note_spot(POSITION y, POSITION x);
 extern void display_dungeon(void);
 extern void prt_path(POSITION y, POSITION x);
-extern void forget_lite(void);
 extern void update_lite(void);
 extern void forget_view(void);
 extern void update_view(void);
diff --git a/src/files.c b/src/files.c
index a2b30b8d3..996002b6c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -34,6 +34,7 @@
 #include "spells.h"
 #include "term.h"
 #include "view-mainwindow.h"
+#include "floor-events.h"
 
 
 /*
diff --git a/src/floor-events.c b/src/floor-events.c
index 9a8b8979c..9fbcbd26a 100644
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -355,3 +355,30 @@ void glow_deep_lava_and_bldg(void)
 
 	p_ptr->redraw |= (PR_MAP);
 }
+
+/*
+ * Actually erase the entire "lite" array, redrawing every grid
+ */
+void forget_lite(void)
+{
+	int i;
+	POSITION x, y;
+
+	/* None to forget */
+	if (!current_floor_ptr->lite_n) return;
+
+	/* Clear them all */
+	for (i = 0; i < current_floor_ptr->lite_n; i++)
+	{
+		y = current_floor_ptr->lite_y[i];
+		x = current_floor_ptr->lite_x[i];
+
+		/* Forget "LITE" flag */
+		current_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;
+}
diff --git a/src/floor-events.h b/src/floor-events.h
index 12146ffeb..d029986d8 100644
--- a/src/floor-events.h
+++ b/src/floor-events.h
@@ -1,7 +1,8 @@
 
-void day_break(void);
-void night_falls(void);
-MONSTER_NUMBER count_all_hostile_monsters(void);
-byte get_dungeon_feeling(void);
-void update_dungeon_feeling(void);
+extern void day_break(void);
+extern void night_falls(void);
+extern MONSTER_NUMBER count_all_hostile_monsters(void);
+extern byte get_dungeon_feeling(void);
+extern void update_dungeon_feeling(void);
 extern void glow_deep_lava_and_bldg(void);
+extern void forget_lite(void);
diff --git a/src/floor-save.c b/src/floor-save.c
index 78c771fd3..b224c2a04 100644
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "floor-events.h"
 #include "generate.h"
 #include "grid.h"
 #include "monster.h"
diff --git a/src/grid.c b/src/grid.c
index 71e837ccf..4b2cb2bf4 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -1599,40 +1599,6 @@ void prt_path(POSITION y, POSITION x)
  */
 
 
-
-
-
-
-
-
- /*
-  * Actually erase the entire "lite" array, redrawing every grid
-  */
-void forget_lite(void)
-{
-	int i;
-	POSITION x, y;
-
-	/* None to forget */
-	if (!current_floor_ptr->lite_n) return;
-
-	/* Clear them all */
-	for (i = 0; i < current_floor_ptr->lite_n; i++)
-	{
-		y = current_floor_ptr->lite_y[i];
-		x = current_floor_ptr->lite_x[i];
-
-		/* Forget "LITE" flag */
-		current_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;
-}
-
-
 /*
  * For delayed visual update
  */
diff --git a/src/grid.h b/src/grid.h
index c3e84a016..92532e192 100644
--- a/src/grid.h
+++ b/src/grid.h
@@ -343,7 +343,6 @@ extern void lite_spot(POSITION y, POSITION x);
 extern void prt_map(void);
 extern void prt_path(POSITION y, POSITION x);
 extern void display_map(int *cy, int *cx);
-extern void forget_lite(void);
 extern void update_lite(void);
 extern void forget_view(void);
 extern void update_view(void);
diff --git a/src/main-win.c b/src/main-win.c
index cd6dd9376..b82cfd152 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -99,6 +99,7 @@
 
 #include "angband.h"
 #include "view-mainwindow.h"
+#include "floor-events.h"
 
 #ifdef WINDOWS
 #include <windows.h>
diff --git a/src/player-status.c b/src/player-status.c
index 68fef61a7..d629b3579 100644
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -2,6 +2,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "floor.h"
+#include "floor-events.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "spells-status.h"
diff --git a/src/save.c b/src/save.c
index 0838b2ccd..d9c37eb44 100644
--- a/src/save.c
+++ b/src/save.c
@@ -16,6 +16,7 @@
 #include "quest.h"
 #include "store.h"
 #include "wild.h"
+#include "floor-events.h"
 
 
 
diff --git a/src/store.c b/src/store.c
index 2a727cb3a..ed02e1d9e 100644
--- a/src/store.c
+++ b/src/store.c
@@ -23,6 +23,7 @@
 #include "player-status.h"
 #include "object-flavor.h"
 #include "object-hook.h"
+#include "floor-events.h"
 
 #define MIN_STOCK 12