[Refactor] #40477 Separated map-screen-options.c/h from cmd-gameoption.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index ab3de0f..5ea4097 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\..\src\core\visuals-reseter.c" />\r
     <ClCompile Include="..\..\src\floor\fixed-map-generator.c" />\r
     <ClCompile Include="..\..\src\game-option\input-options.c" />\r
+    <ClCompile Include="..\..\src\game-option\map-screen-options.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
@@ -530,6 +531,7 @@
     <ClInclude Include="..\..\src\core\visuals-reseter.h" />\r
     <ClInclude Include="..\..\src\floor\fixed-map-generator.h" />\r
     <ClInclude Include="..\..\src\game-option\input-options.h" />\r
+    <ClInclude Include="..\..\src\game-option\map-screen-options.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 9c18f2a..e4a7b99 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1316,6 +1316,9 @@
     <ClCompile Include="..\..\src\game-option\input-options.c">
       <Filter>game-option</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\game-option\map-screen-options.c">
+      <Filter>game-option</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2887,6 +2890,9 @@
     <ClInclude Include="..\..\src\game-option\input-options.h">
       <Filter>game-option</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\game-option\map-screen-options.h">
+      <Filter>game-option</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 57ee755..b589765 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,6 +159,7 @@ hengband_SOURCES = \
        floor/wild.h floor/wild.c \
        \
        game-option/input-options.c game-option/input-options.h \
+       game-option/map-screen-options.c game-option/map-screen-options.h \
        \
        grid/feature.c grid/feature.h \
        grid/grid.c grid/grid.h grid/trap.c grid/trap.h \

diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c
index 425d484..958f776 100644 (file)
--- a/src/cmd-io/cmd-gameoption.c
+++ b/src/cmd-io/cmd-gameoption.c
@@ -4,6 +4,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "core/show-file.h"
 #include "game-option/input-options.h"
+#include "game-option/map-screen-options.h"
 #include "io/files-util.h"
 #include "io/write-diary.h"
 #include "system/game-option-types.h"
@@ -16,25 +17,6 @@
  * Software options (set via the '=' command).
  */
 
-                                                       /*** Map Screen Options ***/
-
-bool center_player;    /* Center map while walking (*slow*) */
-bool center_running;   /* Centering even while running */
-bool view_yellow_lite; /* Use special colors for torch-lit grids */
-bool view_bright_lite; /* Use special colors for 'viewable' grids */
-bool view_granite_lite;        /* Use special colors for wall grids (slow) */
-bool view_special_lite;        /* Use special colors for floor grids (slow) */
-bool view_perma_grids; /* Map remembers all perma-lit grids */
-bool view_torch_grids; /* Map remembers all torch-lit grids */
-bool view_unsafe_grids;        /* Map marked by detect traps */
-bool view_reduce_view; /* Reduce view-radius in town */
-bool fresh_before;     /* Flush output while in repeated command */
-bool fresh_after;      /* Flush output after monster's move */
-bool fresh_message;    /* Flush output after every message */
-bool hilite_player;    /* Hilite the player with the cursor */
-bool display_path;     /* Display actual path before shooting */
-
-
                                        /*** Text Display Options ***/
 
 bool plain_descriptions;       /* Plain object descriptions */

diff --git a/src/cmd-io/cmd-gameoption.h b/src/cmd-io/cmd-gameoption.h
index d4538b0..576675f 100644 (file)
--- a/src/cmd-io/cmd-gameoption.h
+++ b/src/cmd-io/cmd-gameoption.h
@@ -7,25 +7,6 @@
  */
 #define CHEAT_MAX 10
 
-                                                                       /*** Map Screen Options ***/
-
-extern bool center_player;     /* Center map while walking (*slow*) */
-extern bool center_running;    /* Centering even while running */
-extern bool view_yellow_lite;  /* Use special colors for torch-lit grids */
-extern bool view_bright_lite;  /* Use special colors for 'viewable' grids */
-extern bool view_granite_lite; /* Use special colors for wall grids (slow) */
-extern bool view_special_lite; /* Use special colors for floor grids (slow) */
-extern bool view_perma_grids;  /* Map remembers all perma-lit grids */
-extern bool view_torch_grids;  /* Map remembers all torch-lit grids */
-extern bool view_unsafe_grids; /* Map marked by detect traps */
-extern bool view_reduce_view;  /* Reduce view-radius in town */
-extern bool fresh_before;      /* Flush output while continuous command */
-extern bool fresh_after;       /* Flush output after monster's move */
-extern bool fresh_message;     /* Flush output after every message */
-extern bool hilite_player;     /* Hilite the player with the cursor */
-extern bool display_path;      /* Display actual path before shooting */
-
-
                                                        /*** Text Display Options ***/
 
 extern bool plain_descriptions;        /* Plain object descriptions */

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 39aa629..89adbe4 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -4,6 +4,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor-save.h"
 #include "floor/wild.h"
+#include "game-option/map-screen-options.h"
 #include "inventory/pack-overflow.h"
 #include "io/input-key-processor.h"
 #include "mind/mind-force-trainer.h"

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index f965f85..e2250c3 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -7,6 +7,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-save.h"
+#include "game-option/map-screen-options.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "market/arena.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index b8aae81..b456b0f 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -3,6 +3,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
+#include "game-option/map-screen-options.h"
 #include "grid/grid.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 8f9fbf1..9b4fd50 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -5,6 +5,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor-generate.h"
 #include "floor/floor-object.h"
+#include "game-option/map-screen-options.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
 #include "monster-floor/monster-generator.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 353a2cc..f4df467 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -15,6 +15,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "info-reader/parse-error-types.h"

diff --git a/src/game-option/map-screen-options.c b/src/game-option/map-screen-options.c
new file mode 100644 (file)
index 0000000..23d26ad
--- /dev/null
+++ b/src/game-option/map-screen-options.c
@@ -0,0 +1,17 @@
+#include "game-option/map-screen-options.h"
+
+bool center_player; /* Center map while walking (*slow*) */
+bool center_running; /* Centering even while running */
+bool view_yellow_lite; /* Use special colors for torch-lit grids */
+bool view_bright_lite; /* Use special colors for 'viewable' grids */
+bool view_granite_lite; /* Use special colors for wall grids (slow) */
+bool view_special_lite; /* Use special colors for floor grids (slow) */
+bool view_perma_grids; /* Map remembers all perma-lit grids */
+bool view_torch_grids; /* Map remembers all torch-lit grids */
+bool view_unsafe_grids; /* Map marked by detect traps */
+bool view_reduce_view; /* Reduce view-radius in town */
+bool fresh_before; /* Flush output while in repeated command */
+bool fresh_after; /* Flush output after monster's move */
+bool fresh_message; /* Flush output after every message */
+bool hilite_player; /* Hilite the player with the cursor */
+bool display_path; /* Display actual path before shooting */

diff --git a/src/game-option/map-screen-options.h b/src/game-option/map-screen-options.h
new file mode 100644 (file)
index 0000000..3e7458a
--- /dev/null
+++ b/src/game-option/map-screen-options.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "system/angband.h"
+
+extern bool center_player; /* Center map while walking (*slow*) */
+extern bool center_running; /* Centering even while running */
+extern bool view_yellow_lite; /* Use special colors for torch-lit grids */
+extern bool view_bright_lite; /* Use special colors for 'viewable' grids */
+extern bool view_granite_lite; /* Use special colors for wall grids (slow) */
+extern bool view_special_lite; /* Use special colors for floor grids (slow) */
+extern bool view_perma_grids; /* Map remembers all perma-lit grids */
+extern bool view_torch_grids; /* Map remembers all torch-lit grids */
+extern bool view_unsafe_grids; /* Map marked by detect traps */
+extern bool view_reduce_view; /* Reduce view-radius in town */
+extern bool fresh_before; /* Flush output while continuous command */
+extern bool fresh_after; /* Flush output after monster's move */
+extern bool fresh_message; /* Flush output after every message */
+extern bool hilite_player; /* Hilite the player with the cursor */
+extern bool display_path; /* Display actual path before shooting */

diff --git a/src/grid/grid.c b/src/grid/grid.c
index bbb4db1..23c8f09 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -20,6 +20,7 @@
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-generate.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/trap.h"
 #include "monster/monster-info.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index d638c4f..8570f7f 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -23,6 +23,7 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "game-option/input-options.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "inventory/player-inventory.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 59872d4..88f018e 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -151,6 +151,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor-object.h"
 #include "game-option/input-options.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "grid/trap.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index e25faef..cf4b660 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -14,6 +14,7 @@
 #include "floor/floor-object.h"
 #include "floor/floor-save.h"
 #include "floor/floor.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "io/write-diary.h"

diff --git a/src/spell-kind/spells-lite.c b/src/spell-kind/spells-lite.c
index b8a02dc..a4c6ff8 100644 (file)
--- a/src/spell-kind/spells-lite.c
+++ b/src/spell-kind/spells-lite.c
@@ -2,6 +2,7 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
+#include "game-option/map-screen-options.h"
 #include "grid/grid.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-describer.h"

diff --git a/src/util/util.c b/src/util/util.c
index 6226c1f..9a29f45 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -19,6 +19,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "game-option/input-options.h"
+#include "game-option/map-screen-options.h"
 #include "io/files-util.h"
 #include "io/input-key-processor.h"
 #include "io/signal-handlers.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index ed7d15d..41b3db9 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -22,6 +22,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor-town.h"
 #include "floor/floor.h"
+#include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "inventory/player-inventory.h"