[Refactor] #40477 Separated option-flags.c/h from cmd-gameoption.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 53dd642..da761b0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -179,6 +179,7 @@
     <ClCompile Include="..\..\src\game-option\game-play-options.c" />\r
     <ClCompile Include="..\..\src\game-option\input-options.c" />\r
     <ClCompile Include="..\..\src\game-option\map-screen-options.c" />\r
+    <ClCompile Include="..\..\src\game-option\option-flags.c" />\r
     <ClCompile Include="..\..\src\game-option\play-record-options.c" />\r
     <ClCompile Include="..\..\src\game-option\runtime-arguments.c" />\r
     <ClCompile Include="..\..\src\game-option\special-options.c" />\r
@@ -546,6 +547,7 @@
     <ClInclude Include="..\..\src\game-option\game-play-options.h" />\r
     <ClInclude Include="..\..\src\game-option\input-options.h" />\r
     <ClInclude Include="..\..\src\game-option\map-screen-options.h" />\r
+    <ClInclude Include="..\..\src\game-option\option-flags.h" />\r
     <ClInclude Include="..\..\src\game-option\play-record-options.h" />\r
     <ClInclude Include="..\..\src\game-option\runtime-arguments.h" />\r
     <ClInclude Include="..\..\src\game-option\special-options.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 4909610..5c1c91e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1346,6 +1346,9 @@
     <ClCompile Include="..\..\src\game-option\runtime-arguments.c">
       <Filter>game-option</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\game-option\option-flags.c">
+      <Filter>game-option</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2947,6 +2950,9 @@
     <ClInclude Include="..\..\src\game-option\runtime-arguments.h">
       <Filter>game-option</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\game-option\option-flags.h">
+      <Filter>game-option</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 40f0b10..1d5e61b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,6 +165,7 @@ hengband_SOURCES = \
        game-option/game-play-options.c game-option/game-play-options.h \
        game-option/input-options.c game-option/input-options.h \
        game-option/map-screen-options.c game-option/map-screen-options.h \
+       game-option/option-flags.c game-option/option-flags.h \
        game-option/play-record-options.c game-option/play-record-options.h \
        game-option/runtime-arguments.c game-option/runtime-arguments.h \
        game-option/special-options.c game-option/special-options.h \

diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c
index 5b1fddc..a2f8a9e 100644 (file)
--- a/src/birth/character-builder.c
+++ b/src/birth/character-builder.c
@@ -18,6 +18,7 @@
 #include "birth/quick-start.h"
 #include "floor/floor-town.h"
 #include "floor/wild.h"
+#include "game-option/option-flags.h"
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
 #include "monster-floor/monster-remover.h"

diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c
index 595fa23..91fcdbd 100644 (file)
--- a/src/cmd-io/cmd-gameoption.c
+++ b/src/cmd-io/cmd-gameoption.c
@@ -10,6 +10,7 @@
 #include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "game-option/map-screen-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
@@ -21,15 +22,6 @@
 #include "view/display-main-window.h"
 #include "world/world.h"
 
-/*
- * Software options (set via the '=' command).
- */
-
-BIT_FLAGS option_flag[8]; //!< The array of normal options
-BIT_FLAGS option_mask[8]; //!< The array of normal options
-BIT_FLAGS window_flag[8]; //!< The array of window options
-BIT_FLAGS window_mask[8]; //!< The array of window options
-
 /*!
  * @brief オプションテーブル /
  * Available Options

diff --git a/src/cmd-io/cmd-gameoption.h b/src/cmd-io/cmd-gameoption.h
index 89f1c71..5d0f211 100644 (file)
--- a/src/cmd-io/cmd-gameoption.h
+++ b/src/cmd-io/cmd-gameoption.h
@@ -7,27 +7,17 @@
  */
 #define CHEAT_MAX 10
 
-extern BIT_FLAGS option_flag[8];
-extern BIT_FLAGS option_mask[8];
-extern BIT_FLAGS window_flag[8];
-extern BIT_FLAGS window_mask[8];
 /*
  * Available "options"
- *
  *     - Address of actual option variable (or NULL)
- *
  *     - Normal Value (TRUE or FALSE)
- *
  *     - Option Page Number (or zero)
- *
  *     - Savefile Set (or zero)
  *     - Savefile Bit in that set
- *
  *     - Textual name (or NULL)
  *     - Textual description
  */
-
- typedef struct option_type
+typedef struct option_type
 {
        bool    *o_var;
        byte    o_norm;
@@ -42,7 +32,6 @@ extern const option_type option_info[];
 extern const option_type cheat_info[CHEAT_MAX];
 extern const option_type autosave_info[2];
 
-extern void extract_option_vars(void);
-
-extern void do_cmd_options_aux(int page, concptr info);
-extern void do_cmd_options(void);
+void extract_option_vars(void);
+void do_cmd_options_aux(int page, concptr info);
+void do_cmd_options(void);

diff --git a/src/game-option/option-flags.c b/src/game-option/option-flags.c
new file mode 100644 (file)
index 0000000..4423570
--- /dev/null
+++ b/src/game-option/option-flags.c
@@ -0,0 +1,6 @@
+#include "game-option/option-flags.h"
+
+BIT_FLAGS option_flag[8]; //!< The array of normal options
+BIT_FLAGS option_mask[8]; //!< The array of normal options
+BIT_FLAGS window_flag[8]; //!< The array of window options
+BIT_FLAGS window_mask[8]; //!< The array of window options

diff --git a/src/game-option/option-flags.h b/src/game-option/option-flags.h
new file mode 100644 (file)
index 0000000..c90ea03
--- /dev/null
+++ b/src/game-option/option-flags.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "system/angband.h"
+
+extern BIT_FLAGS option_flag[8];
+extern BIT_FLAGS option_mask[8];
+extern BIT_FLAGS window_flag[8];
+extern BIT_FLAGS window_mask[8];

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 2223961..d10cb75 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/input-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
 #include "inventory/inventory-object.h"

diff --git a/src/io/interpret-pref-file.c b/src/io/interpret-pref-file.c
index 5b4b8d9..c4a190a 100644 (file)
--- a/src/io/interpret-pref-file.c
+++ b/src/io/interpret-pref-file.c
@@ -6,6 +6,7 @@
 
 #include "io/interpret-pref-file.h"
 #include "birth/character-builder.h"
+#include "game-option/option-flags.h"
 #include "io/gf-descriptions.h"
 #include "io/tokenizer.h"
 #include "object/object-kind.h"

diff --git a/src/io/load.c b/src/io/load.c
index ac22165..4f11535 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -53,6 +53,7 @@
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/runtime-arguments.h"
 #include "game-option/special-options.h"
 #include "grid/feature.h"

diff --git a/src/io/save.c b/src/io/save.c
index 4b6f09b..5b011ba 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -23,6 +23,7 @@
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/runtime-arguments.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"

diff --git a/src/main/init.c b/src/main/init.c
index adfbf85..3b58151 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -37,6 +37,7 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "game-option/option-flags.h"
 #include "grid/feature.h"
 #include "grid/trap.h"
 #include "info-reader/artifact-reader.h"

diff --git a/src/util/util.c b/src/util/util.c
index b13a41f..510aadb 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -22,6 +22,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/input-options.h"
 #include "game-option/map-screen-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/special-options.h"
 #include "io/files-util.h"
 #include "io/input-key-processor.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index fb2d86a..a2a9933 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -23,6 +23,7 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "game-option/map-screen-options.h"
+#include "game-option/option-flags.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
 #include "grid/feature.h"