[Refactor] #40477 Separated game-play-options.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 043b65e..e5a9234 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -172,6 +172,7 @@
     <ClCompile Include="..\..\src\cmd-io\cmd-menu-content-table.c" />\r
     <ClCompile Include="..\..\src\core\visuals-reseter.c" />\r
     <ClCompile Include="..\..\src\floor\fixed-map-generator.c" />\r
+    <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\text-display-options.c" />\r
@@ -531,6 +532,7 @@
     <ClInclude Include="..\..\src\cmd-io\cmd-menu-content-table.h" />\r
     <ClInclude Include="..\..\src\core\visuals-reseter.h" />\r
     <ClInclude Include="..\..\src\floor\fixed-map-generator.h" />\r
+    <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\text-display-options.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 449e883..7bbc575 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1322,6 +1322,9 @@
     <ClCompile Include="..\..\src\game-option\text-display-options.c">
       <Filter>game-option</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\game-option\game-play-options.c">
+      <Filter>game-option</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2899,6 +2902,9 @@
     <ClInclude Include="..\..\src\game-option\text-display-options.h">
       <Filter>game-option</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\game-option\game-play-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 aa09a5d..963eef3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,6 +158,7 @@ hengband_SOURCES = \
        floor/pattern-walk.c floor/pattern-walk.h \
        floor/wild.h floor/wild.c \
        \
+       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/text-display-options.c game-option/text-display-options.h \

diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c
index 85a40ba..1881e0f 100644 (file)
--- a/src/cmd-io/cmd-gameoption.c
+++ b/src/cmd-io/cmd-gameoption.c
@@ -3,6 +3,7 @@
 #include "cmd-io/cmd-autopick.h"
 #include "cmd-io/cmd-dump.h"
 #include "core/show-file.h"
+#include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "game-option/map-screen-options.h"
 #include "game-option/text-display-options.h"
@@ -18,24 +19,6 @@
  * Software options (set via the '=' command).
  */
 
-                                       /*** Game-Play Options ***/
-
-bool stack_force_notes;        /* Merge inscriptions when stacking */
-bool stack_force_costs;        /* Merge discounts when stacking */
-bool expand_list;      /* Expand the power of the list commands */
-bool small_levels;     /* Allow unusually small dungeon levels */
-bool always_small_levels;      /* Always create unusually small dungeon levels */
-bool empty_levels;     /* Allow empty 'arena' levels */
-bool bound_walls_perm; /* Boundary walls become 'permanent wall' */
-bool last_words;       /* Leave last words when your character dies */
-
-#ifdef WORLD_SCORE
-bool send_score;       /* Send score dump to the world score server */
-#endif
-
-bool allow_debug_opts; /* Allow use of debug/cheat options */
-
-
                                                /*** Disturbance Options ***/
 
 bool find_ignore_stairs;       /* Run past stairs */

diff --git a/src/cmd-io/cmd-gameoption.h b/src/cmd-io/cmd-gameoption.h
index fdc7016..04f1677 100644 (file)
--- a/src/cmd-io/cmd-gameoption.h
+++ b/src/cmd-io/cmd-gameoption.h
@@ -7,24 +7,6 @@
  */
 #define CHEAT_MAX 10
 
-                                                               /*** Game-Play Options ***/
-
-extern bool stack_force_notes; /* Merge inscriptions when stacking */
-extern bool stack_force_costs; /* Merge discounts when stacking */
-extern bool expand_list;       /* Expand the power of the list commands */
-extern bool small_levels;      /* Allow unusually small dungeon levels */
-extern bool always_small_levels;       /* Always create unusually small dungeon levels */
-extern bool empty_levels;      /* Allow empty 'arena' levels */
-extern bool bound_walls_perm;  /* Boundary walls become 'permanent wall' */
-extern bool last_words;        /* Leave last words when your character dies */
-
-#ifdef WORLD_SCORE
-extern bool send_score;        /* Send score dump to the world score server */
-#endif
-
-extern bool allow_debug_opts;  /* Allow use of debug/cheat options */
-
-
                                                                /*** Disturbance Options ***/
 
 extern bool find_ignore_stairs;        /* Run past stairs */

diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c
index ce10f06..a06e6f7 100644 (file)
--- a/src/cmd-io/cmd-lore.c
+++ b/src/cmd-io/cmd-lore.c
@@ -1,6 +1,7 @@
 #include "cmd-io/cmd-lore.h"
 #include "core/sort.h"
 #include "core/stuff-handler.h"
+#include "game-option/game-play-options.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "term/gameterm.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8c83be1..3748b20 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -26,6 +26,7 @@
 #include "floor/floor-object.h"
 #include "floor/geometry.h"
 #include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "grid/grid.h"
 #include "grid/trap.h"

diff --git a/src/core/scores.c b/src/core/scores.c
index b4d09b4..401804f 100644 (file)
--- a/src/core/scores.c
+++ b/src/core/scores.c
@@ -15,6 +15,7 @@
 #include "core/turn-compensator.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
+#include "game-option/game-play-options.h"
 #include "io/report.h"
 #include "io/signal-handlers.h"
 #include "io/uid-checker.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index a5f040d..ce42424 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -21,6 +21,7 @@
 #include "floor/floor-streams.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "grid/trap.h"

diff --git a/src/game-option/game-play-options.c b/src/game-option/game-play-options.c
new file mode 100644 (file)
index 0000000..b6c2981
--- /dev/null
+++ b/src/game-option/game-play-options.c
@@ -0,0 +1,14 @@
+#include "game-option/game-play-options.h"
+
+bool stack_force_notes; /* Merge inscriptions when stacking */
+bool stack_force_costs; /* Merge discounts when stacking */
+bool expand_list; /* Expand the power of the list commands */
+bool small_levels; /* Allow unusually small dungeon levels */
+bool always_small_levels; /* Always create unusually small dungeon levels */
+bool empty_levels; /* Allow empty 'arena' levels */
+bool bound_walls_perm; /* Boundary walls become 'permanent wall' */
+bool last_words; /* Leave last words when your character dies */
+#ifdef WORLD_SCORE
+bool send_score; /* Send score dump to the world score server */
+#endif
+bool allow_debug_opts; /* Allow use of debug/cheat options */

diff --git a/src/game-option/game-play-options.h b/src/game-option/game-play-options.h
new file mode 100644 (file)
index 0000000..7f993ac
--- /dev/null
+++ b/src/game-option/game-play-options.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "system/angband.h"
+
+extern bool stack_force_notes; /* Merge inscriptions when stacking */
+extern bool stack_force_costs; /* Merge discounts when stacking */
+extern bool expand_list; /* Expand the power of the list commands */
+extern bool small_levels; /* Allow unusually small dungeon levels */
+extern bool always_small_levels; /* Always create unusually small dungeon levels */
+extern bool empty_levels; /* Allow empty 'arena' levels */
+extern bool bound_walls_perm; /* Boundary walls become 'permanent wall' */
+extern bool last_words; /* Leave last words when your character dies */
+#ifdef WORLD_SCORE
+extern bool send_score; /* Send score dump to the world score server */
+#endif
+extern bool allow_debug_opts; /* Allow use of debug/cheat options */

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 23c8f09..be116d5 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/game-play-options.h"
 #include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/trap.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 3d82896..30bb5dd 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -5,6 +5,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"
 #include "floor/floor.h"
+#include "game-option/game-play-options.h"
 #include "io-dump/player-status-dump.h"
 #include "io-dump/special-class-dump.h"
 #include "io/mutations-dump.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 3157a7e..95f9804 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -38,6 +38,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h" // do_cmd_quest() がある。後で移設する.
 #include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "inventory/player-inventory.h"
 #include "io/chuukei.h"

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

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index 4e4a188..8554f5a 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -1,6 +1,7 @@
 #include "market/building-monster.h"
 #include "core/sort.h"
 #include "core/stuff-handler.h"
+#include "game-option/game-play-options.h"
 #include "monster-race/race-flags1.h"
 #include "lore/lore-store.h"
 #include "term/gameterm.h"

diff --git a/src/object/object-stack.c b/src/object/object-stack.c
index 48756f2..eeec439 100644 (file)
--- a/src/object/object-stack.c
+++ b/src/object/object-stack.c
@@ -5,14 +5,15 @@
  */
 
 #include "object/object-stack.h"
-#include "sv-definition/sv-other-types.h"
-#include "perception/object-perception.h"
+#include "game-option/game-play-options.h"
 #include "object-enchant/object-ego.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/trc-types.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object-enchant/special-object-flags.h"
-#include "object-enchant/trc-types.h"
+#include "perception/object-perception.h"
+#include "sv-definition/sv-other-types.h"
 
 /*!
  * @brief 魔法棒やロッドのスロット分割時に使用回数を分配する /

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index ffbfc9b..dca781c 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -6,6 +6,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "inventory/inventory-damage.h"
 #include "io/files-util.h"

diff --git a/src/store/store.c b/src/store/store.c
index 91b63ab..96a35c8 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -34,6 +34,7 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
 #include "game-option/text-display-options.h"
 #include "inventory/inventory-object.h"