[Refactor] #40413 Separated cheat-types.h from util.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index b4d976b..f5b10e6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -558,6 +558,7 @@
     <ClInclude Include="..\..\src\game-option\auto-destruction-options.h" />\r
     <ClInclude Include="..\..\src\game-option\birth-options.h" />\r
     <ClInclude Include="..\..\src\game-option\cheat-options.h" />\r
+    <ClInclude Include="..\..\src\game-option\cheat-types.h" />\r
     <ClInclude Include="..\..\src\game-option\disturbance-options.h" />\r
     <ClInclude Include="..\..\src\game-option\game-play-options.h" />\r
     <ClInclude Include="..\..\src\game-option\input-options.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 476bf32..48ac670 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3055,6 +3055,9 @@
     <ClInclude Include="..\..\src\util\tag-sorter.h">
       <Filter>util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\game-option\cheat-types.h">
+      <Filter>game-option</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 21371fb..33eb0db 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,6 +162,7 @@ hengband_SOURCES = \
        game-option/auto-destruction-option.c game-option/auto-destruction-option.h \
        game-option/birth-options.c game-option/birth-options.h \
        game-option/cheat-options.c game-option/cheat-options.h \
+       game-option/cheat-types.h \
        game-option/disturbance-options.c game-option/disturbance-options.h \
        game-option/game-play-options.c game-option/game-play-options.h \
        game-option/input-options.c game-option/input-options.h \

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 00f8f5a..2bf9908 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -11,6 +11,7 @@
 #include "core/asking-player.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
+#include "game-option/cheat-types.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 69e2ecb..7421560 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -28,6 +28,7 @@
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"
 #include "game-option/input-options.h"
+#include "game-option/keymap-directory-getter.h"
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "io/input-key-acceptor.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index ecaa5f7..b259109 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -28,6 +28,7 @@
 #include "floor/geometry.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
+#include "game-option/cheat-types.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/game-play-options.h"
 #include "game-option/input-options.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 5cd8cdf..9eece30 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -5,6 +5,7 @@
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
+#include "game-option/cheat-types.h"
 #include "game-option/special-options.h"
 #include "grid/grid.h"
 #include "inventory/inventory-object.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 90c700a..ff0c3b6 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -22,6 +22,7 @@
 #include "floor/floor.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
+#include "game-option/cheat-types.h"
 #include "game-option/game-play-options.h"
 #include "game-option/play-record-options.h"
 #include "grid/feature.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 70cb009..2f22d1d 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -8,6 +8,7 @@
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
+#include "game-option/cheat-types.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "object-enchant/apply-magic.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 2f23e89..839ba97 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -20,6 +20,7 @@
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "monster/monster-info.h"

diff --git a/src/game-option/cheat-types.h b/src/game-option/cheat-types.h
new file mode 100644 (file)
index 0000000..c2b0515
--- /dev/null
+++ b/src/game-option/cheat-types.h
@@ -0,0 +1,8 @@
+#pragma once
+
+typedef enum cheat_type {
+    CHEAT_OBJECT = 0,
+    CHEAT_MONSTER = 1,
+    CHEAT_DUNGEON = 2,
+    CHEAT_MISC = 3,
+} cheat_type;

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 7075ac5..9b5176e 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -27,6 +27,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/game-play-options.h"
 #include "game-option/input-options.h"
+#include "game-option/keymap-directory-getter.h"
 #include "game-option/map-screen-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"

diff --git a/src/monster-floor/one-monster-placer.c b/src/monster-floor/one-monster-placer.c
index 74a14d6..d8f2fbe 100644 (file)
--- a/src/monster-floor/one-monster-placer.c
+++ b/src/monster-floor/one-monster-placer.c
@@ -11,6 +11,7 @@
 #include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "game-option/cheat-types.h"
 #include "grid/grid.h"
 #include "monster-floor/monster-move.h"
 #include "monster-floor/monster-summon.h"

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index f5951ea..e42e768 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -20,6 +20,7 @@
 #include "core/asking-player.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
+#include "game-option/cheat-types.h"
 #include "grid/grid.h"
 #include "io/files-util.h"
 #include "perception/identification.h"

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index 7b8bdb3..2f6a017 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -11,6 +11,7 @@
 #include "combat/martial-arts-table.h"
 #include "combat/slaying.h"
 #include "floor/floor.h"
+#include "game-option/cheat-types.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/mind-ninja.h"

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index 94f4032..66f7e1f 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -2,6 +2,7 @@
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "game-option/cheat-types.h"
 #include "grid/grid.h"
 #include "room/rooms.h"
 #include "store/store-util.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 1775d48..cce7d80 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -4,6 +4,7 @@
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index becee7f..170d612 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -2,6 +2,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "monster-race/monster-race-hook.h"

diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c
index 1b3891d..a4bee11 100644 (file)
--- a/src/room/rooms-trap.c
+++ b/src/room/rooms-trap.c
@@ -1,6 +1,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "room/rooms.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 65d0f7d..2dc57b3 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -10,6 +10,7 @@
 #include "floor/floor.h"
 #include "floor/geometry.h"
 #include "floor/wild.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "grid/trap.h"

diff --git a/src/room/rooms.c b/src/room/rooms.c
index c63d6dd..9f9be22 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -41,6 +41,7 @@
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/trap.h"
 #include "monster-floor/monster-generator.h"

diff --git a/src/util/util.h b/src/util/util.h
index 46a5aee..4857585 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -19,12 +19,6 @@
 
 #define SCREEN_BUF_MAX_SIZE (4 * 65536) /*!< Max size of screen dump buffer */
 
-/* Cheat Info Type */
-#define CHEAT_OBJECT 0
-#define CHEAT_MONSTER 1
-#define CHEAT_DUNGEON 2
-#define CHEAT_MISC 3
-
 /*
  * Max numbers of macro trigger names
  */

diff --git a/src/view/display-messages.c b/src/view/display-messages.c
index 6cfe7d6..7dc6305 100644 (file)
--- a/src/view/display-messages.c
+++ b/src/view/display-messages.c
@@ -1,6 +1,7 @@
 #include "view/display-messages.h"
 #include "core/output-updater.h"
 #include "game-option/cheat-options.h"
+#include "game-option/cheat-types.h"
 #include "game-option/input-options.h"
 #include "game-option/map-screen-options.h"
 #include "game-option/option-flags.h"