From 23cf9fbcf5bcaddd0d8c2ff163a3c2791c201751 Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sat, 6 May 2023 10:29:12 +0900
Subject: [PATCH] [Refactor] #3286 Removed player-redraw-types.h
---
Hengband/Hengband/Hengband.vcxproj | 1 -
src/Makefile.am | 1 -
src/birth/birth-stat.cpp | 1 -
src/blue-magic/blue-magic-checker.cpp | 1 -
src/cmd-action/cmd-hissatsu.cpp | 1 -
src/cmd-action/cmd-mane.cpp | 1 -
src/cmd-action/cmd-mind.cpp | 1 -
src/cmd-action/cmd-move.cpp | 1 -
src/cmd-action/cmd-open-close.cpp | 1 -
src/cmd-action/cmd-others.cpp | 1 -
src/cmd-action/cmd-pet.cpp | 1 -
src/cmd-action/cmd-racial.cpp | 1 -
src/cmd-action/cmd-spell.cpp | 1 -
src/cmd-action/cmd-tunnel.cpp | 1 -
src/cmd-building/cmd-building.cpp | 1 -
src/cmd-io/cmd-floor.cpp | 1 -
src/cmd-io/cmd-gameoption.cpp | 1 -
src/cmd-io/cmd-process-screen.cpp | 1 -
src/cmd-item/cmd-equipment.cpp | 1 -
src/cmd-item/cmd-item.cpp | 1 -
src/cmd-item/cmd-refill.cpp | 1 -
src/cmd-item/cmd-throw.cpp | 1 -
src/cmd-visual/cmd-draw.cpp | 1 -
src/combat/shoot.cpp | 1 -
src/combat/slaying.cpp | 1 -
src/core/disturbance.cpp | 1 -
src/core/object-compressor.cpp | 1 -
src/core/player-processor.cpp | 1 -
src/core/player-redraw-types.h | 35 ---------------------------
src/core/stuff-handler.cpp | 1 -
src/core/window-redrawer.cpp | 1 -
src/dungeon/dungeon-processor.cpp | 1 -
src/effect/effect-monster-oldies.cpp | 1 -
src/effect/effect-monster-psi.cpp | 1 -
src/effect/effect-monster-spirit.cpp | 1 -
src/effect/effect-monster.cpp | 1 -
src/effect/effect-player-resist-hurt.cpp | 1 -
src/effect/effect-player-spirit.cpp | 1 -
src/floor/floor-events.cpp | 1 -
src/hpmp/hp-mp-processor.cpp | 1 -
src/hpmp/hp-mp-regenerator.cpp | 1 -
src/inventory/inventory-curse.cpp | 1 -
src/inventory/player-inventory.cpp | 1 -
src/io/cursor.cpp | 1 -
src/io/input-key-processor.cpp | 1 -
src/io/report.cpp | 1 -
src/io/screen-util.cpp | 1 -
src/market/bounty.cpp | 1 -
src/melee/melee-postprocess.cpp | 1 -
src/melee/melee-spell.cpp | 1 -
src/melee/monster-attack-monster.cpp | 1 -
src/mind/mind-blue-mage.cpp | 1 -
src/mind/mind-elementalist.cpp | 1 -
src/mind/mind-force-trainer.cpp | 1 -
src/mind/mind-magic-resistance.cpp | 1 -
src/mind/mind-mirror-master.cpp | 1 -
src/mind/mind-monk.cpp | 1 -
src/mind/mind-ninja.cpp | 1 -
src/mind/mind-samurai.cpp | 1 -
src/mind/mind-sniper.cpp | 1 -
src/mind/mind-warrior-mage.cpp | 1 -
src/monster-attack/monster-eating.cpp | 1 -
src/monster-floor/monster-death.cpp | 1 -
src/monster/monster-damage.cpp | 1 -
src/monster/monster-status-setter.cpp | 1 -
src/monster/monster-update.cpp | 1 -
src/mspell/mspell-attack.cpp | 1 -
src/mspell/mspell-checker.cpp | 1 -
src/mspell/mspell-dispel.cpp | 1 -
src/mspell/mspell-status.cpp | 1 -
src/mutation/mutation-processor.cpp | 1 -
src/object-activation/activation-others.cpp | 1 -
src/object-use/read/scroll-read-executor.cpp | 1 -
src/pet/pet-fall-off.cpp | 1 -
src/player-attack/attack-chaos-effect.cpp | 1 -
src/player-base/player-class.cpp | 1 -
src/player-info/class-info.cpp | 1 -
src/player-status/player-basic-statistics.cpp | 1 -
src/player/digestion-processor.cpp | 1 -
src/player/player-damage.cpp | 1 -
src/player/player-move.cpp | 1 -
src/player/player-status.cpp | 1 -
src/racial/racial-kutar.cpp | 1 -
src/racial/racial-switcher.cpp | 1 -
src/realm/realm-chaos.cpp | 1 -
src/realm/realm-hex.cpp | 1 -
src/realm/realm-hissatsu.cpp | 1 -
src/realm/realm-song.cpp | 1 -
src/specific-object/death-scythe.cpp | 1 -
src/specific-object/stone-of-lore.cpp | 1 -
src/spell-class/spells-mirror-master.cpp | 1 -
src/spell-kind/earthquake.cpp | 1 -
src/spell-kind/spells-fetcher.cpp | 1 -
src/spell-kind/spells-floor.cpp | 1 -
src/spell-kind/spells-genocide.cpp | 1 -
src/spell-kind/spells-neighbor.cpp | 1 -
src/spell-kind/spells-world.cpp | 1 -
src/spell-realm/spells-chaos.cpp | 1 -
src/spell-realm/spells-craft.cpp | 1 -
src/spell-realm/spells-crusade.cpp | 1 -
src/spell-realm/spells-demon.cpp | 1 -
src/spell-realm/spells-hex.cpp | 1 -
src/spell-realm/spells-song.cpp | 1 -
src/spell-realm/spells-sorcery.cpp | 1 -
src/spell/spells-status.cpp | 1 -
src/status/action-setter.cpp | 1 -
src/status/bad-status-setter.cpp | 1 -
src/status/base-status.cpp | 1 -
src/status/body-improvement.cpp | 1 -
src/status/buff-setter.cpp | 1 -
src/status/element-resistance.cpp | 1 -
src/status/shape-changer.cpp | 1 -
src/status/sight-setter.cpp | 1 -
src/status/temporary-resistance.cpp | 1 -
src/store/cmd-store.cpp | 1 -
src/target/grid-selector.cpp | 1 -
src/target/target-checker.cpp | 1 -
src/target/target-setter.cpp | 1 -
src/wizard/wizard-special-process.cpp | 1 -
src/world/world-movement-processor.cpp | 1 -
120 files changed, 154 deletions(-)
delete mode 100644 src/core/player-redraw-types.h
diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 339028124..13d6966a5 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1119,7 +1119,6 @@
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 10035cb5b..0be25e671 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,7 +152,6 @@ hengband_SOURCES = \
core/magic-effects-timeout-reducer.cpp core/magic-effects-timeout-reducer.h \
core/object-compressor.cpp core/object-compressor.h \
core/player-processor.cpp core/player-processor.h \
- core/player-redraw-types.h \
core/score-util.cpp core/score-util.h \
core/scores.cpp core/scores.h \
core/show-file.cpp core/show-file.h \
diff --git a/src/birth/birth-stat.cpp b/src/birth/birth-stat.cpp
index 1c7f314c1..40c8d5655 100644
--- a/src/birth/birth-stat.cpp
+++ b/src/birth/birth-stat.cpp
@@ -1,6 +1,5 @@
#include "birth/birth-stat.h"
#include "birth/auto-roller.h"
-#include "core/player-redraw-types.h"
#include "player-base/player-class.h"
#include "player-base/player-race.h"
#include "player-info/class-info.h"
diff --git a/src/blue-magic/blue-magic-checker.cpp b/src/blue-magic/blue-magic-checker.cpp
index 439dba5d8..9d8bd99ea 100644
--- a/src/blue-magic/blue-magic-checker.cpp
+++ b/src/blue-magic/blue-magic-checker.cpp
@@ -11,7 +11,6 @@
*/
#include "blue-magic/blue-magic-checker.h"
-#include "core/player-redraw-types.h"
#include "main/sound-definitions-table.h"
#include "main/sound-of-music.h"
#include "monster-race/race-ability-mask.h"
diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp
index 84568ef73..54e2d088c 100644
--- a/src/cmd-action/cmd-hissatsu.cpp
+++ b/src/cmd-action/cmd-hissatsu.cpp
@@ -12,7 +12,6 @@
#include "action/action-limited.h"
#include "cmd-action/cmd-spell.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/floor-object.h"
diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index 5e6e89f98..684c5eaa9 100644
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -14,7 +14,6 @@
#include "artifact/fixed-art-types.h"
#include "cmd-action/cmd-spell.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/cave.h"
diff --git a/src/cmd-action/cmd-mind.cpp b/src/cmd-action/cmd-mind.cpp
index dd8362049..d3c1cf870 100644
--- a/src/cmd-action/cmd-mind.cpp
+++ b/src/cmd-action/cmd-mind.cpp
@@ -13,7 +13,6 @@
#include "cmd-action/cmd-mind.h"
#include "action/action-limited.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index 912e15858..d4ba1db63 100644
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -6,7 +6,6 @@
#include "cmd-io/cmd-save.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "dungeon/quest.h"
#include "floor/cave.h"
diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index 07299f2a3..918830c0f 100644
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -3,7 +3,6 @@
#include "action/open-util.h"
#include "cmd-action/cmd-attack.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "floor/geometry.h"
#include "game-option/disturbance-options.h"
#include "game-option/input-options.h"
diff --git a/src/cmd-action/cmd-others.cpp b/src/cmd-action/cmd-others.cpp
index f840c0067..e25934377 100644
--- a/src/cmd-action/cmd-others.cpp
+++ b/src/cmd-action/cmd-others.cpp
@@ -15,7 +15,6 @@
#include "cmd-action/cmd-attack.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "floor/geometry.h"
#include "game-option/game-play-options.h"
#include "grid/grid.h"
diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 7159804f8..47dec5c2b 100644
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -3,7 +3,6 @@
#include "cmd-action/cmd-attack.h"
#include "cmd-io/cmd-dump.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "effect/spells-effect-util.h"
diff --git a/src/cmd-action/cmd-racial.cpp b/src/cmd-action/cmd-racial.cpp
index dee91b624..e0a162d83 100644
--- a/src/cmd-action/cmd-racial.cpp
+++ b/src/cmd-action/cmd-racial.cpp
@@ -9,7 +9,6 @@
#include "action/mutation-execution.h"
#include "action/racial-execution.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "game-option/text-display-options.h"
#include "io/command-repeater.h"
diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index 49726a3d3..5c5668cc7 100644
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -12,7 +12,6 @@
#include "cmd-action/cmd-mind.h"
#include "cmd-io/cmd-dump.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/floor-object.h"
diff --git a/src/cmd-action/cmd-tunnel.cpp b/src/cmd-action/cmd-tunnel.cpp
index 2ccc88498..2ddc924ac 100644
--- a/src/cmd-action/cmd-tunnel.cpp
+++ b/src/cmd-action/cmd-tunnel.cpp
@@ -2,7 +2,6 @@
#include "action/tunnel-execution.h"
#include "cmd-action/cmd-attack.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "floor/geometry.h"
#include "grid/grid.h"
#include "io/input-key-requester.h"
diff --git a/src/cmd-building/cmd-building.cpp b/src/cmd-building/cmd-building.cpp
index 92ae8162c..888b4c277 100644
--- a/src/cmd-building/cmd-building.cpp
+++ b/src/cmd-building/cmd-building.cpp
@@ -17,7 +17,6 @@
#include "cmd-building/cmd-inn.h"
#include "cmd-io/cmd-dump.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/scores.h"
#include "core/show-file.h"
#include "core/special-internal-keys.h"
diff --git a/src/cmd-io/cmd-floor.cpp b/src/cmd-io/cmd-floor.cpp
index b3c06c73f..af5fdb20d 100644
--- a/src/cmd-io/cmd-floor.cpp
+++ b/src/cmd-io/cmd-floor.cpp
@@ -1,6 +1,5 @@
#include "cmd-io/cmd-floor.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/geometry.h"
diff --git a/src/cmd-io/cmd-gameoption.cpp b/src/cmd-io/cmd-gameoption.cpp
index 72003f52d..9100fff85 100644
--- a/src/cmd-io/cmd-gameoption.cpp
+++ b/src/cmd-io/cmd-gameoption.cpp
@@ -3,7 +3,6 @@
#include "cmd-io/cmd-autopick.h"
#include "cmd-io/cmd-dump.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/show-file.h"
#include "core/window-redrawer.h"
#include "floor/geometry.h"
diff --git a/src/cmd-io/cmd-process-screen.cpp b/src/cmd-io/cmd-process-screen.cpp
index f4421be32..100d5b9f9 100644
--- a/src/cmd-io/cmd-process-screen.cpp
+++ b/src/cmd-io/cmd-process-screen.cpp
@@ -7,7 +7,6 @@
#include "cmd-io/cmd-process-screen.h"
#include "cmd-visual/cmd-draw.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/visuals-reseter.h"
#include "game-option/special-options.h"
diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index 455a273d0..7dcd17a5d 100644
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -4,7 +4,6 @@
#include "autopick/autopick.h"
#include "avatar/avatar.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h" //!< @todo éåæãä½æ
ã¢ã¤ãã ãè£
åããã¨ã¯ã¨ã¹ãã®æåå¤å®ãèµ°ãã®ãï¼.
#include "flavor/flavor-describer.h"
diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp
index b40167bfa..99c46a2b8 100644
--- a/src/cmd-item/cmd-item.cpp
+++ b/src/cmd-item/cmd-item.cpp
@@ -22,7 +22,6 @@
#include "cmd-item/cmd-zapwand.h"
#include "combat/shoot.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
diff --git a/src/cmd-item/cmd-refill.cpp b/src/cmd-item/cmd-refill.cpp
index 7ac24c02f..2be7a8dbd 100644
--- a/src/cmd-item/cmd-refill.cpp
+++ b/src/cmd-item/cmd-refill.cpp
@@ -1,5 +1,4 @@
#include "cmd-item/cmd-refill.h"
-#include "core/player-redraw-types.h"
#include "floor/floor-object.h"
#include "inventory/inventory-object.h"
#include "inventory/inventory-slot-types.h"
diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp
index 5a0f83eaa..308dd1f77 100644
--- a/src/cmd-item/cmd-throw.cpp
+++ b/src/cmd-item/cmd-throw.cpp
@@ -4,7 +4,6 @@
* @author Hourier
*/
#include "cmd-item/cmd-throw.h"
-#include "core/player-redraw-types.h"
#include "game-option/special-options.h"
#include "inventory/inventory-slot-types.h"
#include "object-use/throw-execution.h"
diff --git a/src/cmd-visual/cmd-draw.cpp b/src/cmd-visual/cmd-draw.cpp
index b751036f6..62404b34e 100644
--- a/src/cmd-visual/cmd-draw.cpp
+++ b/src/cmd-visual/cmd-draw.cpp
@@ -1,6 +1,5 @@
#include "cmd-visual/cmd-draw.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "io/files-util.h"
diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 2e390b491..eaccd840a 100644
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -2,7 +2,6 @@
#include "artifact/fixed-art-types.h"
#include "avatar/avatar.h"
#include "combat/attack-criticality.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
diff --git a/src/combat/slaying.cpp b/src/combat/slaying.cpp
index a3d62ec78..514802ec6 100644
--- a/src/combat/slaying.cpp
+++ b/src/combat/slaying.cpp
@@ -1,6 +1,5 @@
#include "combat/slaying.h"
#include "artifact/fixed-art-types.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "mind/mind-samurai.h"
#include "monster-race/monster-race.h"
diff --git a/src/core/disturbance.cpp b/src/core/disturbance.cpp
index 5b716cbcc..508ddf918 100644
--- a/src/core/disturbance.cpp
+++ b/src/core/disturbance.cpp
@@ -1,6 +1,5 @@
#include "core/disturbance.h"
#include "action/travel-execution.h"
-#include "core/player-redraw-types.h"
#include "game-option/disturbance-options.h"
#include "game-option/map-screen-options.h"
#include "io/input-key-requester.h"
diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index 15ba9dc15..0ab594d89 100644
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -1,5 +1,4 @@
#include "core/object-compressor.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "floor/floor-object.h"
#include "floor/geometry.h"
diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 7c3ae009a..8997af7b1 100644
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -2,7 +2,6 @@
#include "action/run-execution.h"
#include "action/travel-execution.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/special-internal-keys.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
diff --git a/src/core/player-redraw-types.h b/src/core/player-redraw-types.h
deleted file mode 100644
index 6f8a16caf..000000000
--- a/src/core/player-redraw-types.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-// clang-format off
-enum player_redraw_type {
- PR_MISC = 0x00000001L, /*!< åæç»ãã©ã°: 種æã¨è·æ¥ / Display Race/Class */
- PR_TITLE = 0x00000002L, /*!< åæç»ãã©ã°: ç§°å· / Display Title */
- PR_LEVEL = 0x00000004L, /*!< åæç»ãã©ã°: ã¬ãã« / Display Level */
- PR_EXP = 0x00000008L, /*!< åæç»ãã©ã°: çµé¨å¤ / Display Experience */
- PR_ABILITY_SCORE = 0x00000010L, /*!< åæç»ãã©ã°: ã¹ãã¼ã¿ã¹ / Display Stats */
- PR_AC = 0x00000020L, /*!< åæç»ãã©ã°: AC / Display Armor */
- PR_HP = 0x00000040L, /*!< åæç»ãã©ã°: HP / Display Hitpoints */
- PR_MP = 0x00000080L, /*!< åæç»ãã©ã°: MP / Display Mana */
- PR_GOLD = 0x00000100L, /*!< åæç»ãã©ã°: ææé / Display Gold */
- PR_DEPTH = 0x00000200L, /*!< åæç»ãã©ã°: ãã³ã¸ã§ã³ã®é / Display Depth */
- PR_EQUIPPY = 0x00000400L, /*!< åæç»ãã©ã°: è£
åã·ã³ãã« / Display equippy chars */
- PR_HEALTH = 0x00000800L, /*!< åæç»ãã©ã°: ã¢ã³ã¹ã¿ã¼ã®ã¹ãã¼ã¿ã¹ / Display Health Bar */
- PR_CUT = 0x00001000L, /*!< åæç»ãã©ã°: è² å·åº¦ / Display Extra (Cut) */
- PR_STUN = 0x00002000L, /*!< åæç»ãã©ã°: æ¦æ§åº¦ / Display Extra (Stun) */
- PR_HUNGER = 0x00004000L, /*!< åæç»ãã©ã°: 空è
¹åº¦ / Display Extra (Hunger) */
- PR_TIMED_EFFECT = 0x00008000L, /*!< åæç»ãã©ã°: ãã¬ã¤ã¤ã¼ã®ä»ä¸ç¶æ
/ Display Status Bar */
- PR_XXX0 = 0x00010000L, /*!< (unused) */
- PR_UHEALTH = 0x00020000L, /*!< åæç»ãã©ã°: ãããã®ã¹ãã¼ã¿ã¹ / Display Uma Health Bar */
- PR_XXX1 = 0x00040000L, /*!< (unused) */
- PR_XXX2 = 0x00080000L, /*!< (unused) */
- PR_ACTION = 0x00100000L, /*!< åæç»ãã©ã°: ãã¬ã¤ã¤ã¼ã®è¡åç¶æ
/ Display Extra (State) */
- PR_SPEED = 0x00200000L, /*!< åæç»ãã©ã°: å é / Display Extra (Speed) */
- PR_STUDY = 0x00400000L, /*!< åæç»ãã©ã°: å¦ç¿ / Display Extra (Study) */
- PR_IMITATION = 0x00800000L, /*!< åæç»ãã©ã°: ãã®ã¾ã / Display Extra (Imitation) */
- PR_EXTRA = 0x01000000L, /*!< åæç»ãã©ã°: æ¡å¼µã¹ãã¼ã¿ã¹å
¨ä½ / Display Extra Info */
- PR_BASIC = 0x02000000L, /*!< åæç»ãã©ã°: åºæ¬ã¹ãã¼ã¿ã¹å
¨ä½ / Display Basic Info */
- PR_MAP = 0x04000000L, /*!< åæç»ãã©ã°: ã²ã¼ã ããã / Display Map */
- PR_WIPE = 0x08000000L, /*!< åæç»ãã©ã°: ç»é¢æ¶å» / Hack -- Total Redraw */
-};
-
-// clang-format on
diff --git a/src/core/stuff-handler.cpp b/src/core/stuff-handler.cpp
index 50a5069d6..641cf0abd 100644
--- a/src/core/stuff-handler.cpp
+++ b/src/core/stuff-handler.cpp
@@ -1,5 +1,4 @@
#include "core/stuff-handler.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "player/player-status.h"
#include "system/player-type-definition.h"
diff --git a/src/core/window-redrawer.cpp b/src/core/window-redrawer.cpp
index c893db232..0e59b9b86 100644
--- a/src/core/window-redrawer.cpp
+++ b/src/core/window-redrawer.cpp
@@ -4,7 +4,6 @@
* @author Hourier
*/
#include "core/window-redrawer.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "floor/floor-util.h"
#include "game-option/option-flags.h"
diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp
index 28cd6ba4e..6099b4727 100644
--- a/src/dungeon/dungeon-processor.cpp
+++ b/src/dungeon/dungeon-processor.cpp
@@ -4,7 +4,6 @@
#include "core/disturbance.h"
#include "core/object-compressor.h"
#include "core/player-processor.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/turn-compensator.h"
#include "core/window-redrawer.h"
diff --git a/src/effect/effect-monster-oldies.cpp b/src/effect/effect-monster-oldies.cpp
index 38a8a7afb..b047b2d11 100644
--- a/src/effect/effect-monster-oldies.cpp
+++ b/src/effect/effect-monster-oldies.cpp
@@ -1,6 +1,5 @@
#include "effect/effect-monster-oldies.h"
#include "avatar/avatar.h"
-#include "core/player-redraw-types.h"
#include "effect/effect-monster-util.h"
#include "monster-floor/monster-generator.h"
#include "monster-race/monster-race.h"
diff --git a/src/effect/effect-monster-psi.cpp b/src/effect/effect-monster-psi.cpp
index b44c4498a..575d0bbd4 100644
--- a/src/effect/effect-monster-psi.cpp
+++ b/src/effect/effect-monster-psi.cpp
@@ -1,5 +1,4 @@
#include "effect/effect-monster-psi.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-monster-util.h"
#include "floor/line-of-sight.h"
diff --git a/src/effect/effect-monster-spirit.cpp b/src/effect/effect-monster-spirit.cpp
index abb22c05b..e1c45820e 100644
--- a/src/effect/effect-monster-spirit.cpp
+++ b/src/effect/effect-monster-spirit.cpp
@@ -1,5 +1,4 @@
#include "effect/effect-monster-spirit.h"
-#include "core/player-redraw-types.h"
#include "effect/effect-monster-util.h"
#include "hpmp/hp-mp-processor.h"
#include "monster-race/monster-race.h"
diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp
index a69841101..083de38fe 100644
--- a/src/effect/effect-monster.cpp
+++ b/src/effect/effect-monster.cpp
@@ -7,7 +7,6 @@
#include "effect/effect-monster.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "effect/attribute-types.h"
diff --git a/src/effect/effect-player-resist-hurt.cpp b/src/effect/effect-player-resist-hurt.cpp
index c9259f18a..b96a635b7 100644
--- a/src/effect/effect-player-resist-hurt.cpp
+++ b/src/effect/effect-player-resist-hurt.cpp
@@ -1,7 +1,6 @@
#include "effect/effect-player-resist-hurt.h"
#include "artifact/fixed-art-types.h"
#include "blue-magic/blue-magic-checker.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-player.h"
#include "hpmp/hp-mp-processor.h"
diff --git a/src/effect/effect-player-spirit.cpp b/src/effect/effect-player-spirit.cpp
index e1c921e39..d512769ed 100644
--- a/src/effect/effect-player-spirit.cpp
+++ b/src/effect/effect-player-spirit.cpp
@@ -1,6 +1,5 @@
#include "effect/effect-player-spirit.h"
#include "blue-magic/blue-magic-checker.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-player.h"
#include "mind/mind-mirror-master.h"
diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index f0ab22ae8..2ddc195c1 100644
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -1,7 +1,6 @@
#include "floor/floor-events.h"
#include "cmd-io/cmd-dump.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h"
diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index f129b3d96..d77a153a4 100644
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -1,7 +1,6 @@
#include "hpmp/hp-mp-processor.h"
#include "avatar/avatar.h"
#include "cmd-action/cmd-pet.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp
index 27dba59c0..b1250a827 100644
--- a/src/hpmp/hp-mp-regenerator.cpp
+++ b/src/hpmp/hp-mp-regenerator.cpp
@@ -1,6 +1,5 @@
#include "hpmp/hp-mp-regenerator.h"
#include "cmd-item/cmd-magiceat.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "inventory/inventory-slot-types.h"
#include "monster-race/monster-race.h"
diff --git a/src/inventory/inventory-curse.cpp b/src/inventory/inventory-curse.cpp
index 1de862eb8..48c5d3b1d 100644
--- a/src/inventory/inventory-curse.cpp
+++ b/src/inventory/inventory-curse.cpp
@@ -2,7 +2,6 @@
#include "artifact/fixed-art-types.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
#include "inventory/inventory-slot-types.h"
diff --git a/src/inventory/player-inventory.cpp b/src/inventory/player-inventory.cpp
index 8e1136364..b9ba1bbb0 100644
--- a/src/inventory/player-inventory.cpp
+++ b/src/inventory/player-inventory.cpp
@@ -2,7 +2,6 @@
#include "autopick/autopick.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
diff --git a/src/io/cursor.cpp b/src/io/cursor.cpp
index 05becac1b..bd3d8d511 100644
--- a/src/io/cursor.cpp
+++ b/src/io/cursor.cpp
@@ -1,5 +1,4 @@
#include "io/cursor.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "effect/effect-characteristics.h"
#include "effect/spells-effect-util.h"
diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp
index da7ef2f1e..ad61eb75a 100644
--- a/src/io/input-key-processor.cpp
+++ b/src/io/input-key-processor.cpp
@@ -46,7 +46,6 @@
#include "cmd-visual/cmd-map.h"
#include "cmd-visual/cmd-visuals.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/special-internal-keys.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h" //!< @do_cmd_quest() ããããå¾ã§ç§»è¨ãã.
diff --git a/src/io/report.cpp b/src/io/report.cpp
index 869de59f8..60d1f967c 100644
--- a/src/io/report.cpp
+++ b/src/io/report.cpp
@@ -7,7 +7,6 @@
#include "io/report.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/turn-compensator.h"
#include "core/visuals-reseter.h"
diff --git a/src/io/screen-util.cpp b/src/io/screen-util.cpp
index bcacb57b0..c80fdc98e 100644
--- a/src/io/screen-util.cpp
+++ b/src/io/screen-util.cpp
@@ -11,7 +11,6 @@
#include "io/screen-util.h"
#include "core/player-processor.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "dungeon/quest.h"
#include "effect/effect-characteristics.h"
diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index d11c433d0..6d93d1825 100644
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -3,7 +3,6 @@
#include "avatar/avatar.h"
#include "cmd-building/cmd-building.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "flavor/flavor-describer.h"
#include "game-option/cheat-options.h"
diff --git a/src/melee/melee-postprocess.cpp b/src/melee/melee-postprocess.cpp
index 804607ad8..4de760c9b 100644
--- a/src/melee/melee-postprocess.cpp
+++ b/src/melee/melee-postprocess.cpp
@@ -12,7 +12,6 @@
#include "melee/melee-postprocess.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "floor/cave.h"
#include "floor/geometry.h"
diff --git a/src/melee/melee-spell.cpp b/src/melee/melee-spell.cpp
index 31fb94dd3..3b24b7875 100644
--- a/src/melee/melee-spell.cpp
+++ b/src/melee/melee-spell.cpp
@@ -1,6 +1,5 @@
#include "melee/melee-spell.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "melee/melee-spell-flags-checker.h"
#include "melee/melee-spell-util.h"
#include "monster-race/monster-race.h"
diff --git a/src/melee/monster-attack-monster.cpp b/src/melee/monster-attack-monster.cpp
index 22dc2b8d0..4d159287a 100644
--- a/src/melee/monster-attack-monster.cpp
+++ b/src/melee/monster-attack-monster.cpp
@@ -8,7 +8,6 @@
#include "combat/attack-accuracy.h"
#include "combat/hallucination-attacks-table.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "dungeon/dungeon-flag-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
diff --git a/src/mind/mind-blue-mage.cpp b/src/mind/mind-blue-mage.cpp
index 203c367db..9de62f17d 100644
--- a/src/mind/mind-blue-mage.cpp
+++ b/src/mind/mind-blue-mage.cpp
@@ -4,7 +4,6 @@
#include "blue-magic/blue-magic-caster.h"
#include "blue-magic/learnt-power-getter.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "game-option/disturbance-options.h"
#include "game-option/input-options.h"
diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp
index f8973fc4a..e20788638 100644
--- a/src/mind/mind-elementalist.cpp
+++ b/src/mind/mind-elementalist.cpp
@@ -9,7 +9,6 @@
#include "cmd-action/cmd-spell.h"
#include "cmd-io/cmd-gameoption.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "effect/effect-characteristics.h"
diff --git a/src/mind/mind-force-trainer.cpp b/src/mind/mind-force-trainer.cpp
index 331b09827..9b4404a48 100644
--- a/src/mind/mind-force-trainer.cpp
+++ b/src/mind/mind-force-trainer.cpp
@@ -1,7 +1,6 @@
#include "mind/mind-force-trainer.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "effect/attribute-types.h"
#include "effect/spells-effect-util.h"
diff --git a/src/mind/mind-magic-resistance.cpp b/src/mind/mind-magic-resistance.cpp
index a9b593445..8902bc9a8 100644
--- a/src/mind/mind-magic-resistance.cpp
+++ b/src/mind/mind-magic-resistance.cpp
@@ -1,6 +1,5 @@
#include "mind/mind-magic-resistance.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "system/player-type-definition.h"
diff --git a/src/mind/mind-mirror-master.cpp b/src/mind/mind-mirror-master.cpp
index baaefd837..2ecf69933 100644
--- a/src/mind/mind-mirror-master.cpp
+++ b/src/mind/mind-mirror-master.cpp
@@ -7,7 +7,6 @@
#include "mind/mind-mirror-master.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
diff --git a/src/mind/mind-monk.cpp b/src/mind/mind-monk.cpp
index a56cb8946..4e484eaa0 100644
--- a/src/mind/mind-monk.cpp
+++ b/src/mind/mind-monk.cpp
@@ -1,6 +1,5 @@
#include "mind/mind-monk.h"
#include "action/action-limited.h"
-#include "core/player-redraw-types.h"
#include "io/input-key-acceptor.h"
#include "mind/stances-table.h"
#include "player-base/player-class.h"
diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index 054c728bb..62d681bc4 100644
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -3,7 +3,6 @@
#include "cmd-item/cmd-throw.h"
#include "combat/combat-options-type.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/mind/mind-samurai.cpp b/src/mind/mind-samurai.cpp
index b33de3657..bf94a8aca 100644
--- a/src/mind/mind-samurai.cpp
+++ b/src/mind/mind-samurai.cpp
@@ -8,7 +8,6 @@
#include "action/action-limited.h"
#include "avatar/avatar.h"
#include "cmd-action/cmd-attack.h"
-#include "core/player-redraw-types.h"
#include "inventory/inventory-slot-types.h"
#include "io/input-key-acceptor.h"
#include "mind/stances-table.h"
diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 223eb185a..903c1be12 100644
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -9,7 +9,6 @@
#include "action/action-limited.h"
#include "cmd-action/cmd-shoot.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/geometry.h"
diff --git a/src/mind/mind-warrior-mage.cpp b/src/mind/mind-warrior-mage.cpp
index cc109eec7..cba7093fb 100644
--- a/src/mind/mind-warrior-mage.cpp
+++ b/src/mind/mind-warrior-mage.cpp
@@ -1,5 +1,4 @@
#include "mind/mind-warrior-mage.h"
-#include "core/player-redraw-types.h"
#include "hpmp/hp-mp-processor.h"
#include "player/player-damage.h"
#include "system/player-type-definition.h"
diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index 6f5d2720e..7904638d8 100644
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -6,7 +6,6 @@
#include "monster-attack/monster-eating.h"
#include "avatar/avatar.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index d1bf87f92..1ea58fe27 100644
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -2,7 +2,6 @@
#include "artifact/fixed-art-generator.h"
#include "artifact/fixed-art-types.h"
#include "cmd-building/cmd-building.h"
-#include "core/player-redraw-types.h"
#include "dungeon/quest-completion-checker.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/monster/monster-damage.cpp b/src/monster/monster-damage.cpp
index e5d84698a..8cc655ce4 100644
--- a/src/monster/monster-damage.cpp
+++ b/src/monster/monster-damage.cpp
@@ -6,7 +6,6 @@
#include "monster/monster-damage.h"
#include "avatar/avatar-changer.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
#include "game-option/birth-options.h"
diff --git a/src/monster/monster-status-setter.cpp b/src/monster/monster-status-setter.cpp
index 66926c0b5..9fbd3b46c 100644
--- a/src/monster/monster-status-setter.cpp
+++ b/src/monster/monster-status-setter.cpp
@@ -1,7 +1,6 @@
#include "monster/monster-status-setter.h"
#include "avatar/avatar.h"
#include "cmd-visual/cmd-draw.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp
index 81a47c33d..2e9fa5909 100644
--- a/src/monster/monster-update.cpp
+++ b/src/monster/monster-update.cpp
@@ -6,7 +6,6 @@
#include "monster/monster-update.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "floor/cave.h"
diff --git a/src/mspell/mspell-attack.cpp b/src/mspell/mspell-attack.cpp
index 36e9fc712..24128af03 100644
--- a/src/mspell/mspell-attack.cpp
+++ b/src/mspell/mspell-attack.cpp
@@ -1,7 +1,6 @@
#include "mspell/mspell-attack.h"
#include "blue-magic/blue-magic-checker.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h"
#include "floor/cave.h"
diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index 49d9c799e..fbd167e72 100644
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -12,7 +12,6 @@
#include "mspell/mspell-checker.h"
#include "blue-magic/blue-magic-checker.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h"
#include "effect/attribute-types.h"
diff --git a/src/mspell/mspell-dispel.cpp b/src/mspell/mspell-dispel.cpp
index ebb6ff2d7..59de9d499 100644
--- a/src/mspell/mspell-dispel.cpp
+++ b/src/mspell/mspell-dispel.cpp
@@ -1,6 +1,5 @@
#include "mspell/mspell-dispel.h"
#include "blue-magic/blue-magic-checker.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/window-redrawer.h"
#include "mind/mind-force-trainer.h"
diff --git a/src/mspell/mspell-status.cpp b/src/mspell/mspell-status.cpp
index aec6ebec8..fb190480e 100644
--- a/src/mspell/mspell-status.cpp
+++ b/src/mspell/mspell-status.cpp
@@ -8,7 +8,6 @@
#include "mspell/mspell-status.h"
#include "blue-magic/blue-magic-checker.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-processor.h"
#include "mind/drs-types.h"
diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index 52519eabd..136cf15a2 100644
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -1,7 +1,6 @@
#include "mutation/mutation-processor.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "floor/geometry.h"
#include "grid/grid.h"
diff --git a/src/object-activation/activation-others.cpp b/src/object-activation/activation-others.cpp
index 065e5784a..ad0e4f5d5 100644
--- a/src/object-activation/activation-others.cpp
+++ b/src/object-activation/activation-others.cpp
@@ -9,7 +9,6 @@
#include "avatar/avatar.h"
#include "cmd-io/cmd-save.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/object-use/read/scroll-read-executor.cpp b/src/object-use/read/scroll-read-executor.cpp
index b49ef1518..50997e94f 100644
--- a/src/object-use/read/scroll-read-executor.cpp
+++ b/src/object-use/read/scroll-read-executor.cpp
@@ -5,7 +5,6 @@
*/
#include "object-use/read/scroll-read-executor.h"
-#include "core/player-redraw-types.h"
#include "monster-floor/monster-summon.h"
#include "monster-floor/place-monster-types.h"
#include "player-base/player-class.h"
diff --git a/src/pet/pet-fall-off.cpp b/src/pet/pet-fall-off.cpp
index 12bb015dd..f2013ea2b 100644
--- a/src/pet/pet-fall-off.cpp
+++ b/src/pet/pet-fall-off.cpp
@@ -5,7 +5,6 @@
*/
#include "pet/pet-fall-off.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/cave.h"
diff --git a/src/player-attack/attack-chaos-effect.cpp b/src/player-attack/attack-chaos-effect.cpp
index 3c7495f1d..f66663943 100644
--- a/src/player-attack/attack-chaos-effect.cpp
+++ b/src/player-attack/attack-chaos-effect.cpp
@@ -8,7 +8,6 @@
#include "player-attack/attack-chaos-effect.h"
#include "artifact/fixed-art-types.h"
-#include "core/player-redraw-types.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
#include "inventory/inventory-object.h"
diff --git a/src/player-base/player-class.cpp b/src/player-base/player-class.cpp
index a5e512a64..8a76e6e11 100644
--- a/src/player-base/player-class.cpp
+++ b/src/player-base/player-class.cpp
@@ -6,7 +6,6 @@
*/
#include "player-base/player-class.h"
#include "cmd-io/diary-subtitle-table.h"
-#include "core/player-redraw-types.h"
#include "inventory/inventory-slot-types.h"
#include "mind/mind-elementalist.h"
#include "player-info/bard-data-type.h"
diff --git a/src/player-info/class-info.cpp b/src/player-info/class-info.cpp
index 7dafbce1d..1da727684 100644
--- a/src/player-info/class-info.cpp
+++ b/src/player-info/class-info.cpp
@@ -5,7 +5,6 @@
*/
#include "player-info/class-info.h"
-#include "core/player-redraw-types.h"
#include "inventory/inventory-slot-types.h"
#include "player-info/race-info.h"
#include "system/item-entity.h"
diff --git a/src/player-status/player-basic-statistics.cpp b/src/player-status/player-basic-statistics.cpp
index cee02f65f..07c3f2377 100644
--- a/src/player-status/player-basic-statistics.cpp
+++ b/src/player-status/player-basic-statistics.cpp
@@ -1,5 +1,4 @@
#include "player-status/player-basic-statistics.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "mutation/mutation-flag-types.h"
#include "object/object-flags.h"
diff --git a/src/player/digestion-processor.cpp b/src/player/digestion-processor.cpp
index 841086ee5..d0bcfe08f 100644
--- a/src/player/digestion-processor.cpp
+++ b/src/player/digestion-processor.cpp
@@ -1,7 +1,6 @@
#include "player/digestion-processor.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
#include "floor/wild.h"
diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index f2c35fbf8..c28b7c123 100644
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -5,7 +5,6 @@
#include "cmd-io/cmd-process-screen.h"
#include "core/asking-player.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index b4a66c3f2..b24730b86 100644
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -7,7 +7,6 @@
#include "player/player-move.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/special-internal-keys.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index aed1cdf47..256a33aaf 100644
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -9,7 +9,6 @@
#include "cmd-item/cmd-magiceat.h"
#include "combat/attack-power-table.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
diff --git a/src/racial/racial-kutar.cpp b/src/racial/racial-kutar.cpp
index e79a347b3..42fa066ee 100644
--- a/src/racial/racial-kutar.cpp
+++ b/src/racial/racial-kutar.cpp
@@ -1,6 +1,5 @@
#include "racial/racial-kutar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "system/player-type-definition.h"
diff --git a/src/racial/racial-switcher.cpp b/src/racial/racial-switcher.cpp
index c363fad44..07ffd8ab4 100644
--- a/src/racial/racial-switcher.cpp
+++ b/src/racial/racial-switcher.cpp
@@ -16,7 +16,6 @@
#include "cmd-action/cmd-spell.h"
#include "cmd-item/cmd-magiceat.h"
#include "cmd-item/cmd-zapwand.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "effect/spells-effect-util.h"
diff --git a/src/realm/realm-chaos.cpp b/src/realm/realm-chaos.cpp
index f41e8268b..c5ff46d86 100644
--- a/src/realm/realm-chaos.cpp
+++ b/src/realm/realm-chaos.cpp
@@ -1,7 +1,6 @@
#include "realm/realm-chaos.h"
#include "cmd-action/cmd-spell.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index 784c62027..8d95495b4 100644
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -9,7 +9,6 @@
#include "cmd-action/cmd-spell.h"
#include "cmd-item/cmd-quaff.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp
index 5f0e53416..70336a5c9 100644
--- a/src/realm/realm-hissatsu.cpp
+++ b/src/realm/realm-hissatsu.cpp
@@ -5,7 +5,6 @@
#include "cmd-item/cmd-throw.h"
#include "combat/combat-options-type.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "dungeon/dungeon-flag-types.h"
#include "effect/attribute-types.h"
diff --git a/src/realm/realm-song.cpp b/src/realm/realm-song.cpp
index ccc8d4bac..3b80b0cd9 100644
--- a/src/realm/realm-song.cpp
+++ b/src/realm/realm-song.cpp
@@ -1,5 +1,4 @@
#include "cmd-action/cmd-spell.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/specific-object/death-scythe.cpp b/src/specific-object/death-scythe.cpp
index 7ee1f584f..c70c2ae0d 100644
--- a/src/specific-object/death-scythe.cpp
+++ b/src/specific-object/death-scythe.cpp
@@ -7,7 +7,6 @@
#include "specific-object/death-scythe.h"
#include "combat/attack-criticality.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "inventory/inventory-slot-types.h"
#include "main/sound-definitions-table.h"
diff --git a/src/specific-object/stone-of-lore.cpp b/src/specific-object/stone-of-lore.cpp
index 9b815e2a3..749842a29 100644
--- a/src/specific-object/stone-of-lore.cpp
+++ b/src/specific-object/stone-of-lore.cpp
@@ -5,7 +5,6 @@
*/
#include "specific-object/stone-of-lore.h"
-#include "core/player-redraw-types.h"
#include "player/player-damage.h"
#include "spell-kind/spells-perception.h"
#include "status/bad-status-setter.h"
diff --git a/src/spell-class/spells-mirror-master.cpp b/src/spell-class/spells-mirror-master.cpp
index 0ba35622c..d5d34a92d 100644
--- a/src/spell-class/spells-mirror-master.cpp
+++ b/src/spell-class/spells-mirror-master.cpp
@@ -6,7 +6,6 @@
*/
#include "spell-class/spells-mirror-master.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "dungeon/dungeon-flag-types.h"
#include "effect/attribute-types.h"
diff --git a/src/spell-kind/earthquake.cpp b/src/spell-kind/earthquake.cpp
index cb0d72944..caeb4cfa0 100644
--- a/src/spell-kind/earthquake.cpp
+++ b/src/spell-kind/earthquake.cpp
@@ -1,5 +1,4 @@
#include "spell-kind/earthquake.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h"
diff --git a/src/spell-kind/spells-fetcher.cpp b/src/spell-kind/spells-fetcher.cpp
index 6f9eac470..dacbb3901 100644
--- a/src/spell-kind/spells-fetcher.cpp
+++ b/src/spell-kind/spells-fetcher.cpp
@@ -1,5 +1,4 @@
#include "spell-kind/spells-fetcher.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index cc9ccc435..a47ceb2e8 100644
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -7,7 +7,6 @@
#include "spell-kind/spells-floor.h"
#include "action/travel-execution.h"
#include "cmd-io/cmd-dump.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/quest.h"
diff --git a/src/spell-kind/spells-genocide.cpp b/src/spell-kind/spells-genocide.cpp
index bc56384f6..f2d93c080 100644
--- a/src/spell-kind/spells-genocide.cpp
+++ b/src/spell-kind/spells-genocide.cpp
@@ -1,7 +1,6 @@
#include "spell-kind/spells-genocide.h"
#include "avatar/avatar.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
diff --git a/src/spell-kind/spells-neighbor.cpp b/src/spell-kind/spells-neighbor.cpp
index d9ede95ac..77116a6ec 100644
--- a/src/spell-kind/spells-neighbor.cpp
+++ b/src/spell-kind/spells-neighbor.cpp
@@ -1,5 +1,4 @@
#include "spell-kind/spells-neighbor.h"
-#include "core/player-redraw-types.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index 8af058781..927928730 100644
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -7,7 +7,6 @@
#include "spell-kind/spells-world.h"
#include "cmd-io/cmd-save.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "dungeon/quest-completion-checker.h"
#include "floor/cave.h"
#include "floor/floor-mode-changer.h"
diff --git a/src/spell-realm/spells-chaos.cpp b/src/spell-realm/spells-chaos.cpp
index 6102d079f..3732ae8a8 100644
--- a/src/spell-realm/spells-chaos.cpp
+++ b/src/spell-realm/spells-chaos.cpp
@@ -1,5 +1,4 @@
#include "spell-realm/spells-chaos.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
#include "effect/attribute-types.h"
diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp
index 238448bdf..8b60cb926 100644
--- a/src/spell-realm/spells-craft.cpp
+++ b/src/spell-realm/spells-craft.cpp
@@ -1,7 +1,6 @@
#include "spell-realm/spells-craft.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
diff --git a/src/spell-realm/spells-crusade.cpp b/src/spell-realm/spells-crusade.cpp
index c70a52501..66ec39f9b 100644
--- a/src/spell-realm/spells-crusade.cpp
+++ b/src/spell-realm/spells-crusade.cpp
@@ -6,7 +6,6 @@
#include "spell-realm/spells-crusade.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
diff --git a/src/spell-realm/spells-demon.cpp b/src/spell-realm/spells-demon.cpp
index 713eee078..686d88e60 100644
--- a/src/spell-realm/spells-demon.cpp
+++ b/src/spell-realm/spells-demon.cpp
@@ -1,6 +1,5 @@
#include "spell-realm/spells-demon.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "system/player-type-definition.h"
diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index 11d05f064..715eb9a57 100644
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -1,6 +1,5 @@
#include "spell-realm/spells-hex.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
diff --git a/src/spell-realm/spells-song.cpp b/src/spell-realm/spells-song.cpp
index 31c790fd5..fd46dfe84 100644
--- a/src/spell-realm/spells-song.cpp
+++ b/src/spell-realm/spells-song.cpp
@@ -1,6 +1,5 @@
#include "spell-realm/spells-song.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "game-option/disturbance-options.h"
diff --git a/src/spell-realm/spells-sorcery.cpp b/src/spell-realm/spells-sorcery.cpp
index 92530bf63..aa913ae92 100644
--- a/src/spell-realm/spells-sorcery.cpp
+++ b/src/spell-realm/spells-sorcery.cpp
@@ -1,6 +1,5 @@
#include "spell-realm/spells-sorcery.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "flavor/flavor-describer.h"
#include "floor/floor-object.h"
diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index a0dd5c306..6cda99258 100644
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -8,7 +8,6 @@
#include "avatar/avatar.h"
#include "cmd-action/cmd-spell.h"
#include "cmd-item/cmd-magiceat.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "effect/attribute-types.h"
diff --git a/src/status/action-setter.cpp b/src/status/action-setter.cpp
index d1f883c83..08cc6bcaa 100644
--- a/src/status/action-setter.cpp
+++ b/src/status/action-setter.cpp
@@ -12,7 +12,6 @@
*/
#include "status/action-setter.h"
-#include "core/player-redraw-types.h"
#include "player-base/player-class.h"
#include "player-info/bluemage-data-type.h"
#include "player-info/monk-data-type.h"
diff --git a/src/status/bad-status-setter.cpp b/src/status/bad-status-setter.cpp
index 351c02faa..cef5018f6 100644
--- a/src/status/bad-status-setter.cpp
+++ b/src/status/bad-status-setter.cpp
@@ -1,7 +1,6 @@
#include "status/bad-status-setter.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "game-option/disturbance-options.h"
diff --git a/src/status/base-status.cpp b/src/status/base-status.cpp
index ce9f989b3..b8278a0be 100644
--- a/src/status/base-status.cpp
+++ b/src/status/base-status.cpp
@@ -1,6 +1,5 @@
#include "status/base-status.h"
#include "avatar/avatar.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "game-option/birth-options.h"
#include "inventory/inventory-slot-types.h"
diff --git a/src/status/body-improvement.cpp b/src/status/body-improvement.cpp
index 455e10e8c..defbb8a02 100644
--- a/src/status/body-improvement.cpp
+++ b/src/status/body-improvement.cpp
@@ -1,7 +1,6 @@
#include "status/body-improvement.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
diff --git a/src/status/buff-setter.cpp b/src/status/buff-setter.cpp
index 405e90bc3..48f0e9021 100644
--- a/src/status/buff-setter.cpp
+++ b/src/status/buff-setter.cpp
@@ -1,7 +1,6 @@
#include "status/buff-setter.h"
#include "avatar/avatar.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/speed-table.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
diff --git a/src/status/element-resistance.cpp b/src/status/element-resistance.cpp
index 9c95155da..258225816 100644
--- a/src/status/element-resistance.cpp
+++ b/src/status/element-resistance.cpp
@@ -1,6 +1,5 @@
#include "status/element-resistance.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "player-base/player-class.h"
diff --git a/src/status/shape-changer.cpp b/src/status/shape-changer.cpp
index 80c604b88..2eae931c5 100644
--- a/src/status/shape-changer.cpp
+++ b/src/status/shape-changer.cpp
@@ -4,7 +4,6 @@
#include "birth/birth-body-spec.h"
#include "birth/birth-stat.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "grid/grid.h"
diff --git a/src/status/sight-setter.cpp b/src/status/sight-setter.cpp
index e43444d42..2431ce81e 100644
--- a/src/status/sight-setter.cpp
+++ b/src/status/sight-setter.cpp
@@ -1,6 +1,5 @@
#include "status/sight-setter.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "player/player-status.h"
diff --git a/src/status/temporary-resistance.cpp b/src/status/temporary-resistance.cpp
index 8e1b41cee..8e547e412 100644
--- a/src/status/temporary-resistance.cpp
+++ b/src/status/temporary-resistance.cpp
@@ -1,6 +1,5 @@
#include "status/temporary-resistance.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "game-option/disturbance-options.h"
#include "system/player-type-definition.h"
diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 2ffd3c70b..f96fc6c56 100644
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -1,6 +1,5 @@
#include "store/cmd-store.h"
#include "cmd-io/macro-util.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "flavor/flavor-describer.h"
diff --git a/src/target/grid-selector.cpp b/src/target/grid-selector.cpp
index 79e2b4010..01c80f737 100644
--- a/src/target/grid-selector.cpp
+++ b/src/target/grid-selector.cpp
@@ -1,5 +1,4 @@
#include "target/grid-selector.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/cave.h"
diff --git a/src/target/target-checker.cpp b/src/target/target-checker.cpp
index fb4c5d866..a23a50ebc 100644
--- a/src/target/target-checker.cpp
+++ b/src/target/target-checker.cpp
@@ -11,7 +11,6 @@
#include "target/target-checker.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "core/window-redrawer.h"
#include "game-option/disturbance-options.h"
#include "game-option/map-screen-options.h"
diff --git a/src/target/target-setter.cpp b/src/target/target-setter.cpp
index 78dbc8ea1..fd621d411 100644
--- a/src/target/target-setter.cpp
+++ b/src/target/target-setter.cpp
@@ -1,5 +1,4 @@
#include "target/target-setter.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "floor/geometry.h"
diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index fe127498a..bdf11a7ad 100644
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -18,7 +18,6 @@
#include "cmd-io/cmd-save.h"
#include "cmd-visual/cmd-draw.h"
#include "core/asking-player.h"
-#include "core/player-redraw-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
diff --git a/src/world/world-movement-processor.cpp b/src/world/world-movement-processor.cpp
index 32d4414ff..60b7ad9e5 100644
--- a/src/world/world-movement-processor.cpp
+++ b/src/world/world-movement-processor.cpp
@@ -1,7 +1,6 @@
#include "world/world-movement-processor.h"
#include "cmd-io/cmd-save.h"
#include "core/disturbance.h"
-#include "core/player-redraw-types.h"
#include "dungeon/quest.h"
#include "floor/floor-mode-changer.h"
#include "game-option/birth-options.h"
--
2.11.0