[Refactor] #40483 Separated lighting-colors-table.c/h from display-main-window.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 638896c..249e673 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -191,6 +191,7 @@
     <ClCompile Include="..\..\src\game-option\runtime-arguments.c" />\r
     <ClCompile Include="..\..\src\game-option\special-options.c" />\r
     <ClCompile Include="..\..\src\game-option\text-display-options.c" />\r
+    <ClCompile Include="..\..\src\grid\lighting-colors-table.c" />\r
     <ClCompile Include="..\..\src\info-reader\artifact-reader.c" />\r
     <ClCompile Include="..\..\src\info-reader\dungeon-info-tokens-table.c" />\r
     <ClCompile Include="..\..\src\info-reader\dungeon-reader.c" />\r
@@ -582,6 +583,7 @@
     <ClInclude Include="..\..\src\game-option\runtime-arguments.h" />\r
     <ClInclude Include="..\..\src\game-option\special-options.h" />\r
     <ClInclude Include="..\..\src\game-option\text-display-options.h" />\r
+    <ClInclude Include="..\..\src\grid\lighting-colors-table.h" />\r
     <ClInclude Include="..\..\src\info-reader\artifact-reader.h" />\r
     <ClInclude Include="..\..\src\info-reader\dungeon-info-tokens-table.h" />\r
     <ClInclude Include="..\..\src\info-reader\dungeon-reader.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 092f06d..91e7273 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1430,6 +1430,9 @@
     <ClCompile Include="..\..\src\floor\floor-util.c">
       <Filter>floor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\grid\lighting-colors-table.c">
+      <Filter>grid</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3148,6 +3151,9 @@
     <ClInclude Include="..\..\src\floor\floor-util.h">
       <Filter>floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\grid\lighting-colors-table.h">
+      <Filter>grid</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 00cf9d8..ede60e7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,7 +179,9 @@ hengband_SOURCES = \
        game-option/text-display-options.c game-option/text-display-options.h \
        \
        grid/feature.c grid/feature.h \
-       grid/grid.c grid/grid.h grid/trap.c grid/trap.h \
+       grid/grid.c grid/grid.h \
+       grid/lighting-colors-table.c grid/lighting-colors-table.h \
+       grid/trap.c grid/trap.h \
        \
        info-reader/artifact-reader.c info-reader/artifact-reader.h \
        info-reader/dungeon-info-tokens-table.c info-reader/dungeon-info-tokens-table.h \

diff --git a/src/grid/lighting-colors-table.c b/src/grid/lighting-colors-table.c
new file mode 100644 (file)
index 0000000..b2a262f
--- /dev/null
+++ b/src/grid/lighting-colors-table.c
@@ -0,0 +1,62 @@
+#include "grid/lighting-colors-table.h"
+#include "term/term-color-types.h"
+
+
+/*!
+ * 照明の表現を行うための色合いの関係を{暗闇時, 照明時} で定義する /
+ * This array lists the effects of "brightness" on various "base" colours.\n
+ *\n
+ * This is used to do dynamic lighting effects in ascii :-)\n
+ * At the moment, only the various "floor" tiles are affected.\n
+ *\n
+ * The layout of the array is [x][0] = light and [x][1] = dark.\n
+ */
+TERM_COLOR lighting_colours[MAX_COLORS][MAX_TIME_ZONES] = {
+    /* TERM_DARK */
+    { TERM_L_DARK, TERM_DARK },
+
+    /* TERM_WHITE */
+    { TERM_YELLOW, TERM_SLATE },
+
+    /* TERM_SLATE */
+    { TERM_WHITE, TERM_L_DARK },
+
+    /* TERM_ORANGE */
+    { TERM_L_UMBER, TERM_UMBER },
+
+    /* TERM_RED */
+    { TERM_RED, TERM_RED },
+
+    /* TERM_GREEN */
+    { TERM_L_GREEN, TERM_GREEN },
+
+    /* TERM_BLUE */
+    { TERM_BLUE, TERM_BLUE },
+
+    /* TERM_UMBER */
+    { TERM_L_UMBER, TERM_RED },
+
+    /* TERM_L_DARK */
+    { TERM_SLATE, TERM_L_DARK },
+
+    /* TERM_L_WHITE */
+    { TERM_WHITE, TERM_SLATE },
+
+    /* TERM_VIOLET */
+    { TERM_L_RED, TERM_BLUE },
+
+    /* TERM_YELLOW */
+    { TERM_YELLOW, TERM_ORANGE },
+
+    /* TERM_L_RED */
+    { TERM_L_RED, TERM_L_RED },
+
+    /* TERM_L_GREEN */
+    { TERM_L_GREEN, TERM_GREEN },
+
+    /* TERM_L_BLUE */
+    { TERM_L_BLUE, TERM_L_BLUE },
+
+    /* TERM_L_UMBER */
+    { TERM_L_UMBER, TERM_UMBER }
+};

diff --git a/src/grid/lighting-colors-table.h b/src/grid/lighting-colors-table.h
new file mode 100644 (file)
index 0000000..849013f
--- /dev/null
+++ b/src/grid/lighting-colors-table.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "system/angband.h"
+
+#define MAX_COLORS 16
+#define MAX_TIME_ZONES 2
+
+TERM_COLOR lighting_colours[MAX_COLORS][MAX_TIME_ZONES];

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 06f52e4..e93de56 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -147,64 +147,7 @@ void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p)
         *wid_p /= 2;
 }
 
-/*!
- * 照明の表現を行うための色合いの関係を{暗闇時, 照明時} で定義する /
- * This array lists the effects of "brightness" on various "base" colours.\n
- *\n
- * This is used to do dynamic lighting effects in ascii :-)\n
- * At the moment, only the various "floor" tiles are affected.\n
- *\n
- * The layout of the array is [x][0] = light and [x][1] = dark.\n
- */
-static TERM_COLOR lighting_colours[16][2] = {
-    /* TERM_DARK */
-    { TERM_L_DARK, TERM_DARK },
-
-    /* TERM_WHITE */
-    { TERM_YELLOW, TERM_SLATE },
-
-    /* TERM_SLATE */
-    { TERM_WHITE, TERM_L_DARK },
-
-    /* TERM_ORANGE */
-    { TERM_L_UMBER, TERM_UMBER },
-
-    /* TERM_RED */
-    { TERM_RED, TERM_RED },
-
-    /* TERM_GREEN */
-    { TERM_L_GREEN, TERM_GREEN },
-
-    /* TERM_BLUE */
-    { TERM_BLUE, TERM_BLUE },
-
-    /* TERM_UMBER */
-    { TERM_L_UMBER, TERM_RED },
-
-    /* TERM_L_DARK */
-    { TERM_SLATE, TERM_L_DARK },
-
-    /* TERM_L_WHITE */
-    { TERM_WHITE, TERM_SLATE },
-
-    /* TERM_VIOLET */
-    { TERM_L_RED, TERM_BLUE },
-
-    /* TERM_YELLOW */
-    { TERM_YELLOW, TERM_ORANGE },
-
-    /* TERM_L_RED */
-    { TERM_L_RED, TERM_L_RED },
-
-    /* TERM_L_GREEN */
-    { TERM_L_GREEN, TERM_GREEN },
-
-    /* TERM_L_BLUE */
-    { TERM_L_BLUE, TERM_L_BLUE },
-
-    /* TERM_L_UMBER */
-    { TERM_L_UMBER, TERM_UMBER }
-};
+#include "grid/lighting-colors-table.h"
 
 /*!
  * @brief 調査中